定边报警系统修改

alarm-scanner/pom.xml

@@ -203,11 +203,17 @@
             <version>5.1.1</version>
             <scope>test</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.taosdata.jdbc</groupId>-->
+<!--            <artifactId>taos-jdbcdriver</artifactId>-->
+<!--            <version>3.3.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.3.0</version>
+            <version>2.0.38</version>
         </dependency>
 
+
     </dependencies>
 </project>

alarm-service/pom.xml

@@ -187,7 +187,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.39</version>
+            <version>2.0.38</version>
         </dependency>
 
     </dependencies>

alarm-service/src/main/java/com/gyee/alarm/AlarmMain.java

@@ -1,5 +1,10 @@
 package com.gyee.alarm;
 
+import com.gyee.alarm.service.AlarmBtService;
+import com.gyee.alarm.service.AlarmCtService;
+import com.gyee.alarm.service.AlarmInService;
+import com.gyee.alarm.service.AlarmWtService;
+import com.gyee.alarm.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,6 +18,18 @@ public class AlarmMain {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(AlarmMain.class, args);
 
+//        AlarmBtService alarmBtService= SpringUtils.getBean("alarmBtService");
+//        AlarmWtService alarmWtService= SpringUtils.getBean("alarmWtService");
+//
+//
+//
+//
+//        alarmWtService.createSuperTable();
+//        alarmWtService.initalWtAlarm();
+//
+////        alarmBtService.createSuperTable();
+////        alarmBtService.initalBtAlarm();
+
         System.out.println("完成");
     }
 }

alarm-service/src/main/java/com/gyee/alarm/service/AlarmWtService.java

@@ -117,20 +117,20 @@ public class AlarmWtService {
                         vo.getNemCode(), vo.getFaultCause(), vo.getResolvent(), vo.getFaultType(), vo.getAname());
 
 
-                alarmTsService.updateTable(vo.getTbName(), vo.getAlarmid(), vo.getAlarmtype(),
-                        vo.getCharacteristic(), vo.getComponents(),
-                        vo.getDescription(),
-                        vo.getDeviceid(), vo.getDevicename(),
-                        vo.getDevicetype(), vo.getEnabled(),
-                        vo.getLineid(), vo.getLinename(),
-                        vo.getModelId(), vo.getProjectid(),
-                        vo.getProjectname(), vo.getRank(),
-                        vo.getResettable(), vo.getStationid(),
-                        vo.getStationname(), vo.getSubcomponents(),
-                        vo.getSuffix(), vo.getTagid(),
-                        vo.getTriggertype(), vo.getUniformcode(), vo.getSuperTableName(),
-                        vo.getName(),
-                        vo.getNemCode(),vo.getFaultCause(),vo.getResolvent(),vo.getFaultType(),vo.getAname());
+//                alarmTsService.updateTable(vo.getTbName(), vo.getAlarmid(), vo.getAlarmtype(),
+//                        vo.getCharacteristic(), vo.getComponents(),
+//                        vo.getDescription(),
+//                        vo.getDeviceid(), vo.getDevicename(),
+//                        vo.getDevicetype(), vo.getEnabled(),
+//                        vo.getLineid(), vo.getLinename(),
+//                        vo.getModelId(), vo.getProjectid(),
+//                        vo.getProjectname(), vo.getRank(),
+//                        vo.getResettable(), vo.getStationid(),
+//                        vo.getStationname(), vo.getSubcomponents(),
+//                        vo.getSuffix(), vo.getTagid(),
+//                        vo.getTriggertype(), vo.getUniformcode(), vo.getSuperTableName(),
+//                        vo.getName(),
+//                        vo.getNemCode(),vo.getFaultCause(),vo.getResolvent(),vo.getFaultType(),vo.getAname());
 //                AlarmTag po=new AlarmTag();
 //                po.setId(vo.getTbName());
 //                if(valuemap.containsKey(vo.getTagid()))
@@ -187,7 +187,9 @@ public class AlarmWtService {
 //                            System.out.println("");
 //                        }
                         for (ProEconAlarmConfiguration alarm : alarmls) {
-                            if (pointMap.containsKey(alarm.getUniformCode())) {
+
+
+                            if (pointMap.containsKey(alarm.getUniformCode()) && alarm.getDeviceId().equals(wt.getId())) {
                                 ProBasicEquipmentPoint equipmentPoint = pointMap.get(alarm.getUniformCode());
 
                                 if (StringUtils.notEmp(initialcode) &&

alarm-web/pom.xml

@@ -164,7 +164,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.35</version>
+            <version>2.0.38</version>
         </dependency>
         <!-- 工具类相关 -->
         <dependency>

alarm-web/src/main/java/com/gyee/alarm/controller/AlarmHistoryController.java

@@ -217,17 +217,6 @@ public class AlarmHistoryController {
             modelId=null;
         }
         List<AlarmStatVo> pressureList = alarmHistoryService.findCtFeatureStat(stId,modelId, dtStart, dtEnd,components,deviceType,alarmIds,timeType);
-
-//
-//        Map<String, List<AlarmStatVo>> map=new TreeMap<>();
-//
-//        for(AlarmStatVo vo:pressureList)
-//        {
-//            if(map.containsKey(vo.getRelateParts()))
-//            {
-//                List<AlarmStatVo>
-//            }
-//        }
         //根据风机编号分组
         Map<String, List<AlarmStatVo>> alarmStatMapGroupbyWindturbineId = pressureList.stream().collect(Collectors.groupingBy(AlarmStatVo::getWindturbineId));
 
@@ -251,6 +240,7 @@ public class AlarmHistoryController {
 
         return list;
 
+
     }
 
 

alarm-web/src/main/java/com/gyee/alarm/init/CacheContext.java

@@ -681,6 +681,7 @@ public class CacheContext implements CommandLineRunner {
                         if (ctAlarmlsMap.containsKey(String.valueOf(sb))) {
                             List<ProEconAlarmRule> ls = ctAlarmlsMap.get(String.valueOf(sb));
                             ls.add(vo);
+                            ctAlarmlsMap.put(String.valueOf(sb), ls);
                         } else {
                             List<ProEconAlarmRule> ls = new ArrayList<>();
                             ls.add(vo);

alarm-web/src/main/java/com/gyee/alarm/service/AlarmHistoryService.java

@@ -350,6 +350,11 @@ public class AlarmHistoryService   {
             {
                 vo.setWpName(CacheContext.subwpmap.get(vo.getStationid()).getName());
             }
+
+            if(CacheContext.alarmTypeMap.containsKey(vo.getComponents()))
+            {
+                vo.setComponents(CacheContext.alarmTypeMap.get(vo.getComponents()).getName());
+            }
         }
 
 
@@ -673,7 +678,7 @@ public class AlarmHistoryService   {
 
                         if(StringUtils.notEmp(components) )
                         {
-                            if(componentsMap.containsKey(at.getRelatedParts()) )
+                            if(componentsMap.containsKey(at.getRelatedParts().trim()) )
                             {
                                 if(StringUtils.notEmp(alarmIdMap) && !alarmIdMap.isEmpty())
                                 {
@@ -699,9 +704,15 @@ public class AlarmHistoryService   {
         }
 
 
-        Map<String,List<AlarmStatVo>> vomap=new HashMap<>();
+        System.out.println("vos"+vos.size());
+
+//        Map<String,List<AlarmStatVo>> vomap=new HashMap<>();
         for(ProBasicFeatureStat fs:vos)
         {
+//            if(fs.getDescription().equals("自定义"))
+//            {
+//                continue;
+//            }
             AlarmStatVo d = new AlarmStatVo();
             d.setRelateParts(fs.getTypeCode());
             d.setRelatePartsText(fs.getTypeName());
@@ -727,6 +738,8 @@ public class AlarmHistoryService   {
                 double times= new BigDecimal(fs.getTotalSeconds()).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue();
                 d.setTime(times);
             }
+
+
             d.setStationId(fs.getStationId());
             d.setSnapId(SnowflakeGenerator.generateId());
             d.setWindturbineId(fs.getWtId());
@@ -736,22 +749,22 @@ public class AlarmHistoryService   {
                 d.setWindturbineCode(wt.getNemCode());
             }
 
-            StringBuilder sb=new StringBuilder();
-            sb.append(fs.getWtId()).append("_").append(fs.getTypeCode()).append("_").append(fs.getAlarmid());
-
-            if(map.containsKey(String.valueOf(sb)))
-            {
-                List<AlarmStatVo> ls=vomap.get(String.valueOf(sb));
-                ls.add(d);
-            }else
-            {
-                List<AlarmStatVo> ls=new ArrayList<>();
-                ls.add(d);
-                vomap.put(String.valueOf(sb),ls);
-            }
+//            StringBuilder sb=new StringBuilder();
+//            sb.append(fs.getWtId()).append("_").append(fs.getTypeCode()).append("_").append(fs.getAlarmid());
+//
+//            if(map.containsKey(String.valueOf(sb)))
+//            {
+//                List<AlarmStatVo> ls=vomap.get(String.valueOf(sb));
+//                ls.add(d);
+//            }else
+//            {
+//                List<AlarmStatVo> ls=new ArrayList<>();
+//                ls.add(d);
+//                vomap.put(String.valueOf(sb),ls);
+//            }
             resultList.add(d);
         }
-
+        System.out.println("resultList"+vos.size());
 
         return resultList;
     }
@@ -1124,8 +1137,22 @@ public class AlarmHistoryService   {
         sb.append(wt.getId()).append("_").append(at.getId());
         if (map.containsKey(String.valueOf(sb))) {
             ProBasicFeatureStat old = map.get(String.valueOf(sb));
-            BeanUtil.copyProperties(old, fs);
-            fs.setAlarmid(old.getAlarmid());
+//            BeanUtil.copyProperties(old, fs);
+//            fs.setAlarmid(old.getAlarmid());
+
+            fs.setStatDate(old.getStatDate());
+            fs.setId(old.getId());
+            fs.setWtId(wt.getId());
+            fs.setStationId(old.getStationId());
+            fs.setTypeCode(old.getTypeCode());
+            fs.setTypeName(old.getTypeName());
+            fs.setAlarmid(at.getId());
+            fs.setDescription(old.getDescription());
+            fs.setTotal(old.getTotal());
+            fs.setAvgSeconds(old.getAvgSeconds());
+            fs.setMaxSeconds(old.getMaxSeconds());
+            fs.setMinSeconds(old.getMinSeconds());
+            fs.setTotalSeconds(old.getTotalSeconds());
         } else {
             fs.setStatDate(new Timestamp(statDate.getTime()));
             fs.setId(String.valueOf(SnowflakeGenerator.generateId()));