From 3578b0ef674d6e356fb4ca11d534c2228cf37c4b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 15 八月 2022 18:23:18 +0800
Subject: [PATCH] changes
---
dao/src/main/java/com/sandu/ximon/dao/bo/LightBo.java | 3 +++
dao/src/main/resources/mapper/LightMapper.xml | 11 ++++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 14 +++++++-------
dao/src/main/java/com/sandu/ximon/dao/bo/LightTaskNameIdBo.java | 17 +++++++++++++++++
4 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/bo/LightBo.java b/dao/src/main/java/com/sandu/ximon/dao/bo/LightBo.java
index 479594f..25e82b4 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/bo/LightBo.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/bo/LightBo.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.List;
/**
* @author chenjiantian
@@ -19,4 +20,6 @@
private String taskName;
private LocalDateTime reportTime;
+ private List<LightTaskNameIdBo> taskNameIdBos;
+
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/bo/LightTaskNameIdBo.java b/dao/src/main/java/com/sandu/ximon/dao/bo/LightTaskNameIdBo.java
new file mode 100644
index 0000000..c8c692c
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/bo/LightTaskNameIdBo.java
@@ -0,0 +1,17 @@
+package com.sandu.ximon.dao.bo;
+
+import lombok.Data;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/8/15
+ */
+@Data
+public class LightTaskNameIdBo {
+
+ private Long taskId;
+
+ private String taskName;
+
+ private String lightAddress;
+}
diff --git a/dao/src/main/resources/mapper/LightMapper.xml b/dao/src/main/resources/mapper/LightMapper.xml
index 06dcc84..1cc69c0 100644
--- a/dao/src/main/resources/mapper/LightMapper.xml
+++ b/dao/src/main/resources/mapper/LightMapper.xml
@@ -23,7 +23,11 @@
<result property="poleId" column="pole_id" jdbcType="BIGINT"/>
<result property="poleCode" column="pole_code" jdbcType="VARCHAR"/>
<result property="poleName" column="pole_name" jdbcType="VARCHAR"/>
- <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
+ <collection property="taskNameIdBos" ofType="com.sandu.ximon.dao.bo.LightTaskNameIdBo">
+ <result property="taskId" column="task_id" jdbcType="BIGINT"/>
+ <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
+ <result property="lightAddress" column="light_address" jdbcType="VARCHAR"/>
+ </collection>
</resultMap>
@@ -33,7 +37,9 @@
t2.id AS pole_id,
t2.pole_code,
t2.pole_name,
- t4.task_name
+ t4.task_id AS task_id,
+ t4.task_name AS task_name,
+ t3.light_address AS light_address
FROM
light t1
LEFT JOIN pole t2 USING ( device_code )
@@ -50,7 +56,6 @@
)
</if>
</where>
- GROUP BY t1.device_code
</select>
<select id="listCode" resultType="java.lang.String">
SELECT
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 789d202..637c9c4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -270,7 +270,7 @@
List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
if (CollectionUtil.isNotEmpty(newPoleIdList)) {
//鏂扮伅鏉嗕笅鍙戞柊浠诲姟
- Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
//newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
@@ -282,7 +282,7 @@
List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
//瑕嗙洊鎿嶄綔鐏潌
- Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
}
@@ -293,7 +293,7 @@
System.out.println(closeLight + "closeLight");
if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null && closeLight.get(0) != null) {
//鍏崇伅鍐呭抚
- String framePayloadClose = "7f0000007f173b00";
+ String framePayloadClose = "7F0000007F173B00";
//鍏崇伅鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
@@ -409,7 +409,6 @@
WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
System.out.println(responseCommonFrame + " -----------responseCommonFrame");
StoreOperationRecordsUtils.storeInnerFrameData(deviceCode, "鍗曠伅甯�-鎺х伅", requestFrame, responseCommonFrame);
-
return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
}
@@ -612,6 +611,8 @@
* @return
*/
private Map<String, List<LightTaskPoleRelation>> sendControllerFrame(List<Long> poleIdList, String framePayload, String lightAddress) {
+
+ System.out.println("framePayload:" + framePayload);
List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
//鎴愬姛
List<LightTaskPoleRelation> success = new ArrayList<>();
@@ -636,7 +637,7 @@
// rrpc 鍙戠敓瀹氭椂鍛戒护
- /* if ("FFFF".equals(lightAddress)) {
+ if ("FFFF".equals(lightAddress)) {
LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
lightTaskPoleRelation01.setPoleId(pole.getId());
lightTaskPoleRelation01.setLightAddress("0001");
@@ -681,8 +682,7 @@
lightTaskPoleRelationList.add(lightTaskPoleRelation01);
lightTaskPoleRelationList.add(lightTaskPoleRelation02);
- } else */
- {
+ } else {
lightTaskPoleRelation.setLightAddress(lightAddress);
// rrpc 鍙戠敓瀹氭椂鍛戒护
try {
--
Gitblit v1.9.3