报警统计功能

alarm-scanner/src/main/java/com/gyee/alarm/model/vo/AlarmTag.java

@@ -35,7 +35,7 @@ public class AlarmTag {
     /**
      * 过去值
      */
-    private Double oval=-1.0;
+    private Double oval=0.0;
 
     /**
      * 报警级别

alarm-scanner/src/main/java/com/gyee/alarm/task/thread/AlarmThreadPool.java

@@ -71,6 +71,7 @@ public class AlarmThreadPool implements Callable<String>, Serializable {
 				int times=0;
 				for(AlarmTag vo:alarmVoList)
 				{
+
 					ls.add(vo.getTagId());
 					times++;
 					if(times==readRows)
@@ -124,7 +125,7 @@ public class AlarmThreadPool implements Callable<String>, Serializable {
 
 								po.setId(vo.getId());
 								po.setTs(vo.getTs());
-								po.setEndts(po.getEndts());
+								po.setEndts(vo.getEndts());
 								po.setVal(vo.getVal());
 								po.setOval(vo.getOval());
 								po.setTriggerType(vo.getTriggerType());

alarm-scanner/src/main/resources/application-bt.yml

@@ -168,7 +168,7 @@ frequency:
   #切入切出
   cutinandout: 1
 urls:
-  alarm-service: http://127.0.0.1:6010
+  alarm-service: http://127.0.0.1:6014
 
 #分隔10个线程
 task-count: 10

alarm-scanner/src/main/resources/application-wt.yml

@@ -168,7 +168,7 @@ frequency:
   #切入切出
   cutinandout: 1
 urls:
-  alarm-service: http://127.0.0.1:6010
+  alarm-service: http://127.0.0.1:6014
 
 #分隔10个线程
 task-count: 10

alarm-scanner/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: bt
+    active: wt

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

@@ -59,10 +59,10 @@ public class AlarmBtService {
 
                 AlarmTag po = new AlarmTag();
                 po.setId(vo.getTbName());
-                po.setVal(Double.valueOf(String.valueOf(vo.getTriggertype())));
+                po.setVal(0.0);
                 po.setTriggerType(vo.getTriggertype());
                 po.setTagId(vo.getTagid());
-                po.setOval(po.getVal());
+                po.setOval(0.0);
                 po.setRank(vo.getRank());
                 po.setTs(new Date().getTime());
                 po.setTimeLong(0.0);
@@ -117,6 +117,7 @@ public class AlarmBtService {
                     vo.setTriggertype(alarm.getTriggerType());
                     vo.setUniformcode(alarm.getUniformCode());
                     vo.setSuperTableName(AlarmSuperTalbeType.BT.getCode());
+                    vo.setVal(0);
                     alarmVoList.add(vo);
                 }
             }
@@ -136,9 +137,10 @@ public class AlarmBtService {
                 for (AlarmVo vo : vos) {
                     AlarmTag po=new AlarmTag();
                     po.setId(vo.getTbName());
-
+                    po.setOval(vo.getVal().doubleValue());
                     po.setTriggerType(vo.getTriggertype());
                     po.setTagId(vo.getTagid());
+                    po.setVal(vo.getVal().doubleValue());
                     po.setRank(vo.getRank());
 
                     ls.add(po);

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

@@ -60,10 +60,10 @@ public class AlarmCtService {
 
                 AlarmTag po = new AlarmTag();
                 po.setId(vo.getTbName());
-                po.setVal(Double.valueOf(String.valueOf(vo.getTriggertype())));
+                po.setVal(0.0);
                 po.setTriggerType(vo.getTriggertype());
                 po.setTagId(vo.getTagid());
-                po.setOval(po.getVal());
+                po.setVal(0.0);
                 po.setRank(vo.getRank());
                 po.setTs(new Date().getTime());
                 alarmTags.add(po);
@@ -156,6 +156,7 @@ public class AlarmCtService {
                         vo.setTriggertype(1);
                         vo.setUniformcode("");
                         vo.setSuperTableName(AlarmSuperTalbeType.CT.getCode());
+                        vo.setVal(0);
                         alarmVoList.add(vo);
                     }
                 }
@@ -201,6 +202,7 @@ public class AlarmCtService {
                     vo.setTriggertype(1);
                     vo.setUniformcode("");
                     vo.setSuperTableName(AlarmSuperTalbeType.CT.getCode());
+                    vo.setVal(0);
                     alarmVoList.add(vo);
                 }
             }
@@ -282,6 +284,7 @@ public class AlarmCtService {
                     vo.setTriggertype(1);
                     vo.setUniformcode("");
                     vo.setSuperTableName(AlarmSuperTalbeType.CT.getCode());
+                    vo.setVal(0);
                     alarmVoList.add(vo);
                 }
             }
@@ -305,6 +308,8 @@ public class AlarmCtService {
                     po.setAlarmtype(vo.getAlarmtype());
                     po.setStationid(vo.getStationid());
 
+                    po.setVal(vo.getVal().doubleValue());
+
                     ls.add(po);
                 }
             }

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

@@ -47,6 +47,8 @@ public class AlarmWtService {
         {
             for(AlarmVo vo: alarmVoList)
             {
+
+
                 alarmTsService.createTable(vo.getTbName(), vo.getAlarmid(), vo.getAlarmtype(),
                         vo.getCharacteristic(), vo.getComponents(),
                         vo.getDescription(),
@@ -62,10 +64,10 @@ public class AlarmWtService {
 
                 AlarmTag po=new AlarmTag();
                 po.setId(vo.getTbName());
-                po.setVal(Double.valueOf(String.valueOf(vo.getTriggertype())));
+                po.setVal(0.0);
                 po.setTriggerType(vo.getTriggertype());
                 po.setTagId(vo.getTagid());
-                po.setOval(po.getVal());
+                po.setOval(0.0);
                 po.setRank(vo.getRank());
                 po.setTimeLong(0.0);
                 po.setTs(new Date().getTime());
@@ -84,6 +86,15 @@ public class AlarmWtService {
         Map<String, List<ProEconAlarmConfiguration>> wtAlarmMap = CacheContext.wtAlarmMap;
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
         for (ProBasicEquipment wt : CacheContext.wtls) {
+
+//            if(wt.getId().contains("SXJ_KGDL_DJY_F_WT_0001_EQ"))
+//            {
+//                System.out.println("");
+//            }
+//            if(wt.getId().contains("SXJ_KGDL_GJY_F_WT_0001_EQ"))
+//            {
+//                System.out.println("");
+//            }
             if (wtpAimap.containsKey(wt.getId())) {
                 Map<String, ProBasicEquipmentPoint> pointMap = wtpAimap.get(wt.getId());
 
@@ -141,9 +152,56 @@ public class AlarmWtService {
                                     vo.setTriggertype(alarm.getTriggerType());
                                     vo.setUniformcode(alarm.getUniformCode());
                                     vo.setSuperTableName(AlarmSuperTalbeType.WT.getCode());
+                                    vo.setVal(0);
                                     alarmVoList.add(vo);
                                 }
 
+                            }else {
+
+                                //临时创建表
+                                AlarmVo vo=new AlarmVo();
+                                StringBuilder tbName = new StringBuilder();
+                                tbName.append(wt.getId()).append("_").append(alarm.getId());
+                                vo.setTbName(String.valueOf(tbName));
+                                vo.setAlarmid(alarm.getId());
+                                vo.setTagid("GF-TZ-SYZ.038200G9911SYB99GI017DB0111PA99RAW01");
+                                vo.setAlarmtype(alarm.getAlarmType());
+                                vo.setCharacteristic(alarm.getCharacteristic());
+                                vo.setComponents(alarm.getComponents());
+                                vo.setDescription(alarm.getDescription());
+                                vo.setDeviceid(wt.getId());
+                                vo.setDevicename(wt.getName());
+                                vo.setDevicetype(DeviceTypeValue.WT.getCode());
+                                vo.setEnabled(alarm.getEnable());
+                                vo.setLineid(wt.getLineId());
+                                if(CacheContext.lnmap.containsKey(wt.getLineId()))
+                                {
+                                    ProBasicLine ln=CacheContext.lnmap.get(wt.getLineId());
+                                    vo.setLinename(ln.getName());
+                                }
+                                vo.setModelId(wt.getModelId());
+                                vo.setProjectid(wt.getProjectId());
+                                if(CacheContext.pjmap.containsKey(wt.getProjectId()))
+                                {
+                                    ProBasicProject pj=CacheContext.pjmap.get(wt.getProjectId());
+                                    vo.setProjectname(pj.getName());
+                                }
+                                vo.setRank(alarm.getRank());
+                                vo.setResettable(alarm.getResetTable());
+                                vo.setStationid(wt.getWindpowerstationId());
+                                if(CacheContext.wpmap.containsKey(wt.getWindpowerstationId()))
+                                {
+                                    ProBasicPowerstation wp=CacheContext.wpmap.get(wt.getWindpowerstationId());
+                                    vo.setStationname(wp.getName());
+                                }
+                                vo.setSubcomponents(alarm.getSubcomponents());
+                                vo.setSuffix(alarm.getSuffix());
+                                vo.setTriggertype(alarm.getTriggerType());
+                                vo.setUniformcode(alarm.getUniformCode());
+                                vo.setSuperTableName(AlarmSuperTalbeType.WT.getCode());
+                                vo.setVal(0);
+                                alarmVoList.add(vo);
+
                             }
                         }
                     }
@@ -170,10 +228,10 @@ public class AlarmWtService {
                 {
                     AlarmTag po=new AlarmTag();
                     po.setId(vo.getTbName());
-
+                    po.setOval(vo.getVal().doubleValue());
                     po.setTriggerType(vo.getTriggertype());
                     po.setTagId(vo.getTagid());
-
+                    po.setVal(vo.getVal().doubleValue());
                     po.setRank(vo.getRank());
 
                     ls.add(po);
@@ -352,7 +410,7 @@ public class AlarmWtService {
                 List<ProEconAlarmInfo> templs = new ArrayList<>();
                 for (ProEconAlarmInfo vo : valuels) {
                     templs.add(vo);
-                    if (templs.size() == 100) {
+                    if (templs.size() == 1000) {
                         proEconAlarmInfoService.saveBatch(templs);
                         templs = new ArrayList<>();
                     }

alarm-service/src/main/java/com/gyee/alarm/service/auto/impl/AlarmTsServiceImpl.java

@@ -93,24 +93,21 @@ public class AlarmTsServiceImpl extends ServiceImpl<AlarmTsMapper, AlarmTs> impl
         int i=0;
         for (AlarmTag tag:alarmTags) {
 
-            if(tag.getVal()==1)
-            {
-                String tableName = tag.getId();
-                StringBuilder sub_sb = new StringBuilder(tableName);
-
-                sub_sb.append( " values ");
-                sub_sb.append(" (");
-                sub_sb.append(tag.getTs()).append(",").append(tag.getVal().intValue()).append(",").append(false).append(",")
-                        .append(tag.getEndts()).append(",").append(tag.getTimeLong());
-                sub_sb.append(" ) ");
-                i++;
-                if (i==100) {
-                    alarmTsMapper.insertList(String.valueOf(sb));
-                    sb = new StringBuilder("INSERT INTO ");
-                    i=0;
-                }
-                sb.append(sub_sb);
+            String tableName = tag.getId();
+            StringBuilder sub_sb = new StringBuilder(tableName);
+
+            sub_sb.append( " values ");
+            sub_sb.append(" (");
+            sub_sb.append(tag.getTs()).append(",").append(tag.getVal().intValue()).append(",").append(false).append(",")
+                    .append(tag.getEndts()).append(",").append(tag.getTimeLong());
+            sub_sb.append(" ) ");
+            i++;
+            if (i==100) {
+                alarmTsMapper.insertList(String.valueOf(sb));
+                sb = new StringBuilder("INSERT INTO ");
+                i=0;
             }
+            sb.append(sub_sb);
 
         }
 

alarm-service/src/main/resources/application-jn.yml

@@ -140,7 +140,7 @@ db:
 
 #参与计算的场站
 #runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
-runWindpowerstation: SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_TL_GDC_STA
+runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_TL_GDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

alarm-service/src/test/java/com/gyee/AppTest.java

@@ -18,12 +18,14 @@ public class AppTest
         AlarmWtService alarmWtService= SpringUtils.getBean("alarmWtService");
         AlarmCtService alarmCtService= SpringUtils.getBean("alarmCtService");
 
-        alarmBtService.createSuperTable();
-        alarmBtService.initalBtAlarm();
+
 
         alarmWtService.createSuperTable();
         alarmWtService.initalWtAlarm();
 
+        alarmBtService.createSuperTable();
+        alarmBtService.initalBtAlarm();
+//
 //        alarmCtService.createSuperTable();
 //        alarmCtService.initalCtAlarm();