1.alarmEventType 增加groupCode

2.解除PoemsWebConfigurer 部分代码注释
3.增加多数据库配置

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.persagy</groupId>
 		<artifactId>apm-package</artifactId>
-		<version>v1.0.0-SNAPSHOT</version>
+		<version>v1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>dmp-alarm</artifactId>

src/main/java/com/persagy/apm/alarmservice/common/configuration/PoemsWebConfigurer.java

@@ -1,17 +1,15 @@
 package com.persagy.apm.alarmservice.common.configuration;
 
-import com.persagy.apm.common.handler.PoemsContextFilter;
-import com.persagy.apm.common.handler.PoemsContextHandler;
-import com.persagy.apm.mybatis.handler.DynamicDataSourceHandler;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.Filter;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.servlet.Filter;
+import com.persagy.apm.common.handler.PoemsContextFilter;
+import com.persagy.apm.mybatis.handler.DynamicDataSourceHandler;
 
 /**
  * web拦截器配置
@@ -22,21 +20,21 @@ import javax.servlet.Filter;
 @Configuration
 public class PoemsWebConfigurer implements WebMvcConfigurer {
 
-//    @Bean
-//    public DynamicDataSourceHandler dynamicDataSourceHandler() {
-//        return new DynamicDataSourceHandler();
-//    }
+    @Bean
+    public DynamicDataSourceHandler dynamicDataSourceHandler() {
+        return new DynamicDataSourceHandler();
+    }
 
     @Bean
     public Filter poemsContextFilter() {
         return new PoemsContextFilter();
     }
 
-//    @Override
-//    public void addInterceptors(InterceptorRegistry registry) {
-//        // 设置拦截的路径、不拦截的路径、优先级等等
-//        registry.addInterceptor(dynamicDataSourceHandler()).addPathPatterns("/**");
-//    }
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 设置拦截的路径、不拦截的路径、优先级等等
+        registry.addInterceptor(dynamicDataSourceHandler()).addPathPatterns("/**");
+    }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {

src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/controller/AlarmRecordController.java

@@ -1,12 +1,41 @@
 package com.persagy.apm.alarmservice.group.alarmrecord.controller;
 
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.assertj.core.util.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumDownloadAlarmListType;
 import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatMode;
 import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatState;
+import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumDownloadAlarmListType;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.ConvertAlarmRecordTool;
-import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.*;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.AlarmRecordConvertWorkOrderDTO;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.CloseAlarmRecordDTO;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.DownloadAlarmRecordDTO;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.DownloadAllAlarmRecordDTO;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.GetAlarmRecordDTO;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.IgnoreAlarmRecordDTO;
+import com.persagy.apm.alarmservice.group.alarmrecord.model.dto.PageQueryAlarmRecordDTO;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordIdsItem;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordItemVO;
 import com.persagy.apm.alarmservice.group.alarmrecord.model.vo.AlarmRecordListItem;
@@ -22,7 +51,6 @@ import com.persagy.apm.common.response.PageList;
 import com.persagy.apm.common.utils.ResultHelper;
 import com.persagy.apm.energyalarmstarter.alarmdata.enums.EnumAlarmListType;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.AddAlarmRecordDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.BatchUpdateAlarmRecordDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.QueryAlarmRecordDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.UpdateAlarmRecordDTO;
@@ -32,29 +60,9 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmRecordItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
 import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmRecordServiceImpl;
 import com.persagy.apm.energyalarmstarter.alarmdata.utils.DateUtils;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.assertj.core.util.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 报警记录控制层

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

@@ -21,6 +21,7 @@ public class AlarmEventType implements Serializable {
     private String id;
     private Integer eventId;
     private String eventName;
+    private String groupCode;
     private String category; 
     private Date ts;
     private String creator;

src/main/resources/bootstrap.yml

@@ -73,5 +73,8 @@ logging:
   level:
     com:
       persagy: info
-
+dynamic:
+    not-url: /alarm/comment,/alarm/config,/alarm/event,/alarm/item,/alarm/log ,/alarm/record,/alarm/target
+    db:
+      name: dmp-alarm