From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 404 +++++++++++++++++++++++++++------------------------------
1 files changed, 192 insertions(+), 212 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 0227b49..7ca83bb 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
@@ -2,11 +2,10 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
-import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
@@ -30,8 +29,9 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
-import com.sandu.ximon.dao.bo.LightTaskPoleRelationBo;
-import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
+import com.sandu.ximon.admin.vo.LightTaskInfoVO;
+import com.sandu.ximon.admin.vo.LightTaskRelationVO;
+import com.sandu.ximon.admin.vo.LightTaskVO;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
@@ -39,7 +39,6 @@
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
-import com.sandu.ximon.dao.mapper.LightTaskPoleRelationMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -84,7 +83,6 @@
if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
}
-// LightTask lightTask = getById(null);
int week = 0;
@@ -95,7 +93,7 @@
LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
- newLightTask.setClientId(clientService.getClientId());
+ newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
newLightTask.setUserId(SecurityUtils.getUserId());
newLightTask.setWeek(week);
@@ -145,24 +143,18 @@
newPoleMap.forEach(
commend -> {
//寮�鍏崇伅鏃堕棿
-// String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
-// if (newLightTask.getControlOrder() != null) {
-// //鎺х伅鏃堕棿
-// s = s + newLightTask.getControlOrder();
-// }
-// // 鏇存柊绯荤粺瀹氭椂
-// commend.setSysScheduled(s);
+ commend.setSysScheduled(JSON.toJSONString(newLightTask));
+ System.out.println(commend.getIssueStatus() + "鐘舵��");
if (commend.getIssueStatus() == 0) {
//涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
- commend.setDeviceScheduled(JSONObject.toJSONString(newLightTask));
+ commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
} else {
//涓嬪彂澶辫触 鏇存柊绯荤粺瀹氭椂 淇濈暀纭欢瀹氭椂 纭欢瀹氭椂
// commend.setSysScheduled(s);
oldLightTaskStatusAndPoles.forEach(task -> {
if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
//鍚屼竴涓伅澶�
- LightTask oldTask = getById(task.getTaskId());
- commend.setDeviceScheduled(JSONObject.toJSONString(oldTask));
+ commend.setDeviceScheduled(task.getDeviceScheduled());
}
});
@@ -184,7 +176,7 @@
//鍒犻櫎鏃х殑鍏崇郴
lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()).in(LightTaskPoleRelation::getPoleId, poleIdList));
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));
boolean b = true;
//淇濆瓨浠诲姟鍏崇郴
@@ -214,6 +206,9 @@
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
+ if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
+ throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
+ }
LightTask newLightTask = getById(taskId);
if (newLightTask == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
@@ -225,10 +220,9 @@
week |= w;
}
-// LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
- newLightTask.setClientId(clientService.getClientId());
+ newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
newLightTask.setUserId(SecurityUtils.getUserId());
newLightTask.setWeek(week);
@@ -341,32 +335,47 @@
all.addAll(newPoleFail);
all.addAll(oldPoleSuccess);
all.addAll(oldPoleFail);
- all.addAll(closePoleSuccess);
- all.addAll(closePoleFail);
+
+
+ if (closePoleFail.size() != 0) {
+ List<LightTaskPoleRelation> colesFail = new ArrayList<>();
+ //鍘熸潵浠诲姟涓湰韬氨涓嬪彂澶辫触鐨勪换鍔� 鍗崇‖浠跺畾鏃朵负绌� 缂栬緫鍚庤繘琛屽叧鐏搷浣� 鍙洿鎺ュ墧闄や换鍔″叧绯�
+ closePoleFail.forEach(
+ close -> {
+ relations.forEach(
+ task -> {
+ System.out.println(task.getLightAddress().equals(close.getLightAddress()) + " addressResult");
+ System.out.println(close.getLightAddress() + " close.getLightAddress()");
+ if (task.getLightAddress().equals(close.getLightAddress()) && task.getDeviceCode().equals(close.getDeviceCode())
+ && task.getDeviceScheduled() != null && !task.getDeviceScheduled().isEmpty()) {
+ colesFail.add(close);
+ }
+ }
+ );
+ all.addAll(colesFail);
+ }
+ );
+
+ }
+
if (!all.isEmpty()) {
List<LightTaskPoleRelation> finalOldRelation = relations;
all.forEach(
commend -> {
- commend.setTaskId(newLightTask.getTaskId());
- //寮�鍏崇伅鏃堕棿
- String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
- if (newLightTask.getControlOrder() != null) {
- //鎺х伅鏃堕棿
- s = s + newLightTask.getControlOrder();
- }
// 鏇存柊绯荤粺瀹氭椂
- commend.setSysScheduled(s);
+ commend.setSysScheduled(JSON.toJSONString(newLightTask));
+ commend.setTaskId(taskId);
// 鍏堣缃‖浠跺畾鏃朵负涓婃鐨勭‖浠跺畾鏃� 涓嶈鎴愬姛澶辫触
- String finalS = s;
finalOldRelation.forEach(task -> {
if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
//鍚屼竴涓伅澶�
commend.setDeviceScheduled(task.getDeviceScheduled());
if (commend.getIssueStatus() == 0) {
//涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
- commend.setDeviceScheduled(finalS);
+ commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
}
+
}
});
@@ -377,10 +386,14 @@
//缂栬緫鍓嶅悗鎵�鏈夌殑鐏潌ID闆嗗悎
poleIdList.addAll(oldList);
- if (!poleIdList.isEmpty()) {
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
+ //鍘婚噸
+ List<Long> collect = poleIdList.stream().distinct().collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, collect).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));
}
+
if (!all.isEmpty()) {
b = lightTaskPoleRelationService.saveBatch(all);
@@ -551,48 +564,6 @@
lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
// rrpc 鍙戠敓瀹氭椂鍛戒护
-// if ("FFFF".equals(lightAddress)) {
-// LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
-// lightTaskPoleRelation01.setPoleId(pole.getId());
-// lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
-// lightTaskPoleRelation01.setLightAddress("0001");
-//
-// LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
-// lightTaskPoleRelation02.setPoleId(pole.getId());
-// lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
-// lightTaskPoleRelation02.setLightAddress("0002");
-//
-// // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
-// try {
-// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
-// //鐏ご1
-// if (a5LightTimerRespInnerFrame01 == null) {
-// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// } else {
-// lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
-// }
-//
-// } catch (BusinessException e) {
-// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// }
-//
-// // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
-// try {
-// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
-// //鐏ご2
-// if (a5LightTimerRespInnerFrame02 == null) {
-// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// } else {
-// lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
-// }
-//
-// } catch (BusinessException e) {
-// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// }
-//
-// lightTaskPoleRelationList.add(lightTaskPoleRelation01);
-// lightTaskPoleRelationList.add(lightTaskPoleRelation02);
-// } else {
lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
lightTaskPoleRelation.setLightAddress(lightAddress);
// rrpc 鍙戠敓瀹氭椂鍛戒护
@@ -649,52 +620,6 @@
// rrpc 鍙戠敓瀹氭椂鍛戒护
-// if ("FFFF".equals(lightAddress)) {
-// LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
-// lightTaskPoleRelation01.setPoleId(pole.getId());
-// lightTaskPoleRelation01.setLightAddress("0001");
-//
-// LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
-// lightTaskPoleRelation02.setPoleId(pole.getId());
-// lightTaskPoleRelation02.setLightAddress("0002");
-//
-// // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
-// try {
-// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
-// //鐏ご1
-// if (a5LightTimerRespInnerFrame01 == null) {
-// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// fail.add(lightTaskPoleRelation01);
-// } else {
-// lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
-// success.add(lightTaskPoleRelation01);
-// }
-//
-// } catch (BusinessException e) {
-// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// fail.add(lightTaskPoleRelation01);
-// }
-//
-// // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
-// try {
-// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
-// //鐏ご2
-// if (a5LightTimerRespInnerFrame02 == null) {
-// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// fail.add(lightTaskPoleRelation02);
-// } else {
-// lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
-// success.add(lightTaskPoleRelation02);
-// }
-//
-// } catch (BusinessException e) {
-// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
-// fail.add(lightTaskPoleRelation02);
-// }
-//
-// lightTaskPoleRelationList.add(lightTaskPoleRelation01);
-// lightTaskPoleRelationList.add(lightTaskPoleRelation02);
-// } else {
lightTaskPoleRelation.setLightAddress(lightAddress);
lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
// rrpc 鍙戠敓瀹氭椂鍛戒护
@@ -714,7 +639,6 @@
lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
-// }
map.put("success", success);
map.put("fail", fail);
map.put("all", lightTaskPoleRelationList);
@@ -724,65 +648,110 @@
@Transactional(rollbackFor = Exception.class)
- public String delLightTask(List<Long> taskIdList) {
- List<LightTask> lightTaskList = listByIds(taskIdList);
- if (CollectionUtil.isEmpty(lightTaskList)) {
+ public String delLightTask(Long taskId) {
+ LightTask byId = getById(taskId);
+ if (byId == null) {
throw new BusinessException("鎵句笉鍒颁换鍔′俊鎭�");
}
//鍙栧嚭浠诲姟鍏崇郴
- List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
+ List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
//鍙栧嚭鐏潌id
List<Long> poleIds = relations.stream().map(LightTaskPoleRelation::getPoleId).distinct().collect(Collectors.toList());
- //涓嬪彂娓呴櫎浠诲姟鎸囦护
-// boolean b = clearLightTask(lightTaskIds);
- Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", "FFFF");
- /**
- * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
- */
- String content = "{鎺х伅浠诲姟id锛�" + taskIdList + " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
- /**
- * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
- if (ffff.get("fail").size() == 0) {
- //鍏ㄩ儴娓呴櫎鎴愬姛 鍒犻櫎鍏ㄩ儴浠诲姟鍏崇郴
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
- //鍒犻櫎浠诲姟
- removeByIds(taskIdList);
- return "浠诲姟鍒犻櫎鎴愬姛";
+ if (poleIds != null && poleIds.size() > 0) {
+ //瀛樺湪浠诲姟鍏崇郴 涓嬪彂娓呴櫎浠诲姟鎸囦护
+ Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());
+
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鎺х伅浠诲姟id锛�" + taskId + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+ if (ffff.get("fail").size() == 0) {
+ //鍏ㄩ儴娓呴櫎鎴愬姛 鍒犻櫎鍏ㄩ儴浠诲姟鍏崇郴
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
+ //鍒犻櫎浠诲姟
+ removeById(taskId);
+ return "浠诲姟鍒犻櫎鎴愬姛";
+ } else if (ffff.get("success").size() != ffff.get("all").size()) {
+ //閮ㄥ垎鎴愬姛 鍒犻櫎鎴愬姛閮ㄥ垎鐨勫叧绯� 淇濈暀浠诲姟
+ List<LightTaskPoleRelation> relations1 = ffff.get("success");
+ if (relations1 != null && relations1.size() > 0) {
+ relations1.forEach(lightTaskPoleRelation -> {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, taskId));
+ });
+ }
+ return "閮ㄥ垎浠诲姟鍒犻櫎鎴愬姛,娓呴櫎浠诲姟澶辫触鐨勪换鍔″強鏁版嵁淇濈暀!";
+ } else if (ffff.get("fail").size() == ffff.get("all").size()) {
+ //鍏ㄩ儴澶辫触 淇濈暀浠诲姟
+ return "浠诲姟鍒犻櫎澶辫触 ,璇锋鏌ョ‖浠惰澶�!";
+ } else {
+ return "浠诲姟鍒犻櫎澶辫触,鏈煡閿欒绫诲瀷!";
+ }
} else {
- //閮ㄥ垎娓呴櫎鎴愬姛 鍒犻櫎鎴愬姛閮ㄥ垎鐨勪换鍔″叧绯�
- ffff.get("success").forEach(lightTaskPoleRelation -> {
- lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
- .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, lightTaskPoleRelation.getTaskId()));
- });
- //鍒犻櫎浠诲姟
- lightTaskList.forEach(
- taskId -> {
- List<LightTaskPoleRelation> poleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
- if (poleRelations.size() == 0) {
- //涓嶅瓨鍦ㄤ换鍔″叧绯� 鍒犻櫎浠诲姟
- removeById(taskId);
- }
- }
- );
- return "閮ㄥ垎浠诲姟鍒犻櫎鎴愬姛,娓呴櫎浠诲姟澶辫触鐨勪换鍔″強鏁版嵁淇濈暀";
+ //涓嶅瓨鍦ㄤ换鍔″叧绯� 绌轰换鍔＄洿鎺ュ垹闄�
+ removeById(taskId);
+ return "浠诲姟鍒犻櫎鎴愬姛";
}
}
/**
* 浠诲姟璇︽儏
*/
- public Map<Object, Object> detailLightTask(Long taskId) {
+ public Object detailLightTask(Long taskId) {
LightTask lightTask = getById(taskId);
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒颁换鍔�");
}
- List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
- return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
+ LightTaskInfoVO vo = new LightTaskInfoVO();
+
+// LightTaskDto lightTaskDto = new LightTaskDto();
+// BeanUtils.copyProperties(lightTask, lightTaskDto);
+
+ lightTask.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
+
+ vo.setLightTask(lightTask);
+ List<LightTaskRelationVO> relations = new ArrayList<>();
+ List<LightTaskPoleRelation> taskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getTaskId, taskId));
+ if (taskPoleRelations != null && !taskPoleRelations.isEmpty()) {
+ taskPoleRelations.forEach(
+ relation -> {
+ LightTaskRelationVO lightTaskRelationVO = new LightTaskRelationVO();
+ lightTaskRelationVO.setLightAddress(relation.getLightAddress());
+ lightTaskRelationVO.setIssueStatus(relation.getIssueStatus());
+ lightTaskRelationVO.setPoleId(relation.getPoleId());
+ Pole byId = poleService.getById(relation.getPoleId());
+ if (byId != null) {
+ lightTaskRelationVO.setPoleName(byId.getPoleName());
+ }
+
+ LightTaskVO sys = JSONObject.parseObject(relation.getSysScheduled(), LightTaskVO.class);
+ sys.setWeekList(TaskOrderUtil.parseLightWeek2List(sys.getWeek()));
+ lightTaskRelationVO.setSysScheduled(sys);
+
+ LightTaskVO device = JSONObject.parseObject(relation.getDeviceScheduled(), LightTaskVO.class);
+ if (device != null) {
+ device.setWeekList(TaskOrderUtil.parseLightWeek2List(device.getWeek()));
+ lightTaskRelationVO.setDeviceScheduled(device);
+ }
+ relations.add(lightTaskRelationVO);
+ }
+ );
+
+ vo.setRelations(relations);
+ }
+
+// List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+
+// return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
+ return vo;
}
/**
@@ -837,11 +806,21 @@
* 涓嬪彂鍗曚釜鐏潌鐨勪换鍔�
*/
public boolean issueLightTask(LightTaskIssueParam param) {
- LightTask lightTask = getById(param.getTaskId());
+
+ LightTaskPoleRelation relation = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+
+ if (relation == null) {
+ throw new BusinessException("鎵句笉鍒颁换鍔″叧绯�,鏃犳硶琛ュ彂");
+ }
+ LightTask lightTask = JSONObject.parseObject(relation.getSysScheduled(), LightTask.class);
+// LightTask lightTask = getById(param.getTaskId());
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒颁换鍔�");
}
+ //杞崲甯ф寚浠�
String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
+ //鍙戦�乺rpc 寰楀埌鍙戦�佺粨鏋�
List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());
/**
@@ -860,11 +839,17 @@
if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
- return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+ LightTaskPoleRelation lightTaskPoleRelation = lightTaskPoleRelationList.get(0);
+ if (lightTaskPoleRelation.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊纭欢瀹氭椂 杩斿洖鎴愬姛
+ relation.setDeviceScheduled(JSON.toJSONString(lightTaskPoleRelation));
+ lightTaskPoleRelationService.updateById(relation);
+ return true;
+ } else {
+ return false;
+ }
}
-
-
- return true;
+ return false;
}
@@ -872,46 +857,31 @@
* 璁＄畻鍔熺巼鍙婅兘鑰�
*/
public void energy() {
- List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
- List<Long> taskIdList = new ArrayList<>();
- for (LightTask bean : lightTasks) {
- taskIdList.add(bean.getTaskId());
- }
- if (taskIdList.size() != 0) {
- List<LightTaskPoleRelationBo> list = SpringContextHolder.getBean(LightTaskPoleRelationMapper.class).test(taskIdList);
- for (LightTaskPoleRelationBo bean : list) {
+ //鎵�鏈夊瓨鍦ㄤ换鍔＄殑鐏潌鍏崇郴
+ List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list();
+ for (LightTaskPoleRelation bean : list) {
+ if (bean.getDeviceScheduled() != null) {
+ //瀛樺湪纭欢浠诲姟
+ LightTask lightTask = JSONObject.parseObject(bean.getDeviceScheduled(), LightTask.class);
LightTaskDto lightTaskDto = new LightTaskDto();
- BeanUtils.copyProperties(bean, lightTaskDto);
- lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(bean.getWeek()));
+ BeanUtils.copyProperties(lightTask, lightTaskDto);
+ lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
BigDecimal energySaving;
BigDecimal energy;
//鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
int week = yesterday.getDayOfWeek().getValue();
- if (!list.isEmpty()) {
- //鏈夌粦瀹氱伅鏉� 杩涜璁＄畻
- if (lightTaskDto.getWeekList().contains(week)) {
- //浠诲姟鏈夎鏄熸湡鏁� 璁＄畻
- energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
- energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
- } else {
- //浠诲姟鏃犺鏄熸湡鏁� 杩斿洖
- energySaving = new BigDecimal(1);
- energy = BigDecimal.ZERO;
- }
- for (int i = 0; i < list.size(); i++) {
- LightTaskPoleRelation relation = list.get(i);
- if (relation.getIssueStatus() != 0) {
- //浠诲姟涓嬪彂澶辫触 杩斿洖
- energySaving = new BigDecimal(1);
- energy = BigDecimal.ZERO;
- }
- }
+
+ if (lightTaskDto.getWeekList().contains(week)) {
+ //浠诲姟鏈夎鏄熸湡鏁� 璁＄畻
+ energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto, bean);
+ energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto, bean);
+ System.out.println("鑳借��: " + energy + ", 鑺傝兘鐜�: " + energySaving);
} else {
- //鏈粦瀹氱伅鏉� 鐩存帴杩斿洖
+ //浠诲姟鏃犺鏄熸湡鏁� 杩斿洖
energySaving = new BigDecimal(1);
energy = BigDecimal.ZERO;
}
@@ -920,19 +890,22 @@
* 瀛樺偍鏁版嵁
*/
+ System.out.println("鑳借��: " + energy + ", 鑺傝兘鐜�: " + energySaving);
LightEnergyData lightEnergyData = new LightEnergyData();
- lightEnergyData.setTaskId(bean.getTaskId());
+ lightEnergyData.setTaskId(lightTask.getTaskId());
lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
lightEnergyData.setEnergySaving(energySaving);
lightEnergyData.setEnergy(energy);
- lightEnergyData.setUserId(bean.getUserId());
- lightEnergyData.setClientId(bean.getClientId());
+ lightEnergyData.setLightAdderss(lightTask.getLightAdress());
+ lightEnergyData.setUserId(lightTask.getUserId());
+ lightEnergyData.setClientId(lightTask.getClientId());
lightEnergyData.setPoleId(bean.getPoleId());
//淇濆瓨鑳借�楁暟鎹埌鏁版嵁搴�
lightEnergyDataService.save(lightEnergyData);
}
-
}
+
+
}
public boolean clearLightTask(List<Long> poleIds) {
@@ -951,22 +924,29 @@
String lightAddress = param.getLightAddress();
List<Long> poleIdList = param.getPoleIdList();
List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, lightAddress));
+ //閲嶅鐨勪换鍔d
List<Long> taskIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
- List<Long> poleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
- //poleIds涓噸澶嶅厓绱犲彧淇濈暀涓�涓�
+ //閲嶅鐨勭伅鏉唅d
+ List<Long> oldPoleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
+ //鏈噸澶嶇殑鐏潌id
+ List<Long> finalOldPoleIds = oldPoleIds;
+ //鍙栧嚭瀛樺湪浜巔oleIdList鑰屼笉鍦╫ldPoleIds涓殑鐏潌
+ List<Long> newPoleIds = poleIdList.stream().filter(id -> !finalOldPoleIds.contains(id)).collect(Collectors.toList());
+
+ //閲嶅鍏冪礌鍙繚鐣欎竴涓�
taskIds = taskIds.stream().distinct().collect(Collectors.toList());
- poleIds = poleIds.stream().distinct().collect(Collectors.toList());
+ oldPoleIds = oldPoleIds.stream().distinct().collect(Collectors.toList());
+ newPoleIds = newPoleIds.stream().distinct().collect(Collectors.toList());
Map map = new HashMap();
if (!lightTaskPoleRelations.isEmpty()) {
- map.put("request", "false");
- map.put("msg", "浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
- + "鐏潌id涓簕" + poleIds + "}");
-// throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
-// + "鐏潌id涓簕" + poleIds + "}");
+ map.put("result", "false");
+ map.put("newPoleIds", newPoleIds);
+ map.put("oldPoleIds", oldPoleIds);
+ map.put("taskIds", taskIds);
} else {
- map.put("request", "true");
+ map.put("result", "true");
map.put("msg", "浠诲姟涓棤閲嶅鐏潌鍦板潃");
}
return map;
--
Gitblit v1.9.3