更改导入包

pom.xml

@@ -8,7 +8,7 @@
 		<version>v1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>energy-alarm-service</artifactId>
+	<artifactId>dmp-alarm</artifactId>
 	<version>v1.0.0</version>
 
 	<repositories>

src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/model/AlarmCondition.java

@@ -1,18 +1,19 @@
 package com.persagy.apm.alarmservice.project.alarmcondition.model;
 
+import java.io.Serializable;
+import java.util.List;
+
+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 com.persagy.apm.alarmservice.group.calculatemethod.model.dto.CalculateMethodDTO;
 import com.persagy.apm.common.model.entity.AuditableEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.json.JSONObject;
-
-import java.io.Serializable;
-import java.util.List;
 
 /**
  * 报警条件(AlarmCondition)实体类

src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/model/vo/AlarmConditionItemVO.java

@@ -1,16 +1,14 @@
 package com.persagy.apm.alarmservice.project.alarmcondition.model.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.dto.CalculateMethodDTO;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import org.json.JSONObject;
 
 /**
  * @author lixing

src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/model/vo/AlarmConditionListItemVO.java

@@ -1,5 +1,6 @@
 package com.persagy.apm.alarmservice.project.alarmcondition.model.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.persagy.apm.alarmservice.group.calculatemethod.model.dto.CalculateMethodDTO;
@@ -10,7 +11,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import org.json.JSONObject;
 
 /**
  * @author lixing

src/main/java/com/persagy/apm/dmpalarm/model/AlarmRecord.java

@@ -49,7 +49,7 @@ public class AlarmRecord implements Serializable {
 	@TableField(value = "`condition`", typeHandler = FastjsonTypeHandler.class)
 	private JSONObject condition;
 	@TableField(typeHandler = FastjsonTypeHandler.class)
-	@JSONField(jsonDirect=true)
+	@JSONField(jsonDirect = true)
 	private JSONObject triggerInfo;
 	private Date triggerTime;
 	@TableField(typeHandler = FastjsonTypeHandler.class)
@@ -65,6 +65,13 @@ public class AlarmRecord implements Serializable {
 	@TableField(typeHandler = FastjsonTypeHandler.class)
 	private JSONObject supplement;
 
+	public void setSupplement(JSONObject supplement) {
+		this.supplement = supplement;
+		if (null != supplement && !supplement.isEmpty()) {
+			this.setObjName(supplement.getString("alarm_obj_name"));
+		}
+	}
+
 	/**
 	 * 忽略报警时间
 	 */
@@ -98,7 +105,7 @@ public class AlarmRecord implements Serializable {
 	public static String PROP_NATURE = "nature";
 	public static String PROP_TREAT_MODE = "treat_mode";
 	public static String PROP_TREAT_STATE = "treat_state";
-	public static String PROP_ALARM_STATE="alarmState";
+	public static String PROP_ALARM_STATE = "alarmState";
 	public static String PROP_GROUP_CODE = "group_code";
 	public static String PROP_CONDITION = "condition";
 	public static String PROP_TRIGGER_INFO = "trigger_info";

src/main/java/com/persagy/apm/dmpalarm/service/impl/AlarmRecordServiceImpl.java

@@ -77,7 +77,6 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 					endTime = DateUtil.parse(lt);
 				}
 			}
-
 			PagedResponse<AlarmRecord> resp = shardingService.selectShardingPageList(AlarmRecord.class, queryWrapper,
 					jsonCriteria.getPage(), jsonCriteria.getSize(), startTime, endTime);
 			PagedResponse<AlarmRecord> resultAlarmRecordList = new PagedResponse<>();
@@ -151,7 +150,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 	private <T> void addAlarmQueryCondition(JSONObject criteria, QueryWrapper<T> queryWrappers) {
 		String listType = criteria.getString("listType");
 		if (EnumAlarmListType.CURRENT.name().equals(listType)) {
-			queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE,0);
+			queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE, 0);
 		}
 		if (EnumAlarmListType.HISTORY.name().equals(listType)) {
 			queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE, 1);
@@ -197,10 +196,14 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		entity.setValid(1);
 		entity.setProjectId(alarmParam.projectId);
 		entity.setGroupCode(alarmParam.groupCode);
-		if (entity.getState() == EnumAlarmState.UN_HANDLE.getType() && (entity.getTreatState() == EnumAlarmTreatState.UN_HANDLE.getType() || entity.getTreatState() == EnumAlarmTreatState.HANDLING.getType())) {
+		if (EnumAlarmState.UN_HANDLE.getType().equals(entity.getState())
+				&& (EnumAlarmTreatState.UN_HANDLE.getType().equals(entity.getTreatState())
+						|| EnumAlarmTreatState.HANDLING.getType().equals(entity.getTreatState()))) {
 			entity.setAlarmState(0);
 		}
-		if(entity.getState()==EnumAlarmState.END.getType() || entity.getState()==EnumAlarmState.EXPIRE.getType() || entity.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
+		if (EnumAlarmState.END.getType().equals(entity.getState())
+				|| EnumAlarmState.EXPIRE.getType().equals(entity.getState())
+				|| EnumAlarmTreatState.DONE.getType().equals(entity.getTreatState())) {
 			entity.setAlarmState(1);
 		}
 		shardingService.save(entity, entity.getTriggerTime());
@@ -318,10 +321,14 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		}
 		alarmRecord.setUpdateUser(alarmParam.userId);
 		alarmRecord.setUpdateTime(new Date());
-		if (alarmRecord.getState() == EnumAlarmState.UN_HANDLE.getType() && (alarmRecord.getTreatState() == EnumAlarmTreatState.UN_HANDLE.getType() || alarmRecord.getTreatState() == EnumAlarmTreatState.HANDLING.getType())) {
+		if (EnumAlarmState.UN_HANDLE.getType().equals(alarmRecord.getState())
+				&& (EnumAlarmTreatState.UN_HANDLE.getType().equals(alarmRecord.getTreatState())
+						|| EnumAlarmTreatState.HANDLING.getType().equals(alarmRecord.getTreatState()))) {
 			alarmRecord.setAlarmState(0);
 		}
-		if(alarmRecord.getState()==EnumAlarmState.END.getType() || alarmRecord.getState()==EnumAlarmState.EXPIRE.getType() || alarmRecord.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
+		if (EnumAlarmState.END.getType().equals(alarmRecord.getState())
+				|| EnumAlarmState.EXPIRE.getType().equals(alarmRecord.getState())
+				|| EnumAlarmTreatState.DONE.getType().equals(alarmRecord.getTreatState())) {
 			alarmRecord.setAlarmState(1);
 		}
 		shardingService.saveOrUpdate(alarmRecord, alarmRecord.getTriggerTime());

src/main/java/com/persagy/apm/dmpalarm/service/impl/ShardingServiceImpl.java

@@ -44,9 +44,9 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 public class ShardingServiceImpl implements IShardingService {
 
-	private final String COUNT_SQL = "SELECT COUNT(*) total";
+	private static final String COUNT_SQL = "SELECT COUNT(*) total";
 
-	private final String ALL_FIELD_SQL = "SELECT * ";
+	private static final String ALL_FIELD_SQL = "SELECT * ";
 	@Autowired
 	SqlSessionTemplate sqlSessionTemplate;
 	@Autowired
@@ -184,7 +184,7 @@ public class ShardingServiceImpl implements IShardingService {
 			}
 		}
 
-		String sql = String.format(updateSql, column.substring(0, column.length()-1),
+		String sql = String.format(updateSql, column.substring(0, column.length() - 1),
 				tableInfo.getKeyColumn() + "=#{" + tableInfo.getKeyProperty() + "}");
 		paramMap.put("sql", sql);
 		this.shardingMapper.updateById(paramMap);