From 9089d366569c6407c5ab01682ee3ad2fb52f8f69 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Tue, 11 Jul 2023 11:05:53 +0800 Subject: [PATCH] =?UTF-8?q?2023-07-11=2011:05:46=20=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=AD=96=E7=95=A5=E4=B8=8B=E5=8F=91=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=AE=BE=E5=A4=87=E8=B0=83=E6=8E=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=BB=88=E7=AB=AF=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=9D=A5=E5=8F=8D=E9=A6=88=E7=BB=99=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../psdc/mqtt/savedata/ControlResultSave.java | 7 +++-- .../psdc/mqtt/savedata/DataAndPowerSave.java | 27 ++++++++++--------- .../service/impl/PsdcDeviceServiceImpl.java | 10 +++++-- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/psdc-admin/src/main/resources/application-dev.yml b/psdc-admin/src/main/resources/application-dev.yml index 5530c41..890e2e2 100644 --- a/psdc-admin/src/main/resources/application-dev.yml +++ b/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 diff --git a/psdc-business/src/main/java/com/psdc/mqtt/savedata/ControlResultSave.java b/psdc-business/src/main/java/com/psdc/mqtt/savedata/ControlResultSave.java index 46e85b9..220779a 100644 --- a/psdc-business/src/main/java/com/psdc/mqtt/savedata/ControlResultSave.java +++ b/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){ diff --git a/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java b/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java index d7a1a41..bea1a6a 100644 --- a/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java +++ b/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 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 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 { diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index 0d6161d..e85c026 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/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]++; }