Browse Source

更新报警

luoguangyi 3 years ago
parent
commit
3ad934b7a5

+ 3 - 3
src/main/java/com/persagy/cache/AlarmInfoCache.java

@@ -46,7 +46,7 @@ public class AlarmInfoCache {
 
     /**
      * @param alarmDefine:
-     * @description:获取报警定义id, 中台报警定义ID没有实际意义,根据itemCode-objId-targetId拼接作为唯一标识
+     * @description:获取报警定义id, 中台报警定义ID没有实际意义,根据objId-itemId拼接作为唯一标识
      * @exception:
      * @author: LuoGuangyi
      * @company: Persagy Technology Co.,Ltd
@@ -54,11 +54,11 @@ public class AlarmInfoCache {
      * @version: V1.0
      */
     public static String getAlarmDefineId(AlarmDefine alarmDefine) {
-        return alarmDefine.getItemCode() + "-" + alarmDefine.getObjId() + "-" + alarmDefine.getTargetId();
+        return alarmDefine.getObjId() + "-" + alarmDefine.getItemId();
     }
 
     public static String getAlarmDefineId(JSONObject alarmDefine) {
-        return alarmDefine.getString("itemCode") + "-" + alarmDefine.getString("objId") + "-" + alarmDefine.getString("targetId");
+        return alarmDefine.getString("objId") + "-" + alarmDefine.getString("itemId");
     }
 
     /**

+ 2 - 2
src/main/java/com/persagy/controller/HelloWorld.java

@@ -87,12 +87,12 @@ public class HelloWorld {
 
     @PostMapping("/test3")
     public ArrayList<ZktAlarmRecordDO> test3(@RequestBody JSONObject jsonObject) throws Exception {
-        String defineId = jsonObject.getString("itemCode") + "-" + jsonObject.getString("objId") + "-" + jsonObject.getString("targetId");
+        String defineId = AlarmInfoCache.getAlarmDefineId(jsonObject);
         ZktAlarmRecordDO zktAlarmRecordDO = alarmRecordRepository.findById(defineId).orElse(new ZktAlarmRecordDO());
         zktAlarmRecordDO.setDefinitionId(defineId);
         zktAlarmRecordDO.setItemCode(jsonObject.getString("itemCode"));
         zktAlarmRecordDO.setObjId(jsonObject.getString("objId"));
-        zktAlarmRecordDO.setTargetId(jsonObject.getString("targetId"));
+        zktAlarmRecordDO.setItemId(jsonObject.getString("itemId"));
         zktAlarmRecordDO.setAlarmId(jsonObject.getString("id"));
         ZktAlarmRecordDO save = alarmRecordRepository.save(zktAlarmRecordDO);
         log.info("保存结果为:{}", save);

+ 4 - 2
src/main/java/com/persagy/entity/AlarmDefine.java

@@ -1,6 +1,7 @@
 package com.persagy.entity;
 
 import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -53,9 +54,10 @@ public class AlarmDefine {
      */
     private String systemName;
     /**
-     * 报警匹配规则ID
+     * 类型id
      */
-    private String targetId;
+    @ApiModelProperty(value = "报警类型id")
+    private String itemId;
     /**
      * 对象类型
      */

+ 3 - 3
src/main/java/com/persagy/entity/AlarmRecord.java

@@ -48,10 +48,10 @@ public class AlarmRecord implements Serializable {
     private String objId;
 
     /**
-     * 报警对象匹配规则ID
+     * 报警对象类型ID
      */
-    @ApiModelProperty(value = "报警对象匹配规则ID")
-    private String targetId;
+    @ApiModelProperty(value = "报警对象类型ID")
+    private String itemId;
 
     /**
      * 对象id

+ 5 - 4
src/main/java/com/persagy/entity/ZktAlarmRecordDO.java

@@ -51,12 +51,13 @@ public class ZktAlarmRecordDO implements Serializable {
     @Column(name = "obj_id", nullable = false)
     @ApiModelProperty(value = "报警对象ID")
     private String objId;
+
     /**
-     * 报警对象ID
+     * 类型id
      */
-    @Column(name = "target_id", nullable = false)
-    @ApiModelProperty(value = "报警对象匹配规则ID")
-    private String targetId;
+    @Column(name = "item_id", nullable = false)
+    @ApiModelProperty(value = "报警类型id")
+    private String itemId;
 
     /**
      * 报警定义对应最新一条报警记录状态

+ 2 - 3
src/main/java/com/persagy/netty/client/CenterClientHandler.java

@@ -101,16 +101,15 @@ public class CenterClientHandler extends SimpleChannelInboundHandler<NettyMessag
             }
         } else if (msg.getOpCode() == 8) {
             log.info("-----报警记录id推送----[{}]", msg);
-            //{"id":"","objId":"","itemCode":""}  id为报警记录ID
             List content = msg.getContent();
             if (CollectionUtil.isNotEmpty(content)) {
                 JSONObject parseObject = JSONObject.parseObject(JSONObject.toJSONString(content.get(0)));
-                String defineId = parseObject.getString("itemCode") + "-" + parseObject.getString("objId") + "-" + parseObject.getString("targetId");
+                String defineId = AlarmInfoCache.getAlarmDefineId(parseObject);
                 ZktAlarmRecordDO zktAlarmRecordDO = alarmRecordRepository.findById(defineId).orElse(new ZktAlarmRecordDO());
                 zktAlarmRecordDO.setDefinitionId(defineId);
                 zktAlarmRecordDO.setItemCode(parseObject.getString("itemCode"));
                 zktAlarmRecordDO.setObjId(parseObject.getString("objId"));
-                zktAlarmRecordDO.setTargetId(parseObject.getString("targetId"));
+                zktAlarmRecordDO.setItemId(parseObject.getString("itemId"));
                 zktAlarmRecordDO.setAlarmId(parseObject.getString("id"));
                 alarmRecordRepository.save(zktAlarmRecordDO);
             }

+ 1 - 1
src/main/java/com/persagy/service/impl/AlarmDefineServiceImpl.java

@@ -139,7 +139,7 @@ public class AlarmDefineServiceImpl implements AlarmDefineService {
                 zktAlarmRecordDO.setProjectId(stateItem.getString("projectId"));
                 zktAlarmRecordDO.setObjId(stateItem.getString("objId"));
                 zktAlarmRecordDO.setItemCode(stateItem.getString("itemCode"));
-                zktAlarmRecordDO.setTargetId(stateItem.getString("targetId"));
+                zktAlarmRecordDO.setItemId(stateItem.getString("itemId"));
                 zktAlarmRecordDO.setState(stateItem.getString("state"));
                 alarmRecordRepository.save(zktAlarmRecordDO);
             }

+ 4 - 4
src/main/java/com/persagy/service/impl/AlarmHandleServiceImpl.java

@@ -196,7 +196,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                 alarmRecordDO.setDefinitionId(defineId);
                 alarmRecordDO.setObjId(alarmDefine.getObjId());
                 alarmRecordDO.setItemCode(alarmDefine.getItemCode());
-                alarmRecordDO.setTargetId(alarmDefine.getTargetId());
+                alarmRecordDO.setItemId(alarmDefine.getItemId());
                 alarmRecordDO.setState("2");
                 alarmRecordDO.setEndTime(DateUtils.parseDate(dateTime));
                 alarmRecordDO.setEndInfo(JSONObject.toJSONString(paramMap));
@@ -359,7 +359,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                     .groupCode(CommonConst.groupCode)
                     .itemCode(alarmDefine.getItemCode())
                     .objId(alarmDefine.getObjId())
-                    .targetId(alarmDefine.getTargetId())
+                    .itemId(alarmDefine.getItemId())
                     .classCode(alarmDefine.getClassCode())
                     .createUser(CommonConst.systemId)
                     .build();
@@ -371,7 +371,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
             zktAlarmRecordDO.setDefinitionId(defineId);
             zktAlarmRecordDO.setObjId(alarmDefine.getObjId());
             zktAlarmRecordDO.setItemCode(alarmDefine.getItemCode());
-            zktAlarmRecordDO.setTargetId(alarmDefine.getTargetId());
+            zktAlarmRecordDO.setItemId(alarmDefine.getItemId());
             zktAlarmRecordDO.setState("1");
             zktAlarmRecordDO.setAlarmTime(alarmState.getAlarmStartTime());
             zktAlarmRecordDO.setProjectId(alarmDefine.getProjectId());
@@ -389,7 +389,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                         .itemCode(alarmDefine.getItemCode())
                         .name(alarmDefine.getName())
                         .objId(alarmDefine.getObjId())
-                        .targetId(alarmDefine.getTargetId())
+                        .itemId(alarmDefine.getItemId())
                         .projectId(alarmDefine.getProjectId())
                         .state("3")  //要变成已过期
                         .alarmId(alarmId)

+ 28 - 0
src/main/resources/application-WD127Pj4403070003.yml

@@ -0,0 +1,28 @@
+group:
+  #需要更改
+  code: WD   #标识哪个接团 比如万达使用WD
+  alarm:
+    #需要更改
+    host: 127.0.0.1 #netty IP   39.102.43.179
+    #需要更改
+    port: 9986          #netty 端口8826
+    #需要更改
+terminal: #边缘端IOT采集程序地址
+  alarm: # 拼接后的地址为ws://host:port/suffix
+    #需要更改
+    compress: false    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
+    #需要更改
+    host: 39.102.43.179  #39.102.54.110
+    #需要更改
+    port: 9994
+    #需要更改
+    suffix: websocket   #websocker后缀
+project:
+  #需要更改
+  iotid: 4403070003 #iot使用项目ID,不包含PJ
+  #需要更改
+  id: Pj4403070003 #项目ID
+spring:
+  datasource:
+    #需要更改
+    url: jdbc:mysql://39.102.43.179:9934/alarm-quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false

+ 2 - 2
src/main/resources/application-ZSPj4403050019.yml

@@ -12,9 +12,9 @@ terminal: #边缘端IOT采集程序地址
     #需要更改
     compress: false    #采用的是压缩方式还是不压缩方式  true-压缩 false-不压缩
     #需要更改
-    host: 39.96.55.242  #172.17.233.176
+    host: 39.102.43.179  #172.17.233.176
     #需要更改
-    port: 9980 #9984
+    port: 9994 #9984
     #需要更改
     suffix: websocket   #websocker后缀
 project:

+ 1 - 1
src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
   application:
     name: zkt-project-alarm
   profiles:
-    active: 39Pj4403050019 #39Pj5001120003 #Pj4403070003 #Pj3201110003
+    active: WD127Pj4403070003 #39Pj5001120003 #Pj4403070003 #Pj3201110003
   datasource:
     #需要更改
     url: jdbc:mysql://39.102.43.179:9934/alarm-quartz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false