2023-3-15 测试定时排风消息消费。

zd-model/src/main/java/com/zd/model/constant/BaseConstants.java

@@ -183,4 +183,7 @@ public interface BaseConstants {
      * 手机登录验证码有效期（分钟）
      */
     long CODE_EXPIRATION = 5;
+
+
+    String DELAY_QUEUE = "delayQueue";
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabAbnormalController.java

@@ -1,16 +1,21 @@
 package com.zd.laboratory.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.DictUtils;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.LabAbnormal;
 import com.zd.laboratory.domain.vo.LabAbnormalVO;
+import com.zd.laboratory.domain.vo.LabDealyNotifyVo;
 import com.zd.laboratory.service.ILabAbnormalService;
 import com.zd.laboratory.socket.command.Symbol;
 import com.zd.laboratory.socket.service.SocketService;
+import com.zd.model.constant.BaseConstants;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
@@ -23,10 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 异常设备Controller
@@ -42,6 +45,9 @@ public class LabAbnormalController extends BaseController {
     @Autowired
     private SocketService socketService;
 
+    @Autowired
+    private RedisService redisService;
+
     @GetMapping("/send")
     public ResultData send(int num, String deviceNum, int type) {
 
@@ -187,4 +193,24 @@ public class LabAbnormalController extends BaseController {
     public ResultData getAbnormalCount(LabAbnormalVO labAbnormal) {
         return ResultData.success(labAbnormalService.getAbnormalCount(labAbnormal));
     }
+
+    @GetMapping("/sendMsg")
+    public ResultData sendMsg() {
+        LabDealyNotifyVo labDealyNotifyVo = new LabDealyNotifyVo();
+        labDealyNotifyVo.setRandomNum(UUID.randomUUID().toString());
+        labDealyNotifyVo.setHardwareNum("123455");
+        labDealyNotifyVo.setOpenOrCloseType(1);
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put(BaseConstants.DELAY_QUEUE,labDealyNotifyVo);
+        redisService.setCacheObject(BaseConstants.DELAY_QUEUE+"~"+ jsonObj,jsonObj, 10L, TimeUnit.SECONDS);
+
+        LabDealyNotifyVo labDealyNotifyVo2 = new LabDealyNotifyVo();
+        labDealyNotifyVo2.setRandomNum(UUID.randomUUID().toString());
+        labDealyNotifyVo2.setHardwareNum("123455");
+        labDealyNotifyVo2.setOpenOrCloseType(0);
+        JSONObject jsonObj2 = new JSONObject();
+        jsonObj2.put(BaseConstants.DELAY_QUEUE,labDealyNotifyVo2);
+        redisService.setCacheObject(BaseConstants.DELAY_QUEUE+"~"+ jsonObj2,jsonObj2, 20L, TimeUnit.SECONDS);
+        return null;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabDealyNotifyVo.java

@@ -0,0 +1,30 @@
+package com.zd.laboratory.domain.vo;
+
+import com.zd.laboratory.domain.LabBuildFloor;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author cyl
+ * @date 2023/3/14
+ */
+@ApiModel("延迟通知消息")
+@Data
+public class LabDealyNotifyVo {
+
+    /** 随机数，保证同样的继电器不重复 */
+    @ApiModelProperty(value = "随机数")
+    private String randomNum;
+
+    /** 继电器编号 */
+    @ApiModelProperty(value = "继电器编号")
+    private String hardwareNum;
+
+    /** 开启关闭状态 */
+    @ApiModelProperty(value = "开启关闭状态")
+    private Integer openOrCloseType;
+
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredAndWorkListener.java

@@ -1,31 +1,25 @@
 package com.zd.laboratory.event;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
-import com.zd.laboratory.domain.LabControl;
-import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.domain.vo.LabDealyNotifyVo;
-import com.zd.laboratory.domain.vo.LabHardwareVO;
-import com.zd.laboratory.mapper.LabHardwareMapper;
-import com.zd.laboratory.service.ILabControlService;
-import com.zd.laboratory.socket.command.Symbol;
-import com.zd.laboratory.socket.service.SocketService;
+import com.zd.laboratory.domain.vo.LabExitLineJoinPointVO;
+import com.zd.laboratory.event.handle.EventHandler;
 import com.zd.model.constant.BaseConstants;
-import com.zd.model.constant.HttpStatus;
-import com.zd.model.domain.ResultData;
-import com.zd.model.enums.HardwareTypeEnum;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+import org.springframework.data.redis.listener.PatternTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
-
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 当前由于没有消息中间件，所以只能暂时采用此种方式直接消费数据
@@ -39,22 +33,13 @@ import java.util.Optional;
  *
  *
  *
- * @Author: cyl
- * @Date: 2023/3/15/11:19
+ * @Author: zhoupan
+ * @Date: 2021/10/20/11:19
  * @Description:
  */
 @Component
 public class RedisExpiredAndWorkListener extends KeyExpirationEventMessageListener {
 
-    @Autowired
-    private LabHardwareMapper labHardwareMapper;
-
-    @Autowired
-    private ILabControlService labControlService;
-
-    @Autowired
-    private SocketService socketService;
-
     public RedisExpiredAndWorkListener(RedisMessageListenerContainer listenerContainer)
     {
         super(listenerContainer);
@@ -68,53 +53,11 @@ public class RedisExpiredAndWorkListener extends KeyExpirationEventMessageListen
             String[] delayStr = expiredKey.split(BaseConstants.DELAY_QUEUE+"~");
             JSONObject jsonObj = (JSONObject) JSONObject.parseObject(delayStr[1], Object.class, Feature.OrderedField);
             LabDealyNotifyVo dealyNotifyVo = jsonObj.getObject(BaseConstants.DELAY_QUEUE, new TypeReference <LabDealyNotifyVo>(){});
-
-            //这里类型固定写死2，智能通风
-            List <Long> ids = new ArrayList <>();
-            ids.add(2L);
-            LabHardwareVO labHardwareVO = new LabHardwareVO();
-            labHardwareVO.setIds(ids);
-            labHardwareVO.setSubjectId(dealyNotifyVo.getSubId());
-            List<LabHardware> hardwareList = labHardwareMapper.selectNewLabHardwareByTypes(labHardwareVO);
-            Optional.ofNullable(hardwareList).orElseGet(Collections::emptyList)
-                    .stream()
-                    .forEach(a->{
-                        if(dealyNotifyVo.getOpenOrCloseType().intValue()==1){
-                            ResultData ResultData = socketService.sendMqttCommand(a.getId(), a.getRelayCode(), Symbol.command.open, a.getBit(),a.getSubjectId());
-                            boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
-                            //插入control 打开日志
-                            if (equals) {
-                                saveControl(a, 1);
-                            }
-                        }else{
-                            ResultData ResultData = socketService.sendMqttCommand(a.getId(), a.getRelayCode(), Symbol.command.close, a.getBit(),a.getSubjectId());
-                            boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);
-                            //插入control 关闭日志
-                            if (equals) {
-                                saveControl(a,0);
-                            }
-                        }
-
-                    });
+            System.out.println("测试继电器编号："+dealyNotifyVo.getHardwareNum());
+            System.out.println("测试随机数："+dealyNotifyVo.getRandomNum());
+            System.out.println("测试开启或关闭：：：："+dealyNotifyVo.getOpenOrCloseType());
         }
 
     }
 
-
-    public void saveControl(LabHardware labHardware,Integer controlType){
-        LabControl control = new LabControl();
-        control.setTriggerModes(1);
-        control.setControlType(controlType);
-        control.setUserName("定时排风自动执行");
-        if(controlType.intValue()==1){
-            control.setOperation("定时排风:打开");
-        }else{
-            control.setOperation("定时排风:关闭");
-        }
-        control.setHardwareType(HardwareTypeEnum.AI_VENTILATION);
-        control.setHardwareId(labHardware.getId());
-        control.setSubjectId(labHardware.getSubjectId());
-        labControlService.insertLabControl(control);
-    }
-
 }