dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java
@@ -70,6 +70,11 @@ private String framePayload; /** * 控灯地址 */ private String lightAdress = "FFFF"; /** * 创建用户 */ private String createUser; dao/src/main/resources/mapper/LightTaskMapper.xml
@@ -9,6 +9,7 @@ <result property="clientId" column="client_id" jdbcType="BIGINT"/> <result property="userId" column="user_id" jdbcType="BIGINT"/> <result property="taskName" column="task_name" jdbcType="VARCHAR"/> <result property="lightAdress" column="light_adress" jdbcType="VARCHAR"/> <result property="pause" column="pause" jdbcType="TINYINT"/> <result property="week" column="week" jdbcType="TINYINT"/> <result property="openOrder" column="open_order" jdbcType="VARCHAR"/> ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightBrightnessReqInnerFrame.java
@@ -21,8 +21,13 @@ /** * @param lightLevel 亮度等级 [0,100] */ public A5LightBrightnessReqInnerFrame(Integer lightLevel) { String destinationAddress = "FFFF"; public A5LightBrightnessReqInnerFrame(Integer lightLevel, String lightAddress) { String destinationAddress; if (lightAddress == null || (!lightAddress.equals("0001") && !lightAddress.equals("0002"))) { destinationAddress = "FFFF"; } else { destinationAddress = lightAddress; } // 将整型亮度转换为Hex if (lightLevel < 0) { lightLevel = 0; ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/A5LightTimerReqInnerFrame.java
@@ -25,8 +25,13 @@ /** * @param framePayload 多个路灯定时指令， */ public A5LightTimerReqInnerFrame(String framePayload) { String destinationAddress = "FFFF"; public A5LightTimerReqInnerFrame(String framePayload, String lightAddress) { String destinationAddress; if (lightAddress == null || (!lightAddress.equals("0001") && !lightAddress.equals("0002"))) { destinationAddress = "FFFF"; } else { destinationAddress = lightAddress; } payload = destinationAddress + framePayload; this.payloadLength = SupplementUtils.suppleZero(Integer.toHexString((payload.length() / 2)).toUpperCase(), 4); } ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightControlParam.java
@@ -16,10 +16,13 @@ @NotBlank(message = "设备码不能为空") private String deviceCode; //双灯头控制参数 private String lightAddress = "FFFF"; @NotNull(message = "亮度不能为空") @Min(value = 0,message = "亮度最小为0") @Max(value = 100,message = "亮度最大为100") @Min(value = 0, message = "亮度最小为0") @Max(value = 100, message = "亮度最大为100") private Integer brightness; } ximon-admin/src/main/java/com/sandu/ximon/admin/param/LightTaskParam.java
@@ -45,5 +45,10 @@ */ private String controlOrder; /** * 灯头,默认全亮 */ private String lightAddress = "FFFF"; private List<Long> poleIdList; } ximon-admin/src/main/java/com/sandu/ximon/admin/quartz/LightTimerJob.java
@@ -1,9 +1,11 @@ package com.sandu.ximon.admin.quartz; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.util.SpringContextHolder; import com.sandu.common.util.ThrowableUtil; import com.sandu.ximon.admin.service.*; import com.sandu.ximon.dao.domain.LightTask; import com.sandu.ximon.dao.domain.LightTaskQuartz; import com.sandu.ximon.dao.domain.LightTaskQuartzLog; import org.quartz.JobExecutionContext; @@ -43,6 +45,7 @@ try { // 任务绑定的灯杆 List<Long> poleIdList = lightTaskPoleRelationService.listPoleIdByTaskId(taskId); String lightAdress = lightTaskService.getOne(Wrappers.lambdaQuery(LightTask.class).eq(LightTask::getTaskId, taskId)).getLightAdress(); // 灯杆的设备码 List<String> deviceCodeList = poleService.listDeviceCodeByIds(poleIdList); @@ -51,7 +54,7 @@ if (lightTaskQuartz != null) { for (String deviceCode : deviceCodeList) { // 定时给每个设备吗发送灯控请求 lightTaskService.sendTimeRRpc(lightTaskQuartz.getFramePayload(), deviceCode); lightTaskService.sendTimeRRpc(lightTaskQuartz.getFramePayload(), deviceCode, lightAdress); } log.setFramePayload(lightTaskQuartz.getFramePayload()); } ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -167,7 +167,7 @@ List<Map<String, Object>> resultList = new ArrayList<>(); for (LightControlParam param : paramList) { A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness()); A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness(), param.getLightAddress()); A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame); Map<String, Object> map = new HashMap<>(); try { ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -75,6 +75,7 @@ lightTask.setClientId(SecurityUtils.getClientId()); lightTask.setTaskName(param.getTaskName()); lightTask.setWeek(week); lightTask.setLightAdress(param.getLightAddress()); lightTask.setCloseOrder(param.getCloseOrder()); lightTask.setOpenOrder(param.getOpenOrder()); lightTask.setControlOrder(param.getControlOrder()); @@ -87,7 +88,7 @@ List<Long> poleIdList = param.getPoleIdList(); if (CollectionUtil.isNotEmpty(poleIdList)) { List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload()); List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress()); // 添加绑定灯杆 if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) { @@ -118,6 +119,7 @@ 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)); @@ -128,7 +130,7 @@ List<Long> poleIdList = param.getPoleIdList(); if (CollectionUtil.isNotEmpty(poleIdList)) { List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload()); List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress()); lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId())); // 添加绑定灯杆 @@ -150,8 +152,8 @@ * @param deviceCode 设备吗 * @return 返回帧 */ public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode) { IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload)) public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode, String lightAddress) { IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload, lightAddress)) .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build(); WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance() .sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class); @@ -207,7 +209,7 @@ // 每个路灯发送控制帧 返回关联列表 private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload) { private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload, String lightAddress) { List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>(); List<Pole> poles = poleService.listByIds(poleIdList); @@ -221,7 +223,7 @@ lightTaskPoleRelation.setTaskId(lightTask.getTaskId()); // rrpc 发生定时命令 try { A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode()); A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress); if (a5LightTimerRespInnerFrame == null) { lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode()); } else { @@ -332,7 +334,7 @@ throw new BusinessException("找不到任务"); } String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek()); List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload); List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress()); if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) { return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()) ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java
@@ -54,7 +54,7 @@ @Test void rrpcLightControl() { // 32313243305008ff1a06ffff A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(80); A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(80, "FFFF"); A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame); try { WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
