diff --git a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java index 5d9542e..bbd7007 100644 --- a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java +++ b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java @@ -272,9 +272,9 @@ public class RtServiceImpl implements IRtService { baseRealDataSet.setVThdB(FloatUtils.get2Float(map.get("Pq_ThdUB"))); baseRealDataSet.setVThdC(FloatUtils.get2Float(map.get("Pq_ThdUC"))); } else { - baseRealDataSet.setVThdA(FloatUtils.get2Float(map.get("Pq_ThdLUA"))); - baseRealDataSet.setVThdB(FloatUtils.get2Float(map.get("Pq_ThdLUB"))); - baseRealDataSet.setVThdC(FloatUtils.get2Float(map.get("Pq_ThdLUC"))); + baseRealDataSet.setVThdA(FloatUtils.get2Float(map.get("Pq_ThdLUAB"))); + baseRealDataSet.setVThdB(FloatUtils.get2Float(map.get("Pq_ThdLUBC"))); + baseRealDataSet.setVThdC(FloatUtils.get2Float(map.get("Pq_ThdLUCA"))); } //电流总谐波畸变率 baseRealDataSet.setIThdA(FloatUtils.get2Float(map.get("Pq_ThdIA"))); diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java index 79839b1..65d527f 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java @@ -185,7 +185,7 @@ public class StatServiceImpl implements IStatService { } } } - redisUtil.saveByKey(AppRedisKey.LINE_POSITION+id,map); + redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L); } /** diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveAnalysisServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveAnalysisServiceImpl.java index 3a5c855..a191b6d 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveAnalysisServiceImpl.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveAnalysisServiceImpl.java @@ -184,6 +184,6 @@ public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService { map.put(2,item.getLineId()); } } - redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,600L); + redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L); } } diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java index 18f3971..d6a95bc 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java @@ -370,7 +370,7 @@ public class EventServiceImpl implements IEventService { map.put(2,item.getLineId()); } } - redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,600L); + redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L); } /**