diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 9b78e0b0a..db5f06479 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -20,7 +20,7 @@ com.esua.epdc - epdc-cloud-optimize + epdc-optimize-department 1.0.0 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 6d5c4ffdf..9dc80eef2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -411,7 +411,7 @@ public class SysUserController { * @author work@yujt.net.cn * @date 2019/11/27 14:31 */ - @GetMapping("deptOptions/getDeptAuthByUser") + @GetMapping("deptOptions/getDeptPartyByUser") public Result getDeptPartyByUser() { UserDetail user = SecurityUser.getUser(); DeptOption deptOption = optSysDeptService.getDeptOption(user.getId(), user.getDeptIdList(), diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/pom.xml b/esua-epdc/epdc-admin/epdc-cloud-optimize/pom.xml deleted file mode 100644 index acc7530a6..000000000 --- a/esua-epdc/epdc-admin/epdc-cloud-optimize/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - com.esua.epdc - epdc-admin - 1.0.0 - - 4.0.0 - - epdc-cloud-optimize - pom - 党群e家部门机构优化微服务模块 - - - epdc-optimize-department - - - \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/pom.xml b/esua-epdc/epdc-admin/epdc-optimize-department/pom.xml similarity index 98% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/pom.xml rename to esua-epdc/epdc-admin/epdc-optimize-department/pom.xml index a3c7c725c..a44b48b3e 100644 --- a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/pom.xml +++ b/esua-epdc/epdc-admin/epdc-optimize-department/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - epdc-cloud-optimize com.esua.epdc + epdc-admin 1.0.0 4.0.0 diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/db/update.sql b/esua-epdc/epdc-admin/epdc-optimize-department/src/db/update.sql similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/db/update.sql rename to esua-epdc/epdc-admin/epdc-optimize-department/src/db/update.sql diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/application.yml similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/application.yml rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/application.yml diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/logback-spring.xml b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/logback-spring.xml similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/logback-spring.xml rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/logback-spring.xml diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml diff --git a/esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml b/esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml similarity index 100% rename from esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml rename to esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml diff --git a/esua-epdc/epdc-admin/pom.xml b/esua-epdc/epdc-admin/pom.xml index 9c5cc105e..20b142699 100644 --- a/esua-epdc/epdc-admin/pom.xml +++ b/esua-epdc/epdc-admin/pom.xml @@ -16,7 +16,7 @@ epdc-admin-client epdc-admin-server - epdc-cloud-optimize + epdc-optimize-department