2023-07-11 11:05:46 基本完成策略下发执行设备调控逻辑，根据终端上传结果来反馈给前端页面展示!

psdc-admin/src/main/resources/application-dev.yml

@@ -138,7 +138,7 @@ mqtt:
   #QOS等级 0， 1， 2
   qos: 1
   #客户端id 必须唯一
-  clientId: psdcDev12356EVX
+  clientId: psdcDev12356EVQ
   #连接超时,默认30000
   timeOut: 10
   #心跳间隔时间,默认3000

psdc-business/src/main/java/com/psdc/mqtt/savedata/ControlResultSave.java

@@ -72,7 +72,8 @@ public class ControlResultSave {
                             break;
                         }
                     }
-                    String runSta = strategyLog.getStrategyRunRes() + statusCode;
+                    String s2 = strategyLog.getStrategyRunRes().substring(0,strategyLog.getStrategyRunRes().length()-1);
+                    String runSta = s2 + statusCode;
                     psdcStrategyLogMapper.updateRunRes(strategyLog.getId(), upDateTime, 1, null, runSta, s[0], s[1]);
 
                     synchronized (AppInfoRes.class) {
@@ -96,11 +97,13 @@ public class ControlResultSave {
                         }
                     }
 
-                    String runSta = strategyLog.getStrategyRunRes() + statusCode + ",";
+                    String s3 = strategyLog.getStrategyRunRes().substring(0,strategyLog.getStrategyRunRes().length()-1);
+                    String runSta = s3 + statusCode + ",";
                     if (runSta.indexOf("null") >= 0) {
                         runSta = runSta.substring(4);
                     }
 
+
                     if (b1) {
                         psdcStrategyLogMapper.updateRunRes(strategyLog.getId(), null, null, null, runSta, null, null);
                         if (b2){

psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java

@@ -164,22 +164,25 @@ public class DataAndPowerSave {
             if (null != strategyLog) {
                 Boolean b2 = false;
                 String[] runCodes = strategyLog.getRunSceneCodes().split(",");
-                String[] resList = strategyLog.getStrategyRunRes().split(",");
-                if (runCodes.length == resList.length){
-                    String[] split2 = strategyLog.getAllSceneCodes().split(",");
-                    Integer nextCode = Integer.valueOf(split2[runCodes.length]);
-                    List<PsdcSceneRes> list2 = psdcSceneMapper.queryScenes2(Long.valueOf(nextCode));
-                    PsdcSceneRes psc = list2.get(0);
-                    if (String.valueOf(deviceId).equals(String.valueOf(psc.getJudgeDevice()))){
-                        b2 = isOk2(psc.getIsJudge(), psc.getJudgeDevice(), psc.getJudgeElement(), psc.getJudgeData(), date1);
-                        if (b2) {
-                            synchronized (AppInfoRes.class) {
-                                AppInfoRes.class.notify();
+                String[] resList ;
+                if (null != strategyLog.getStrategyRunRes()){
+                    resList = strategyLog.getStrategyRunRes().split(",");
+                    if (runCodes.length == resList.length){
+                        String[] split2 = strategyLog.getAllSceneCodes().split(",");
+                        Integer nextCode = Integer.valueOf(split2[runCodes.length]);
+                        List<PsdcSceneRes> list2 = psdcSceneMapper.queryScenes2(Long.valueOf(nextCode));
+                        PsdcSceneRes psc = list2.get(0);
+                        if (String.valueOf(deviceId).equals(String.valueOf(psc.getJudgeDevice()))){
+                            b2 = isOk2(psc.getIsJudge(), psc.getJudgeDevice(), psc.getJudgeElement(), psc.getJudgeData(), date1);
+                            if (b2) {
+                                synchronized (AppInfoRes.class) {
+                                    AppInfoRes.class.notify();
+                                }
                             }
                         }
                     }
                 }
-            }
+                }
 
             return true;
         } else {

psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java

@@ -14,6 +14,7 @@ import com.psdc.mqtt.MyMQTTClient;
 import com.psdc.service.IPsdcDeviceService;
 import com.psdc.utils.SecurityUtils;
 import com.psdc.utils.poi.ExcelUtil;
+import io.lettuce.core.ScriptOutputType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -447,8 +448,13 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
                             if (sCode.indexOf("null") >= 0){
                                 sCode = sCode.substring(4);
                             }
-                            System.out.println("你好 （3） 世界: " + sCode);
-                            psdcStrategyLogMapper.updateRunRes(newLog.getId(), null, null, sCode, null, null, null);
+                            String res = newLog.getStrategyRunRes() + "2";
+                            if (res.indexOf("null") >= 0){
+                                res = res.substring(4);
+                            }
+
+                            System.out.println("你好 （3） 世界: " + sCode + "，执行中: " + res);
+                            psdcStrategyLogMapper.updateRunRes(newLog.getId(), null, null, sCode, res, null, null);
                             if (i > 0) {
                                 count[0]++;
                             }