微调

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java

@@ -133,6 +133,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                     if (ObjectUtil.isNotNull(object)) {
                         csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString());
                     }
+                    //清空监测点缓存的模板信息
+                    
                 }
             }
             csLogsFeignClient.addUserLog(logDto);
@@ -1275,6 +1277,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                     showName = "电网侧数据模板";
                 } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
                     showName = "监测1#数据模板";
+                } else {
+                    showName = "统计数据";
                 }
                 break;
             case "Ds$Pqd$Stat$02":
@@ -1282,8 +1286,13 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                     showName = "负载侧数据模板";
                 } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
                     showName = "监测2#数据模板";
+                } else {
+                    showName = "统计数据";
                 }
                 break;
+            case "Ds$Pqd$Rt$01":
+                showName = "实时数据";
+                break;
             //波形参数名称
             case "Wave_Param_Position":
                 showName = "录波记录位置";

iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java

@@ -88,7 +88,7 @@ public class RtServiceImpl implements IRtService {
             long timestamp = item.getDataTimeSec() - 8*3600;
             baseRealDataSet.setDataTime(getTime(timestamp));
             publisher.send("/Web/RealData/" + lineId, new Gson().toJson(baseRealDataSet), 1, false);
-        } else if (dataSet.getName().contains("实时数据")) {
+        } else if (dataSet.getName().contains("实时数据") || dataSet.getName().contains("Ds$Pqd$Rt$01")) {
             //用户Id
             Object redisObject = redisUtil.getObjectByKey("rtDataUserId:"+lineId);
             if (ObjectUtil.isNotNull(redisObject)) {

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java

@@ -265,7 +265,7 @@ public class EventServiceImpl implements IEventService {
         po.setStartTime(LocalDateTime.parse(cldLogMessage.getTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         po.setTag(cldLogMessage.getLog());
         po.setClDid(1);
-        po.setLevel(3);
+        po.setLevel(channelLevel(cldLogMessage.getGrade()));
         po.setProcess(4);
         po.setCode(cldLogMessage.getCode());
         //前置告警
@@ -289,6 +289,29 @@ public class EventServiceImpl implements IEventService {
         csEventService.save(po);
     }
 
+    /**
+     * 处理告警等级
+     */
+    public int channelLevel(String grade) {
+        int result;
+        switch (grade) {
+            case "DEBUG":
+                result = 4;
+                break;
+            case "WARN":
+                result = 6;
+                break;
+            case "ERROR":
+                result = 7;
+                break;
+            default:
+                result = 5;
+                break;
+        }
+        return result;
+    }
+
+
     /**
      * 处理电压
      * @param vol