删除无用代码

README.md

@@ -267,6 +267,35 @@ ruoyi-common-swagger添加
 （0）本身业务只有用户管理和部门管理存在数据权限  
 （1）部门改为懒加载，并且新增行政区划表和部门表对应，部门区划选择 限制只能选择部门层级或者上一级（直属）  
 （2）角色增删改，不对外开放，数据权限去掉，改造为增加角色可分配权限的字段，由超管进行 角色分配后选择可分配角色进行下级角色分配，需要同步处理用户里角色选择的问题，非自己能分配的角色禁止分配，但是可以取消用户角色  
+（3）内部调用的服务 不走@requirePermissions相关注解
+```
+PreAuthorizeAspect.java
+@Around("pointcut()")
+public Object around(ProceedingJoinPoint joinPoint) throws Throwable
+{
+    String source = ServletUtils.getRequest().getHeader(SecurityConstants.FROM_SOURCE);
+    // 内部请求验证
+    if (!StringUtils.equals(SecurityConstants.INNER, source))
+    {
+        // 注解鉴权
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        checkMethodAnnotation(signature.getMethod());
+    }
+    try
+    {
+        // 执行原有逻辑
+        Object obj = joinPoint.proceed();
+        return obj;
+    }
+    catch (Throwable e)
+    {
+        throw e;
+    }
+
+}
+
+```
+
 ```
 角色数据权限值跨度修改
 {

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteJobService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.system.api;
+package com.ruoyi.ext.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.factory.RemoteJobFallbackFactory;
+import com.ruoyi.ext.api.factory.RemoteJobFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteOrgYljgJcxxService.java

@@ -1,10 +1,10 @@
-package com.ruoyi.system.api;
+package com.ruoyi.ext.api;
 
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.domain.YljgsqJcxx;
-import com.ruoyi.system.api.factory.RemoteOrgYljgJcxxFallbackFactory;
+import com.ruoyi.ext.api.factory.RemoteOrgYljgJcxxFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteSysConfigService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.system.api;
+package com.ruoyi.ext.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.factory.RemoteSysConfigFallbackFactory;
+import com.ruoyi.ext.api.factory.RemoteSysConfigFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteSysDeptJlService.java

@@ -1,8 +1,7 @@
-package com.ruoyi.system.api;
+package com.ruoyi.ext.api;
 
 import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.factory.RemoteSysDeptJlFallbackFactory;
+import com.ruoyi.ext.api.factory.RemoteSysDeptJlFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteJobFallbackFactory.java

@@ -1,7 +1,7 @@
-package com.ruoyi.system.api.factory;
+package com.ruoyi.ext.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.RemoteJobService;
+import com.ruoyi.ext.api.RemoteJobService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrgYljgJcxxFallbackFactory.java

@@ -1,9 +1,9 @@
-package com.ruoyi.system.api.factory;
+package com.ruoyi.ext.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.ext.api.RemoteOrgYljgJcxxService;
 import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.domain.YljgsqJcxx;
-import com.ruoyi.system.api.RemoteOrgYljgJcxxService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteSysConfigFallbackFactory.java

@@ -1,7 +1,7 @@
-package com.ruoyi.system.api.factory;
+package com.ruoyi.ext.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.RemoteSysConfigService;
+import com.ruoyi.ext.api.RemoteSysConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteSysDeptJlFallbackFactory.java

@@ -1,8 +1,6 @@
-package com.ruoyi.system.api.factory;
+package com.ruoyi.ext.api.factory;
 
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.RemoteSysDeptJlService;
+import com.ruoyi.ext.api.RemoteSysDeptJlService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/DjpdGsA.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.poi;
+package com.ruoyi.ext.api.testpoi;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/DjpdGsB.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.poi;
+package com.ruoyi.ext.api.testpoi;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/ExcelUtilTest.java

@@ -0,0 +1,47 @@
+package com.ruoyi.ext.api.testpoi;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtilMTab;
+import com.ruoyi.common.core.utils.poi.ExcelUtilTool;
+import com.ruoyi.common.core.utils.poi.ExeclTempBean;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExcelUtilTest {
+
+    public static void demomain(String[] args) {
+
+        ExcelUtilTool<DjpdGsA> utila = new ExcelUtilTool<DjpdGsA>(DjpdGsA.class);
+        ExeclTempBean[] TempData= new ExeclTempBean[2];
+        List<DjpdGsA> lista  = new ArrayList<DjpdGsA>();
+        DjpdGsA sss=new DjpdGsA();
+        for (int i = 0; i <2000 ; i++) {
+            sss.setKsrq("A0"+Integer.toString(i));
+            sss.setJsrq("B0"+Integer.toString(i));
+            sss.setZzrq("C0"+Integer.toString(i));
+            lista.add(sss);
+        }
+        ExcelUtilTool<DjpdGsB> utilb = new ExcelUtilTool<DjpdGsB>(DjpdGsB.class);
+        List<DjpdGsB> listb  = new ArrayList<DjpdGsB>();
+        DjpdGsB sss1=new DjpdGsB();
+        for (int i = 0; i <2000 ; i++) {
+            sss1.setGslx("555"+Integer.toString(i));
+            sss1.setKsrq("A0"+Integer.toString(i));
+            sss1.setJsrq("B0"+Integer.toString(i));
+            sss1.setZzrq("C0"+Integer.toString(i));
+            listb.add(sss1);
+        }
+        try {
+            TempData[0]=utila.getObjectData(lista, "等级评定公示信息数据");
+            TempData[1]=utilb.getObjectData(listb, "等级评定公示信息数据333");
+            ExcelUtilMTab util2 = new ExcelUtilMTab();
+            util2.exportExcel(new FileOutputStream(new File("c:/1233444.xls")), TempData);
+
+        } catch (Exception e) {
+
+        }
+    }
+
+}

ruoyi-api/ruoyi-api-ext/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.ext.api.factory.RemoteDictDataFallbackFactory, \
-  com.ruoyi.ext.api.factory.RemoteDictTypeFallbackFactory

ruoyi-api/ruoyi-api-ext/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,6 @@
+com.ruoyi.ext.api.factory.RemoteDictDataFallbackFactory
+com.ruoyi.ext.api.factory.RemoteDictTypeFallbackFactory
+com.ruoyi.ext.api.factory.RemoteSysConfigFallbackFactory
+com.ruoyi.ext.api.factory.RemoteJobFallbackFactory
+com.ruoyi.ext.api.factory.RemoteSysDeptJlFallbackFactory
+com.ruoyi.ext.api.factory.RemoteOrgYljgJcxxFallbackFactory

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java

@@ -1,24 +0,0 @@
-package com.ruoyi.system.api;
-
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.factory.RemoteConfigFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 参数配置 信息操作处理
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "remoteConfigService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteConfigFallbackFactory.class)
-public interface RemoteConfigService
-{
-    /**
-     * 根据参数键名查询参数值
-     */
-    @GetMapping("/config/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable("configKey") String configKey, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteSysDjpdzbService.java

@@ -1,20 +0,0 @@
-package com.ruoyi.system.api;
-
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
-import com.ruoyi.system.api.factory.RemoteSysDjpdzbFallbackFactory;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.ruoyi.system.api.model.LoginUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-@FeignClient(contextId = "remoteSysDjpdzbService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteSysDjpdzbFallbackFactory.class)
-public interface RemoteSysDjpdzbService {
-
-    @PostMapping("/djpdJbpz/list")
-    public TableDataInfo list(@RequestBody SysDjpdzbJbpz sysDjpdzbJbpz, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java

@@ -1,33 +0,0 @@
-package com.ruoyi.system.api.factory;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.RemoteConfigService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteConfigFallbackFactory implements FallbackFactory<RemoteConfigService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteConfigFallbackFactory.class);
-
-    @Override
-    public RemoteConfigService create(Throwable throwable)
-    {
-        log.error("获取参数配置列表调用失败:{}", throwable.getMessage());
-        return new RemoteConfigService()
-        {
-            @Override
-            public AjaxResult getConfigKey(String configKey, String source)
-            {
-                return null;
-            }
-        };
-    }
-}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteSysDjpdzbFallbackFactory.java

@@ -1,38 +0,0 @@
-package com.ruoyi.system.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.system.api.RemoteSysDjpdzbService;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- *
- *
- * @author sun
- */
-@Component
-public class RemoteSysDjpdzbFallbackFactory implements FallbackFactory<RemoteSysDjpdzbService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteSysDjpdzbFallbackFactory.class);
-
-    @Override
-    public RemoteSysDjpdzbService create(Throwable throwable)
-    {
-        log.error("指标服务调用失败:{}", throwable.getMessage());
-        return new RemoteSysDjpdzbService()
-        {
-            @Override
-            public TableDataInfo list(SysDjpdzbJbpz sysDjpdzbJbpz, String source) {
-                return null;
-            }
-        };
-    }
-}

ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,9 +1,3 @@
 com.ruoyi.system.api.factory.RemoteUserFallbackFactory
 com.ruoyi.system.api.factory.RemoteLogFallbackFactory
 com.ruoyi.system.api.factory.RemoteFileFallbackFactory
-com.ruoyi.system.api.factory.RemoteSysConfigFallbackFactory
-com.ruoyi.system.api.factory.RemoteSysDjpdzbFallbackFactory
-com.ruoyi.system.api.factory.RemoteJobFallbackFactory
-com.ruoyi.system.api.factory.RemoteSysDeptJlFallbackFactory
-com.ruoyi.system.api.factory.RemoteOrgYljgJcxxFallbackFactory
-com.ruoyi.system.api.factory.RemoteConfigFallbackFactory

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtilTool.java

@@ -209,38 +209,6 @@ public class ExcelUtilTool<T>
     }
 
 
-    public static void demomain(String[] args) {
-
-        ExcelUtilTool<DjpdGsA> utila = new ExcelUtilTool<DjpdGsA>(DjpdGsA.class);
-        ExeclTempBean[] TempData= new ExeclTempBean[2];
-        List<DjpdGsA> lista  = new ArrayList<DjpdGsA>();
-        DjpdGsA sss=new DjpdGsA();
-        for (int i = 0; i <2000 ; i++) {
-            sss.setKsrq("A0"+Integer.toString(i));
-            sss.setJsrq("B0"+Integer.toString(i));
-            sss.setZzrq("C0"+Integer.toString(i));
-            lista.add(sss);
-        }
-        ExcelUtilTool<DjpdGsB> utilb = new ExcelUtilTool<DjpdGsB>(DjpdGsB.class);
-        List<DjpdGsB> listb  = new ArrayList<DjpdGsB>();
-        DjpdGsB sss1=new DjpdGsB();
-        for (int i = 0; i <2000 ; i++) {
-            sss1.setGslx("555"+Integer.toString(i));
-            sss1.setKsrq("A0"+Integer.toString(i));
-            sss1.setJsrq("B0"+Integer.toString(i));
-            sss1.setZzrq("C0"+Integer.toString(i));
-            listb.add(sss1);
-        }
-        try {
-            TempData[0]=utila.getObjectData(lista, "等级评定公示信息数据");
-            TempData[1]=utilb.getObjectData(listb, "等级评定公示信息数据333");
-            ExcelUtilMTab util2 = new ExcelUtilMTab();
-            util2.exportExcel(new FileOutputStream(new File("c:/1233444.xls")), TempData);
-
-        } catch (Exception e) {
-
-        }
-    }
 
 
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/PdzjServiceImpl.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.ext.api.enums.SexStatus;
 import com.ruoyi.ext.api.enums.StateStatus;
 import com.ruoyi.ext.api.enums.SysUserTypeStatus;
-import com.ruoyi.system.api.RemoteSysConfigService;
+import com.ruoyi.ext.api.RemoteSysConfigService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywHldsJfServiceImpl.java

@@ -5,7 +5,6 @@ import com.ruoyi.business.domain.ZwywHldsJf;
 import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywHldsJfMapper;
 import com.ruoyi.business.service.IZwywHldsJfService;
-import com.ruoyi.system.api.RemoteSysDeptJlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywHldsXsxxServiceImpl.java

@@ -5,7 +5,6 @@ import com.ruoyi.business.domain.ZwywHldsXsxx;
 import com.ruoyi.business.mapper.SysDeptJlMapper;
 import com.ruoyi.business.mapper.ZwywHldsXsxxMapper;
 import com.ruoyi.business.service.IZwywHldsXsxxService;
-import com.ruoyi.system.api.RemoteSysDeptJlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/validator/BusinessJgVH.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.ext.api.enums.SurvivalStatus;
 import com.ruoyi.ext.api.validate.ValidatorHandler;
 import com.ruoyi.organization.domain.YljgJcxx;
-import com.ruoyi.system.api.RemoteOrgYljgJcxxService;
+import com.ruoyi.ext.api.RemoteOrgYljgJcxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/validator/BusinessSqJgVH.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.ext.api.enums.SurvivalStatus;
 import com.ruoyi.ext.api.validate.ValidatorHandler;
 import com.ruoyi.organization.domain.YljgsqJcxx;
-import com.ruoyi.system.api.RemoteOrgYljgJcxxService;
+import com.ruoyi.ext.api.RemoteOrgYljgJcxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgJcxxServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.ext.api.RemoteSysConfigService;
 import com.ruoyi.ext.api.enums.DocumentTypeStatus;
 import com.ruoyi.ext.api.utils.IDCardUtil;
 import com.ruoyi.organization.domain.YljgBmxx;
@@ -16,7 +17,6 @@ import com.ruoyi.organization.mapper.SysDeptJlMapper;
 import com.ruoyi.organization.mapper.YljgBmxxMapper;
 import com.ruoyi.organization.mapper.YljgJcxxMapper;
 import com.ruoyi.organization.service.IYljgJcxxService;
-import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@ public class YljgJcxxServiceImpl implements IYljgJcxxService
     private RemoteUserService remoteUserService;
 
     @Autowired
-    private RemoteConfigService remoteConfigService;
+    private RemoteSysConfigService remoteConfigService;
 
     /**
      * 查询机构信息

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/service/impl/YljgsqJcxxServiceImpl.java

@@ -2,12 +2,12 @@ package com.ruoyi.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.ext.api.RemoteSysConfigService;
 import com.ruoyi.ext.api.utils.IDCardUtil;
 import com.ruoyi.organization.domain.YljgBmxx;
 import com.ruoyi.organization.domain.YljgsqJcxx;
@@ -16,7 +16,6 @@ import com.ruoyi.organization.mapper.YljgBmxxMapper;
 import com.ruoyi.organization.mapper.YljgJcxxMapper;
 import com.ruoyi.organization.mapper.YljgsqJcxxMapper;
 import com.ruoyi.organization.service.IYljgsqJcxxService;
-import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +51,7 @@ public class YljgsqJcxxServiceImpl implements IYljgsqJcxxService
     private RemoteUserService remoteUserService;
 
     @Autowired
-    private RemoteConfigService remoteConfigService;
+    private RemoteSysConfigService remoteConfigService;
 
     /**
      * 查询社区养老机构_基础信息

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java

@@ -7,7 +7,7 @@ import com.ruoyi.job.domain.SysJob;
 import com.ruoyi.job.mapper.SysJobMapper;
 import com.ruoyi.job.util.CronUtils;
 import com.ruoyi.job.util.ScheduleUtils;
-import com.ruoyi.system.api.RemoteJobService;
+import com.ruoyi.ext.api.RemoteJobService;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDjpdzbJbpzController.java

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.ruoyi.ext.api.validate.group.AddGroup;
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
+import com.ruoyi.system.domain.SysDjpdzbJbpz;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDjpdzbXzpzController.java

@@ -1,13 +1,11 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.ruoyi.ext.api.validate.group.AddGroup;
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +24,6 @@ import com.ruoyi.system.service.ISysDjpdzbXzpzService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
 
 /**
  * 等级评定指标细则配置Controller

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysJgZhglController.java

@@ -1,11 +1,8 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.api.RemoteOrgYljgJcxxService;
-import com.ruoyi.system.api.RemoteSysDeptJlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDjpdzbJbpz.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.domain;
+package com.ruoyi.system.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDjpdzbJbpzMapper.java

@@ -3,7 +3,7 @@ package com.ruoyi.system.mapper;
 import java.util.List;
 
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
+import com.ruoyi.system.domain.SysDjpdzbJbpz;
 
 /**
  * 等级评定指标基本配置Mapper接口

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDjpdzbJbpzService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
+import com.ruoyi.system.domain.SysDjpdzbJbpz;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDjpdzbJbpzServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.system.api.domain.SysDjpdzbJbpz;
+import com.ruoyi.system.domain.SysDjpdzbJbpz;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Arrays;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJgZhglServiceImpl.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.domain.YljgsqJcxx;
-import com.ruoyi.system.api.RemoteOrgYljgJcxxService;
+import com.ruoyi.ext.api.RemoteOrgYljgJcxxService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.SysJgZhgl;
 import com.ruoyi.system.mapper.*;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -4,9 +4,8 @@ import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.ext.api.enums.SysUserTypeStatus;
 import com.ruoyi.ext.api.utils.OtherConstants;
-import com.ruoyi.system.api.RemoteOrgYljgJcxxService;
+import com.ruoyi.ext.api.RemoteOrgYljgJcxxService;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.system.domain.vo.MetaVo;
@@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDjpdzbJbpzMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDjpdzbJbpzMapper">
 
-    <resultMap type="com.ruoyi.system.api.domain.SysDjpdzbJbpz" id="SysDjpdzbJbpzResult">
+    <resultMap type="com.ruoyi.system.domain.SysDjpdzbJbpz" id="SysDjpdzbJbpzResult">
         <result property="id"    column="id"    />
         <result property="xh"    column="xh"    />
         <result property="pddj"    column="pddj"    />