From d35545d88b9123b92b50aaf1b0fa4e3f20fd2209 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 20 五月 2022 11:23:50 +0800
Subject: [PATCH] 摄像头
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 195 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 169 insertions(+), 26 deletions(-)
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 3dfff8f..405f68e 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
@@ -30,7 +30,6 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
-import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
@@ -62,6 +61,7 @@
private final PoleService poleService;
private final LightTaskPoleRelationService lightTaskPoleRelationService;
private final LightTaskMapper lightTaskMapper;
+ private final ClientService clientService;
/**
* 鏂板璺伅浠诲姟
@@ -76,7 +76,10 @@
week |= w;
}
LightTask lightTask = new LightTask();
- lightTask.setClientId(SecurityUtils.getClientId());
+ if (SecurityUtils.getClientId() != null) {
+ lightTask.setClientId(clientService.getClientId());
+ lightTask.setUserId(SecurityUtils.getUserId());
+ }
lightTask.setTaskName(param.getTaskName());
lightTask.setWeek(week);
lightTask.setLightAdress(param.getLightAddress());
@@ -84,8 +87,7 @@
lightTask.setOpenOrder(param.getOpenOrder());
lightTask.setControlOrder(param.getControlOrder());
lightTask.setCreateUser(SecurityUtils.getUsername());
- String framePayload = buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week);
- lightTask.setFramePayload(framePayload);
+ lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
if (!save(lightTask)) {
throw new BusinessException("淇濆瓨璺伅浠诲姟澶辫触");
}
@@ -107,7 +109,7 @@
+ "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "鏂板璺伅浠诲姟", content, poleCodeList.toString());
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "鏂板璺伅浠诲姟", content);
/**
* 鏂板璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
@@ -131,11 +133,9 @@
String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
- + "}锛寋鍐呭抚鎸囦护" + lightTask.getFramePayload()
- + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
- + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "涓嬪彂璺伅浠诲姟", content1, poleCodeList.toString());
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
@@ -152,36 +152,145 @@
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
}
+
+
+ //璁板綍浠诲姟缂栬緫鍣ㄥ墠鐏潌ID
+ List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+
+
int week = 0;
for (Integer w : param.getWeekList()) {
week |= w;
}
- lightTask.setTaskName(param.getTaskName());
- lightTask.setWeek(week);
- lightTask.setControlOrder(param.getControlOrder());
- lightTask.setOpenOrder(param.getOpenOrder());
- lightTask.setCloseOrder(param.getCloseOrder());
- lightTask.setLightAdress(param.getLightAddress());
- lightTask.setUpdateTime(LocalDateTime.now());
- lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
- if (!updateById(lightTask)) {
+ LightTask newLightTask = new LightTask();
+ newLightTask.setTaskName(param.getTaskName());
+ if (SecurityUtils.getClientId() != null) {
+ lightTask.setClientId(clientService.getClientId());
+ lightTask.setUserId(SecurityUtils.getUserId());
+ }
+ newLightTask.setWeek(week);
+ newLightTask.setCreateUser(SecurityUtils.getUsername());
+ newLightTask.setControlOrder(param.getControlOrder());
+ newLightTask.setOpenOrder(param.getOpenOrder());
+ newLightTask.setCloseOrder(param.getCloseOrder());
+ newLightTask.setLightAdress(param.getLightAddress());
+ newLightTask.setUpdateTime(LocalDateTime.now());
+ newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
+
+ if (!save(newLightTask)) {
throw new BusinessException("缂栬緫浠诲姟澶辫触");
}
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ List<String> poleCodeList = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
+ List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+ if (CollectionUtil.isNotEmpty(poleList)) {
+ poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
+ }
+ }
+ String content = "{浠诲姟ID锛�" + newLightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
+ + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload()
+ + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
List<Long> poleIdList = param.getPoleIdList();
if (CollectionUtil.isNotEmpty(poleIdList)) {
+ List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(newLightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ //鐘舵�佷笉涓�0 鏂板缓浠诲姟
+ lightTaskPoleRelationList.forEach(
+ taskResult -> {
+ //淇濆瓨涓嬪彂澶辫触鐨勪换鍔″叧鑱斿叧绯伙紝鐘舵�佷负O鎴愬姛锛屽叾浠栫姸鎬侀兘涓哄け璐�
+ if (taskResult.getIssueStatus() == 0) {
+ for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
+ if (bean.getId().equals(taskResult.getPoleId())) {
+ oldLightTaskStatusAndPoles.remove(bean);
+ break;
+ }
+ }
+ }
+ }
+ );
+ //淇敼鐏潌浠诲姟缁戝畾鍏崇郴琛�
+ for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
+ //鎴愬姛鎵嶄慨鏀癸紝澶辫触涓嶅彉
+ if (bean.getIssueStatus() == 0) {
- List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
-
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
- // 娣诲姞缁戝畾鐏潌
- if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
- throw new BusinessException("缁戝畾鐏潌澶辫触");
+ LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
+ if (one != null) {
+ one.setTaskId(newLightTask.getTaskId());
+ lightTaskPoleRelationService.updateById(one);
+ } else {
+ lightTaskPoleRelationService.save(bean);
+ }
+ }
}
- // 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+ List<Long> failPoleId = new ArrayList<>();
+ for (LightTaskStatusAndPole bean1 : oldLightTaskStatusAndPoles) {
+ failPoleId.add(bean1.getId());
+ }
+ //鎵ц鍏崇伅
+ String framePayloadClose = "7f0000007f173b00";
+
+ List<LightTaskPoleRelation> lightTaskPoleRelations = new ArrayList<>();
+ if (!failPoleId.isEmpty()) {
+ lightTaskPoleRelations = sendControllerFrame(lightTask, failPoleId, framePayloadClose, lightTask.getLightAdress());
+ }
+
+ //鐘舵�佷笉涓�0 鏂板缓浠诲姟
+ lightTaskPoleRelations.forEach(
+ taskResult -> {
+ //淇濆瓨涓嬪彂澶辫触鐨勪换鍔″叧鑱斿叧绯伙紝鐘舵�佷负O鎴愬姛锛屽叾浠栫姸鎬侀兘涓哄け璐�
+ if (taskResult.getIssueStatus() == 0) {
+ for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
+ if (bean.getId().equals(taskResult.getPoleId())) {
+ oldLightTaskStatusAndPoles.remove(bean);
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()).eq(LightTaskPoleRelation::getPoleId, bean.getId()));
+ break;
+ }
+ }
+ }
+ }
+ );
+
+
+ //浠诲姟椤哄埄瀹屾垚
+ if (oldLightTaskStatusAndPoles.size() == 0) {
+ removeById(lightTask);
+ }
+
+
+// // 娣诲姞缁戝畾鐏潌
+// if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
+// throw new BusinessException("缁戝畾鐏潌澶辫触");
+// }
+//
+// // 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
+// lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+
+ String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+ + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
}
return true;
@@ -287,6 +396,11 @@
throw new BusinessException("鎵句笉鍒颁换鍔′俊鎭�");
}
+ List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
+ if (list.size() != 0) {
+ throw new BusinessException("鍒犻櫎浠诲姟澶辫触锛屽垹闄ょ殑浠诲姟鏈夌伅鏉嗘鍦ㄤ娇鐢�");
+ }
+
// 鍒犻櫎浠诲姟
if (!removeByIds(taskIdList)) {
throw new BusinessException("鍒犻櫎浠诲姟澶辫触");
@@ -304,6 +418,14 @@
}
);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鎺х伅浠诲姟id锛�" + taskIdList + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
return true;
}
@@ -377,11 +499,32 @@
}
String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ List<String> poleCodeList = new ArrayList<>();
+ List<Pole> list = SpringContextHolder.getBean(PoleService.class).list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, param.getPoleId()));
+ if (CollectionUtil.isNotEmpty(list)) {
+ poleCodeList = list.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
+ }
+ String content = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+ + "}," + " 鐏潌ID锛�" + param.getPoleId()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
+
if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0),
Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId())
.eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
}
+
+
return true;
}
}
--
Gitblit v1.9.3