Selaa lähdekoodia

Merge branch 'v3.0.0' of http://39.106.8.246:3003/apm/energy-alarm-service into v3.0.0

lixing 3 vuotta sitten
vanhempi
commit
c8fe3d67ae

+ 5 - 6
src/main/java/com/persagy/apm/dmpalarm/model/AlarmConfig.java

@@ -1,19 +1,18 @@
 package com.persagy.apm.dmpalarm.model;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 报警定义(AlarmConfig)实体类

+ 6 - 6
src/main/java/com/persagy/apm/dmpalarm/model/AlarmItem.java

@@ -1,16 +1,16 @@
 package com.persagy.apm.dmpalarm.model;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
-
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 报警条目(AlarmItem)实体类
@@ -41,7 +41,7 @@ public class AlarmItem implements Serializable {
 	private String remark;
 
 	@ApiModelProperty("触发条件")
-	@TableField(value ="`condition`" )
+	@TableField(value = "`condition`", typeHandler = FastjsonTypeHandler.class)
 	private JSONObject condition;
 
 	@ApiModelProperty("处理算法")

+ 3 - 0
src/main/java/com/persagy/apm/dmpalarm/model/AlarmLog.java

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -31,6 +33,7 @@ public class AlarmLog implements Serializable {
 	private Integer before;
 	@TableField(value = "`after`")
 	private Integer after;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
 	private JSONObject remark;
 	private Date createTime;
 	private String projectId;

+ 3 - 1
src/main/java/com/persagy/apm/dmpalarm/model/AlarmTarget.java

@@ -5,8 +5,9 @@ import java.util.Date;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
-
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,6 +32,7 @@ public class AlarmTarget implements Serializable {
     private String classCode;
     
     @ApiModelProperty("触发条件")
+	@TableField(value = "`condition`", typeHandler = FastjsonTypeHandler.class)
     private JSONObject condition;
     
     @ApiModelProperty("报警等级")

+ 1 - 2
src/main/java/com/persagy/apm/dmpalarm/service/impl/AlarmLogServiceImpl.java

@@ -7,13 +7,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.persagy.apm.dmpalarm.model.AlarmItem;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.apm.dmpalarm.criteria.JsonCriteria;
 import com.persagy.apm.dmpalarm.enumeration.AlarmLogType;
 import com.persagy.apm.dmpalarm.model.AlarmLog;

+ 1 - 1
src/main/java/com/persagy/apm/dmpalarm/service/impl/BaseServiceImpl.java

@@ -11,7 +11,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<Bas
     @Autowired
     protected CriteriaUtils criteriaUtils;
 
-    protected static class AlarmParam {
+    protected class AlarmParam {
         String groupCode;
         String userId;
         String projectId;

+ 1 - 1
src/main/resources/mapper/AlarmConfigMapper.xml

@@ -12,7 +12,7 @@
 		<result column="category" property="category" />
 		<result column="level" property="level" />
 		<result column="remark" property="remark" />
-		<result column="`condition`" property="condition"  typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler" />
+		<result column="condition" property="condition"  typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler" />
 		<result column="open" property="open" />
 		<result column="concern" property="concern" />
 		<result column="user_defined" property="userDefined" />