保存记录

appapi/src/main/java/tech/glinfo/enbao/modules/mq/OutletParse.java

@@ -50,9 +50,6 @@ public class OutletParse implements IParse {
     @Autowired
     private TimeParseUtils timeParseUtils;
 
-    @Autowired
-    private SpeakerService speakerService;
-
     @Autowired
     private MqProducer mqProducer;
 
@@ -126,7 +123,7 @@ public class OutletParse implements IParse {
             logger.info("已删除重复 : {}", redisUtils.hasKey(device.getNumbering() + "cf"));
             String content = datas.get("content");
             //开关状态
-            if (content.equals("00")) {
+           /* if (content.equals("00")) {
                 //保存开关记录
                 String action = redisUtils.get(datas.get("receiveId") + "action");
                 if (action != null) {
@@ -136,7 +133,7 @@ public class OutletParse implements IParse {
                     shDeviceRecordService.save(recordEntity);
                     redisUtils.delete(datas.get("receiveId") + "action");
                 }
-            }
+            }*/
             ws.put("action", content);
 
         }else if("1A".equals(datas.get("cmd"))) {//温控响应
@@ -160,6 +157,15 @@ public class OutletParse implements IParse {
             }
             redisUtils.delete(device.getNumbering() + "temp");
 
+        }else if("20".equals(datas.get("cmd"))) {//事件上报
+            //保存开关记录
+            String content = datas.get("content");
+            String action = content.substring(6, 8);
+            ShDeviceRecordEntity recordEntity = new ShDeviceRecordEntity();
+            recordEntity.setDeviceId(device.getId());
+            recordEntity.setAction(action.equals("01") ? 1 : 2);
+            shDeviceRecordService.save(recordEntity);
+
         }
         new Thread(() -> {
             //检测有没待下发指令

appapi/src/main/java/tech/glinfo/enbao/modules/mq/SwitchParse.java

@@ -119,7 +119,7 @@ public class SwitchParse implements IParse {
             String content = datas.get("content");
             logger.info("开关响应 : {}", content);
             //开关状态
-            if (content.equals("00")) {
+            /*if (content.equals("00")) {
                 //保存开关记录
                 logger.info("receiveId : {}", datas.get("receiveId"));
                 String action = redisUtils.get(datas.get("receiveId") + "action1");
@@ -140,7 +140,7 @@ public class SwitchParse implements IParse {
                     redisUtils.delete(datas.get("receiveId") + "action2");
                 }
 
-            }
+            }*/
             ws.put("action", content);
 
         }else if("1A".equals(datas.get("cmd"))) {//温控响应
@@ -168,6 +168,23 @@ public class SwitchParse implements IParse {
             }
             redisUtils.delete(device.getNumbering() + "temp");
 
+        }else if("20".equals(datas.get("cmd"))) {//事件上报
+            //保存开关记录
+            String content = datas.get("content");
+            String type = content.substring(2, 4);
+            String action = content.substring(6, 8);
+            ShDeviceRecordEntity recordEntity = new ShDeviceRecordEntity();
+            recordEntity.setDeviceId(device.getId());
+            if (type.equals("01")) {
+                //开关1  1:开 2:关
+                recordEntity.setAction(action.equals("01") ? 1 : 2);
+            }else {
+                //开关2  3:开 4:关
+                recordEntity.setAction(action.equals("01") ? 3 : 4);
+            }
+
+            shDeviceRecordService.save(recordEntity);
+
         }
         return ws;
     }

appapi/src/main/java/tech/glinfo/enbao/modules/sh/controller/ShDeviceController.java

@@ -349,15 +349,15 @@ public class ShDeviceController {
         protocol.setDeviceType(type);
         protocol.setCmd("18");
         if (flag == null) {
-            redisUtils.set(mac + "action", action.substring(0, 2), 50);
+//            redisUtils.set(mac + "action", action.substring(0, 2), 50);
             protocol.setContent(action + "000000000001");
         }else {
             if (flag == 1) {
                 protocol.setContent(action + "000000000001");
-                redisUtils.set(mac + "action1", action.substring(0, 2).equals("01") ? 1 : 2, 50);
+//                redisUtils.set(mac + "action1", action.substring(0, 2).equals("01") ? 1 : 2, 50);
             }else {
                 protocol.setContent(action + "000000000002");
-                redisUtils.set(mac + "action2", action.substring(2, 4).equals("01") ? 3 : 4, 50);
+//                redisUtils.set(mac + "action2", action.substring(2, 4).equals("01") ? 3 : 4, 50);
             }
         }
         mqProducer.sendT(JSON.toJSONString(protocol));