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/amqp/AmqpMessageListener.java
@@ -46,15 +46,6 @@ @Slf4j public class AmqpMessageListener implements MessageListener { @Autowired private C3ChargingService c3ChargingService; @Autowired private PoleBindingService bindingService; @Autowired private PoleService poleService; @Autowired private C3mOrderService orderService; protected final static ExecutorService EXECUTOR_SERVICE = new ThreadPoolExecutor( Runtime.getRuntime().availableProcessors(), @@ -143,133 +134,19 @@ private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) { String functionCode = frame.getPayload().substring(2, 4); if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) { // A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); // log.info("C3充电桩上报处理_netRequestFrame"); // log.info(netRequestFrame.toString()); //网络请求 // c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame); } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) { // 网页操作二维码请求(41) A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_codeRequestFrame"); log.info(codeRequestFrame.toString()); c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame); } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) { // 心跳包上报(42) 若五分钟无心跳包数据，则判断离线 c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame); } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) { A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_completeRequestFrame"); log.info(completeRequestFrame.toString()); // 充电结束上报(43) /** * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。 */ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress()); if (aPackage == null) { LogUtils.error("{ 充电桩(" + completeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }"); return; } refund(aPackage); c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame); } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) { A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_stopRequestFrame"); log.info(stopRequestFrame.toString()); A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress()); if (aPackage == null) { LogUtils.error("{ 充电桩(" + stopRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }"); return; } refund(aPackage); c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame); } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) { A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_errorCodeRequestFrame"); log.info(errorCodeRequestFrame.toString()); A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress()); if (aPackage == null) { LogUtils.error("{ 充电桩(" + errorCodeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }"); return; } refund(aPackage); c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame); } } private void atmosphereAnalysis(String productKey, String deviceName, CommonFrame frame) { A5AtmosphereHeartbeatReportInnerFrame transformFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload()); log.info("大气心跳上报"); log.info(transformFrame.toString()); } private void refund(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) { // private void refund(A5C3CommonReportInnerFrame completeRequestFrame,String code){ /** * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。 */ String c3Mac = aPackage.getC3Mac(); // 获取心跳包中的剩余金额和已充电量，与缓存中正在进行的订单进行对比 String chargingOrderJson = RedisUtils.getBean().get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3Mac); if (chargingOrderJson.isEmpty() || null == chargingOrderJson) { C3mCharging c3m = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac)); PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class) .eq(PoleBinding::getDeviceCode,aPackage.getC3Mac()) .eq(PoleBinding::getDeviceType, 2)); // 生成订单，并加载到redis缓存，设置超时时间为5分钟 C3mOrder order = new C3mOrderVO().generateOrder(binding.getPoleId() == null ? 0L : binding.getPoleId() , c3m.getPoleDevicesCode(), c3m.getC3Mac(), OrderType.ERROR, Double.valueOf(aPackage.getRemainingAmount()), Integer.parseInt(new java.text.DecimalFormat("0").format(aPackage.getReservedCapacity())) ); order.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity())); order.setOrderStatus(OrderStatus.REFUNDING.getStatus()); order.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount())); orderService.save(order); String s = c3ChargingService.finishCharging(c3Mac); // if(C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(code)){ // // } //是否需要区分log类型 待定 LogUtils.error("{ 充电桩(" + c3Mac + ")不存在正在进行的订单，请检查充电桩是否出现故障!结束订单,结果为" + s + "}"); } else { C3mOrder c3mOrderEntity = JSON.parseObject(chargingOrderJson, C3mOrder.class); // 设置已充电量，订单状态，退款金额，订单退款时间戳，订单退款说明，结束充电时间戳， c3mOrderEntity.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity())); c3mOrderEntity.setOrderStatus(OrderStatus.REFUNDING.getStatus()); c3mOrderEntity.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount())); // 获取剩余金额进行退款，并写入当前正在进行的订单 boolean b = orderService.orderRefund(c3mOrderEntity.getOutTradeNo(), c3mOrderEntity.getRefundAmount()); c3mOrderEntity.setRefundTimestamp(new Date().getTime()); if (b) { c3mOrderEntity.setOrderStatus(OrderStatus.REFUND.getStatus()); c3mOrderEntity.setRefundMsg("充电结束,订单退款成功"); } else { c3mOrderEntity.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus()); c3mOrderEntity.setRefundMsg( "充电结束,订单退款失败,请进行手动退款(订单号(" + c3mOrderEntity.getOutTradeNo() + "),总金额(" + c3mOrderEntity.getTotalAmount() + ",退款金额(" + aPackage.getRemainingAmount() + "))" ); } c3mOrderEntity.setStopChargingTimestamp(new Date().getTime()); orderService.updateById(c3mOrderEntity); // 清除缓存中正在进行中的订单 b = RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac()); if (!b) { try { Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); } RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac()); } // 发送结束订单 String s = c3ChargingService.finishCharging(c3Mac); LogUtils.error("{ 充电桩(" + c3Mac + ")不存在正在进行的订单，请检查充电桩是否出现故障!结束订单,结果为" + s + "}"); } } } ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -1,16 +1,32 @@ package com.sandu.ximon.admin.manager.iot.amqp.processor; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.util.SpringContextHolder; import com.sandu.ximon.admin.config.RedisConfig; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame; import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame; import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame; import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum; import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant; import com.sandu.ximon.admin.service.C3ChargingService; import com.sandu.ximon.admin.service.C3mOrderService; import com.sandu.ximon.admin.service.PoleBindingService; import com.sandu.ximon.admin.service.PoleService; import com.sandu.ximon.admin.utils.LogUtils; import com.sandu.ximon.admin.utils.RedisUtils; import com.sandu.ximon.admin.vo.C3mOrderVO; import com.sandu.ximon.dao.domain.C3mCharging; import com.sandu.ximon.dao.domain.C3mOrder; import com.sandu.ximon.dao.domain.PoleBinding; import com.sandu.ximon.dao.enums.OrderStatus; import com.sandu.ximon.dao.enums.OrderType; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; /** * @author ZZQ @@ -19,6 +35,15 @@ @Slf4j public class c3ChargingProcessor implements IMessageProcessor { @Autowired private C3ChargingService c3ChargingService; @Autowired private PoleBindingService bindingService; @Autowired private PoleService poleService; @Autowired private C3mOrderService orderService; public c3ChargingProcessor() { } @@ -33,7 +58,23 @@ @Override public void process(String productKey, String deviceName, CommonFrame frame) { String functionCode = frame.getPayload().substring(2, 4); if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) { if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) { A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_netRequestFrame"); log.info(netRequestFrame.toString()); if (netRequestFrame.isValidate()) { boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress()); if (!b) { return; } } } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) { // 网页操作二维码请求(41) A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_codeRequestFrame"); log.info(codeRequestFrame.toString()); } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) { log.info("心跳相应——C3充电桩数据" + productKey + " ------- " + deviceName); A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_heartbeatReportInnerFrame"); @@ -48,6 +89,42 @@ RedisUtils.getBean().set(C3mRedisConstant.C3_STATUS.getCode() + heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac() , heartbeatReportInnerFrame.getHeartBeatDataPackage(), 300L); } } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) { A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_completeRequestFrame"); log.info(completeRequestFrame.toString()); // 充电结束上报(43) /** * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。 */ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress()); if (aPackage == null) { LogUtils.error("{ 充电桩(" + completeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }"); return; } refund(aPackage); } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) { A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_stopRequestFrame"); log.info(stopRequestFrame.toString()); A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress()); if (aPackage == null) { LogUtils.error("{ 充电桩(" + stopRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }"); return; } refund(aPackage); } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) { A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_errorCodeRequestFrame"); log.info(errorCodeRequestFrame.toString()); A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress()); if (aPackage == null) { LogUtils.error("{ 充电桩(" + errorCodeRequestFrame.getDestinationAddress() + ")充电结束上报读取心跳包失败，请检查充电桩是否出现故障! }"); return; } refund(aPackage); } else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) { log.info("心跳响应——C3充电桩开始充电"); A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(frame.getPayload()); @@ -57,17 +134,75 @@ // if (operationReportInnerFrame.isValidate()) { // SpringContextHolder.getBean(C3ChargingService.class).saveReportData(deviceName, operationReportInnerFrame.getHeartBeatDataPackage()); // } } else if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) { A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload()); log.info("C3充电桩上报处理_netRequestFrame"); log.info(netRequestFrame.toString()); if (netRequestFrame.isValidate()) { boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress()); if (!b) { return; } } } } private void refund(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) { // private void refund(A5C3CommonReportInnerFrame completeRequestFrame,String code){ /** * 读取心跳包，判断剩余金额和已充电量，统计到缓存中正在进行的订单。 */ String c3Mac = aPackage.getC3Mac(); // 获取心跳包中的剩余金额和已充电量，与缓存中正在进行的订单进行对比 String chargingOrderJson = RedisUtils.getBean().get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3Mac); if (chargingOrderJson.isEmpty() || null == chargingOrderJson) { C3mCharging c3m = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac)); PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class) .eq(PoleBinding::getDeviceCode, aPackage.getC3Mac()) .eq(PoleBinding::getDeviceType, 2)); // 生成订单，并加载到redis缓存，设置超时时间为5分钟 C3mOrder order = new C3mOrderVO().generateOrder(binding.getPoleId() == null ? 0L : binding.getPoleId() , c3m.getPoleDevicesCode(), c3m.getC3Mac(), OrderType.ERROR, Double.valueOf(aPackage.getRemainingAmount()), Integer.parseInt(new java.text.DecimalFormat("0").format(aPackage.getReservedCapacity())) ); order.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity())); order.setOrderStatus(OrderStatus.REFUNDING.getStatus()); order.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount())); orderService.save(order); String s = c3ChargingService.finishCharging(c3Mac); // if(C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(code)){ // // } //是否需要区分log类型 待定 LogUtils.error("{ 充电桩(" + c3Mac + ")不存在正在进行的订单，请检查充电桩是否出现故障!结束订单,结果为" + s + "}"); } else { C3mOrder c3mOrderEntity = JSON.parseObject(chargingOrderJson, C3mOrder.class); // 设置已充电量，订单状态，退款金额，订单退款时间戳，订单退款说明，结束充电时间戳， c3mOrderEntity.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity())); c3mOrderEntity.setOrderStatus(OrderStatus.REFUNDING.getStatus()); c3mOrderEntity.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount())); // 获取剩余金额进行退款，并写入当前正在进行的订单 boolean b = orderService.orderRefund(c3mOrderEntity.getOutTradeNo(), c3mOrderEntity.getRefundAmount()); c3mOrderEntity.setRefundTimestamp(new Date().getTime()); if (b) { c3mOrderEntity.setOrderStatus(OrderStatus.REFUND.getStatus()); c3mOrderEntity.setRefundMsg("充电结束,订单退款成功"); } else { c3mOrderEntity.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus()); c3mOrderEntity.setRefundMsg( "充电结束,订单退款失败,请进行手动退款(订单号(" + c3mOrderEntity.getOutTradeNo() + "),总金额(" + c3mOrderEntity.getTotalAmount() + ",退款金额(" + aPackage.getRemainingAmount() + "))" ); } c3mOrderEntity.setStopChargingTimestamp(new Date().getTime()); orderService.updateById(c3mOrderEntity); // 清除缓存中正在进行中的订单 b = RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac()); if (!b) { try { Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); } RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac()); } // 发送结束订单 String s = c3ChargingService.finishCharging(c3Mac); LogUtils.error("{ 充电桩(" + c3Mac + ")不存在正在进行的订单，请检查充电桩是否出现故障!结束订单,结果为" + s + "}"); } } } 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()
