解决设备下发消息

device-manager/src/main/java/com/mortals/xhx/thread/DeviceDownMsgThread.java

@@ -59,20 +59,19 @@ public class DeviceDownMsgThread extends AbstractThread {
 
     @Override
     protected void process() {
-        log.info("DeviceDownMsgThread process");
+        //log.info("DeviceDownMsgThread process");
         List<DeviceMsgReq> deviceMsgReqs = new ArrayList<>();
         while (true) {
             DeviceMsgReq deviceMsgReq = cacheService.lpop(KEY_DEVICE_DOWN_MSG_QUEUE, DeviceMsgReq.class);
             if (ObjectUtils.isEmpty(deviceMsgReq)) {
-                log.info("deviceMsgReq:{}", deviceMsgReq == null);
+               // log.info("deviceMsgReq:{}", deviceMsgReq == null);
                 break;
-            } else {
-                deviceMsgReqs.add(deviceMsgReq);
             }
+            deviceMsgReqs.add(deviceMsgReq);
+
         }
         if (!ObjectUtils.isEmpty(deviceMsgReqs)) {
             log.info("消息下发数量:{}", deviceMsgReqs.size());
-
             ArrayList<DeviceLogEntity> deviceLogList = new ArrayList<>();
 
             for (DeviceMsgReq item : deviceMsgReqs) {

device-manager/src/main/java/com/mortals/xhx/thread/DeviceUpdateComsumerThread.java

@@ -37,17 +37,17 @@ public class DeviceUpdateComsumerThread extends AbstractThread {
     }
 
     @Override
-    protected void process()  {
-        log.info("DeviceUpdateComsumerThread process");
+    protected void process() {
+        // log.info("DeviceUpdateComsumerThread process");
         List<DeviceEntity> waitUpdateDeviceList = new ArrayList<>();
         while (true) {
-            DeviceEntity deviceEntity = cacheService.lpop(RedisKey.KEY_DEVICE_UPDATE_QUEUE,DeviceEntity.class);
+            DeviceEntity deviceEntity = cacheService.lpop(RedisKey.KEY_DEVICE_UPDATE_QUEUE, DeviceEntity.class);
             if (ObjectUtils.isEmpty(deviceEntity)) {
-                log.info("deviceEntity:{}", deviceEntity == null);
+                //  log.info("deviceEntity:{}", deviceEntity == null);
                 break;
-            } else {
-                waitUpdateDeviceList.add(deviceEntity);
             }
+            waitUpdateDeviceList.add(deviceEntity);
+
         }
 
         if (!ObjectUtils.isEmpty(waitUpdateDeviceList)) {

device-manager/src/main/java/com/mortals/xhx/thread/SendThirdPartyThread.java

@@ -45,7 +45,7 @@ public class SendThirdPartyThread extends AbstractThread {
 
     @Override
     protected void process() {
-        log.info("SendThirdPartyThread process");
+      //  log.info("SendThirdPartyThread process");
         DeviceReq deviceReq = cacheService.blpop(KEY_DEVICE_THIRDPARTY_QUEUE, 10, DeviceReq.class);
         if (!ObjectUtils.isEmpty(deviceReq)) {
             String phpInUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_IN_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");