Kaynağa Gözat

新版代码修改,日期类型变更

易涛 3 yıl önce
ebeveyn
işleme
5170679617

+ 7 - 1
src/main/java/com/persagy/entity/AlarmDefine.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Transient;
+
 /**
  * @description:
  * @author:LuoGuangyi
@@ -69,7 +71,7 @@ public class AlarmDefine {
     /**
      * 报警对象类型
      */
-    private String category;
+    private String objType;
     /**
      * 严重程度
      */
@@ -100,6 +102,10 @@ public class AlarmDefine {
      */
     private int concern;
 
+    private String ibmsClassCode;
+
+    private String ibmsSceneCode;
+
 
     @Override
     public String toString() {

+ 9 - 4
src/main/java/com/persagy/entity/AlarmRecord.java

@@ -9,7 +9,9 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -79,7 +81,7 @@ public class AlarmRecord implements Serializable {
      * 报警分类
      */
     @ApiModelProperty(value = "报警分类")
-    private String category;
+    private String objType;
 
     /**
      * 是否重点关注
@@ -123,7 +125,7 @@ public class AlarmRecord implements Serializable {
      * 报警时间
      */
     @ApiModelProperty(value = "报警时间")
-    private Date triggerTime;
+    private LocalDateTime triggerTime;
 
     /**
      * 报警结束值
@@ -136,7 +138,7 @@ public class AlarmRecord implements Serializable {
      * 有效期结束时间
      */
     @ApiModelProperty(value = "报警自动过期时间")
-    private Date endTime;
+    private LocalDateTime endTime;
 
 
     /**
@@ -149,7 +151,7 @@ public class AlarmRecord implements Serializable {
      * 创建时间 时间戳
      */
     @ApiModelProperty(value = "创建时间")
-    private Long createTime;
+    private Date createTime;
 
     /**
      * 更新用户
@@ -198,4 +200,7 @@ public class AlarmRecord implements Serializable {
         return JSONObject.toJSONString(this);
     }
 
+    private String ibmsClassCode;
+
+    private String ibmsSceneCode;
 }

+ 1 - 1
src/main/java/com/persagy/job/AlarmExpireJob.java

@@ -118,7 +118,7 @@ public class AlarmExpireJob extends QuartzJobBean {
                         .build();
                 if ("2".equals(state)) {
                     message.setEndInfo(endInfo);
-                    message.setEndTime(DateUtils.parseDate(endTime));
+                    message.setEndTime(DateUtils.parse(endTime));
                 }
                 nettyMessage.setContent(Arrays.asList(message));
                 //{"id","123", "state":1, "groupCode":"wd", "projectId":"Pj123"}

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

@@ -213,7 +213,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                         .state(2)
                         .groupCode(CommonConst.groupCode)
                         .projectId(CommonConst.projectId)
-                        .endTime(DateUtils.parseDate(dateTime))
+                        .endTime(DateUtils.parse(dateTime))
                         .endInfo(JSONObject.toJSONString(paramMap))
                         .build();
                 //如果有报警ID,直接报警恢复
@@ -350,13 +350,13 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
         if (timeSecond >= condition.getTriggerUphold()) {
             log.warn("大于持续时间了,产生一条报警[{}]>[{}]", timeSecond, condition.getTriggerUphold());
             AlarmRecord alarmRecord = AlarmRecord.builder()
-                    .category(alarmDefine.getCategory())
+                    .objType(alarmDefine.getObjType())
                     .concern(alarmDefine.getConcern())
                     .level(alarmDefine.getLevel())
                     .projectId(CommonConst.projectId)
                     .state(1)
                     //报警时间为第一次满足报警条件时候的时间
-                    .triggerTime(DateUtils.parseDate(alarmState.getAlarmStartTime()))
+                    .triggerTime(DateUtils.parse(alarmState.getAlarmStartTime()))
                     .remark(alarmDefine.getRemark())
                     .triggerInfo(JSONObject.toJSONString(paramMap))
                     .condition(condition.toString())
@@ -367,6 +367,8 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                     .itemId(alarmDefine.getItemId())
                     .classCode(alarmDefine.getClassCode())
                     .createUser(CommonConst.systemId)
+                    .ibmsClassCode(alarmDefine.getIbmsClassCode())
+                    .ibmsSceneCode(alarmDefine.getIbmsSceneCode())
                     .build();
             NettyMessage<AlarmRecord> nettyMessage = new NettyMessage<>(5);
             nettyMessage.setContent(Arrays.asList(alarmRecord));