Quellcode durchsuchen

更改枚举类型为静态类

gaoyu vor 3 Jahren
Ursprung
Commit
ac4f0537ad

+ 4 - 4
src/main/java/com/persagy/apm/dmpalarm/enumeration/EnumAlarmLogType.java

@@ -7,8 +7,8 @@ package com.persagy.apm.dmpalarm.enumeration;
  * @since: 2020/10/19 2:07 下午
  * @version: V1.0
  **/
-public enum EnumAlarmLogType {
-    ALARMSTATE,
-    TREATMODE,
-    TREATSTATE
+public class AlarmLogType {
+	public static final String ALARMSTATE = "0";
+	public static final String TREATMODE = "1";
+	public static final String TREATSTATE = "2";
 }

+ 1 - 2
src/main/java/com/persagy/apm/dmpalarm/model/AlarmLog.java

@@ -5,7 +5,6 @@ import java.util.Date;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.persagy.apm.dmpalarm.enumeration.EnumAlarmLogType;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -24,7 +23,7 @@ public class AlarmLog implements Serializable {
 	private String id;
 	private String recordId;
 	@TableField(value = "`type`")
-	private EnumAlarmLogType type;
+	private String type;
 	private Integer nature;
 	@TableField(value = "`before`")
 	private Integer before;

+ 15 - 8
src/main/java/com/persagy/apm/dmpalarm/service/impl/AlarmLogServiceImpl.java

@@ -1,18 +1,25 @@
 package com.persagy.apm.dmpalarm.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+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.persagy.apm.dmpalarm.criteria.JsonCriteria;
-import com.persagy.apm.dmpalarm.enumeration.EnumAlarmLogType;
+import com.persagy.apm.dmpalarm.enumeration.AlarmLogType;
 import com.persagy.apm.dmpalarm.model.AlarmLog;
 import com.persagy.apm.dmpalarm.service.IAlarmLogService;
 import com.persagy.apm.dmpalarm.web.MapResponse;
 import com.persagy.apm.dmpalarm.web.PagedResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 报警日志(AlarmLog) service层
@@ -91,7 +98,7 @@ public class AlarmLogServiceImpl extends BaseServiceImpl<AlarmLog> implements IA
     public Date getIgnoreAlarmTime(String recordId) {
         // 已忽略
         int after = 1;
-        return getCreateTime(recordId, EnumAlarmLogType.TREATMODE, after);
+        return getCreateTime(recordId, AlarmLogType.TREATMODE, after);
     }
 
     /**
@@ -101,7 +108,7 @@ public class AlarmLogServiceImpl extends BaseServiceImpl<AlarmLog> implements IA
      * @param after
      * @return
      */
-    private Date getCreateTime(String recordId, EnumAlarmLogType type, int after) {
+    private Date getCreateTime(String recordId, String type, int after) {
         JsonCriteria criteria=new JsonCriteria();
         criteria.getCriteria().put("recordId", recordId);
         criteria.getCriteria().put("type", type);

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

@@ -20,8 +20,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.persagy.apm.dmpalarm.config.DmpParameterStorage;
 import com.persagy.apm.dmpalarm.criteria.JsonCriteria;
+import com.persagy.apm.dmpalarm.enumeration.AlarmLogType;
 import com.persagy.apm.dmpalarm.enumeration.EnumAlarmListType;
-import com.persagy.apm.dmpalarm.enumeration.EnumAlarmLogType;
 import com.persagy.apm.dmpalarm.enumeration.EnumAlarmMessageType;
 import com.persagy.apm.dmpalarm.enumeration.EnumAlarmRecordWithColumns;
 import com.persagy.apm.dmpalarm.enumeration.EnumAlarmState;
@@ -119,11 +119,11 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 					alarmLogList = alarmLogListMap.get(entity.getId());
 				}
 				if (withColumns.contains(EnumAlarmRecordWithColumns.ignoreTime.name())) {
-					Date ignoreAlarmTime = getCreateTime(alarmLogList, EnumAlarmLogType.TREATMODE, 1);
+					Date ignoreAlarmTime = getCreateTime(alarmLogList, AlarmLogType.TREATMODE, 1);
 					entity.setIgnoreTime(ignoreAlarmTime);
 				}
 				if (withColumns.contains(EnumAlarmRecordWithColumns.treatEndTime.name())) {
-					Date treatEndTime = getCreateTime(alarmLogList, EnumAlarmLogType.TREATSTATE, 3);
+					Date treatEndTime = getCreateTime(alarmLogList, AlarmLogType.TREATSTATE, 3);
 					entity.setTreatEndTime(treatEndTime);
 				}
 			}
@@ -135,7 +135,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		return new PagedResponse<>();
 	}
 
-	public Date getCreateTime(List<AlarmLog> alarmLogList, EnumAlarmLogType type, int after) {
+	public Date getCreateTime(List<AlarmLog> alarmLogList, String type, int after) {
 		Date createTime = null;
 		if (!CollectionUtils.isEmpty(alarmLogList)) {
 			for (AlarmLog alarmLog : alarmLogList) {
@@ -266,7 +266,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		if (param.getState() != null) {
 			if (!param.getState().equals(alarmRecord.getState())) {
 				AlarmLog alarmLog = initAlarmLogModel(param);
-				alarmLog.setType(EnumAlarmLogType.ALARMSTATE);
+				alarmLog.setType(AlarmLogType.ALARMSTATE);
 				alarmLog.setNature(alarmRecord.getNature());
 				alarmLog.setBefore(alarmRecord.getState());
 				alarmLog.setAfter(param.getState());
@@ -281,7 +281,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		if (param.getTreatMode() != null) {
 			if (!param.getTreatMode().equals(alarmRecord.getTreatMode())) {
 				AlarmLog alarmLogModel = initAlarmLogModel(param);
-				alarmLogModel.setType(EnumAlarmLogType.TREATMODE);
+				alarmLogModel.setType(AlarmLogType.TREATMODE);
 				alarmLogModel.setNature(alarmRecord.getNature());
 				alarmLogModel.setBefore(alarmRecord.getTreatMode());
 				alarmLogModel.setAfter(param.getTreatMode());
@@ -293,7 +293,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		if (param.getTreatState() != null) {
 			if (!param.getTreatState().equals(alarmRecord.getTreatState())) {
 				AlarmLog alarmLogModel = initAlarmLogModel(param);
-				alarmLogModel.setType(EnumAlarmLogType.TREATSTATE);
+				alarmLogModel.setType(AlarmLogType.TREATSTATE);
 				alarmLogModel.setNature(alarmRecord.getNature());
 				alarmLogModel.setBefore(alarmRecord.getTreatState());
 				alarmLogModel.setAfter(param.getTreatState());