From 0f5b61e7faf30dce9281c913fae59aa9d05c61c4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 23 九月 2022 16:53:22 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 343 +++++++++++++-----------------
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskInfoVO.java | 21 +
dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java | 7
dao/src/main/resources/mapper/LightEnergyDataMapper.xml | 24 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java | 4
dao/src/main/java/com/sandu/ximon/dao/mapper/LightEnergyDataMapper.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 7
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java | 56 ----
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java | 35 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskVO.java | 53 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java | 24 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/config/BroadcastAPI.java | 9
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java | 4
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskDelParam.java | 7
dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java | 13
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 30 +
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/TerminalDto.java | 4
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java | 8
18 files changed, 352 insertions(+), 299 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java
index 219bd89..64c28ab 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java
@@ -4,21 +4,19 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
+import lombok.Data;
/**
* 鍗曠伅浠诲姟鑳借��/鑺傝兘鐜囪〃
- *
* @TableName light_energy_data
*/
-@TableName(value = "light_energy_data")
+@TableName(value ="light_energy_data")
@Data
public class LightEnergyData implements Serializable {
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -49,6 +47,11 @@
private Long poleId;
/**
+ * 鐏ご鍦板潃
+ */
+ private String lightAdderss;
+
+ /**
* 鐢ㄦ埛id
*/
private Long userId;
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java
index 7363bca..3cf65b0 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 璺伅浠诲姟琛�
@@ -42,11 +43,13 @@
/**
* 1鏆傚仠銆�0鍚敤
*/
+ @JsonIgnore
private Integer pause;
/**
* 鏄熸湡鍑狅紝浣嶈繍绠椾繚瀛橈紝1浠ｈ〃鏄熸湡涓�锛�2鏄熸湡浜岋紝4鏄熸湡涓夛紝8鏄熸湡鍥涳紝16鏄熸湡浜旓紝32鏄熸湡鍏紝64鏄熸湡鏃�
*/
+ @JsonIgnore
private Integer week;
/**
@@ -91,4 +94,8 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+
+ @TableField(exist = false)
+ private List<Integer> weekList;
}
\ No newline at end of file
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightEnergyDataMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightEnergyDataMapper.java
index 7e8e80f..51ad78e 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightEnergyDataMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightEnergyDataMapper.java
@@ -9,7 +9,7 @@
/**
* @author Administrator
* @description 閽堝琛ㄣ�恖ight_energy_data(鍗曠伅浠诲姟鑳借��/鑺傝兘鐜囪〃)銆戠殑鏁版嵁搴撴搷浣淢apper
- * @createDate 2022-05-20 14:21:29
+ * @createDate 2022-09-23 11:13:50
* @Entity com.sandu.ximon.dao.domain.LightEnergyData
*/
@Mapper
diff --git a/dao/src/main/resources/mapper/LightEnergyDataMapper.xml b/dao/src/main/resources/mapper/LightEnergyDataMapper.xml
index df4456e..e134f2e 100644
--- a/dao/src/main/resources/mapper/LightEnergyDataMapper.xml
+++ b/dao/src/main/resources/mapper/LightEnergyDataMapper.xml
@@ -5,21 +5,21 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightEnergyDataMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightEnergyData">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="taskId" column="task_id" jdbcType="BIGINT"/>
- <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
- <result property="energy" column="energy" jdbcType="DOUBLE"/>
- <result property="energySaving" column="energy_saving" jdbcType="DOUBLE"/>
- <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="clientId" column="client_id" jdbcType="BIGINT"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="taskId" column="task_id" jdbcType="BIGINT"/>
+ <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
+ <result property="energy" column="energy" jdbcType="DECIMAL"/>
+ <result property="energySaving" column="energy_saving" jdbcType="DECIMAL"/>
+ <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
+ <result property="lightAdderss" column="light_adderss" jdbcType="VARCHAR"/>
+ <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="clientId" column="client_id" jdbcType="BIGINT"/>
</resultMap>
<sql id="Base_Column_List">
- id
- ,task_id,ytd_time,
- energy,energy_saving,user_id,
- client_id
+ id,task_id,ytd_time,
+ energy,energy_saving,pole_id,
+ light_adderss,user_id,client_id
</sql>
<select id="getEnergyList" resultType="com.sandu.ximon.dao.domain.LightEnergyData">
SELECT
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/BroadcastAPI.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/BroadcastAPI.java
index 20cc0c7..90b404a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/BroadcastAPI.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/BroadcastAPI.java
@@ -29,15 +29,14 @@
DEL_TASK("/del_task"),
ADD_REGION("/add_region"),
- GET_REGION_LIST("/get_region_list");
+ GET_REGION_LIST("/get_region_list");;
- ;
+ private static final String SERVER = "http://47.106.172.9:8000";//todo 鎻愬彇鍒伴厤缃枃浠�
- private static final String SERVER = "http://47.106.172.9:8000";
-
- BroadcastAPI(String url){
+ BroadcastAPI(String url) {
this.url = url;
}
+
private String url;
public String getUrl() {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
index 42ac6a4..8539d55 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
@@ -2,6 +2,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.param.ReceiveParam;
@@ -83,4 +84,11 @@
return ResponseUtil.success("淇敼闊抽噺澶辫触锛�");
}
}
+
+ @AnonymousAccess
+ @PostMapping("/getInfo")
+ public ResponseVO<Object> getInfo() {
+ return ResponseUtil.success(IpVolumeService.getInfo());
+ }
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
index 52366f0..27fc02c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -17,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 璺伅浠诲姟鐩稿叧鎺у埗绫�
@@ -58,7 +57,7 @@
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- String result = lightTaskService.delLightTask(param.getTaskIdList());
+ String result = lightTaskService.delLightTask(param.getTaskId());
return ResponseUtil.success(result);
}
@@ -80,22 +79,21 @@
* @param
* @return
*/
- @PostMapping("/clear")
- public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
- if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- boolean result = lightTaskService.clearLightTask(poleIds);
- return ResponseUtil.success(result);
- }
-
+// @PostMapping("/clear")
+// public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
+// if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
+// boolean result = lightTaskService.clearLightTask(poleIds);
+// return ResponseUtil.success(result);
+// }
@GetMapping("/{taskId}")
public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
- return ResponseUtil.success(objectObjectMap);
+
+ return ResponseUtil.success(lightTaskService.detailLightTask(taskId));
}
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java
index 1e60015..7685227 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java
@@ -22,10 +22,10 @@
/**
* 鐏ご1鏄惁鎵ц
*/
- private Boolean light1 = false;
+// private Boolean light1 = false;
/**
* 鐏ご2鏄惁鎵ц
*/
- private Boolean light2 = false;
+// private Boolean light2 = false;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/TerminalDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/TerminalDto.java
index 14cc69d..5a7b256 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/TerminalDto.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/TerminalDto.java
@@ -15,6 +15,8 @@
// 缁堢 IP 鍦板潃
private String ip;
// 缁堢闊抽噺(1-100)
+ private Integer volume;
+ // 缁堢闊抽噺(1-100)
private Integer volumn;
// 缁堢鐧婚檰鐨勯粯璁ら煶閲�
private Integer defaultVolumn;
@@ -35,4 +37,6 @@
// 鍛煎彨绛栫暐 ID锛岃缁堢鏈夊懠鍙姛鑳芥敮鎸�
private Integer strategy_id;
+
+
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskDelParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskDelParam.java
index b9ff90e..ce8f634 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskDelParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskDelParam.java
@@ -1,11 +1,8 @@
package com.sandu.ximon.admin.param;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
-import java.util.List;
/**
* @author chenjiantian
@@ -14,7 +11,7 @@
@Data
public class LightTaskDelParam {
- @NotEmpty(message = "浠诲姟id涓嶈兘涓虹┖")
- private List<Long> taskIdList;
+ @NotNull(message = "浠诲姟id涓嶈兘涓虹┖")
+ private Long taskId;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
index 58245b0..45df555 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
@@ -5,7 +5,6 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -51,4 +50,7 @@
private String lightAddress;
private List<Long> poleIdList;
+
+
+ private Long taskId;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index b0ffe3d..3724557 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -6,12 +6,12 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
-import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -332,4 +332,9 @@
*/
return flag;
}
+
+
+ public static Object getInfo() {
+ return TerminalAPIUtils.getTerminalInfo(23);
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index 2f08bb8..5304552 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -29,10 +29,7 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
-import com.sandu.ximon.dao.domain.Light;
-import com.sandu.ximon.dao.domain.LightReportData;
-import com.sandu.ximon.dao.domain.Pole;
-import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightMapper;
@@ -636,7 +633,7 @@
*
* @return
*/
- public BigDecimal jisuan(LightTaskDto Task) {
+ public BigDecimal jisuan(LightTaskDto Task, LightTaskPoleRelation bean) {
final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
/**
* 鑺傝兘鐜囪绠楀紑濮�
@@ -758,9 +755,10 @@
* 涓�澶╃殑鑳借��
*
* @param
+ * @param bean
* @return
*/
- public BigDecimal jisuanEnergy(LightTaskDto Task) {
+ public BigDecimal jisuanEnergy(LightTaskDto Task, LightTaskPoleRelation bean) {
//瀛樻斁鑳借��
final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
@@ -779,9 +777,21 @@
}
/**
- * 鑺傝兘鐜囪绠楀紑濮�
+ * 鑳借�楄绠楀紑濮�
*/
- List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
+// List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
+ List<PoleTaskLightPowerBo> poleTaskLightPowerBos = new ArrayList<>();
+ PoleTaskLightPowerBo poleTaskLightPowerBo = new PoleTaskLightPowerBo();
+ Light one = getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, bean.getDeviceCode()));
+
+ if (one != null) {
+ if ("0001".equals(bean.getLightAddress())) {
+ poleTaskLightPowerBo.setPower1(one.getPower1());
+ } else {
+ poleTaskLightPowerBo.setPower2(one.getPower2());
+ }
+ }
+ poleTaskLightPowerBos.add(poleTaskLightPowerBo);
ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
//鑾峰彇鍒板崟鐏换鍔＄殑鑺傝兘鐜�
@@ -1009,14 +1019,14 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode,String orderBy) {
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode, String orderBy) {
List<String> list;
if (SecurityUtils.getClientId() != null) {
PageHelper.startPage(pageNo, pageSize);
list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
} else {
- PageHelper.startPage(pageNo, pageSize,orderBy);
+ PageHelper.startPage(pageNo, pageSize, orderBy);
list = baseMapper.listCode(null, keyword, deviceCode);
}
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 8aaa080..324735b 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,11 @@
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;
import com.github.pagehelper.PageHelper;
@@ -29,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;
@@ -38,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;
@@ -94,7 +94,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);
@@ -150,18 +150,18 @@
// s = s + newLightTask.getControlOrder();
// }
// // 鏇存柊绯荤粺瀹氭椂
-// commend.setSysScheduled(s);
+ commend.setSysScheduled(JSON.toJSONString(newLightTask));
+ System.out.println(commend.getIssueStatus() + "鐘舵��");
if (commend.getIssueStatus() == 0) {
//涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
- commend.setDeviceScheduled(JSONUtils.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(JSONUtils.toJSONString(oldTask));
+ commend.setDeviceScheduled(task.getDeviceScheduled());
}
});
@@ -183,7 +183,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;
//淇濆瓨浠诲姟鍏崇郴
@@ -227,7 +227,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);
@@ -347,24 +347,17 @@
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));
}
}
});
@@ -376,8 +369,17 @@
//缂栬緫鍓嶅悗鎵�鏈夌殑鐏潌ID闆嗗悎
poleIdList.addAll(oldList);
- if (!poleIdList.isEmpty()) {
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
+ List<Long> longs = new ArrayList<>();
+ //鍘婚噸
+ List<Long> collect = poleIdList.stream().distinct().collect(Collectors.toList());
+// for (Long item : poleIdList) {
+// if (!poleIdList.contains(item)) {
+// longs.add(item);
+// }
+// }
+ if (!collect.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, collect).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));
}
@@ -550,48 +552,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 鍙戠敓瀹氭椂鍛戒护
@@ -648,52 +608,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 鍙戠敓瀹氭椂鍛戒护
@@ -713,7 +627,6 @@
lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
-// }
map.put("success", success);
map.put("fail", fail);
map.put("all", lightTaskPoleRelationList);
@@ -723,65 +636,106 @@
@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());
+
+ 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;
}
/**
@@ -871,46 +825,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;
}
@@ -919,19 +858,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) {
@@ -950,22 +892,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;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java
index 8de0610..2e33a26 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java
@@ -3,14 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.config.BroadcastAPI;
+import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.utils.request.CommonRequestParams;
import com.sandu.ximon.admin.utils.response.CommonResponseVO;
import com.sandu.ximon.admin.utils.response.DataResponseVO;
import com.sandu.ximon.admin.vo.ListDataResponseVO;
-import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.vo.TerminalVO;
-import jodd.bean.BeanCopy;
-import jodd.bean.BeanUtil;
import org.springframework.beans.BeanUtils;
import java.util.ArrayList;
@@ -25,13 +23,7 @@
* @return
*/
public static TerminalDto getTerminalInfo(Integer terminalId) {
- DataResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams().put("id", terminalId).getParams(),
- BroadcastAPI.GET_TERMINAL.getUrl(),
- CharUtils.GBK),
- DataResponseVO.class
- );
+ DataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.GET_TERMINAL.getUrl(), CharUtils.GBK), DataResponseVO.class);
TerminalVO bean = responseVO.convert(TerminalVO.class);
@@ -49,13 +41,7 @@
* 鑾峰彇缁堢鏈嶅姟鍣ㄥ璞″垪琛�
*/
public static List<TerminalDto> getTerminalList() {
- ListDataResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams().getParams(),
- BroadcastAPI.GET_TERMINAL_LIST.getUrl(),
- CharUtils.GBK),
- ListDataResponseVO.class
- );
+ ListDataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().getParams(), BroadcastAPI.GET_TERMINAL_LIST.getUrl(), CharUtils.GBK), ListDataResponseVO.class);
List<TerminalDto> list = new ArrayList<>();
if (responseVO.covertTerminalList() != null) {
@@ -81,16 +67,7 @@
* @return
*/
public static boolean updateTerminal(Integer terminalId, TerminalVO terminalVO, Long userId) {
- CommonResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams()
- .put("id", terminalId)
- .put("data", JSON.toJSONString(terminalVO))
- .getParams(),
- BroadcastAPI.UPDATE_TERMINAL.getUrl(),
- CharUtils.GBK),
- CommonResponseVO.class
- );
+ CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", JSON.toJSONString(terminalVO)).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
if (responseVO.isOK()) {
// log("淇敼鎾斁缁堢(id:"+terminalId+", name:"+terminalVO.getName()+")",userId,null);
return true;
@@ -107,15 +84,7 @@
* @return
*/
public static boolean delTerminal(Integer terminalId, Long userId) {
- CommonResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams()
- .put("id", terminalId)
- .getParams(),
- BroadcastAPI.DEL_TERMINAL.getUrl(),
- CharUtils.GBK),
- CommonResponseVO.class
- );
+ CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.DEL_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
if (responseVO.isOK()) {
// log("鍒犻櫎鎾斁缁堢(id:"+terminalId+")",userId,null);
return true;
@@ -136,17 +105,10 @@
throw new BusinessException("IP闊虫煴纭欢璁惧涓嶅瓨鍦�");
}
terminalInfo.setDefaultVolumn(defaultVolumn);
- terminalInfo.setVolumn(defaultVolumn);
- CommonResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams()
- .put("id", terminalId)
- .put("data", terminalInfo)
- .getParams(),
- BroadcastAPI.UPDATE_TERMINAL.getUrl(),
- CharUtils.GBK),
- CommonResponseVO.class
- );
+ terminalInfo.setVolume(defaultVolumn);
+
+ CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", terminalInfo).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
+ System.out.println(responseVO + " response");
if (responseVO.isOK()) {
return true;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskInfoVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskInfoVO.java
new file mode 100644
index 0000000..38eca0b
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskInfoVO.java
@@ -0,0 +1,21 @@
+package com.sandu.ximon.admin.vo;
+
+import com.sandu.ximon.dao.domain.LightTask;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/9/23
+ */
+@Data
+public class LightTaskInfoVO {
+
+ /**
+ * 浠诲姟
+ */
+ private LightTask lightTask;
+
+ private List<LightTaskRelationVO> relations;
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java
new file mode 100644
index 0000000..91a4d4a
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java
@@ -0,0 +1,35 @@
+package com.sandu.ximon.admin.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.sandu.ximon.dao.domain.LightTask;
+import lombok.Data;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/9/23
+ */
+@Data
+public class LightTaskRelationVO {
+
+ private Long poleId;
+
+
+
+ private String lightAddress;
+
+ /**
+ * 浠诲姟涓嬪彂鐘舵�侊紝0鎴愬姛锛�1鏍￠獙鐮侀敊璇紝2闀垮害閿欒锛�3鍐檉lash閿欒锛�255鍏朵粬閿欒
+ */
+ private Integer issueStatus;
+
+
+ /**
+ * 绯荤粺瀹氭椂
+ */
+ private LightTaskVO sysScheduled;
+
+ /**
+ * 纭欢瀹氭椂
+ */
+ private LightTaskVO deviceScheduled;
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskVO.java
new file mode 100644
index 0000000..6d301bc
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskVO.java
@@ -0,0 +1,53 @@
+package com.sandu.ximon.admin.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/9/23
+ */
+@Data
+public class LightTaskVO {
+
+ private Long taskId;
+
+
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ private String taskName;
+
+ /**
+ * 鏄熸湡鍑狅紝浣嶈繍绠椾繚瀛橈紝1浠ｈ〃鏄熸湡涓�锛�2鏄熸湡浜岋紝4鏄熸湡涓夛紝8鏄熸湡鍥涳紝16鏄熸湡浜旓紝32鏄熸湡鍏紝64鏄熸湡鏃�
+ */
+ @JsonIgnore
+ private Integer week;
+
+ private List<Integer> weekList;
+
+ /**
+ * 寮�鐏懡浠�
+ */
+ private String openOrder;
+
+ /**
+ * 鍏抽棴鐏懡浠�
+ */
+ private String closeOrder;
+
+ /**
+ * 鐏帶鍛戒护
+ */
+ private String controlOrder;
+
+
+ /**
+ * 鎺х伅鍦板潃
+ */
+ private String lightAdress;
+
+
+}
--
Gitblit v1.9.3