添加装备服务

amos-boot-biz-common/.factorypath

 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.23-SNAPSHOT/tyboot-core-foundation-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.25-SNAPSHOT/tyboot-core-foundation-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" enabled="true" runInBatchMode="false"/>
@@ -8,7 +7,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/reflectasm/reflectasm/1.09/reflectasm-1.09.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/axet/kaptcha/0.0.9/kaptcha-0.0.9.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-feign/1.7.10-SNAPSHOT/amos-component-feign-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar" enabled="true" runInBatchMode="false"/>
@@ -209,7 +207,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -258,5 +255,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-privilege/1.7.10-SNAPSHOT/amos-feign-privilege-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/FillCommonUserField.java

 package com.yeejoin.amos.boot.biz.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * @author DELL

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotations/DataAuth.java

 package com.yeejoin.amos.boot.biz.common.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * @author DELL

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

 package com.yeejoin.amos.boot.biz.common.aop;
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -9,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -40,11 +40,10 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
- * controller层切面 用于用户数据缓存 供 sql自动填充使用 (使用粒度过大的Aop会创建大量代理对象，影响性能，占用内存，考虑使用
- * WebMvcConfigurer#addInterceptors 添加拦截器 )
+ * controller层切面 用于用户数据缓存 供 sql自动填充使用
+ * (使用粒度过大的Aop会创建大量代理对象，影响性能，占用内存，考虑使用 WebMvcConfigurer#addInterceptors 添加拦截器 )
  *
  * @author Admin
  */
@@ -52,181 +51,161 @@ import java.util.regex.Pattern;
 @Component
 @Order(value = 0)
 public class ControllerAop {
-	/**
-	 * saveUserRedis设置过期时间
-	 */
-	@Value("${redis.cache.failure.time}")
-	private Long redisRegionTimeSecond;
-
-	@Autowired
-	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.api.openapi.controller..*(..))")
-	public void userCache() {
-
-	}
-
-	@Before("userCache()")
-	public void doBefore(JoinPoint joinPoint) {
-		PermissionInterceptorContext.clean();
-		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-		HttpServletRequest request = null;
-		if (ObjectUtils.isNotEmpty(attributes)) {
-			request = attributes.getRequest();
-		} else {
-			return;
-		}
-		// 不需要添加请求头的接口，如使用url中有PathVariable，则使用正则表达式匹配
-		List<String> urls = Lists.newArrayList();
-		urls.add("/api/user/save/curCompany");
-		urls.add("/jcs/command/lookHtmlText");
-		urls.add("^/jcs/common/duty-person/findByDutyAreaId/[A-Za-z0-9]+$");
-		urls.add("/tzs/wechatBack");
-		urls.add("/tzs/elevator/getElevatorInfo");
-		urls.add("/openapi/bizToken/applyToken");
-		urls.add("/tzs/flc-unit-info/region/tree");
-		urls.add("/tzs/reg-unit-info/management-unit/tree");
-		urls.add("/tzs/reg-unit-info/unit-type/list");
-		urls.add("^/tzs/flc-unit-info/hasExistPhone/[0-9]+$");
-		urls.add("^/tzs/flc-unit-info/sendTelCode/[0-9]+$");
-		urls.add("^/tzs/reg-unit-info/[A-Za-z0-9]+/check$");
-		urls.add("^/tzs/flc-unit-info/verifyTelCode/[A-Za-z0-9]+/[A-Za-z0-9]+");
-		urls.add("^/tzs/flc-unit-info/hasExistUser/[A-Za-z0-9_-]+");
-		urls.add("/tzs/reg-unit-info/save");
-        urls.add("/hygf/unit-info/region/tree");
-        urls.add("/hygf/unit-info/management-unit/tree");
-        urls.add("/hygf/unit-info/hasExistPhone/.*");
-		urls.add("/hygf/unit-info/hasExistUserName/.*");
-        urls.add("/hygf/unit-info/sendTelCode/.*");
-        urls.add("/hygf/unit-info/verifyTelCode/.*/.*");
-        urls.add("/hygf/peasant-household/mobile/login");
-        urls.add("/hygf/peasant-household/mobile/getRegisterPhone");
-        urls.add("/hygf/qiyuesuo/callback");
-        urls.add("/hygf/unit-info/unitRegister");
-        urls.add("/hygf/maintenance/getDealer");
-        urls.add("/hygf/maintenance/save");
-        urls.add("/hygf/qiyuesuo/getUserToken");
-		urls.add("/hygf/peasant-household/mobile/register");
-
-
-		// 获取请求路径
-		for (String uri : urls) {
-			Pattern p = Pattern.compile(uri);
-			if (p.matcher(request.getRequestURI()).matches()) {
-				return;
-			}
-		}
-		// TODO tyboot 框架拦截器已缓存数据
-		String token = RequestContext.getToken();
-
-		// 不需要校验token的接口直接返回
+    /**
+     * saveUserRedis设置过期时间
+     */
+    @Value("${redis.cache.failure.time}")
+    private Long redisRegionTimeSecond;
+
+    @Autowired
+    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.api.openapi.controller..*(..))")
+    public void userCache() {
+
+    }
+
+    @Before("userCache()")
+    public void doBefore(JoinPoint joinPoint) {
+        PermissionInterceptorContext.clean();
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = null;
+        if(ObjectUtils.isNotEmpty(attributes)){
+            request = attributes.getRequest();
+        } else {
+            return;
+        }
+        // 不需要添加请求头的接口
+        String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
+                "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
+                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail","/equip/car/state/info","equip/fire-fighting-system/getMonitoringCount","equip/fire-fighting-system/getMonitoringUnitList"};
+        // 获取请求路径
+        for (String uri : url) {
+            if (request.getRequestURI().indexOf(uri) != -1) {
+                return;
+            }
+        }
+
+        // 因前端组件下载时不通过url请求，导致RequestContext取不到值，所以针对这个接口特殊处理
+        if (request.getRequestURI().indexOf("/jcs/excel/export/QDSJ") != -1) {
+            String appKey = request.getHeader("appKey");
+            String product = request.getHeader("product");
+            String token = request.getHeader("token");
+            RequestContext.setAppKey(appKey);
+            RequestContext.setProduct(product);
+            RequestContext.setToken(token);
+        }
+
+        //TODO tyboot 框架拦截器已缓存数据
+        String token = RequestContext.getToken();
+
+        // 不需要校验token的接口直接返回
         if (joinPoint.getSignature() instanceof MethodSignature) {
             if (!((MethodSignature) joinPoint.getSignature()).getMethod().getAnnotation(TycloudOperation.class).needAuth() && !request.getParameterMap().containsKey("token") && ValidationUtil.isEmpty(token)) {
                 return;
             }
         }
 
-		// 平台studio配置的下载接口token从url里取
-		if (ValidationUtil.isEmpty(token)) {
-			fillRequestContext(request);
-			token = RequestContext.getToken();
-		}
-		if (token != null) {
-			String pattern = RedisKey.buildPatternKey(token);
-			// 验证token有效性，防止token失效
-			AgencyUserModel userModel;
-			try {
-				FeignClientResult<AgencyUserModel> agencyUserModel = Privilege.agencyUserClient.getme();
-				userModel = agencyUserModel.getResult();
-				if (userModel == null) {
-					throw new Exception("无法获取用户信息");
-				}
-				RequestContext.setExeUserId(userModel.getUserId());
-			} catch (Exception e) {
-				// 删除失效token缓存
-				redisUtils.getAndDeletePatternKeys(pattern);
-				throw new RuntimeException(e.getMessage());
-			}
-			saveUserRedis(userModel, token);
-		} else {
-			throw new AuthException("请求未包含认证信息.");
-		}
-	}
-
-	private void saveUserRedis(AgencyUserModel user, String token) {
-		String authToken = RedisKey.buildReginKey(user.getUserId(), token);
-		if (redisUtils.hasKey(authToken)) {
-			return;
-		}
-		CompanyBo company = new CompanyBo();
-		DepartmentBo department = new DepartmentBo();
-		RoleBo role = new RoleBo();
-		// 平台更新 人员部门可能为NULL 导致redis缓存不到人员信息
-		Map<Long, List<DepartmentModel>> mapDepartments = new HashMap<>();
-		DepartmentModel departmentM = new DepartmentModel();
-		CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null;
-		Bean.copyExistPropertis(companyM, company);
-		if (!ValidationUtil.isEmpty(user.getCompanyDepartments())) {
-			mapDepartments = user.getCompanyDepartments();
-			departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
-		}
-		Bean.copyExistPropertis(departmentM, department);
-		Map<Long, List<RoleModel>> roles = user.getOrgRoles();
-		Long sequenceNbr;
-		if (departmentM == null) {
-			sequenceNbr = null;
-		} else {
-			sequenceNbr = departmentM.getSequenceNbr();
-		}
-		RoleModel roleM = null;
-		if (sequenceNbr == null) {
-			roleM = companyM != null ? roles.get(companyM.getSequenceNbr()).get(0) : null;
-		} else {
-			roleM = roles.get(sequenceNbr).get(0);
-		}
-		if (companyM != null && companyM.getRegionSeq() != null) {
-			FeignClientResult<RegionModel> result = Systemctl.regionClient
-					.getRegion(Long.valueOf(companyM.getRegionSeq()));
-			company.setRegionCode(String.valueOf(result.getResult().getRegionCode()));
-		}
-		Bean.copyExistPropertis(roleM, role);
-		ReginParams reginParams = new ReginParams();
-		reginParams.setCompany(company);
-		reginParams.setRole(role);
-		reginParams.setDepartment(department);
-		reginParams.setUserModel(user);
-		redisUtils.set(authToken, JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
-	}
-
-	@AfterReturning(returning = "ret", pointcut = "userCache()")
-	public void doAfterReturning(Object ret) throws Throwable {
-		// 统一redis管理
+        // 平台studio配置的下载接口token从url里取
+        if (ValidationUtil.isEmpty(token)) {
+            fillRequestContext(request);
+            token = RequestContext.getToken();
+        }
+
+
+        if (token != null) {
+            String authToken = RedisKey.buildReginKey(RequestContext.getExeUserId(), token);
+            if (redisUtils.hasKey(authToken) && TokenOperation.refresh(token)) {
+                return;
+            }
+
+            String pattern = RedisKey.buildPatternKey(token);
+            //验证token有效性，防止token失效
+            AgencyUserModel userModel;
+            try {
+                FeignClientResult<AgencyUserModel> agencyUserModel = Privilege.agencyUserClient.getme();
+                userModel = agencyUserModel.getResult();
+                if (userModel == null) {
+                    throw new Exception("无法获取用户信息");
+                }
+                RequestContext.setExeUserId(userModel.getUserId());
+            } catch (Exception e) {
+                //删除失效token缓存
+                redisUtils.getAndDeletePatternKeys(pattern);
+                throw new RuntimeException(e.getMessage());
+            }
+            saveUserRedis(userModel, token);
+        } else {
+            throw new AuthException("请求未包含认证信息.");
+        }
+    }
+
+    private void saveUserRedis(AgencyUserModel user, String token) {
+        String authToken = RedisKey.buildReginKey(user.getUserId(), token);
+        if (redisUtils.hasKey(authToken)) {
+            return;
+        }
+        CompanyBo company = new CompanyBo();
+        DepartmentBo department = new DepartmentBo();
+        RoleBo role = new RoleBo();
+        //平台更新 人员部门可能为NULL 导致redis缓存不到人员信息
+        Map<Long, List<DepartmentModel>> mapDepartments = new HashMap<>();
+        DepartmentModel departmentM = new DepartmentModel();
+        CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null;
+        Bean.copyExistPropertis(companyM, company);
+        if (!ValidationUtil.isEmpty(user.getCompanyDepartments())){
+            mapDepartments   = user.getCompanyDepartments();
+            departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
+        }
+        Bean.copyExistPropertis(departmentM, department);
+        Map<Long, List<RoleModel>> roles = user.getOrgRoles();
+        Long sequenceNbr;
+        if (departmentM == null) {
+            sequenceNbr = null;
+        } else {
+            sequenceNbr = departmentM.getSequenceNbr();
+        }
+        RoleModel roleM = null;
+        if (sequenceNbr == null) {
+            roleM = companyM != null ? roles.get(companyM.getSequenceNbr()).get(0) : null;
+        } else {
+            roleM = roles.get(sequenceNbr).get(0);
+        }
+        if(companyM!=null&&companyM.getRegionSeq()!=null)
+        {
+        	FeignClientResult<RegionModel> result =  Systemctl.regionClient.getRegion(Long.valueOf(companyM.getRegionSeq()));
+        	company.setRegionCode(String.valueOf(result.getResult().getRegionCode()));
+        }
+        Bean.copyExistPropertis(roleM, role);
+        ReginParams reginParams = new ReginParams();
+        reginParams.setCompany(company);
+        reginParams.setRole(role);
+        reginParams.setDepartment(department);
+        reginParams.setUserModel(user);
+        redisUtils.set(authToken, JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
+    }
+
+    @AfterReturning(returning = "ret", pointcut = "userCache()")
+    public void doAfterReturning(Object ret) throws Throwable {
+        //统一redis管理
 //        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 //        HttpServletRequest request = attributes.getRequest();
 //        String token = request.getHeader("token");
 //        if (token != null) {
 //            GlobalCache.paramMap.remove(token);
 //        }
-	}
-
-	private void fillRequestContext(HttpServletRequest request) {
-		String token = null;
-		String product = null;
-		String appKey = null;
-		if (request != null && request.getParameterMap() != null) {
-			if (request.getParameterMap().get("token") != null && request.getParameterMap().get("product") != null
-					&& request.getParameterMap().get("appKey") != null) {
-				token = request.getParameterMap().get("token")[0];
-				product = request.getParameterMap().get("product")[0];
-				appKey = request.getParameterMap().get("appKey")[0];
-				RequestContext.setToken(token);
-				RequestContext.setProduct(product);
-				RequestContext.setAppKey(appKey);
-			}
-		}
-	}
+    }
+
+    private void fillRequestContext(HttpServletRequest request) {
+        String token = request.getParameterMap().get("token")[0];
+        String product = request.getParameterMap().get("product")[0];
+        String appKey = request.getParameterMap().get("appKey")[0];
+        RequestContext.setToken(token);
+        RequestContext.setProduct(product);
+        RequestContext.setAppKey(appKey);
+    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

 package com.yeejoin.amos.boot.biz.common.bo;
 
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,8 +17,7 @@ public class ReginParams implements Serializable {
     private DepartmentBo department;
     private AgencyUserModel userModel;
     private PersonIdentity personIdentity;
-    private BusinessInfo businessInfo;
-
+    
     @Data
     public static class PersonIdentity implements Serializable {
         private String identityType;
@@ -28,26 +26,7 @@ public class ReginParams implements Serializable {
         private String companyId;
         private String companyName;
         private String bizOrgCode;
-    }
-
-    @Data
-    public static class BusinessInfo implements Serializable {
-        private Long amosBizCode; //平台企业code
-        private String companyName; //公司名称
-        private Long companySequenceNbr; //公司SequenceNbr（业务）
-        private String companyType; //公司类型
-        private Long amosUserCode;
-        private String userName; //用户名称
-        private Long userSequenceNbr; //用户sequenceNbr(业务)
-        private String userType; //用户类型
-    }
-
-    public BusinessInfo getBusinessInfo() {
-        return businessInfo;
-    }
-
-    public void setBusinessInfo(BusinessInfo businessInfo) {
-        this.businessInfo = businessInfo;
+        private String companyBizOrgCode;
     }
 
     public PersonIdentity getPersonIdentity() {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -179,12 +181,48 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null, null);
+					"getParent", null,null);
+
+			if(type.equals("JQLB")){
+				for (Menu menu : menus) {
+					if(menu.id==1214){
+						menus.remove(menu);
+						break;
+					}
+				}
+			}
+
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
 	}
 
+
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/gwmcDataDictionary120/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+	public ResponseModel<Object> gwmcDataDictionary120(@PathVariable String type) throws Exception {
+		// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
+		// kongfm 2021-09-08
+		// 数据字典还原 by kongfm 2021-09-09
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type+"120")) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type+"120");
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+					"getParent", null,null);
+
+
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type+"120", JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
+	
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/dataDictionaryIdFillMenu", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典,id为SequenceNbr", notes = "根据字典类型查询字典,id为SequenceNbr")
@@ -193,13 +231,13 @@ public class DataDictionaryController extends BaseController {
 		queryWrapper.eq("type", type);
 		queryWrapper.orderByAsc("sort_num");
 		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type + "_ID")) {
-			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type + "_ID");
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type  + "_ID");
 			return ResponseHelper.buildResponse(obj);
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getSequenceNbr", 2,
-					"getName", "getParent", null, "getCode");
-			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type + "_ID", JSON.toJSON(menus), time);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getSequenceNbr", 2, "getName",
+					"getParent", null,"getCode");
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type  + "_ID", JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
 	}
@@ -220,12 +258,13 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null, null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
 	}
 
+
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
@@ -296,19 +335,26 @@ public class DataDictionaryController extends BaseController {
 		Collection<DataDictionary> list = null;
 		List<Menu> menus = null;
 		if ("YJLDDW".equals(type)) {
-			list = dataDictionaryMapper.getNoInLinkUnit();
+
+			String bizOrgCode = "";
+			ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+			if (null != reginParam) {
+				bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+			}
+
+			list = dataDictionaryMapper.getNoInLinkUnit(bizOrgCode);
 			// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
 			menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-					null, null);
+					null,null);
 		} else {
 			list = iDataDictionaryService.list(queryWrapper);
 			// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
 			menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-					null, null);
+					null,null);
 		}
 		// 创建根节点
 		Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
@@ -351,22 +397,6 @@ public class DataDictionaryController extends BaseController {
 		return ResponseHelper.buildResponse(type);
 	}
 
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/gwmcDataDictionaryNotokenBySeq/{type}", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典不验证token", notes = "根据字典类型查询字典不验证token")
-	public ResponseModel<Object> gwmcDataDictionaryNotokenBySeq(@PathVariable String type) throws Exception {
-		// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
-		// kongfm 2021-09-08
-		// 数据字典还原 by kongfm 2021-09-09
-		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("type", type);
-		queryWrapper.orderByAsc("sort_num");
-		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
-		List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getSequenceNbr", 2,
-				"getName", "getParent", null, null);
-		return ResponseHelper.buildResponse(menus);
-
-	}
 
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/gwmcDataDictionaryNotoken/{type}", method = RequestMethod.GET)
@@ -385,26 +415,30 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null, null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
 	}
 
+
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/child-list")
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型type和desc查询字典列表", notes = "根据字典类型type和desc查询字典列表")
 	public ResponseModel<List<DataDictionary>> getChildList(@RequestParam(value = "type") String type,
-			@RequestParam(value = "group") String group) {
-		return ResponseHelper.buildResponse(iDataDictionaryService.getChildList(type, group));
+															@RequestParam(value = "group") String group
+															){
+		return ResponseHelper.buildResponse(iDataDictionaryService.getChildList(type,group));
 	}
 
 
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/gwmcDataDictionary/byParent", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "根据字典parent查询列表", notes = "根据字典parent查询树列表")
-	public ResponseModel<List<DataDictionary>> gwmcDataDictionaryByParent(@RequestParam(value = "parent") String parent) throws Exception {
-		return ResponseHelper.buildResponse(iDataDictionaryService.getByParent(parent));
-
+	@GetMapping(value = "/getUserGroupByType")
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型type查询字典列表", notes = "根据字典类型type查询字典列表")
+	public ResponseModel<List<DataDictionary>> getUserGroupByType(@RequestParam(value = "type") String type){
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+		return ResponseHelper.buildResponse(list);
 	}
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

 package com.yeejoin.amos.boot.biz.common.dao.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * 数据字典 Mapper 接口
@@ -16,18 +17,20 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
 	 * 获取领域专家的列表信息，且带有该领域下的专家统计数量
 	 * @return
 	 */
-   public List<DataDictionary>  getDataDictionaryListAndCount();
+   public List<DataDictionary>  getDataDictionaryListAndCount(String bizOrgCode);
    /**
     * 获取包含联动单位的联动单位树信息
     * @return
     */
-   public List<DataDictionary>  getNoInLinkUnit();
+   public List<DataDictionary>  getNoInLinkUnit(@Param("bizOrgCode") String bizOrgCode);
 
 	/**
 	 * 根据code值查询
 	 * @return
 	 */
 	public DataDictionary getByCode(String code,String type);
+
+	public DataDictionary getByType(@Param("type") String type);
 	
 	public List<DataDictionary>  getFireTeamTypeTree(String bizOrgCode);
 	

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

 package com.yeejoin.amos.boot.biz.common.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.alibaba.excel.annotation.ExcelIgnore;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 基础DTO
  * @author kinky

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/DataDictionaryDto.java

 package com.yeejoin.amos.boot.biz.common.dto;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/PermissionModelDto.java

 package com.yeejoin.amos.boot.biz.common.dto;
 
-import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import lombok.Data;
 
 /**

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.biz.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/AmosFeignService.java

 package com.yeejoin.amos.boot.biz.common.feign;
 
 import com.yeejoin.amos.boot.biz.common.dto.OptionDto;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.client.AgencyUserClient;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/FeignConfiguration.java

 package com.yeejoin.amos.boot.biz.common.feign;
 
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
 /**
  * @author DELL
  */
@@ -25,13 +18,4 @@ public class FeignConfiguration {
         return new FeignAuthRequestInterceptor();
     }
 
-    @Autowired
-    private ObjectFactory<HttpMessageConverters> messageConverters;
-
-    @Bean
-    public Encoder feignFormEncoder() {
-        return new SpringFormEncoder(new SpringEncoder(messageConverters));
-    }
-
-
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/MultipartSupportConfig.java

 package com.yeejoin.amos.boot.biz.common.feign;
 
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
@@ -8,9 +10,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.request.RequestContextListener;
 
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-
 /**
  * @Author: xl
  * @Description:
@@ -19,15 +18,6 @@ import feign.form.spring.SpringFormEncoder;
 @Configuration
 public class MultipartSupportConfig {
 
-    /**
-     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
-     * @return
-     */
-    @Bean
-    public FeignAuthRequestInterceptor basicAuthRequestInterceptor() {
-        return new FeignAuthRequestInterceptor();
-    }
-
     @Autowired
     private ObjectFactory<HttpMessageConverters> messageConverters;
 
@@ -35,5 +25,12 @@ public class MultipartSupportConfig {
     public Encoder feignFormEncoder() {
         return new SpringFormEncoder(new SpringEncoder(messageConverters));
     }
-
+    /**
+     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+     * @return
+     */
+    @Bean
+    public RequestContextListener requestInterceptor() {
+        return new RequestContextListener();
+    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -21,21 +21,14 @@ import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
-import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -71,8 +64,8 @@ public class PermissionInterceptor implements Interceptor {
         // 被拦截方法
         Method method = getTargetDataAuthMethod(mappedStatement);
         DataAuth dataAuth = getTargetDataAuthAnnotation(mappedStatement);
-        // 没有DataAuth定义注解的跳过及没有手动指定使用数据规则的跳过
-        if (null == dataAuth && ValidationUtil.isEmpty(dataAuthRule)) {
+        // 没有DataAuth定义注解或注解为空的跳过及没有手动指定使用数据规则的跳过
+        if ((null == dataAuth || ValidationUtil.isEmpty(dataAuth.interfacePath())) && ValidationUtil.isEmpty(dataAuthRule)) {
             PermissionInterceptorContext.clean();
             return invocation.proceed();
         }
@@ -94,12 +87,11 @@ public class PermissionInterceptor implements Interceptor {
         try {
             sql = processSelectSql(sql, dataAuthorization, reginParam, boundSql);
         } catch (Exception e) {
-        	e.printStackTrace();
-            PermissionInterceptorContext.clean();
+            PermissionInterceptorContext.clean(dataAuthRule);
             logger.debug(e.getMessage());
         }
         metaObject.setValue("delegate.boundSql.sql", sql);
-        PermissionInterceptorContext.clean();
+        PermissionInterceptorContext.clean(dataAuthRule);
         return invocation.proceed();
     }
 

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptorContext.java

@@ -22,9 +22,17 @@ public class PermissionInterceptorContext {
 
     public static void clean() {
         if (requestContext != null) {
-            logger.info("clean RestThreadLocal......Begin");
+            logger.info("PermissionInterceptorContext clean RestThreadLocal......Begin");
             requestContext.remove();
-            logger.info("clean RestThreadLocal......Done");
+            logger.info("PermissionInterceptorContext clean RestThreadLocal......Done");
+        }
+    }
+
+    public static void clean(String info) {
+        if (requestContext != null) {
+            logger.info("......" + info + "......PermissionInterceptorContext clean RestThreadLocal......Begin");
+            requestContext.remove();
+            logger.info("......" + info + "......PermissionInterceptorContext clean RestThreadLocal......Done");
         }
     }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptorContextModel.java

 package com.yeejoin.amos.boot.biz.common.interceptors;
 
-import org.typroject.tyboot.core.foundation.context.RequestContextEntityType;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IDataDictionaryService.java

@@ -17,7 +17,7 @@ public interface IDataDictionaryService {
     Object getFireChemical(String type) throws Exception;
 
     Object gwmcDataDictionary(String type) throws Exception;
-    
+
     List<MenuFrom> getGWMCDataDictionary(String type) throws Exception;
     
     public List<DataDictionary> getByType(String type);
@@ -25,6 +25,4 @@ public interface IDataDictionaryService {
     public List<DataDictionary> getAllChildNodes(String type,Long parent) throws Exception;
 
     List<DataDictionary> getChildList(String type, String group);
-
-    List<DataDictionary> getByParent(String parent);
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IWorkflowExcuteService.java

 package com.yeejoin.amos.boot.biz.common.service;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+
 import java.util.List;
 import java.util.Map;
 
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-
 public interface IWorkflowExcuteService{
 
 	/**

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java

@@ -98,8 +98,8 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 
     }
     
-    public List<DataDictionary> getDataDictionaryAndCount(){
-    	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount();
+    public List<DataDictionary> getDataDictionaryAndCount(String bizOrgCode){
+    	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount(bizOrgCode);
     	for (DataDictionary data : list) {
     		Long id = data.getSequenceNbr();
     		int num = data.getCount();
@@ -111,6 +111,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
     		data.setCount(num);
 		}
 		return list;
+    	
     }
     @Override
     public List<DataDictionary> getByType(String type)  {
@@ -168,12 +169,4 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
         wrapper.eq(DataDictionary::getTypeDesc,group);
         return this.list(wrapper);
     }
-
-    @Override
-    public List<DataDictionary> getByParent(String parent) {
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("parent", parent);
-        queryWrapper.orderByAsc("sort_num");
-        return this.list(queryWrapper);
-    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -5,7 +5,10 @@ import org.apache.commons.lang3.StringUtils;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -15,206 +18,221 @@ import java.util.*;
  **/
 public class DateUtils {
 
-	public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
-	public static final String MINUTE_PATTERN = "yyyy-MM-dd HH:mm";
-	public static final String HOUR_PATTERN = "yyyy-MM-dd HH";
-	public static final String DATE_PATTERN = "yyyy-MM-dd";
-	public static final String MONTH_PATTERN = "yyyy-MM";
-	public static final String YEAR_PATTERN = "yyyy";
-	public static final String MINUTE_ONLY_PATTERN = "mm";
-	public static final String HOUR_ONLY_PATTERN = "HH";
-	public static final String DATE_PATTERN_NUM = "yyyyMMdd";
-	public static final String CHN_DATE_PATTERN_YEAR = "yyyy年";
-	public static final String CHN_DATE_PATTERN_MONTH = "MM月";
-	public static final String CHN_DATE_PATTERN = "yyyy年MM月dd日";
-
-	/**
-	 * 获取 当前年、半年、季度、月、日、小时 开始结束时间
-	 */
-	private static final SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy-MM-dd");
-	private static final SimpleDateFormat longHourSdf = new SimpleDateFormat("yyyy-MM-dd HH");
-	private static final SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	private static final Calendar calendar = Calendar.getInstance();
-	private static final SimpleDateFormat shortDateNew = new SimpleDateFormat("yyyy/M/d");
-
-	/**
-	 * 获取时分秒
-	 */
-	private static final SimpleDateFormat timeSdf = new SimpleDateFormat("HH:mm:ss");
-
-	/**
-	 * 获取当前时间
-	 *
-	 * @return 当前日期时间
-	 */
-	public static Date getDateNow() {
-		return new Date();
-	}
-
-	/**
-	 * 获取当前时间
-	 *
-	 * @return 当前日期时间
-	 */
-	public static String getDateNowString() {
-		return convertDateToString(getDateNow(), DATE_TIME_PATTERN);
-	}
-
-	public static String date2LongStr(Date dateDate) {
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String dateString = formatter.format(dateDate);
-		return dateString;
-	}
-
-	/**
-	 * 获取现在日期字符串
-	 *
-	 * @return返回字符串格式 yyyy-MM-dd
-	 */
-	public static String getDateNowShortStr() {
-		Date currentTime = new Date();
-		SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN);
-		String dateString = formatter.format(currentTime);
-		return dateString;
-	}
-
-	/**
-	 * 将日期转换为字符串
-	 *
-	 * @param date   日期
-	 * @param format 字符串格式
-	 * @return 日期字符串
-	 */
-	public static String convertDateToString(Date date, String format) {
-		SimpleDateFormat df = null;
-		String returnValue = "";
-		if (null != date) {
-			df = new SimpleDateFormat(format);
-			returnValue = df.format(date);
-		}
-		return returnValue;
-	}
-
-	/**
-	 * 获取当前时间任意
-	 *
-	 * @return
-	 */
-	public static String get(int field) {
-		return String.valueOf(getCalendar().get(field));
-	}
-
-	/**
-	 * 当前日历，这里用中国时间表示
-	 *
-	 * @return 以当地时区表示的系统当前日历
-	 */
-	public static Calendar getCalendar() {
-		return Calendar.getInstance();
-	}
-
-	/**
-	 * 日期相加减天数
-	 *
-	 * @param date        如果为Null，则为当前时间
-	 * @param days        加减天数
-	 * @param includeTime 是否包括时分秒,true表示包含
-	 * @return
-	 * @throws ParseException
-	 */
-	public static Date dateAdd(Date date, int days, boolean includeTime) throws ParseException {
-		if (date == null) {
-			date = new Date();
-		}
-		if (!includeTime) {
-			SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_PATTERN);
-			date = sdf.parse(sdf.format(date));
-		}
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		cal.add(Calendar.DATE, days);
-		return cal.getTime();
-	}
-
-	/**
-	 * 将长时间格式字符串转换为时间 yyyy-MM-dd HH:mm:ss
-	 *
-	 * @param strDate
-	 * @return
-	 */
-	public static Date longStr2Date(String strDate) {
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		ParsePosition pos = new ParsePosition(0);
-		Date strtodate = formatter.parse(strDate, pos);
-		return strtodate;
-	}
-
-	/**
-	 * 时间格式化成字符串
-	 *
-	 * @param date    Date
-	 * @param pattern StrUtils.DATE_TIME_PATTERN || StrUtils.DATE_PATTERN，
-	 *                如果为空，则为yyyy-MM-dd
-	 * @return
-	 * @throws ParseException
-	 */
-	public static String dateFormat(Date date, String pattern) throws ParseException {
-		if (StringUtils.isEmpty(pattern)) {
-			pattern = DateUtils.DATE_PATTERN;
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat(pattern);
-		return sdf.format(date);
-	}
-
-	/**
-	 * 暂时不操作原生截取做下转换
-	 *
-	 * @param str
-	 * @return
-	 * @throws ParseException
-	 */
-	public static String dateToString(String str) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		Date parse = null;
-		String content = null;
-		try {
-			parse = sdf.parse(str);
-			content = DateUtils.dateFormat(parse, DateUtils.DATE_PATTERN);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return content;
-	}
-
-	/*
-	 * 将时间戳转换为时间
-	 */
-	public static String stampToDate(Long s, String format) {
-		String res;
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-		Date date = new Date(s);
-		res = simpleDateFormat.format(date);
-		return res;
-	}
-
-	/**
-	 * 字符串解析成时间对象
-	 *
-	 * @param dateTimeString String
-	 * @param pattern        StrUtils.DATE_TIME_PATTERN ||
-	 *                       StrUtils.DATE_PATTERN，如果为空，则为yyyy-MM-dd
-	 * @return
-	 * @throws ParseException
-	 */
-	public static Date dateParse(String dateTimeString, String pattern) throws ParseException {
-		if (StringUtils.isEmpty(pattern)) {
-			pattern = DateUtils.DATE_PATTERN;
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat(pattern);
-		return sdf.parse(dateTimeString);
-	}
-
-	/**
+    public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String MINUTE_PATTERN = "yyyy-MM-dd HH:mm";
+    public static final String HOUR_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String DATE_PATTERN = "yyyy-MM-dd";
+    public static final String MONTH_PATTERN = "yyyy-MM";
+    public static final String YEAR_PATTERN = "yyyy";
+    public static final String MINUTE_ONLY_PATTERN = "mm";
+    public static final String HOUR_ONLY_PATTERN = "HH";
+    public static final String MONTH_DAY_PATTERN = "MM-dd";
+    public static final String MONTH_DAY_HOUR_PATTERN = "MM-dd HH";
+    public static final String MONTH_DAY_HOUR_MINUTE_PATTERN = "MM-dd HH:mm";
+    public static final String DATE_PATTERN_NUM = "yyyyMMdd";
+    public static final String CHN_DATE_PATTERN_YEAR = "yyyy年";
+    public static final String CHN_DATE_PATTERN_MONTH = "MM月";
+    public static final String CHN_DATE_PATTERN = "yyyy年MM月dd日";
+
+    /**
+     * 获取  当前年、半年、季度、月、日、小时 开始结束时间
+     */
+    private static final SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat longHourSdf = new SimpleDateFormat("yyyy-MM-dd HH");
+    private static final SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static final Calendar calendar = Calendar.getInstance();
+    private static final SimpleDateFormat shortDateNew = new SimpleDateFormat("yyyy/M/d");
+
+    /**
+     * 获取时分秒
+     */
+    private static final SimpleDateFormat timeSdf = new SimpleDateFormat("HH:mm:ss");
+
+    /**
+     * 获取当前时间
+     *
+     * @return 当前日期时间
+     */
+    public static Date getDateNow() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前时间
+     *
+     * @return 当前日期时间
+     */
+    public static String getDateNowString() {
+        return convertDateToString(getDateNow(), DATE_TIME_PATTERN);
+    }
+
+    public static String date2LongStr(Date dateDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateString = formatter.format(dateDate);
+        return dateString;
+    }
+
+    /**
+     * 获取现在日期字符串
+     *
+     * @return返回字符串格式 yyyy-MM-dd
+     */
+    public static String getDateNowShortStr() {
+        Date currentTime = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN);
+        String dateString = formatter.format(currentTime);
+        return dateString;
+    }
+
+    /**
+     * 将日期转换为字符串
+     *
+     * @param date   日期
+     * @param format 字符串格式
+     * @return 日期字符串
+     */
+    public static String convertDateToString(Date date, String format) {
+        SimpleDateFormat df = null;
+        String returnValue = "";
+        if (null != date) {
+            df = new SimpleDateFormat(format);
+            returnValue = df.format(date);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 将字符换转换为日期
+     * @param date
+     * @param pattern
+     * @return
+     * @throws ParseException
+     */
+    public static Date convertStrToDate(String date, String pattern) throws ParseException {
+        SimpleDateFormat formatter = new SimpleDateFormat(pattern);
+        return formatter.parse(date);
+    }
+
+    /**
+     * 获取当前时间任意
+     *
+     * @return
+     */
+    public static String get(int field) {
+        return String.valueOf(getCalendar().get(field));
+    }
+
+    /**
+     * 当前日历，这里用中国时间表示
+     *
+     * @return 以当地时区表示的系统当前日历
+     */
+    public static Calendar getCalendar() {
+        return Calendar.getInstance();
+    }
+
+    /**
+     * 日期相加减天数
+     *
+     * @param date        如果为Null，则为当前时间
+     * @param days        加减天数
+     * @param includeTime 是否包括时分秒,true表示包含
+     * @return
+     * @throws ParseException
+     */
+    public static Date dateAdd(Date date, int days, boolean includeTime) throws ParseException {
+        if (date == null) {
+            date = new Date();
+        }
+        if (!includeTime) {
+            SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_PATTERN);
+            date = sdf.parse(sdf.format(date));
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.DATE, days);
+        return cal.getTime();
+    }
+
+
+    /**
+     * 将长时间格式字符串转换为时间 yyyy-MM-dd HH:mm:ss
+     *
+     * @param strDate
+     * @return
+     */
+    public static Date longStr2Date(String strDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
+    /**
+     * 时间格式化成字符串
+     *
+     * @param date    Date
+     * @param pattern StrUtils.DATE_TIME_PATTERN || StrUtils.DATE_PATTERN， 如果为空，则为yyyy-MM-dd
+     * @return
+     * @throws ParseException
+     */
+    public static String dateFormat(Date date, String pattern) throws ParseException {
+        if (StringUtils.isEmpty(pattern)) {
+            pattern = DateUtils.DATE_PATTERN;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.format(date);
+    }
+
+    /**
+     * 暂时不操作原生截取做下转换
+     *
+     * @param str
+     * @return
+     * @throws ParseException
+     */
+    public static String dateToString(String str) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date parse = null;
+        String content = null;
+        try {
+            parse = sdf.parse(str);
+            content = DateUtils.dateFormat(parse, DateUtils.DATE_PATTERN);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return content;
+    }
+
+
+    /*
+     * 将时间戳转换为时间
+     */
+    public static String stampToDate(Long s, String format) {
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+        Date date = new Date(s);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
+
+    /**
+     * 字符串解析成时间对象
+     *
+     * @param dateTimeString String
+     * @param pattern        StrUtils.DATE_TIME_PATTERN || StrUtils.DATE_PATTERN，如果为空，则为yyyy-MM-dd
+     * @return
+     * @throws ParseException
+     */
+    public static Date dateParse(String dateTimeString, String pattern) throws ParseException {
+        if (StringUtils.isEmpty(pattern)) {
+            pattern = DateUtils.DATE_PATTERN;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        return sdf.parse(dateTimeString);
+    }
+    
+    /**
 	 * 字符串解析成时间对象
 	 *
 	 * @param dateTimeString String
@@ -243,417 +261,408 @@ public class DateUtils {
 		}
 	}
 
-	/**
-	 * 将日期时间格式成只有日期的字符串（可以直接使用dateFormat，Pattern为Null进行格式化）
-	 *
-	 * @param dateTime Date
-	 * @return
-	 * @throws ParseException
-	 */
-	public static String dateTimeToDateString(Date dateTime) throws ParseException {
-		String dateTimeString = DateUtils.dateFormat(dateTime, DateUtils.DATE_TIME_PATTERN);
-		return dateTimeString.substring(0, 10);
-	}
-
-	/**
-	 * 当时、分、秒为00:00:00时，将日期时间格式成只有日期的字符串， 当时、分、秒不为00:00:00时，直接返回
-	 *
-	 * @param dateTime Date
-	 * @return
-	 * @throws ParseException
-	 */
-	public static String dateTimeToDateStringIfTimeEndZero(Date dateTime) throws ParseException {
-		String dateTimeString = DateUtils.dateFormat(dateTime, DateUtils.DATE_TIME_PATTERN);
-		if (dateTimeString.endsWith("00:00:00")) {
-			return dateTimeString.substring(0, 10);
-		} else {
-			return dateTimeString;
-		}
-	}
-
-	/**
-	 * 将日期时间格式成日期对象，和dateParse互用
-	 *
-	 * @param dateTime Date
-	 * @return Date
-	 * @throws ParseException
-	 */
-	public static Date dateTimeToDate(Date dateTime) throws ParseException {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(dateTime);
-		cal.set(Calendar.HOUR_OF_DAY, 0);
-		cal.set(Calendar.MINUTE, 0);
-		cal.set(Calendar.SECOND, 0);
-		cal.set(Calendar.MILLISECOND, 0);
-		return cal.getTime();
-	}
-
-	/**
-	 * 时间加减小时
-	 *
-	 * @param startDate 要处理的时间，Null则为当前时间
-	 * @param hours     加减的小时
-	 * @return Date
-	 */
-	public static Date dateAddHours(Date startDate, int hours) {
-		if (startDate == null) {
-			startDate = new Date();
-		}
-		Calendar c = Calendar.getInstance();
-		c.setTime(startDate);
-		c.set(Calendar.HOUR, c.get(Calendar.HOUR) + hours);
-		return c.getTime();
-	}
-
-	/**
-	 * 时间加减分钟
-	 *
-	 * @param startDate 要处理的时间，Null则为当前时间
-	 * @param minutes   加减的分钟
-	 * @return
-	 */
-	public static Date dateAddMinutes(Date startDate, int minutes) {
-		if (startDate == null) {
-			startDate = new Date();
-		}
-		Calendar c = Calendar.getInstance();
-		c.setTime(startDate);
-		c.set(Calendar.MINUTE, c.get(Calendar.MINUTE) + minutes);
-		return c.getTime();
-	}
-
-	/**
-	 * 时间加减秒数
-	 *
-	 * @param startDate 要处理的时间，Null则为当前时间
-	 * @param
-	 * @return
-	 */
-	public static Date dateAddSeconds(Date startDate, int seconds) {
-		if (startDate == null) {
-			startDate = new Date();
-		}
-		Calendar c = Calendar.getInstance();
-		c.setTime(startDate);
-		c.set(Calendar.SECOND, c.get(Calendar.SECOND) + seconds);
-		return c.getTime();
-	}
-
-	/**
-	 * 时间加减天数
-	 *
-	 * @param startDate 要处理的时间，Null则为当前时间
-	 * @param days      加减的天数
-	 * @return Date
-	 */
-	public static Date dateAddDays(Date startDate, int days) {
-		if (startDate == null) {
-			startDate = new Date();
-		}
-		Calendar c = Calendar.getInstance();
-		c.setTime(startDate);
-		c.set(Calendar.DATE, c.get(Calendar.DATE) + days);
-		return c.getTime();
-	}
-
-	/**
-	 * 时间加减月数
-	 *
-	 * @param startDate 要处理的时间，Null则为当前时间
-	 * @param months    加减的月数
-	 * @return Date
-	 */
-	public static Date dateAddMonths(Date startDate, int months) {
-		if (startDate == null) {
-			startDate = new Date();
-		}
-		Calendar c = Calendar.getInstance();
-		c.setTime(startDate);
-		c.set(Calendar.MONTH, c.get(Calendar.MONTH) + months);
-		return c.getTime();
-	}
-
-	/**
-	 * 时间加减年数
-	 *
-	 * @param startDate 要处理的时间，Null则为当前时间
-	 * @param years     加减的年数
-	 * @return Date
-	 */
-	public static Date dateAddYears(Date startDate, int years) {
-		if (startDate == null) {
-			startDate = new Date();
-		}
-		Calendar c = Calendar.getInstance();
-		c.setTime(startDate);
-		c.set(Calendar.YEAR, c.get(Calendar.YEAR) + years);
-		return c.getTime();
-	}
-
-	/**
-	 * 时间比较（如果myDate>compareDate返回1，<返回-1，相等返回0）
-	 *
-	 * @param myDate      时间
-	 * @param compareDate 要比较的时间
-	 * @return int
-	 */
-	public static int dateCompare(Date myDate, Date compareDate) {
-		Calendar myCal = Calendar.getInstance();
-		Calendar compareCal = Calendar.getInstance();
-		myCal.setTime(myDate);
-		compareCal.setTime(compareDate);
-		return myCal.compareTo(compareCal);
-	}
-
-	/**
-	 * 获取两个时间中最小的一个时间
-	 *
-	 * @param date
-	 * @param compareDate
-	 * @return
-	 */
-	public static Date dateMin(Date date, Date compareDate) {
-		if (date == null) {
-			return compareDate;
-		}
-		if (compareDate == null) {
-			return date;
-		}
-		if (1 == dateCompare(date, compareDate)) {
-			return compareDate;
-		} else if (-1 == dateCompare(date, compareDate)) {
-			return date;
-		}
-		return date;
-	}
-
-	/**
-	 * 获取两个时间中最大的一个时间
-	 *
-	 * @param date
-	 * @param compareDate
-	 * @return
-	 */
-	public static Date dateMax(Date date, Date compareDate) {
-		if (date == null) {
-			return compareDate;
-		}
-		if (compareDate == null) {
-			return date;
-		}
-		if (1 == dateCompare(date, compareDate)) {
-			return date;
-		} else if (-1 == dateCompare(date, compareDate)) {
-			return compareDate;
-		}
-		return date;
-	}
-
-	/**
-	 * 获取两个日期（不含时分秒）相差的天数，不包含今天
-	 *
-	 * @param startDate
-	 * @param endDate
-	 * @return
-	 * @throws ParseException
-	 */
-	public static int dateBetween(Date startDate, Date endDate) throws ParseException {
-		Date dateStart = dateParse(dateFormat(startDate, DATE_PATTERN), DATE_PATTERN);
-		Date dateEnd = dateParse(dateFormat(endDate, DATE_PATTERN), DATE_PATTERN);
-		return (int) ((dateEnd.getTime() - dateStart.getTime()) / 1000 / 60 / 60 / 24);
-	}
-
-	/**
-	 * 获取两个日期（不含时分秒）相差的天数，包含今天
-	 *
-	 * @param startDate
-	 * @param endDate
-	 * @return
-	 * @throws ParseException
-	 */
-	public static int dateBetweenIncludeToday(Date startDate, Date endDate) throws ParseException {
-		return dateBetween(startDate, endDate) + 1;
-	}
-
-	/**
-	 * 获取日期时间的年份，如2017-02-13，返回2017
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getYear(Date date) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		return cal.get(Calendar.YEAR);
-	}
-
-	/**
-	 * 获取日期时间的月份，如2017年2月13日，返回2
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getMonth(Date date) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		return cal.get(Calendar.MONTH) + 1;
-	}
-
-	/**
-	 * 获取日期时间的第几天（即返回日期的dd），如2017-02-13，返回13
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getDate(Date date) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		return cal.get(Calendar.DATE);
-	}
-
-	/**
-	 * 获取日期时间当月的总天数，如2017-02-13，返回28
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getDaysOfMonth(Date date) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		return cal.getActualMaximum(Calendar.DATE);
-	}
-
-	/**
-	 * 获取日期时间当年的总天数，如2017-02-13，返回2017年的总天数
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getDaysOfYear(Date date) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		return cal.getActualMaximum(Calendar.DAY_OF_YEAR);
-	}
-
-	/**
-	 * 根据时间获取当月最大的日期
-	 * <li>2017-02-13，返回2017-02-28</li>
-	 * <li>2016-02-13，返回2016-02-29</li>
-	 * <li>2016-01-11，返回2016-01-31</li>
-	 *
-	 * @param date Date
-	 * @return
-	 * @throws Exception
-	 */
-	public static Date maxDateOfMonth(Date date) throws Exception {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		int value = cal.getActualMaximum(Calendar.DATE);
-		return dateParse(dateFormat(date, MONTH_PATTERN) + "-" + value, null);
-	}
-
-	/**
-	 * 根据时间获取当月最小的日期，也就是返回当月的1号日期对象
-	 *
-	 * @param date Date
-	 * @return
-	 * @throws Exception
-	 */
-	public static Date minDateOfMonth(Date date) throws Exception {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		int value = cal.getActualMinimum(Calendar.DATE);
-		return dateParse(dateFormat(date, MONTH_PATTERN) + "-" + value, null);
-	}
-
-	/**
-	 * 根据年月返回第一天
-	 *
-	 * @param yearParam
-	 * @param monthParam
-	 * @return
-	 */
-	public static Date getFirstDayByMonth(int yearParam, int monthParam) {
-		Calendar c = Calendar.getInstance(Locale.CHINA);
-		c.set(yearParam, monthParam - 1, 1);
-		try {
-			Date date = shortSdf.parse(shortSdf.format(c.getTime()) + " 00:00:00");
-			return date;
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * 获取某月的日期List
-	 *
-	 * @param yearParam
-	 * @param monthParam
-	 * @return
-	 */
-	public static List<String> getDayByMonth(int yearParam, int monthParam) {
-		List list = new ArrayList();
-		Calendar aCalendar = Calendar.getInstance(Locale.CHINA);
-		aCalendar.set(yearParam, monthParam - 1, 1);
-		int year = aCalendar.get(Calendar.YEAR);// 年份
-		int month = aCalendar.get(Calendar.MONTH) + 1;// 月份
-		int day = aCalendar.getActualMaximum(Calendar.DATE);
-		for (int i = 1; i <= day; i++) {
-
-			list.add(year + "/" + month + "/" + i);
-		}
-		return list;
-	}
-
-	/**
-	 * 当前月的结束时间，即2012-01-31 23:59:59
-	 *
-	 * @return
-	 */
-	public static Date getCurrentMonthEndTime(Date date) {
-		Calendar c = Calendar.getInstance();
-		c.setTime(date);
-		Date now = null;
-		c.set(Calendar.DATE, 1);
-		c.add(Calendar.MONTH, 1);
-		c.add(Calendar.DATE, -1);
-		try {
-			now = longSdf.parse(shortSdf.format(c.getTime()) + " 23:59:59");
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return now;
-
-	}
-
-	public static void main(String[] args) throws Exception {
-		/*
-		 * System.out.println(dateTimeToDate(new Date()));
-		 * System.out.println(dateParse("2017-02-04 14:58:20", null));
-		 * System.out.println(dateTimeToDateStringIfTimeEndZero(new Date()));
-		 * System.out.println(dateTimeToDateStringIfTimeEndZero(dateTimeToDate(new
-		 * Date())));
-		 */
-		// System.out.println(dateBetween(dateParse("2017-01-30", null),
-		// dateParse("2017-02-01", null)));
-		// System.out.println(dateBetweenIncludeToday(dateParse("2017-01-30", null),
-		// dateParse("2017-02-01", null)));
+    /**
+     * 将日期时间格式成只有日期的字符串（可以直接使用dateFormat，Pattern为Null进行格式化）
+     *
+     * @param dateTime Date
+     * @return
+     * @throws ParseException
+     */
+    public static String dateTimeToDateString(Date dateTime) throws ParseException {
+        String dateTimeString = DateUtils.dateFormat(dateTime, DateUtils.DATE_TIME_PATTERN);
+        return dateTimeString.substring(0, 10);
+    }
+
+    /**
+     * 当时、分、秒为00:00:00时，将日期时间格式成只有日期的字符串，
+     * 当时、分、秒不为00:00:00时，直接返回
+     *
+     * @param dateTime Date
+     * @return
+     * @throws ParseException
+     */
+    public static String dateTimeToDateStringIfTimeEndZero(Date dateTime) throws ParseException {
+        String dateTimeString = DateUtils.dateFormat(dateTime, DateUtils.DATE_TIME_PATTERN);
+        if (dateTimeString.endsWith("00:00:00")) {
+            return dateTimeString.substring(0, 10);
+        } else {
+            return dateTimeString;
+        }
+    }
+
+    /**
+     * 将日期时间格式成日期对象，和dateParse互用
+     *
+     * @param dateTime Date
+     * @return Date
+     * @throws ParseException
+     */
+    public static Date dateTimeToDate(Date dateTime) throws ParseException {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(dateTime);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+    /**
+     * 时间加减小时
+     *
+     * @param startDate 要处理的时间，Null则为当前时间
+     * @param hours     加减的小时
+     * @return Date
+     */
+    public static Date dateAddHours(Date startDate, int hours) {
+        if (startDate == null) {
+            startDate = new Date();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.set(Calendar.HOUR, c.get(Calendar.HOUR) + hours);
+        return c.getTime();
+    }
+
+    /**
+     * 时间加减分钟
+     *
+     * @param startDate 要处理的时间，Null则为当前时间
+     * @param minutes   加减的分钟
+     * @return
+     */
+    public static Date dateAddMinutes(Date startDate, int minutes) {
+        if (startDate == null) {
+            startDate = new Date();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.set(Calendar.MINUTE, c.get(Calendar.MINUTE) + minutes);
+        return c.getTime();
+    }
+
+    /**
+     * 时间加减秒数
+     *
+     * @param startDate 要处理的时间，Null则为当前时间
+     * @param
+     * @return
+     */
+    public static Date dateAddSeconds(Date startDate, int seconds) {
+        if (startDate == null) {
+            startDate = new Date();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.set(Calendar.SECOND, c.get(Calendar.SECOND) + seconds);
+        return c.getTime();
+    }
+
+    /**
+     * 时间加减天数
+     *
+     * @param startDate 要处理的时间，Null则为当前时间
+     * @param days      加减的天数
+     * @return Date
+     */
+    public static Date dateAddDays(Date startDate, int days) {
+        if (startDate == null) {
+            startDate = new Date();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.set(Calendar.DATE, c.get(Calendar.DATE) + days);
+        return c.getTime();
+    }
+
+    /**
+     * 时间加减月数
+     *
+     * @param startDate 要处理的时间，Null则为当前时间
+     * @param months    加减的月数
+     * @return Date
+     */
+    public static Date dateAddMonths(Date startDate, int months) {
+        if (startDate == null) {
+            startDate = new Date();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.set(Calendar.MONTH, c.get(Calendar.MONTH) + months);
+        return c.getTime();
+    }
+
+    /**
+     * 时间加减年数
+     *
+     * @param startDate 要处理的时间，Null则为当前时间
+     * @param years     加减的年数
+     * @return Date
+     */
+    public static Date dateAddYears(Date startDate, int years) {
+        if (startDate == null) {
+            startDate = new Date();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(startDate);
+        c.set(Calendar.YEAR, c.get(Calendar.YEAR) + years);
+        return c.getTime();
+    }
+
+    /**
+     * 时间比较（如果myDate>compareDate返回1，<返回-1，相等返回0）
+     *
+     * @param myDate      时间
+     * @param compareDate 要比较的时间
+     * @return int
+     */
+    public static int dateCompare(Date myDate, Date compareDate) {
+        Calendar myCal = Calendar.getInstance();
+        Calendar compareCal = Calendar.getInstance();
+        myCal.setTime(myDate);
+        compareCal.setTime(compareDate);
+        return myCal.compareTo(compareCal);
+    }
+
+    /**
+     * 获取两个时间中最小的一个时间
+     *
+     * @param date
+     * @param compareDate
+     * @return
+     */
+    public static Date dateMin(Date date, Date compareDate) {
+        if (date == null) {
+            return compareDate;
+        }
+        if (compareDate == null) {
+            return date;
+        }
+        if (1 == dateCompare(date, compareDate)) {
+            return compareDate;
+        } else if (-1 == dateCompare(date, compareDate)) {
+            return date;
+        }
+        return date;
+    }
+
+    /**
+     * 获取两个时间中最大的一个时间
+     *
+     * @param date
+     * @param compareDate
+     * @return
+     */
+    public static Date dateMax(Date date, Date compareDate) {
+        if (date == null) {
+            return compareDate;
+        }
+        if (compareDate == null) {
+            return date;
+        }
+        if (1 == dateCompare(date, compareDate)) {
+            return date;
+        } else if (-1 == dateCompare(date, compareDate)) {
+            return compareDate;
+        }
+        return date;
+    }
+
+    /**
+     * 获取两个日期（不含时分秒）相差的天数，不包含今天
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int dateBetween(Date startDate, Date endDate) throws ParseException {
+        Date dateStart = dateParse(dateFormat(startDate, DATE_PATTERN), DATE_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_PATTERN), DATE_PATTERN);
+        return (int) ((dateEnd.getTime() - dateStart.getTime()) / 1000 / 60 / 60 / 24);
+    }
+
+    /**
+     * 获取两个日期（不含时分秒）相差的天数，包含今天
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int dateBetweenIncludeToday(Date startDate, Date endDate) throws ParseException {
+        return dateBetween(startDate, endDate) + 1;
+    }
+
+    /**
+     * 获取日期时间的年份，如2017-02-13，返回2017
+     *
+     * @param date
+     * @return
+     */
+    public static int getYear(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.YEAR);
+    }
+
+    /**
+     * 获取日期时间的月份，如2017年2月13日，返回2
+     *
+     * @param date
+     * @return
+     */
+    public static int getMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.MONTH) + 1;
+    }
+
+    /**
+     * 获取日期时间的第几天（即返回日期的dd），如2017-02-13，返回13
+     *
+     * @param date
+     * @return
+     */
+    public static int getDate(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.DATE);
+    }
+
+    /**
+     * 获取日期时间当月的总天数，如2017-02-13，返回28
+     *
+     * @param date
+     * @return
+     */
+    public static int getDaysOfMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.getActualMaximum(Calendar.DATE);
+    }
+
+    /**
+     * 获取日期时间当年的总天数，如2017-02-13，返回2017年的总天数
+     *
+     * @param date
+     * @return
+     */
+    public static int getDaysOfYear(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.getActualMaximum(Calendar.DAY_OF_YEAR);
+    }
+
+    /**
+     * 根据时间获取当月最大的日期
+     * <li>2017-02-13，返回2017-02-28</li>
+     * <li>2016-02-13，返回2016-02-29</li>
+     * <li>2016-01-11，返回2016-01-31</li>
+     *
+     * @param date Date
+     * @return
+     * @throws Exception
+     */
+    public static Date maxDateOfMonth(Date date) throws Exception {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int value = cal.getActualMaximum(Calendar.DATE);
+        return dateParse(dateFormat(date, MONTH_PATTERN) + "-" + value, null);
+    }
+
+    /**
+     * 根据时间获取当月最小的日期，也就是返回当月的1号日期对象
+     *
+     * @param date Date
+     * @return
+     * @throws Exception
+     */
+    public static Date minDateOfMonth(Date date) throws Exception {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int value = cal.getActualMinimum(Calendar.DATE);
+        return dateParse(dateFormat(date, MONTH_PATTERN) + "-" + value, null);
+    }
+
+    /**
+     * 根据年月返回第一天
+     *
+     * @param yearParam
+     * @param monthParam
+     * @return
+     */
+    public static Date getFirstDayByMonth(int yearParam, int monthParam) {
+        Calendar c = Calendar.getInstance(Locale.CHINA);
+        c.set(yearParam, monthParam - 1, 1);
+        try {
+            Date date = shortSdf.parse(shortSdf.format(c.getTime()) + " 00:00:00");
+            return date;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取某月的日期List
+     *
+     * @param yearParam
+     * @param monthParam
+     * @return
+     */
+    public static List<String> getDayByMonth(int yearParam, int monthParam) {
+        List list = new ArrayList();
+        Calendar aCalendar = Calendar.getInstance(Locale.CHINA);
+        aCalendar.set(yearParam, monthParam - 1, 1);
+        int year = aCalendar.get(Calendar.YEAR);//年份
+        int month = aCalendar.get(Calendar.MONTH) + 1;//月份
+        int day = aCalendar.getActualMaximum(Calendar.DATE);
+        for (int i = 1; i <= day; i++) {
+
+            list.add(year + "/" + month + "/" + i);
+        }
+        return list;
+    }
+
+
+    /**
+     * 当前月的结束时间，即2012-01-31 23:59:59
+     *
+     * @return
+     */
+    public static Date getCurrentMonthEndTime(Date date) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        Date now = null;
+        c.set(Calendar.DATE, 1);
+        c.add(Calendar.MONTH, 1);
+        c.add(Calendar.DATE, -1);
+        try {
+            now = longSdf.parse(shortSdf.format(c.getTime()) + " 23:59:59");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return now;
+
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*System.out.println(dateTimeToDate(new Date()));
+        System.out.println(dateParse("2017-02-04 14:58:20", null));
+        System.out.println(dateTimeToDateStringIfTimeEndZero(new Date()));
+        System.out.println(dateTimeToDateStringIfTimeEndZero(dateTimeToDate(new Date())));*/
+        //System.out.println(dateBetween(dateParse("2017-01-30", null), dateParse("2017-02-01", null)));
+        //System.out.println(dateBetweenIncludeToday(dateParse("2017-01-30", null), dateParse("2017-02-01", null)));
 //        System.out.println(getDate(dateParse("2017-01-17", null)));
-		// System.out.println(getDate(dateParse("2017-01-17", null)));
-		/*
-		 * System.out.println(getDaysOfMonth(dateParse("2017-02-01", null)));
-		 * System.out.println(getDaysOfYear(dateParse("2017-01-30", null)));
-		 */
-		// System.out.println(dateFormat(dateAddMonths(dateParse("2017-02-07",
-		// StrUtils.MONTH_PATTERN), -12), StrUtils
-		// .MONTH_PATTERN));
-		/*
-		 * System.out.println(dateFormat(maxDateOfMonth(dateParse("2016-02",
-		 * "yyyy-MM")), null));
-		 * System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)),
-		 * null));
-		 */
+        //System.out.println(getDate(dateParse("2017-01-17", null)));
+        /*
+        System.out.println(getDaysOfMonth(dateParse("2017-02-01", null)));
+        System.out.println(getDaysOfYear(dateParse("2017-01-30", null)));*/
+        //System.out.println(dateFormat(dateAddMonths(dateParse("2017-02-07", StrUtils.MONTH_PATTERN), -12), StrUtils
+        // .MONTH_PATTERN));
+        /*System.out.println(dateFormat(maxDateOfMonth(dateParse("2016-02", "yyyy-MM")), null));
+        System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)), null));*/
 
 //        System.out.println(dateFormat(new Date(), CHN_DATE_PATTERN_YEAR));
 //        System.out.println(dateFormat(new Date(), CHN_DATE_PATTERN_MONTH));
@@ -661,263 +670,407 @@ public class DateUtils {
 //        System.out.println(getQuarterStr(getMonth(dateParse("2021-5-11", null))));
 //        System.out.println(getWeekBeginDate(dateParse("2021-10-11", null)));
 //        System.out.println(getWeekEndDate(dateParse("2021-10-11", null)));
-		System.out.println(secondsToTimeStr(3600));
-	}
-
-	/**
-	 * 当前日期毫秒.xls
-	 *
-	 * @return
-	 */
-	public static String formatName() {
-		Calendar calen = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
-		String name = sdf.format(calen.getTime());
-		return name;
-	}
-
-	/**
-	 * 获取某月的日期List
-	 *
-	 * @param dateStr
-	 * @return
-	 */
-	public static List<Date> getDayByMonth(String dateStr) {
-		List<Date> list = new ArrayList();
-		Date date = null;
-		try {
-			date = shortSdf.parse(dateStr);
-			calendar.setTime(date);
-			int month = calendar.get(Calendar.MONTH) + 1;// 月份
-			int year = calendar.get(Calendar.YEAR);// 年份
-			int day = calendar.getActualMaximum(Calendar.DATE);
-			for (int i = 1; i <= day; i++) {
-				String source = year + "-" + month + "-" + i;
-				list.add(shortSdf.parse(source));
-			}
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-
-		return list;
-	}
-
-	/**
-	 * 判断一个时间是否在一个时间段内
-	 *
-	 * @param nowTime   当前时间
-	 * @param beginTime 开始时间
-	 * @param endTime   结束时间
-	 */
-
-	public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
-		Calendar date = Calendar.getInstance();
-		date.setTime(nowTime);
-		Calendar begin = Calendar.getInstance();
-		begin.setTime(beginTime);
-		Calendar end = Calendar.getInstance();
-		end.setTime(endTime);
-		return date.after(begin) && date.before(end);
-	}
-
-	/**
-	 * 由出生日期获得年龄
-	 *
-	 * @param birthDay 出生日期
-	 */
-	public static int getAge(Date birthDay) {
-		if (birthDay == null) {
-			return 0;
-		}
-		LocalDate now = LocalDate.now();
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(birthDay);
-		int yearBirth = cal.get(Calendar.YEAR);
-		int monthBirth = cal.get(Calendar.MONTH) + 1;
-		int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
-
-		LocalDate birth = LocalDate.of(yearBirth, monthBirth, dayOfMonthBirth);
-		if (birth.isAfter(now)) {
-			return 0;
-		}
-		int age = birth.until(now).getYears();
-		return age;
-	}
-
-	/**
-	 * 根据两个日期返回相差的时分秒
-	 *
-	 * @param newTime 靠后时间
-	 * @param oldTime 靠前时间
-	 * @return
-	 */
-	public static String getTimestr(Date newTime, Date oldTime) {
-		Long newTimes = newTime.getTime();
-		Long oldTimes = oldTime.getTime();
-		// 不改时间会多加八个小时
-		timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
-		return timeSdf.format(newTimes - oldTimes);
-	}
-
-	/**
-	 * 获取现在日期字符串时间戳格式
-	 *
-	 * @return返回字符串格式 yyyyMMdd
-	 */
-	public static String getDateNowShortNumber() {
-		Date currentTime = new Date();
-		SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN_NUM);
-		String dateString = formatter.format(currentTime);
-		return dateString;
-	}
-
-	/**
-	 * 获取一年的第几周
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getWeekOfYear(Date date) {
-		Calendar c = Calendar.getInstance();
-		c.setTime(date);
-		int week_of_year = c.get(Calendar.WEEK_OF_YEAR);
-		return week_of_year;
-	}
-
-	/**
-	 * 通过月份计算季度
-	 *
-	 * @param month
-	 * @return
-	 */
-	public static int getQuarter(int month) {
-		if (month < 1 || month > 12) {
-			throw new IllegalArgumentException("month is invalid.");
-		}
-		return (month - 1) / 3 + 1;
-	}
-
-	/**
-	 * 通过月份计算季度
-	 *
-	 * @param month
-	 * @return
-	 */
-	public static String getQuarterStr(int month) {
-		if (month < 1 || month > 12) {
-			throw new IllegalArgumentException("month is invalid.");
-		}
-		return (month - 1) / 3 + 1 + "";
-	}
-
-	/**
-	 * 获得本天的开始时间，即2012-01-01 00:00:00
-	 *
-	 * @return
-	 */
-	public static Date getCurrentDayStartTime(Date date) {
-		try {
-			date = shortSdf.parse(shortSdf.format(date) + " 00:00:00");
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return date;
-	}
-
-	/**
-	 * 获得本天的结束时间，即2012-01-01 23:59:59
-	 *
-	 * @return
-	 */
-	public static Date getCurrentDayEndTime(Date date) {
-		try {
-			date = longSdf.parse(shortSdf.format(date) + " 23:59:59");
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return date;
-	}
-
-	/**
-	 * 获取指定时间所在周的第一天日期
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getWeekBeginDate(Date date) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setFirstDayOfWeek(Calendar.MONDAY);
-		calendar.setTime(date);
-		calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-		System.out.println(calendar.getTime());
-
-		return getDate(calendar.getTime());
-	}
-
-	public static Date beginDateOfWeek(Date date) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setFirstDayOfWeek(Calendar.MONDAY);
-		calendar.setTime(date);
-		calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-		return calendar.getTime();
-	}
-
-	public static Date endDateOfWeek(Date date) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setFirstDayOfWeek(Calendar.MONDAY);
-		calendar.setTime(date);
-		calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-		return calendar.getTime();
-	}
-
-	/**
-	 * 获取指定时间所在周的最后一天日期
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static int getWeekEndDate(Date date) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setFirstDayOfWeek(Calendar.MONDAY);
-		calendar.setTime(date);
-		calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-		System.out.println(calendar.getTime());
-
-		return getDate(calendar.getTime());
-	}
-
-	public static Date getBeginDateOfMonth(Date date) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(date);
-		calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
-		return calendar.getTime();
-	}
-
-	/**
-	 * 将秒数转换为时分秒格式
-	 *
-	 * @param times
-	 * @return
-	 */
-	public static String secondsToTimeStr(int times) {
-		if (times <= 0) {
-			return "00:00:00";
-		}
-		int h = times / 3600;
-		int m = (times - h * 3600) / 60;
-		int s = times - h * 3600 - m * 60;
-		String time = "%02d:%02d:%02d";
-		time = String.format(time, h, m, s);
-		return time;
-	}
-
-	public static Date getTargetEndTime(Date target) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(target);
-		calendar.set(Calendar.HOUR_OF_DAY, 23);
-		calendar.set(Calendar.MINUTE, 59);
-		calendar.set(Calendar.SECOND, 59);
-		Date end = calendar.getTime();
-		return end;
-	}
+        System.out.println(secondsToTimeStr(3600));
+    }
+
+    /**
+     * 当前日期毫秒.xls
+     *
+     * @return
+     */
+    public static String formatName() {
+        Calendar calen = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
+        String name = sdf.format(calen.getTime());
+        return name;
+    }
+
+    /**
+     * 获取某月的日期List
+     *
+     * @param dateStr
+     * @return
+     */
+    public static List<Date> getDayByMonth(String dateStr) {
+        List<Date> list = new ArrayList();
+        Date date = null;
+        try {
+            date = shortSdf.parse(dateStr);
+            calendar.setTime(date);
+            int month = calendar.get(Calendar.MONTH) + 1;//月份
+            int year = calendar.get(Calendar.YEAR);//年份
+            int day = calendar.getActualMaximum(Calendar.DATE);
+            for (int i = 1; i <= day; i++) {
+                String source = year + "-" + month + "-" + i;
+                list.add(shortSdf.parse(source));
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return list;
+    }
+
+    /**
+     * 判断一个时间是否在一个时间段内
+     *
+     * @param nowTime   当前时间
+     * @param beginTime 开始时间
+     * @param endTime   结束时间
+     */
+
+    public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(beginTime);
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+        return date.after(begin) && date.before(end);
+    }
+
+    /**
+     * 由出生日期获得年龄
+     *
+     * @param birthDay 出生日期
+     */
+    public static int getAge(Date birthDay) {
+        if (birthDay == null) {
+            return 0;
+        }
+        LocalDate now = LocalDate.now();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(birthDay);
+        int yearBirth = cal.get(Calendar.YEAR);
+        int monthBirth = cal.get(Calendar.MONTH) + 1;
+        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
+
+        LocalDate birth = LocalDate.of(yearBirth, monthBirth, dayOfMonthBirth);
+        if (birth.isAfter(now)) {
+            return 0;
+        }
+        int age = birth.until(now).getYears();
+        return age;
+    }
+
+
+    /**
+     * 根据两个日期返回相差的时分秒
+     *
+     * @param newTime 靠后时间
+     * @param oldTime 靠前时间
+     * @return
+     */
+    public static String getTimestr(Date newTime, Date oldTime) {
+        Long newTimes = newTime.getTime();
+        Long oldTimes = oldTime.getTime();
+        // 不改时间会多加八个小时
+        timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
+        return timeSdf.format(newTimes - oldTimes);
+    }
+
+    /**
+     * 获取现在日期字符串时间戳格式
+     *
+     * @return返回字符串格式 yyyyMMdd
+     */
+    public static String getDateNowShortNumber() {
+        Date currentTime = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN_NUM);
+        String dateString = formatter.format(currentTime);
+        return dateString;
+    }
+
+    /**
+     * 获取一年的第几周
+     *
+     * @param date
+     * @return
+     */
+    public static int getWeekOfYear(Date date) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        int week_of_year = c.get(Calendar.WEEK_OF_YEAR);
+        return week_of_year;
+    }
+
+    /**
+     * 通过月份计算季度
+     *
+     * @param month
+     * @return
+     */
+    public static int getQuarter(int month) {
+        if (month < 1 || month > 12) {
+            throw new IllegalArgumentException("month is invalid.");
+        }
+        return (month - 1) / 3 + 1;
+    }
+
+    /**
+     * 通过月份计算季度
+     *
+     * @param month
+     * @return
+     */
+    public static String getQuarterStr(int month) {
+        if (month < 1 || month > 12) {
+            throw new IllegalArgumentException("month is invalid.");
+        }
+        return (month - 1) / 3 + 1 + "";
+    }
+
+    /**
+     * 获得本天的开始时间，即2012-01-01 00:00:00
+     *
+     * @return
+     */
+    public static Date getCurrentDayStartTime(Date date) {
+        try {
+            date = shortSdf.parse(shortSdf.format(date) + " 00:00:00");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    /**
+     * 获得本天的结束时间，即2012-01-01 23:59:59
+     *
+     * @return
+     */
+    public static Date getCurrentDayEndTime(Date date) {
+        try {
+            date = longSdf.parse(shortSdf.format(date) + " 23:59:59");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    /**
+     * 获取指定时间所在周的第一天日期
+     *
+     * @param date
+     * @return
+     */
+    public static int getWeekBeginDate(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        System.out.println(calendar.getTime());
+
+        return getDate(calendar.getTime());
+    }
+
+    public static Date beginDateOfWeek(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        return calendar.getTime();
+    }
+
+    public static Date endDateOfWeek(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取指定时间所在周的最后一天日期
+     *
+     * @param date
+     * @return
+     */
+    public static int getWeekEndDate(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+        System.out.println(calendar.getTime());
+
+        return getDate(calendar.getTime());
+    }
+
+    public static Date getBeginDateOfMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+        return calendar.getTime();
+    }
+
+    /**
+     * 将秒数转换为时分秒格式
+     *
+     * @param times
+     * @return
+     */
+    public static String secondsToTimeStr(int times) {
+        if (times <= 0) {
+            return "00:00:00";
+        }
+        int h = times / 3600;
+        int m = (times - h * 3600) / 60;
+        int s = times - h * 3600 - m * 60;
+        String time = "%02d:%02d:%02d";
+        time = String.format(time, h, m, s);
+        return time;
+    }
+
+    public static Date getTargetEndTime(Date target) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(target);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        Date end = calendar.getTime();
+        return end;
+    }
+
+    public static List<String> getTimeStrListByStartAndEnd(String startTime, String endTime, String pattern) {
+        try {
+            List<String> list = new ArrayList<>();
+            Date startDate = convertStrToDate(startTime, DATE_TIME_PATTERN);
+            Date endDate = convertStrToDate(endTime, DATE_TIME_PATTERN);
+            list.add(convertDateToString(startDate, pattern));
+            Date date = startDate;
+            while (true) {
+                if (MONTH_DAY_HOUR_PATTERN.equals(pattern)) {
+                    date = dateAddMinutes(date, 60);
+                } else if (DATE_PATTERN.equals(pattern) || MONTH_DAY_PATTERN.equals(pattern)) {
+                    date = dateAddDays(date, 1);
+                } else {
+                    date = dateAddMinutes(date, 1);
+                }
+                if (dateCompare(endDate, date) >= 0) {
+                    list.add(convertDateToString(date, pattern));
+                } else {
+                    break;
+                }
+            }
+            return list;
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 获取两个时间段之间的秒数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 秒数
+     */
+    public static Long getDurationSeconds(String startTime, String endTime, String pattern) {
+        final LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).getSeconds();
+    }
+
+    /**
+     * 获取两个时间段之间的秒数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 秒数
+     */
+    public static Long getDurationSeconds(Date startTime, Date endTime, String pattern) {
+        final SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        final LocalDateTime start = LocalDateTime.parse(sdf.format(startTime), DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(sdf.format(endTime), DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).getSeconds();
+    }
+
+    /**
+     * 获取两个时间段之间的分钟数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 分钟数
+     */
+    public static Long getDurationMinutes(String startTime, String endTime, String pattern) {
+        final LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).toMinutes();
+    }
+
+    /**
+     * 获取两个时间段之间的分钟数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 分钟数
+     */
+    public static Long getDurationMinutes(Date startTime, Date endTime, String pattern) {
+        final SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        final LocalDateTime start = LocalDateTime.parse(sdf.format(startTime), DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(sdf.format(endTime), DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).toMinutes();
+    }
+
+    /**
+     * 获取两个时间段之间的小时数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 小时
+     */
+    public static Long getDurationHours(String startTime, String endTime, String pattern) {
+        final LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).toHours();
+    }
+
+    /**
+     * 获取两个时间段之间的小时数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 小时
+     */
+    public static Long getDurationHours(Date startTime, Date endTime, String pattern) {
+        final SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        final LocalDateTime start = LocalDateTime.parse(sdf.format(startTime), DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(sdf.format(endTime), DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).toHours();
+    }
+
+    /**
+     * 获取两个时间段之间的天数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 天数
+     */
+    public static Long getDurationDays(String startTime, String endTime, String pattern) {
+        final LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).toDays();
+    }
+
+    /**
+     * 获取两个时间段之间的天数
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @param pattern   时间格式
+     * @return 天数
+     */
+    public static Long getDurationDays(Date startTime, Date endTime, String pattern) {
+        final SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        final LocalDateTime start = LocalDateTime.parse(sdf.format(startTime), DateTimeFormatter.ofPattern(pattern));
+        final LocalDateTime end = LocalDateTime.parse(sdf.format(endTime), DateTimeFormatter.ofPattern(pattern));
+        return Duration.between(start, end).toDays();
+    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -26,18 +26,18 @@ public class MyBatisPlusCodeGenerator {
     /**
      * 项目名称缩写
      */
-    static String projectShortName = "ugp";
+    static String projectShortName = "tzs";
 
     /**
      * 项目api目录
      */
-    static String apiAddress = "/amos-boot-system-" + projectShortName + "/amos-boot-module-" + projectShortName +
+    static String apiAddress = "/amos-boot-module/amos-boot-module-api/" + "amos-boot-module-" + projectShortName +
             "-api/";
 
     /**
      * 项目biz目录
      */
-    static String bizAddress = "/amos-boot-system-" + projectShortName + "/amos-boot-module-" + projectShortName +
+    static String bizAddress = "/amos-boot-module/amos-boot-module-biz/" + "amos-boot-module-" + projectShortName +
             "-biz/";
 
     /**
@@ -102,12 +102,12 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://39.98.45.134:3306/tzs_amos_ugp_biz?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-tzs-biz?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("Yeejoin@2020");
+        dsc.setPassword("root_123");
 
         dsc.setTypeConvert(new ITypeConvert() {
             @Override
@@ -292,8 +292,7 @@ public class MyBatisPlusCodeGenerator {
         strategy.setControllerMappingHyphenStyle(true);
         strategy.setTablePrefix();
         //去除表名前缀
-        strategy.setTablePrefix("tz_" + projectShortName + "_", "t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_",
-                "cb_", "tz_", "jc_", "jcb_", "flc_");
+        strategy.setTablePrefix("t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_");
         // 设置父级Controller
         strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
         autoGenerator.setStrategy(strategy);

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -12,9 +12,6 @@ public class RedisKey {
     public static final String FORM_CODE = "form_code_";
     /**根据字典code获取数据字典列表*/
     public static final String DATA_DICTIONARY_CODE= "data_dictionary_code_";
-
-    /**根据字典parent获取数据字典列表*/
-    public static final String DATA_DICTIONARY_PARENT= "data_dictionary_parent_";
     /**根据字典code获取数据字典列表*/
     public static final String DATA_DICTIONARY_CODE_XIN= "data_dictionary_code_xin_";
     /**根据id获取消防人员基本信息*/
@@ -45,7 +42,17 @@ public class RedisKey {
 
     /** 企业用户注册前缀 */
     public static final String FLC_USER_TEL = "flc_tel_";
-    
+
+    /**
+     * 装备指标Key值
+     */
+    public static final String EQUIP_INDEX_ADDRESS = "equip_index_address";
+
+    /**
+     * 装备指标Key值
+     */
+    public static final String EQUIP_INDEX_ADDRESS_KEY = "equip_index_address_key";
+
     /** 驼峰转下划线(简单写法，效率低于 ) */
 	public static String humpToLine(String str) {
 		return str.replaceAll("[A-Z]", "_$0").toLowerCase();

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/TreeParser.java

@@ -257,7 +257,7 @@ public class TreeParser {
 
         //递归退出条件  
         if (childList.size() == 0) {
-            return new ArrayList<Menu>();
+            return null;
         }
 
         return childList;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/WordConverterUtils.java

 package com.yeejoin.amos.boot.biz.common.utils;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.converter.WordToHtmlConverter;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -13,27 +14,10 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.converter.WordToHtmlConverter;
-import org.apache.poi.xwpf.converter.core.FileImageExtractor;
-import org.apache.poi.xwpf.converter.core.FileURIResolver;
-import org.apache.poi.xwpf.converter.pdf.PdfConverter;
-import org.apache.poi.xwpf.converter.pdf.PdfOptions;
-import org.apache.poi.xwpf.converter.xhtml.XHTMLConverter;
-import org.apache.poi.xwpf.converter.xhtml.XHTMLOptions;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-
 
 /**
  * 文档转换工具
@@ -54,14 +38,11 @@ public class WordConverterUtils {
         FileItem item = factory.createItem("textField", "text/plain", true, file.getName());
         int bytesRead = 0;
         byte[] buffer = new byte[8192];
-        try {
-            FileInputStream fis = new FileInputStream(file);
-            OutputStream os = item.getOutputStream();
+        try (FileInputStream fis = new FileInputStream(file);
+			 OutputStream os = item.getOutputStream();) {
             while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) {
                 os.write(buffer, 0, bytesRead);
             }
-            os.close();
-            fis.close();
         } catch (IOException e) {
             e.printStackTrace();
         }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/oConvertUtils.java

 package com.yeejoin.amos.boot.biz.common.utils;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.BeanUtils;
 
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

 package com.yeejoin.amos.boot.biz.common.workflow.feign;
 
-import java.util.HashMap;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import java.text.ParseException;
 import com.alibaba.fastjson.JSONObject;
-
 import feign.Response;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.util.HashMap;
 
 @FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration =
 		{ CommonMultipartSupportConfig.class })
@@ -216,10 +210,8 @@ public interface WorkflowFeignService {
 	 @RequestMapping(value = "/activitiHistory/getTaskListForTaskName/{taskName}/{definitionKey}",method = RequestMethod.GET)
 	 JSONObject getTaskListForTaskName(@PathVariable String taskName,@PathVariable String definitionKey) throws Exception ;
 
-	@RequestMapping("/task/attributes")
-	JSONObject getRoleId(@RequestParam String taskId);
-
-	@RequestMapping("/task/getTaskNoAuth/{processInstanceId}")
-	JSONObject getTaskId(@PathVariable String processInstanceId);
-
+	@RequestMapping("/v2/task/candidateGroupsUser")
+	 JSONObject candidateGroupsUser(	@RequestParam(value="processDefinitionKey", required=false)  String processDefinitionKey,
+										@RequestParam(value="processDefinitionId", required=false)  String processDefinitionId,
+										@RequestParam("nodeKey") String nodeKey) throws Exception;
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -51,7 +51,6 @@ public class MetaHandler implements MetaObjectHandler {
 //		if(metaObject.getValue("createDate")==null){
 //		}
         this.setFieldValByName("createDate", currentDate, metaObject);
-        this.setFieldValByName("recDate", currentDate, metaObject);
     }
 
     private void autoFillUser(MetaObject metaObject, Object entity) {

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -14,6 +14,9 @@ LEFT JOIN (
 		cb_fire_experts
 	WHERE
 		is_delete = 0
+	<if test='bizOrgCode != null and bizOrgCode!=""'>
+		and biz_org_code like concat(#{bizOrgCode}, '%')
+	</if>
 ) cfe ON cdd.`code` = cfe.expert_code
 WHERE
 	cdd.type = 'ZJLY'
@@ -41,6 +44,7 @@ GROUP BY
 		FROM
 		cb_linkage_unit
 		WHERE is_delete = 0
+		and biz_org_code like concat(#{bizOrgCode}, '%')
 		GROUP BY
 		emergency_linkage_unit_code
 		) elink ON elink.emergency_linkage_unit_code = cbb.`code`
@@ -112,6 +116,13 @@ WHERE
 	cdd.type = 'XFSYLX'
 	
 	</select>
-	
-	
+
+<select id="getByType" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+	SELECT
+		*
+	FROM
+		cb_data_dictionary cbb
+	WHERE
+		cbb.is_delete = 0 and cbb.type = #{type}
+	</select>
 </mapper>

amos-boot-core/.factorypath

@@ -126,7 +126,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -175,8 +174,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.23-SNAPSHOT/tyboot-core-foundation-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.25-SNAPSHOT/tyboot-core-foundation-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/reflectasm/reflectasm/1.09/reflectasm-1.09.jar" enabled="true" runInBatchMode="false"/>
@@ -188,7 +186,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-feign/1.7.10-SNAPSHOT/amos-component-feign-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar" enabled="true" runInBatchMode="false"/>
@@ -199,7 +196,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.23-SNAPSHOT/tyboot-component-cache-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.25-SNAPSHOT/tyboot-component-cache-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.5.RELEASE/spring-boot-starter-redis-1.4.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -212,5 +209,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-privilege/1.7.10-SNAPSHOT/amos-feign-privilege-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-data/amos-boot-data-alarm/.factorypath

@@ -148,8 +148,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/jpush/api/jpush-client/3.3.10/jpush-client-3.3.10.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/jpush/api/jiguang-common/1.1.3/jiguang-common-1.1.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-feign/1.7.10-SNAPSHOT/amos-component-feign-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar" enabled="true" runInBatchMode="false"/>
@@ -164,7 +162,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter-brave/2.15.0/zipkin-reporter-brave-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-config/1.7.10-SNAPSHOT/amos-component-config-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.25-SNAPSHOT/tyboot-core-rdbms-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar" enabled="true" runInBatchMode="false"/>
@@ -233,7 +230,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -265,5 +261,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-privilege/1.7.10-SNAPSHOT/amos-feign-privilege-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-data/amos-boot-data-housepvapi/.factorypath

@@ -120,8 +120,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/jpush/api/jpush-client/3.3.10/jpush-client-3.3.10.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/jpush/api/jiguang-common/1.1.3/jiguang-common-1.1.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-feign/1.7.10-SNAPSHOT/amos-component-feign-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar" enabled="true" runInBatchMode="false"/>
@@ -137,7 +135,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-config/1.7.10-SNAPSHOT/amos-component-config-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.25-SNAPSHOT/tyboot-core-rdbms-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar" enabled="true" runInBatchMode="false"/>
@@ -221,7 +218,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -268,5 +264,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-privilege/1.7.10-SNAPSHOT/amos-feign-privilege-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties

-spring.application.name=AMOS-API-HOUSEPVAPI-WJ
+logback-dev.xmlspring.application.name=AMOS-API-HOUSEPVAPI-WJ
 server.servlet.context-path=/housepvapi
 server.port=11006
 

amos-boot-data/pom.xml

@@ -22,6 +22,7 @@
 
   <modules>
   	<module>amos-boot-data-housepvapi</module>
+  	<module>amos-boot-data-equip</module>
   	<module>amos-boot-data-alarm</module>
   </modules>
   

amos-boot-system-jxiop/amos-boot-module-hygf-api/.factorypath

@@ -262,7 +262,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -309,5 +308,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/.factorypath

 <factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-emq/1.1.20/tyboot-component-emq-1.1.20.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.20/tyboot-core-foundation-1.1.20.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar" enabled="true" runInBatchMode="false"/>
@@ -44,7 +45,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/afterturn/easypoi-base/4.0.0/easypoi-base-4.0.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi/4.0.0/poi-4.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-codec/commons-codec/1.14/commons-codec-1.14.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-collections4/4.2/commons-collections4-4.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/ognl/ognl/3.2.6/ognl-3.2.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
@@ -58,8 +58,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/pagehelper/pagehelper/5.1.10/pagehelper-5.1.10.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/jsqlparser/jsqlparser/2.0/jsqlparser-2.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/taosdata/jdbc/taos-jdbcdriver/3.2.4/taos-jdbcdriver-3.2.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/java-websocket/Java-WebSocket/1.5.2/Java-WebSocket-1.5.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-activemq/2.5.4/spring-boot-starter-activemq-2.5.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter/2.3.11.RELEASE/spring-boot-starter-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -88,7 +86,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.2/commons-io-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -102,6 +99,38 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-httpclient/10.10.1/feign-httpclient-10.10.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-codec/commons-codec/1.14/commons-codec-1.14.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/kryo/kryo/2.24.0/kryo-2.24.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/minlog/minlog/1.2/minlog-1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/objenesis/objenesis/2.1/objenesis-2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/de/javakaffee/kryo-serializers/0.45/kryo-serializers-0.45.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/kryo/4.0.2/kryo-4.0.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/reflectasm/1.11.3/reflectasm-1.11.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/cn/com/vastdata/vastbase-jdbc/2.7p/vastbase-jdbc-2.7p.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/seata/seata-spring-boot-starter/1.8.0/seata-spring-boot-starter-1.8.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/seata/seata-spring-autoconfigure-client/1.8.0/seata-spring-autoconfigure-client-1.8.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/seata/seata-spring-autoconfigure-core/1.8.0/seata-spring-autoconfigure-core-1.8.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/seata/seata-all/1.8.0/seata-all-1.8.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr4/4.8/antlr4-4.8.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr4-runtime/4.8/antlr4-runtime-4.8.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/ST4/4.3/ST4-4.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/ibm/icu/icu4j/61.1/icu4j-61.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/typesafe/config/1.2.1/config-1.2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/dubbo/extensions/dubbo-filter-seata/1.0.2/dubbo-filter-seata-1.0.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/ben-manes/caffeine/caffeine/2.8.8/caffeine-2.8.8.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-text/1.9/commons-text-1.9.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-privilege/1.9.0-SNAPSHOT/amos-feign-privilege-1.9.0-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10.jar" enabled="true" runInBatchMode="false"/>
@@ -154,7 +183,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-elasticsearch/4.0.9.RELEASE/spring-data-elasticsearch-4.0.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/transport-netty4-client/7.15.2/transport-netty4-client-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
@@ -199,9 +227,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr-runtime/3.4/antlr-runtime-3.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-math/2.2/commons-math-2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar" enabled="true" runInBatchMode="false"/>
@@ -209,7 +234,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/guice/4.1.0/guice-4.1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-servlet/1.19.1/jersey-servlet-1.19.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-server/1.19.1/jersey-server-1.19.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar" enabled="true" runInBatchMode="false"/>
@@ -267,7 +291,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/hystrix/hystrix-javanica/1.5.18/hystrix-javanica-1.5.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" enabled="true" runInBatchMode="false"/>
@@ -283,7 +306,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -330,5 +352,4 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=AMOS-HYGF-CZ
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/.factorypath

 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-biz/1.0.0/amos-boot-module-common-biz-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-api/1.0.0/amos-boot-module-common-api-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.7.9-SNAPSHOT/amos-component-rule-1.7.9-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-thymeleaf/2.3.11.RELEASE/spring-boot-starter-thymeleaf-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.25-SNAPSHOT/tyboot-component-event-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-mock/2.0.8/spring-mock-2.0.8.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.13.2/junit-4.13.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-rule/1.7.0/amos-feign-rule-1.7.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-security/1.7.13-SNAPSHOT/amos-component-security-1.7.13-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-security/2.3.11.RELEASE/spring-boot-starter-security-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -186,6 +168,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/5.7.0-1/jna-5.7.0-1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -226,6 +209,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-freemarker/2.3.11.RELEASE/spring-boot-starter-freemarker-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-hystrix/2.2.5.RELEASE/spring-cloud-netflix-hystrix-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-client/1.9.25/eureka-client-1.9.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/jettison/jettison/1.3.7/jettison-1.3.7.jar" enabled="true" runInBatchMode="false"/>
@@ -307,7 +291,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -350,5 +333,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/.factorypath

 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-api/1.0.0/amos-boot-module-common-api-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.7.9-SNAPSHOT/amos-component-rule-1.7.9-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.21/tyboot-component-cache-1.1.21.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.5.RELEASE/spring-boot-starter-redis-1.4.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/redis/clients/jedis/3.3.0/jedis-3.3.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-thymeleaf/2.3.11.RELEASE/spring-boot-starter-thymeleaf-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-rule/1.7.0/amos-feign-rule-1.7.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/hutool/hutool-all/5.7.22/hutool-all-5.7.22.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-security/1.7.13-SNAPSHOT/amos-component-security-1.7.13-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-security/2.3.11.RELEASE/spring-boot-starter-security-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -24,6 +7,9 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-web/5.3.9.RELEASE/spring-security-web-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/de/codecentric/spring-boot-admin-starter-client/2.4.1/spring-boot-admin-starter-client-2.4.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/de/codecentric/spring-boot-admin-client/2.4.1/spring-boot-admin-client-2.4.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.23-SNAPSHOT/tyboot-component-cache-1.1.23-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-redis/2.3.11.RELEASE/spring-boot-starter-data-redis-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/lettuce/lettuce-core/5.3.7.RELEASE/lettuce-core-5.3.7.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.25-SNAPSHOT/tyboot-core-rdbms-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.25-SNAPSHOT/tyboot-core-restful-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
@@ -66,6 +52,11 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.5.RELEASE/spring-boot-starter-redis-1.4.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/redis/clients/jedis/3.3.0/jedis-3.3.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/brave/brave/5.12.3/brave-5.12.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter-brave/2.15.0/zipkin-reporter-brave-2.15.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
@@ -133,6 +124,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/5.7.0-1/jna-5.7.0-1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -269,7 +261,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -316,5 +307,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/.factorypath

 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-biz/1.0.0/amos-boot-module-common-biz-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-api/1.0.0/amos-boot-module-common-api-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.7.9-SNAPSHOT/amos-component-rule-1.7.9-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-thymeleaf/2.3.11.RELEASE/spring-boot-starter-thymeleaf-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.25-SNAPSHOT/tyboot-component-event-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-mock/2.0.8/spring-mock-2.0.8.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.13.2/junit-4.13.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-rule/1.7.0/amos-feign-rule-1.7.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-security/1.7.13-SNAPSHOT/amos-component-security-1.7.13-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-security/2.3.11.RELEASE/spring-boot-starter-security-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -169,6 +151,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/5.7.0-1/jna-5.7.0-1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -210,6 +193,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-freemarker/2.3.11.RELEASE/spring-boot-starter-freemarker-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-hystrix/2.2.5.RELEASE/spring-cloud-netflix-hystrix-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-client/1.9.25/eureka-client-1.9.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/jettison/jettison/1.3.7/jettison-1.3.7.jar" enabled="true" runInBatchMode="false"/>
@@ -294,7 +278,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -341,5 +324,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/.factorypath

 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-biz/1.0.0/amos-boot-module-common-biz-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-api/1.0.0/amos-boot-module-common-api-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.7.9-SNAPSHOT/amos-component-rule-1.7.9-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-thymeleaf/2.3.11.RELEASE/spring-boot-starter-thymeleaf-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.25-SNAPSHOT/tyboot-component-event-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-mock/2.0.8/spring-mock-2.0.8.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.13.2/junit-4.13.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-rule/1.7.0/amos-feign-rule-1.7.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-security/1.7.13-SNAPSHOT/amos-component-security-1.7.13-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-security/2.3.11.RELEASE/spring-boot-starter-security-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -161,6 +143,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/5.7.0-1/jna-5.7.0-1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -203,6 +186,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-freemarker/2.3.11.RELEASE/spring-boot-starter-freemarker-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-hystrix/2.2.5.RELEASE/spring-cloud-netflix-hystrix-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-client/1.9.25/eureka-client-1.9.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/jettison/jettison/1.3.7/jettison-1.3.7.jar" enabled="true" runInBatchMode="false"/>
@@ -295,7 +279,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -341,5 +324,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-jxiop-das/.factorypath

@@ -264,7 +264,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -311,5 +310,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/.factorypath

 <factorypath>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-biz/1.0.0/amos-boot-module-common-biz-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-api/1.0.0/amos-boot-module-common-api-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.7.9-SNAPSHOT/amos-component-rule-1.7.9-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-thymeleaf/2.3.11.RELEASE/spring-boot-starter-thymeleaf-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.25-SNAPSHOT/tyboot-component-event-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-mock/2.0.8/spring-mock-2.0.8.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.13.2/junit-4.13.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-rule/1.7.0/amos-feign-rule-1.7.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-security/1.7.13-SNAPSHOT/amos-component-security-1.7.13-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-security/2.3.11.RELEASE/spring-boot-starter-security-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -161,6 +143,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/5.7.0-1/jna-5.7.0-1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -202,6 +185,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-freemarker/2.3.11.RELEASE/spring-boot-starter-freemarker-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-hystrix/2.2.5.RELEASE/spring-cloud-netflix-hystrix-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-client/1.9.25/eureka-client-1.9.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/jettison/jettison/1.3.7/jettison-1.3.7.jar" enabled="true" runInBatchMode="false"/>
@@ -286,7 +270,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -333,5 +316,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/.factorypath

@@ -12,24 +12,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/kafka/kafka-clients/2.5.1/kafka-clients-2.5.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/luben/zstd-jni/1.4.4-7/zstd-jni-1.4.4-7.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/xerial/snappy/snappy-java/1.1.7.3/snappy-java-1.1.7.3.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-biz/1.0.0/amos-boot-module-common-biz-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/amosframework/boot/amos-boot-module-common-api/1.0.0/amos-boot-module-common-api-1.0.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.7.9-SNAPSHOT/amos-component-rule-1.7.9-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-thymeleaf/2.3.11.RELEASE/spring-boot-starter-thymeleaf-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf-spring5/3.0.12.RELEASE/thymeleaf-spring5-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-event/1.1.25-SNAPSHOT/tyboot-component-event-1.1.25-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-mock/2.0.8/spring-mock-2.0.8.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.13.2/junit-4.13.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-rule/1.7.0/amos-feign-rule-1.7.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-security/1.7.13-SNAPSHOT/amos-component-security-1.7.13-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-security/2.3.11.RELEASE/spring-boot-starter-security-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-config/5.3.9.RELEASE/spring-security-config-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -170,6 +152,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/5.7.0-1/jna-5.7.0-1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-plugin-classloader/7.15.2/elasticsearch-plugin-classloader-7.15.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -210,6 +193,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-freemarker/2.3.11.RELEASE/spring-boot-starter-freemarker-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-hystrix/2.2.5.RELEASE/spring-cloud-netflix-hystrix-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-client/1.9.25/eureka-client-1.9.25.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/jettison/jettison/1.3.7/jettison-1.3.7.jar" enabled="true" runInBatchMode="false"/>
@@ -292,7 +276,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-scratchpad/4.0.1/poi-scratchpad-4.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" enabled="true" runInBatchMode="false"/>
@@ -337,5 +320,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.7.10-SNAPSHOT/amos-feign-systemctl-1.7.10-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

pom.xml

@@ -329,6 +329,10 @@
         <module>amos-boot-biz-common</module>
         <module>amos-boot-core</module>
         <module>amos-boot-data</module>
+        <module>amos-boot-module</module>
+        <module>amos-boot-system-ccs</module>
+        <module>amos-boot-system-jcs</module>
+        <module>amos-boot-system-equip</module>
         <module>amos-boot-system-jxiop</module>
     </modules>
 </project>
\ No newline at end of file