Browse Source

# WARNING: head commit changed in the meantime

Merge branch 'v3.0.0' of
http://39.106.8.246:3003/apm/energy-alarm-service.git into v3.0.0
gaoyu 3 years ago
parent
commit
279dd2b09d

+ 1 - 0
src/main/java/com/persagy/apm/dmpalarm/model/AlarmRecord.java

@@ -98,6 +98,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_GROUP_CODE = "group_code";
 	public static String PROP_CONDITION = "condition";
 	public static String PROP_TRIGGER_INFO = "trigger_info";

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

@@ -151,16 +151,10 @@ 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.and(andWrapper -> andWrapper.eq(AlarmRecord.PROP_STATE, EnumAlarmState.UN_HANDLE.getType())
-					.or(orw -> orw.eq(AlarmRecord.PROP_TREAT_STATE, EnumAlarmState.UN_HANDLE.getType())
-							.eq(AlarmRecord.PROP_TREAT_STATE, EnumAlarmTreatState.HANDLING.getType())));
+			queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE,0);
 		}
-
 		if (EnumAlarmListType.HISTORY.name().equals(listType)) {
-			queryWrappers.and(andWrapper -> andWrapper.eq(AlarmRecord.PROP_STATE, EnumAlarmState.END.getType())
-					.or(orw -> orw.eq(AlarmRecord.PROP_STATE, EnumAlarmState.EXPIRE.getType())
-							.eq(AlarmRecord.PROP_TREAT_STATE, EnumAlarmTreatState.DONE.getType())));
-
+			queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE, 1);
 		}
 	}
 
@@ -203,9 +197,10 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
 		entity.setValid(1);
 		entity.setProjectId(alarmParam.projectId);
 		entity.setGroupCode(alarmParam.groupCode);
-		if (entity.getState() == 1 || (entity.getTreatState() == 1 && entity.getTreatState() == 2)) {
+		if (entity.getState() == EnumAlarmState.UN_HANDLE.getType() && (entity.getTreatState() == EnumAlarmTreatState.UN_HANDLE.getType() || entity.getTreatState() == EnumAlarmTreatState.HANDLING.getType())) {
 			entity.setAlarmState(0);
-		} else {
+		}
+		if(entity.getState()==EnumAlarmState.END.getType() || entity.getState()==EnumAlarmState.EXPIRE.getType() || entity.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
 			entity.setAlarmState(1);
 		}
 		shardingService.save(entity, entity.getTriggerTime());
@@ -323,6 +318,12 @@ 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())) {
+			alarmRecord.setAlarmState(0);
+		}
+		if(alarmRecord.getState()==EnumAlarmState.END.getType() || alarmRecord.getState()==EnumAlarmState.EXPIRE.getType() || alarmRecord.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
+			alarmRecord.setAlarmState(1);
+		}
 		shardingService.saveOrUpdate(alarmRecord, alarmRecord.getTriggerTime());
 		response.add("id", alarmRecord.getId());
 		// 推送消息至mq

+ 4 - 7
src/main/resources/bootstrap.yml

@@ -1,10 +1,9 @@
 server:
   port:
     9977
-
 spring:
   application:
-    name: energy-alarm-service
+    name: dmp-alarm
   jackson:
     serialization:
       # 统一将时间都转为时间戳
@@ -21,12 +20,10 @@ spring:
           data: classpath*:db/init/data.sql
           continue-on-error: true
           # MYSQL_SCHEMA建议使用默认值。如果有特殊需求,建议在环境变量中配置该值
-          url: jdbc:mysql://${mysql.ip}:${mysql.port}/${MYSQL_SCHEMA:energy_alarm_service}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://${mysql.ip}:${mysql.port}/${MYSQL_SCHEMA:dmp_alarm}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
           username: ${MYSQL_USERNAME:${spring.datasource.username}}
           password: ${MYSQL_PASSWORD:${spring.datasource.password}}
           driver-class-name: com.mysql.cj.jdbc.Driver
-
-
 feign:
   compression:
     response:
@@ -55,8 +52,8 @@ integrated:
 # 不打印sql
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 eureka:
   client: