优化

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -37,6 +37,7 @@ import java.util.Map;
 
 /**
  * controller层切面 用于用户数据缓存 供 sql自动填充使用
+ * (使用粒度过大的Aop会创建大量代理对象，影响性能，占用内存，考虑使用 WebMvcConfigurer#addInterceptors 添加拦截器 )
  *
  * @author Admin
  */
@@ -54,9 +55,9 @@ public class ControllerAop {
     private RedisUtils redisUtils;
 
     @Pointcut("(execution(public * com.yeejoin.amos.boot.module..*.biz.controller..*(..))"
-    		+ "|| execution(public * com.yeejoin.amos.*.business.controller..*(..))"
-    		+ " && !@annotation(org.springframework.scheduling.annotation.Scheduled))"
-    		+ "|| execution(public * com.yeejoin.equipmanage.controller..*.*(..))")
+            + "|| execution(public * com.yeejoin.amos.*.business.controller..*(..))"
+            + " && !@annotation(org.springframework.scheduling.annotation.Scheduled))"
+            + "|| execution(public * com.yeejoin.equipmanage.controller..*.*(..))")
     public void userCache() {
 
     }
@@ -69,8 +70,8 @@ public class ControllerAop {
         String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo"};
         // 获取请求路径
-        for(String uri : url) {
-            if(request.getRequestURI().indexOf(uri) != -1) {
+        for (String uri : url) {
+            if (request.getRequestURI().indexOf(uri) != -1) {
                 return;
             }
         }
@@ -118,10 +119,10 @@ public class ControllerAop {
         CompanyBo company = new CompanyBo();
         DepartmentBo department = new DepartmentBo();
         RoleBo role = new RoleBo();
-        CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null ;
+        CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null;
         Bean.copyExistPropertis(companyM, company);
         Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
-        DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null ;
+        DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
         Bean.copyExistPropertis(departmentM, department);
         Map<Long, List<RoleModel>> roles = user.getOrgRoles();
         Long sequenceNbr;
@@ -132,7 +133,7 @@ public class ControllerAop {
         }
         RoleModel roleM = null;
         if (sequenceNbr == null) {
-            roleM = companyM != null ?roles.get(companyM.getSequenceNbr()).get(0) : null;
+            roleM = companyM != null ? roles.get(companyM.getSequenceNbr()).get(0) : null;
         } else {
             roleM = roles.get(sequenceNbr).get(0);
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/AddResourceHandlersConfig.java

@@ -3,10 +3,10 @@ package com.yeejoin.equipmanage.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class AddResourceHandlersConfig extends WebMvcConfigurerAdapter {
+public class AddResourceHandlersConfig implements WebMvcConfigurer {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/core/framework/FasApplicationConfig.java

 package com.yeejoin.amos.fas.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.fas.business.constants.FasConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.io.File;
 
-import com.yeejoin.amos.fas.business.constants.FasConstant;;
+;
 
 @Configuration
-public class FasApplicationConfig extends WebMvcConfigurerAdapter{
+public class FasApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +28,5 @@ public class FasApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+FasConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.latentdanger.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.latentdanger.business.constants.Constants;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.latentdanger.business.constants.Constants;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+ Constants.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.maintenance.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.maintenance.business.constants.XJConstant;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+XJConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.patrol.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.patrol.business.constants.XJConstant;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+XJConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.supervision.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.supervision.business.constants.XJConstant;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+XJConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }