From 5bf4652eccd80a7852691d13e6055c1e32d040a2 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 17 Mar 2020 09:08:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 5ab568cb98..9aca2a1ae1 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -18,7 +18,6 @@ epmet-job epmet-message epmet-activiti - epmet-api epmet-demo oper-customize oper-crm From 9fd480acfb102269506fdf0dc75359fb6eec9579 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 17 Mar 2020 10:07:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=A7=BB=E5=88=B0epmet-module=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=8B=EF=BC=8Cepmet-module=E7=9A=84pom=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E5=88=A0=E9=99=A4=E5=8E=9Fepmet-api=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E7=94=A8=EF=BC=8C=E4=BF=AE=E6=94=B9epmet-gateway?= =?UTF-8?q?=E4=B8=ADbootstap.yaml=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E8=B7=AF=E7=94=B1order=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9gov-org-server=E7=9A=84=E9=BB=98=E8=AE=A4=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E5=8F=B7=E4=B8=BA8092?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 4 ++-- epmet-gateway/src/main/resources/bootstrap.yml | 16 ++++++++-------- epmet-module/epmet-message/pom.xml | 8 ++++---- .../gov-org}/gov-org-client/pom.xml | 0 .../com/epmet/dto/CustomerDepartmentDTO.java | 0 .../main/java/com/epmet/dto/CustomerGridDTO.java | 0 .../com/epmet/dto/CustomerOrganizationDTO.java | 0 .../epmet/dto/CustomerRelevantDepartmentDTO.java | 0 .../main/java/com/epmet/dto/CustomerRoleDTO.java | 0 .../epmet/dto/CustomerStaffDepartmentDTO.java | 0 .../java/com/epmet/dto/CustomerStaffGridDTO.java | 0 .../epmet/dto/CustomerStaffOrganizationDTO.java | 0 .../java/com/epmet/dto/CustomerStaffRoleDTO.java | 0 .../java/com/epmet/dto/PdmanDbVersionDTO.java | 0 .../gov-org}/gov-org-server/pom.xml | 4 ++-- .../main/java/com/epmet/GovOrgApplication.java | 0 .../java/com/epmet/config/ModuleConfigImpl.java | 0 .../java/com/epmet/config/SwaggerConfig.java | 0 .../controller/CustomerDepartmentController.java | 0 .../epmet/controller/CustomerGridController.java | 0 .../CustomerOrganizationController.java | 0 .../CustomerRelevantDepartmentController.java | 0 .../epmet/controller/CustomerRoleController.java | 0 .../CustomerStaffDepartmentController.java | 0 .../controller/CustomerStaffGridController.java | 0 .../CustomerStaffOrganizationController.java | 0 .../controller/CustomerStaffRoleController.java | 0 .../controller/PdmanDbVersionController.java | 0 .../com/epmet/dao/CustomerDepartmentDao.java | 0 .../main/java/com/epmet/dao/CustomerGridDao.java | 0 .../com/epmet/dao/CustomerOrganizationDao.java | 0 .../epmet/dao/CustomerRelevantDepartmentDao.java | 0 .../main/java/com/epmet/dao/CustomerRoleDao.java | 0 .../epmet/dao/CustomerStaffDepartmentDao.java | 0 .../java/com/epmet/dao/CustomerStaffGridDao.java | 0 .../epmet/dao/CustomerStaffOrganizationDao.java | 0 .../java/com/epmet/dao/CustomerStaffRoleDao.java | 0 .../java/com/epmet/dao/PdmanDbVersionDao.java | 0 .../epmet/entity/CustomerDepartmentEntity.java | 0 .../com/epmet/entity/CustomerGridEntity.java | 0 .../epmet/entity/CustomerOrganizationEntity.java | 0 .../entity/CustomerRelevantDepartmentEntity.java | 0 .../com/epmet/entity/CustomerRoleEntity.java | 0 .../entity/CustomerStaffDepartmentEntity.java | 0 .../epmet/entity/CustomerStaffGridEntity.java | 0 .../entity/CustomerStaffOrganizationEntity.java | 0 .../epmet/entity/CustomerStaffRoleEntity.java | 0 .../com/epmet/entity/PdmanDbVersionEntity.java | 0 .../com/epmet/excel/CustomerDepartmentExcel.java | 0 .../java/com/epmet/excel/CustomerGridExcel.java | 0 .../epmet/excel/CustomerOrganizationExcel.java | 0 .../excel/CustomerRelevantDepartmentExcel.java | 0 .../java/com/epmet/excel/CustomerRoleExcel.java | 0 .../excel/CustomerStaffDepartmentExcel.java | 0 .../com/epmet/excel/CustomerStaffGridExcel.java | 0 .../excel/CustomerStaffOrganizationExcel.java | 0 .../com/epmet/excel/CustomerStaffRoleExcel.java | 0 .../com/epmet/excel/PdmanDbVersionExcel.java | 0 .../com/epmet/redis/CustomerDepartmentRedis.java | 0 .../java/com/epmet/redis/CustomerGridRedis.java | 0 .../epmet/redis/CustomerOrganizationRedis.java | 0 .../redis/CustomerRelevantDepartmentRedis.java | 0 .../java/com/epmet/redis/CustomerRoleRedis.java | 0 .../redis/CustomerStaffDepartmentRedis.java | 0 .../com/epmet/redis/CustomerStaffGridRedis.java | 0 .../redis/CustomerStaffOrganizationRedis.java | 0 .../com/epmet/redis/CustomerStaffRoleRedis.java | 0 .../com/epmet/redis/PdmanDbVersionRedis.java | 0 .../epmet/service/CustomerDepartmentService.java | 0 .../com/epmet/service/CustomerGridService.java | 0 .../service/CustomerOrganizationService.java | 0 .../CustomerRelevantDepartmentService.java | 0 .../com/epmet/service/CustomerRoleService.java | 0 .../service/CustomerStaffDepartmentService.java | 0 .../epmet/service/CustomerStaffGridService.java | 0 .../CustomerStaffOrganizationService.java | 0 .../epmet/service/CustomerStaffRoleService.java | 0 .../com/epmet/service/PdmanDbVersionService.java | 0 .../impl/CustomerDepartmentServiceImpl.java | 0 .../service/impl/CustomerGridServiceImpl.java | 0 .../impl/CustomerOrganizationServiceImpl.java | 0 .../CustomerRelevantDepartmentServiceImpl.java | 0 .../service/impl/CustomerRoleServiceImpl.java | 0 .../impl/CustomerStaffDepartmentServiceImpl.java | 0 .../impl/CustomerStaffGridServiceImpl.java | 0 .../CustomerStaffOrganizationServiceImpl.java | 0 .../impl/CustomerStaffRoleServiceImpl.java | 0 .../service/impl/PdmanDbVersionServiceImpl.java | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/logback-spring.xml | 0 .../resources/mapper/CustomerDepartmentDao.xml | 0 .../main/resources/mapper/CustomerGridDao.xml | 0 .../resources/mapper/CustomerOrganizationDao.xml | 0 .../mapper/CustomerRelevantDepartmentDao.xml | 0 .../main/resources/mapper/CustomerRoleDao.xml | 0 .../mapper/CustomerStaffDepartmentDao.xml | 0 .../resources/mapper/CustomerStaffGridDao.xml | 0 .../mapper/CustomerStaffOrganizationDao.xml | 0 .../resources/mapper/CustomerStaffRoleDao.xml | 0 .../main/resources/mapper/PdmanDbVersionDao.xml | 0 {gov-org => epmet-module/gov-org}/pom.xml | 2 +- epmet-module/pom.xml | 1 + pom.xml | 1 - 103 files changed, 18 insertions(+), 18 deletions(-) rename {gov-org => epmet-module/gov-org}/gov-org-client/pom.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/pom.xml (98%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/bootstrap.yml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/logback-spring.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml (100%) rename {gov-org => epmet-module/gov-org}/pom.xml (93%) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 158544f723..c255242999 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -132,7 +132,7 @@ http://localhost:8091 - + http://localhost:8092 @@ -184,7 +184,7 @@ lb://oper-crm-server lb://resi-guid-server - + lb://gov-org-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 309844844d..4644b5a062 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -69,7 +69,7 @@ spring: #工作流服务 - id: epmet-activiti-server uri: @gateway.routes.epmet-activiti-server.uri@ - order: 5 + order: 6 predicates: - Path=${server.servlet.context-path}/activiti/** filters: @@ -77,7 +77,7 @@ spring: #定时任务服务 - id: epmet-job-server uri: @gateway.routes.epmet-job-server.uri@ - order: 6 + order: 7 predicates: - Path=${server.servlet.context-path}/job/** filters: @@ -85,7 +85,7 @@ spring: #用户服务 - id: epmet-user-server uri: @gateway.routes.epmet-user-server.uri@ - order: 7 + order: 8 predicates: - Path=${server.servlet.context-path}/epmetuser/** filters: @@ -93,7 +93,7 @@ spring: #demo流服务 - id: epmet-demo-server uri: @gateway.routes.epmet-demo-server.uri@ - order: 8 + order: 9 predicates: - Path=${server.servlet.context-path}/demo/** filters: @@ -101,7 +101,7 @@ spring: #运营端客户定制化服务 - id: oper-customize-server uri: @gateway.routes.oper-customize-server.uri@ - order: 9 + order: 10 predicates: - Path=${server.servlet.context-path}/oper/customize/** filters: @@ -109,7 +109,7 @@ spring: #运营端客户管理 - id: oper-crm-server uri: @gateway.routes.oper-crm-server.uri@ - order: 9 + order: 11 predicates: - Path=${server.servlet.context-path}/oper/crm/** filters: @@ -117,7 +117,7 @@ spring: #居民端陌生人导览 - id: resi-guide-server uri: @gateway.routes.resi-guide-server.uri@ - order: 10 + order: 12 predicates: - Path=${server.servlet.context-path}/resi/guide/** filters: @@ -125,7 +125,7 @@ spring: #政府端组织管理 - id: gov-org-server uri: @gateway.routes.gov-org-server.uri@ - order: 10 + order: 13 predicates: - Path=${server.servlet.context-path}/gov/org/** filters: diff --git a/epmet-module/epmet-message/pom.xml b/epmet-module/epmet-message/pom.xml index 6238a8b4d1..9610fd3def 100644 --- a/epmet-module/epmet-message/pom.xml +++ b/epmet-module/epmet-message/pom.xml @@ -4,10 +4,10 @@ 4.0.0 - com.epmet - epmet-module - 2.0.0 - + com.epmet + epmet-module + 2.0.0 + com.epmet epmet-message diff --git a/gov-org/gov-org-client/pom.xml b/epmet-module/gov-org/gov-org-client/pom.xml similarity index 100% rename from gov-org/gov-org-client/pom.xml rename to epmet-module/gov-org/gov-org-client/pom.xml diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java diff --git a/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml similarity index 98% rename from gov-org/gov-org-server/pom.xml rename to epmet-module/gov-org/gov-org-server/pom.xml index 4efa0331da..d750db2d37 100644 --- a/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -82,7 +82,7 @@ true - 8087 + 8092 dev @@ -112,7 +112,7 @@ true --> - 8087 + 8092 test diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/bootstrap.yml rename to epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml diff --git a/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/logback-spring.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml diff --git a/gov-org/pom.xml b/epmet-module/gov-org/pom.xml similarity index 93% rename from gov-org/pom.xml rename to epmet-module/gov-org/pom.xml index 55049442f5..0ef2ad2df6 100644 --- a/gov-org/pom.xml +++ b/epmet-module/gov-org/pom.xml @@ -5,7 +5,7 @@ com.epmet - epmet-cloud + epmet-module 2.0.0 diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 9aca2a1ae1..571b2fed2c 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -22,6 +22,7 @@ oper-customize oper-crm resi-guide + gov-org diff --git a/pom.xml b/pom.xml index d8ef348870..741f491b12 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ epmet-admin epmet-module epmet-user - gov-org From 97744844ed2d469b9f17b251054ef020c3ba039e Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 17 Mar 2020 14:14:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=8E=88=E6=9D=83/?= =?UTF-8?q?=E4=B8=8D=E6=8E=88=E6=9D=83=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/CustomerGridListQueryDTO.java | 37 ++++ .../dto/result/CustomerGridListResultDTO.java | 26 +++ .../epmet/controller/ResiGuideController.java | 39 +++++ .../epmet/dao/StrangerAccessRecordDao.java | 33 ++++ .../entity/StrangerAccessRecordEntity.java | 66 ++++++++ .../excel/StrangerAccessRecordExcel.java | 71 ++++++++ .../com/epmet/service/ResiGuideService.java | 16 ++ .../service/impl/ResiGuideServiceImpl.java | 29 ++++ .../src/main/resources/logback-spring.xml | 159 ++++++++++++++++++ .../mapper/StrangerAccessRecordDao.xml | 24 +++ 10 files changed, 500 insertions(+) create mode 100644 epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java create mode 100644 epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/CustomerGridListResultDTO.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java new file mode 100644 index 0000000000..9edd12b94f --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto;/** + * Created by 11 on 2020/3/17. + */ + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName CustomerGridListQueryDTO + * @Author wangc + * @date 2020.03.17 13:45 + */ +@Data +public class CustomerGridListQueryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + //token信息 + private String token; + + //期望分页页码 + private Integer pageNo; + + //每页数据量(默认20) + private Integer pageSize; + + + private String areaCode; + + + private String lelectedAreaCode; + + //是否首次位置授权(0:是 1:否) + private Integer isAuthorized; +} diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/CustomerGridListResultDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/CustomerGridListResultDTO.java new file mode 100644 index 0000000000..0ee73173ca --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/CustomerGridListResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.result;/** + * Created by 11 on 2020/3/17. + */ + +import java.io.Serializable; + +/** + * @Description + * @ClassName CustomerGridListResultDTO + * @Author wangc + * @date 2020.03.17 13:56 + */ +public class CustomerGridListResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + //网格Id epmet_gov_org.customer_gird.id + private String gridId; + + //客户Id epmet_gov_org.customer_gird.customer_id + private String customerId; + + //网格名称 epmet_gov_org.customer_gird.grid_name + private String gridName; + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java new file mode 100644 index 0000000000..9dc4f5c5b2 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java @@ -0,0 +1,39 @@ +package com.epmet.controller;/** + * Created by 11 on 2020/3/17. + */ + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.service.ResiGuideService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description + * @ClassName ResiGuideController + * @Author wangc + * @date 2020.03.17 11:33 + */ +@RestController +@RequestMapping("stranger") +public class ResiGuideController { + + @Autowired + private ResiGuideService resiGuideService; + + + @PostMapping() + Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ + return null; + } + + @PostMapping() + Result> getlelectcdcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ + return null; + } +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java new file mode 100644 index 0000000000..2a66e64424 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.StrangerAccessRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 陌生人访问记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-16 + */ +@Mapper +public interface StrangerAccessRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java new file mode 100644 index 0000000000..76965ff098 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java @@ -0,0 +1,66 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 陌生人访问记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("stranger_access_record") +public class StrangerAccessRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 定位地区编码 (用户允许获取位置) + */ + private String locationAreaCode; + + /** + * 选择地区编码 (用户选择地区位置 + */ + private String lelectedAreaCode; + + /** + * 是否首次位置授权(0:是 1:否) + */ + private Integer isAuthorized; + + /** + * 网格数 根据位置查询到的附近网格数 + */ + private Integer gridNumber; + + /** + * 访问时间 访问的当前时间 + */ + private Date visitTime; + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java new file mode 100644 index 0000000000..977f253ef3 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java @@ -0,0 +1,71 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 陌生人访问记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-16 + */ +@Data +public class StrangerAccessRecordExcel { + + @Excel(name = "唯一标识") + private String id; + + @Excel(name = "定位地区编码 (用户允许获取位置)") + private String locationAreaCode; + + @Excel(name = "选择地区编码 (用户选择地区位置") + private String lelectedAreaCode; + + @Excel(name = "是否首次位置授权(0:是 1:否)") + private Integer isAuthorized; + + @Excel(name = "网格数 根据位置查询到的附近网格数") + private Integer gridNumber; + + @Excel(name = "访问时间 访问的当前时间") + private Date visitTime; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java new file mode 100644 index 0000000000..26dd0af259 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java @@ -0,0 +1,16 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.entity.StrangerAccessRecordEntity; + +/** + * Created by 11 on 2020/3/17. + */ + +public interface ResiGuideService extends BaseService { + + PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO); +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java new file mode 100644 index 0000000000..5efc51dcb0 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java @@ -0,0 +1,29 @@ +package com.epmet.service.impl;/** + * Created by 11 on 2020/3/17. + */ + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dao.StrangerAccessRecordDao; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.entity.StrangerAccessRecordEntity; +import com.epmet.service.ResiGuideService; +import org.springframework.stereotype.Service; + +/** + * @Description + * @ClassName ResiGuideServiceImpl + * @Author wangc + * @date 2020.03.17 13:01 + */ +@Service +public class ResiGuideServiceImpl extends BaseServiceImpl implements ResiGuideService { + + + @Override + public PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) { + + return null; + } +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..6f0e508a90 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml new file mode 100644 index 0000000000..ca90b06034 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7db67f2594281148d3644e3a1e1dc0b558f2b54c Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 17 Mar 2020 15:35:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=8E=88=E6=9D=83/?= =?UTF-8?q?=E4=B8=8D=E6=8E=88=E6=9D=83=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerGridController.java | 5 +++ .../epmet/controller/ResiGuideController.java | 19 +++++--- .../com/epmet/feign/GovOrgFeignClient.java | 22 ++++++++++ .../epmet/feign/impl/GovOrgFeginFallBack.java | 29 +++++++++++++ .../com/epmet/service/ResiGuideService.java | 2 + .../service/impl/ResiGuideServiceImpl.java | 43 ++++++++++++++++++- 6 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index be74383365..46eba71b6f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -91,4 +91,9 @@ public class CustomerGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerGridExcel.class); } + @GetMapping("{areaCode}") + public Result queryListByOrder(@PathVariable("areaCode")String areaCode){ + + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java index 9dc4f5c5b2..a7ef911c89 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java @@ -27,13 +27,22 @@ public class ResiGuideController { private ResiGuideService resiGuideService; - @PostMapping() - Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ - return null; + @PostMapping("getlocationcustomergridlist") + Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ + Result> result = new Result<>(); + + //TODO..捕获异常 + + return result.ok(resiGuideService.ListCustomerGrid(queryParam)); + } - @PostMapping() + @PostMapping("getlelectcdcustomergridlist") Result> getlelectcdcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ - return null; + Result> result = new Result<>(); + + //TODO..捕获异常 + + return result.ok(resiGuideService.ListCustomerGrid(queryParam)); } } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..990e8fb5db --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,22 @@ +package com.epmet.feign; + + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.feign.impl.GovOrgFeginFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + + +/** + * Created by 11 on 2020/3/17. + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class) +public interface GovOrgFeignClient { + @PostMapping(value = "/gov/org/customergrid/{areaCode}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getPageForStrangerGuideInterface(@PathVariable("areaCode")String areaCode); +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java new file mode 100644 index 0000000000..286ce4e36c --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java @@ -0,0 +1,29 @@ +package com.epmet.feign.impl;/** + * Created by 11 on 2020/3/17. + */ + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Controller; + +/** + * @Description + * @ClassName GovOrgFeginFallBack + * @Author wangc + * @date 2020.03.17 14:29 + */ +@Component +public class GovOrgFeginFallBack implements GovOrgFeignClient { + + @Override + public Result> getPageForStrangerGuideInterface(String areaCode) { + + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListByAreaCodeOrderBy",areaCode); + } +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java index 26dd0af259..84e11a07da 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java @@ -13,4 +13,6 @@ import com.epmet.entity.StrangerAccessRecordEntity; public interface ResiGuideService extends BaseService { PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO); + + void save(StrangerAccessRecordEntity strangerAccessRecordEntity); } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java index 5efc51dcb0..f7b1b32f59 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java @@ -4,12 +4,19 @@ package com.epmet.service.impl;/** import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.StrangerAccessRecordDao; import com.epmet.dto.CustomerGridListQueryDTO; import com.epmet.dto.result.CustomerGridListResultDTO; import com.epmet.entity.StrangerAccessRecordEntity; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.ResiGuideService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; /** * @Description @@ -20,10 +27,44 @@ import org.springframework.stereotype.Service; @Service public class ResiGuideServiceImpl extends BaseServiceImpl implements ResiGuideService { + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override public PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) { - return null; + PageData queryResult = + govOrgFeignClient.getPageForStrangerGuideInterface(customerGridListQueryDTO); + if(null != queryResult.getList() && queryResult.getList().size() > 0){ + for(CustomerGridListResultDTO obj : queryResult.getList()){ + StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity(); + //未授权，手动选择 locationAreaCode + if(0 == customerGridListQueryDTO.getIsAuthorized()){ + strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getLelectedAreaCode()); + }else if( 1 == customerGridListQueryDTO.getIsAuthorized()){ + //已授权，自动选择 lelectedAreaCode + strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode()); + } + strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized()); + strangerTrance.setGridNumber(queryResult.getTotal()); + strangerTrance.setVisitTime(new Date()); + strangerTrance.setDelFlag("1"); + strangerTrance.setRevision(0); + strangerTrance.setCreatedBy("陌生人访客"); + strangerTrance.setCreatedTime(new Date()); + + insert(strangerTrance); + } + + } + + return queryResult; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(StrangerAccessRecordEntity strangerAccessRecordEntity) { + StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(strangerAccessRecordEntity, StrangerAccessRecordEntity.class); + insert(entity); } } From 65c26f2eed598533295542b76eca82ef0c59ec68 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 18 Mar 2020 18:00:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?authlogin=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-demo/epmet-demo-server/pom.xml | 6 +++++ .../com/epmet/controller/DemoController.java | 7 +++++- .../com/epmet/feign/GovOrgFeignClient.java | 25 +++++++++++++++++++ .../feign/impl/GovOrgFeignClientFallBack.java | 25 +++++++++++++++++++ .../java/com/epmet/service/DemoService.java | 2 ++ .../epmet/service/impl/DemoServiceImpl.java | 16 ++++++++++++ epmet-module/gov-org/gov-org-client/pom.xml | 2 +- .../java/com/epmet/GovOrgApplication.java | 4 +++ 8 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/GovOrgFeignClientFallBack.java diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index d331612129..8e5d67e67c 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -55,6 +55,12 @@ 2.0.0 compile + + com.epmet + gov-org-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index e3d1f43721..8ea90173df 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -32,7 +32,6 @@ import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.excel.DemoExcel; import com.epmet.service.DemoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -115,4 +114,10 @@ public class DemoController { ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); return demoService.saveCustomerInfo(dto); } + + @PostMapping("/testDemoToGov") + public String testDemoToGov(){ + + return demoService.testDemo2Gov(); + } } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..c955830654 --- /dev/null +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,25 @@ +package com.epmet.feign; + + + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.impl.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Created by 11 on 2020/3/18. + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url="http://localhost:8092") +public interface GovOrgFeignClient { + + + @GetMapping("gov/org/customergrid/page") + Result> page(); + + + +} diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/GovOrgFeignClientFallBack.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..eab629cec6 --- /dev/null +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/GovOrgFeignClientFallBack.java @@ -0,0 +1,25 @@ +package com.epmet.feign.impl;/** + * Created by 11 on 2020/3/18. + */ + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description + * @ClassName GovOrgFeignClientFallBack + * @Author wangc + * @date 2020.03.18 14:52 + */ +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient{ + @Override + public Result> page() { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "page"); + } +} diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java index ab5a997da0..a9331a78e7 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java @@ -104,4 +104,6 @@ public interface DemoService extends BaseService { Result queryCustomerInfo(String customerId); Result saveCustomerInfo(SaveCustomerFormDTO dto); + + String testDemo2Gov(); } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java index 9299b20ddd..a75132488b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java @@ -26,10 +26,12 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.DemoDao; import com.epmet.dto.CustomerDTO; +import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.DemoDTO; import com.epmet.dto.form.SaveCustomerFormDTO; import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.entity.DemoEntity; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.DemoRedis; import com.epmet.service.DemoService; @@ -58,6 +60,8 @@ public class DemoServiceImpl extends BaseServiceImpl implem private DemoRedis demoRedis; @Autowired private OperCrmFeignClient operCrmFeignClient; + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -147,4 +151,16 @@ public class DemoServiceImpl extends BaseServiceImpl implem return operCrmFeignClient.saveCustomerInfo(dto); } + @Override + public String testDemo2Gov() { + Result> testResult = + govOrgFeignClient.page(); + if(testResult.success()){ + return "成功了"; + }else{ + return "失败了"; + } + + } + } diff --git a/epmet-module/gov-org/gov-org-client/pom.xml b/epmet-module/gov-org/gov-org-client/pom.xml index 59518f86e2..e9c924f60d 100644 --- a/epmet-module/gov-org/gov-org-client/pom.xml +++ b/epmet-module/gov-org/gov-org-client/pom.xml @@ -10,7 +10,7 @@ gov-org-client - jar + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java index 7f1f254652..d4cafe7020 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java @@ -10,6 +10,8 @@ package com.epmet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @@ -18,6 +20,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @since 1.0.0 */ @SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients public class GovOrgApplication { public static void main(String[] args) { From 622a4de1ff08e679ffe6b0ed06f54d42cb991eb7 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 19 Mar 2020 12:24:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9A=E6=A0=B9=E6=8D=AE=E4=BD=8D=E7=BD=AE=E6=8E=88=E6=9D=83?= =?UTF-8?q?/=E4=B8=8D=E6=8E=88=E6=9D=83=E9=80=89=E5=AE=9A=E9=99=84?= =?UTF-8?q?=E8=BF=91=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF,=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A,=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 4 +- .../com/epmet/controller/DemoController.java | 5 -- .../CustomerGridForStangerResultDTO.java | 25 +++++- epmet-module/gov-org/gov-org-server/pom.xml | 5 ++ .../controller/CustomerGridController.java | 11 ++- .../java/com/epmet/dao/CustomerGridDao.java | 15 +++- .../com/epmet/exception/ModuleErrorCode.java | 17 +++- .../epmet/service/CustomerGridService.java | 9 +++ .../service/impl/CustomerGridServiceImpl.java | 53 ++++++++++++ .../main/resources/mapper/CustomerGridDao.xml | 32 ++++++++ .../epmet/dto/CustomerGridListQueryDTO.java | 47 ++++++++--- .../resi-guide/resi-guide-server/pom.xml | 5 ++ .../epmet/controller/ResiGuideController.java | 48 ----------- .../StrangerAccessRecordController.java | 53 ++++++++++++ .../entity/StrangerAccessRecordEntity.java | 8 +- .../com/epmet/feign/GovOrgFeignClient.java | 25 +++++- .../epmet/feign/impl/GovOrgFeginFallBack.java | 19 +++-- .../com/epmet/service/ResiGuideService.java | 18 ----- .../service/StrangerAccessRecordService.java | 21 +++++ .../service/impl/ResiGuideServiceImpl.java | 70 ---------------- .../impl/StrangerAccessRecordServiceImpl.java | 80 +++++++++++++++++++ .../mapper/StrangerAccessRecordDao.xml | 5 +- 22 files changed, 401 insertions(+), 174 deletions(-) delete mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java delete mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java delete mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index c255242999..3827af2249 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -130,7 +130,7 @@ http://localhost:8090 - + http://localhost:8091 @@ -183,7 +183,7 @@ lb://oper-crm-server - lb://resi-guid-server + lb://resi-guide-server lb://gov-org-server diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index a3d6bc7643..17810c525b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -155,9 +155,4 @@ public class DemoController { return demoService.saveCustomerInfo(dto); } - @PostMapping("/testDemoToGov") - public String testDemoToGov(){ - - return demoService.testDemo2Gov(); - } } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java index 79816d1714..2a8c4108d0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java @@ -2,11 +2,32 @@ package com.epmet.dto.result;/** * Created by 11 on 2020/3/19. */ +import lombok.Data; + +import java.io.Serializable; + /** - * @Description + * @Description 陌生人搜索网格返回结果 * @ClassName CustomerGridForStangerResultDTO * @Author wangc * @date 2020.03.19 00:38 */ -public class CustomerGridForStangerResultDTO { +@Data +public class CustomerGridForStangerResultDTO implements Serializable { + private static final long serialVersionUID = -1L; + + /** + * 网格ID + * */ + private String gridId; + + /** + * 客户ID + * */ + private String customerId; + + /** + * 网格名称 + * */ + private String gridName; } diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index dbdded2ad2..29225234d3 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -54,6 +54,11 @@ feign-httpclient 10.3.0 + + com.github.pagehelper + pagehelper + 5.0.1 + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 46eba71b6f..8e0a07fbfd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; import com.epmet.excel.CustomerGridExcel; import com.epmet.service.CustomerGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +62,7 @@ public class CustomerGridController { return new Result().ok(data); } - @PostMapping + @PostMapping("save") public Result save(@RequestBody CustomerGridDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -91,9 +92,11 @@ public class CustomerGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerGridExcel.class); } - @GetMapping("{areaCode}") - public Result queryListByOrder(@PathVariable("areaCode")String areaCode){ - return new Result(); + + @GetMapping("queryListForStrangerByOrder") + public Result> queryListForStrangerByOrder(@RequestParam("areaCode")String areaCode, @RequestParam("pageNo") Integer pageNo, Integer pageSize){ + + return customerGridService.ListGridForStrangerByOrder(areaCode, pageNo, pageSize); } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index f13389578a..90aaa87faa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; import com.epmet.entity.CustomerGridEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 客户网格表 @@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface CustomerGridDao extends BaseDao { - + + //查特定区的网格 + List selectGridByAreaCode(@Param("areaCode")String areaCode); + + //查整个城市的网格 + List selectGridByCityLike(@Param("areaCode")String areaCode); + + //指定区时查询当前城市下除该区之外其余的网格 + List selectRestGridWithoutGivenAreaCode(@Param("areaCode")String areaCode , @Param("cityCode")String cityCode); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java index 51f1d2cd38..dc2e3e93cc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java @@ -1,7 +1,20 @@ package com.epmet.exception; +import com.epmet.commons.tools.exception.ErrorCode; + /** - * Created by 11 on 2020/3/19. + * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码 + *

+ * 如：100001001（100001代表模块，001代表业务代码） + *

+ * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 */ -public interface ModuleErrorCode { +public interface ModuleErrorCode extends ErrorCode { + + int ARGS_NOT_ALLOW_NULL_ERROR = 100019001; + + int NOT_STANDARD_AREA_CODE_ERROR = 100019002; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index cdc050da2c..fb07d7d585 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -19,7 +19,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; import com.epmet.entity.CustomerGridEntity; import java.util.List; @@ -92,4 +94,11 @@ public interface CustomerGridService extends BaseService { * @date 2020-03-16 */ void delete(String[] ids); + + /** + * 陌生人查询附近网格数据 + * 不管传递的areaCode是市级还是县级，都查询整个城市的网格信息，需要特定的排序 + * + * */ + Result> ListGridForStrangerByOrder(String areaCode, Integer PageNo, Integer pageSize); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 2058bf4d79..9dc2a5f126 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -20,14 +20,19 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerGridDao; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; import com.epmet.entity.CustomerGridEntity; +import com.epmet.exception.ModuleErrorCode; import com.epmet.redis.CustomerGridRedis; import com.epmet.service.CustomerGridService; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -101,4 +106,52 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> ListGridForStrangerByOrder(String areaCode, Integer pageNo, Integer pageSize) { + + //判断areaCode是市级还是县级 + if(StringUtils.isBlank(areaCode)){ + throw new RenException(ModuleErrorCode.ARGS_NOT_ALLOW_NULL_ERROR,"地区码不能为空！"); + } + if(areaCode.length() != 6){ + throw new RenException(ModuleErrorCode.NOT_STANDARD_AREA_CODE_ERROR,"无法识别的地区码！"); + } + if(null == pageNo){ + throw new RenException(ModuleErrorCode.ARGS_NOT_ALLOW_NULL_ERROR,"页码不能为空！"); + } + if(null == pageSize || pageSize <= 0 || pageSize >=100){ + pageSize = 20; + } + + Result> result = new Result<>(); + + if(areaCode.endsWith("00")){ + //城市 - 查全部 + PageHelper.startPage(pageNo,pageSize); + List gridList + = baseDao.selectGridByCityLike(areaCode.substring(0,areaCode.length()-2)); + + result.setData(gridList); + result.setCode(0); + return result; + }else{ + //行政区 + List gridListArea + = baseDao.selectGridByAreaCode(areaCode); + List restGridListArea + = baseDao.selectRestGridWithoutGivenAreaCode(areaCode,areaCode.substring(0,areaCode.length()-2)); + for(CustomerGridForStangerResultDTO obj : restGridListArea){ + gridListArea.add(obj); + } + + //分页操作 + + result.setData(gridListArea); + result.setCode(0); + return result; + + } + + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 5765fffd44..cd1a2338f0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -22,5 +22,37 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java index 9edd12b94f..b51dd9e7bc 100644 --- a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java +++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java @@ -4,6 +4,8 @@ package com.epmet.dto;/** import lombok.Data; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -17,21 +19,46 @@ public class CustomerGridListQueryDTO implements Serializable { private static final long serialVersionUID = 1L; - //token信息 - private String token; - - //期望分页页码 + /** + * 当前页 + * */ + @Min(value = 1) private Integer pageNo; - //每页数据量(默认20) - private Integer pageSize; - + /** + * 每页数量 + * */ + private Integer pageSize = 20; + /** + * 地区码 + * */ private String areaCode; + /** + * 选定地区编码 + * */ + private String selectedAreaCode; - private String lelectedAreaCode; - - //是否首次位置授权(0:是 1:否) + /** + * 是否首次位置授权(0:是 1:否) + */ private Integer isAuthorized; + + /** + * 前端传递的省份 + * */ + @NotBlank(message = "省份信息不能为空") + private String province; + + /** + * 前端传递的城市 + * */ + @NotBlank(message = "城市信息不能为空") + private String city; + + /** + * 前端传递的地区 + * */ + private String area; } diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index d51420a810..721594d7d6 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -58,6 +58,11 @@ feign-httpclient 10.3.0 + + com.epmet + gov-org-client + 2.0.0 + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java deleted file mode 100644 index a7ef911c89..0000000000 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.epmet.controller;/** - * Created by 11 on 2020/3/17. - */ - -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerGridListQueryDTO; -import com.epmet.dto.result.CustomerGridListResultDTO; -import com.epmet.service.ResiGuideService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Description - * @ClassName ResiGuideController - * @Author wangc - * @date 2020.03.17 11:33 - */ -@RestController -@RequestMapping("stranger") -public class ResiGuideController { - - @Autowired - private ResiGuideService resiGuideService; - - - @PostMapping("getlocationcustomergridlist") - Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ - Result> result = new Result<>(); - - //TODO..捕获异常 - - return result.ok(resiGuideService.ListCustomerGrid(queryParam)); - - } - - @PostMapping("getlelectcdcustomergridlist") - Result> getlelectcdcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ - Result> result = new Result<>(); - - //TODO..捕获异常 - - return result.ok(resiGuideService.ListCustomerGrid(queryParam)); - } -} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java new file mode 100644 index 0000000000..aef1f145ba --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java @@ -0,0 +1,53 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; +import com.epmet.service.StrangerAccessRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Description + * @ClassName StrangerAccessRecordController + * @Author wangc + * @date 2020.03.17 11:33 + */ +@RestController +@RequestMapping("stranger") +public class StrangerAccessRecordController { + + @Autowired + private StrangerAccessRecordService strangerAccessRecordService; + + + /** + * 陌生访客授权位置获取附近网格数据 + * + * */ + @PostMapping("getlocationcustomergridlist") + Result> getLocationCustomerGridList(@RequestBody CustomerGridListQueryDTO customerGridListQueryDTO){ + + ValidatorUtils.validateEntity(customerGridListQueryDTO); + + return new Result>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO)); + + } + /** + * 陌生访客自动选定位置获取附近网格数据 + * + * */ + @PostMapping("getselectcdcustomergridlist") + Result> getSelectcdCustomerGridList(@RequestBody CustomerGridListQueryDTO customerGridListQueryDTO){ + + ValidatorUtils.validateEntity(customerGridListQueryDTO); + + return new Result>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO)); + } +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java index 76965ff098..f707fd0b25 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java @@ -46,7 +46,7 @@ public class StrangerAccessRecordEntity extends BaseEpmetEntity { /** * 选择地区编码 (用户选择地区位置 */ - private String lelectedAreaCode; + private String selectedAreaCode; /** * 是否首次位置授权(0:是 1:否) @@ -63,4 +63,10 @@ public class StrangerAccessRecordEntity extends BaseEpmetEntity { */ private Date visitTime; + private String province; + + private String city; + + private String area; + } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 990e8fb5db..fe9f1d879b 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -4,19 +4,38 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; import com.epmet.dto.result.CustomerGridListResultDTO; import com.epmet.feign.impl.GovOrgFeginFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; /** + * Feign调用gov-org-server模块 * Created by 11 on 2020/3/17. */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class, url="http://localhost:8092") public interface GovOrgFeignClient { - @PostMapping(value = "/gov/org/customergrid/{areaCode}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result> getPageForStrangerGuideInterface(@PathVariable("areaCode")String areaCode); + + /** + * 根据地区编码获取附近网格数据 + * @Param areaCode 地区编码 + * @Param pageNo 当前页 + * @Param pageSize 每页数据量 + * */ + @GetMapping("/gov/org/customergrid/queryListForStrangerByOrder") + Result> getPageForStrangerGuideInterface(@RequestParam("areaCode")String areaCode, @RequestParam("pageNo")Integer pageNo, @RequestParam("pageSize")Integer pageSize); + + + + + } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java index 286ce4e36c..2018edd626 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java @@ -3,14 +3,14 @@ package com.epmet.feign.impl;/** */ import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerGridListQueryDTO; -import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; import com.epmet.feign.GovOrgFeignClient; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Controller; + + +import java.util.List; /** * @Description @@ -21,9 +21,14 @@ import org.springframework.stereotype.Controller; @Component public class GovOrgFeginFallBack implements GovOrgFeignClient { + /** + * 根据地区编码获取附近网格数据 + * @Param areaCode 地区编码 + * @Param pageNo 当前页 + * @Param pageSize 每页数据量 + * */ @Override - public Result> getPageForStrangerGuideInterface(String areaCode) { - - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListByAreaCodeOrderBy",areaCode); + public Result> getPageForStrangerGuideInterface(String areaCode, Integer pageNo, Integer pageSize) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",areaCode,pageNo,pageSize); } } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java deleted file mode 100644 index 84e11a07da..0000000000 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.CustomerGridListQueryDTO; -import com.epmet.dto.result.CustomerGridListResultDTO; -import com.epmet.entity.StrangerAccessRecordEntity; - -/** - * Created by 11 on 2020/3/17. - */ - -public interface ResiGuideService extends BaseService { - - PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO); - - void save(StrangerAccessRecordEntity strangerAccessRecordEntity); -} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java new file mode 100644 index 0000000000..956682fc98 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java @@ -0,0 +1,21 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; +import com.epmet.entity.StrangerAccessRecordEntity; + +import java.util.List; + +/** + * Created by 11 on 2020/3/17. + */ + +public interface StrangerAccessRecordService extends BaseService { + + /** + * + * 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录 + * */ + List ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO); +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java deleted file mode 100644 index f7b1b32f59..0000000000 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.epmet.service.impl;/** - * Created by 11 on 2020/3/17. - */ - -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.StrangerAccessRecordDao; -import com.epmet.dto.CustomerGridListQueryDTO; -import com.epmet.dto.result.CustomerGridListResultDTO; -import com.epmet.entity.StrangerAccessRecordEntity; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.service.ResiGuideService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; - -/** - * @Description - * @ClassName ResiGuideServiceImpl - * @Author wangc - * @date 2020.03.17 13:01 - */ -@Service -public class ResiGuideServiceImpl extends BaseServiceImpl implements ResiGuideService { - - @Autowired - private GovOrgFeignClient govOrgFeignClient; - - @Override - public PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) { - - PageData queryResult = - govOrgFeignClient.getPageForStrangerGuideInterface(customerGridListQueryDTO); - if(null != queryResult.getList() && queryResult.getList().size() > 0){ - for(CustomerGridListResultDTO obj : queryResult.getList()){ - StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity(); - //未授权，手动选择 locationAreaCode - if(0 == customerGridListQueryDTO.getIsAuthorized()){ - strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getLelectedAreaCode()); - }else if( 1 == customerGridListQueryDTO.getIsAuthorized()){ - //已授权，自动选择 lelectedAreaCode - strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode()); - } - strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized()); - strangerTrance.setGridNumber(queryResult.getTotal()); - strangerTrance.setVisitTime(new Date()); - strangerTrance.setDelFlag("1"); - strangerTrance.setRevision(0); - strangerTrance.setCreatedBy("陌生人访客"); - strangerTrance.setCreatedTime(new Date()); - - insert(strangerTrance); - } - - } - - return queryResult; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(StrangerAccessRecordEntity strangerAccessRecordEntity) { - StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(strangerAccessRecordEntity, StrangerAccessRecordEntity.class); - insert(entity); - } -} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java new file mode 100644 index 0000000000..00d779cfad --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -0,0 +1,80 @@ +package com.epmet.service.impl;/** + * Created by 11 on 2020/3/17. + */ + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.StrangerAccessRecordDao; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridForStangerResultDTO; +import com.epmet.entity.StrangerAccessRecordEntity; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.service.StrangerAccessRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * @Description + * @ClassName ResiGuideServiceImpl + * @Author wangc + * @date 2020.03.17 13:01 + */ +@Service +public class StrangerAccessRecordServiceImpl extends BaseServiceImpl implements StrangerAccessRecordService { + + @Autowired + private GovOrgFeignClient govOrgFeignClient; + + /** + * + * 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录 + * */ + @Override + public List ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) { + + Result> queryResult = + govOrgFeignClient + .getPageForStrangerGuideInterface(customerGridListQueryDTO.getAreaCode(),customerGridListQueryDTO.getPageNo(),customerGridListQueryDTO.getPageSize()); + if(0 == queryResult.getCode()) { + + + List queryList = queryResult.getData(); + if (null != queryResult && queryList.size() > 0) { + StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity(); + //未授权，手动选择 locationAreaCode + if (0 == customerGridListQueryDTO.getIsAuthorized()) { + strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getSelectedAreaCode()); + } else if (1 == customerGridListQueryDTO.getIsAuthorized()) { + //已授权，自动选择 selectedAreaCode + strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode()); + } + strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized()); + strangerTrance.setGridNumber(queryList.size()); + strangerTrance.setVisitTime(new Date()); + strangerTrance.setDelFlag("1"); + strangerTrance.setRevision(0); + strangerTrance.setCreatedBy("陌生人访客"); + strangerTrance.setCreatedTime(new Date()); + strangerTrance.setProvince(customerGridListQueryDTO.getProvince()); + strangerTrance.setCity(customerGridListQueryDTO.getCity()); + strangerTrance.setArea(customerGridListQueryDTO.getArea()); + insert(strangerTrance); + + return queryList; + } else { + + return null; + } + }else{ + return null; + } + + + } + + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml index ca90b06034..84434a743a 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml @@ -6,7 +6,7 @@ - + @@ -16,6 +16,9 @@ + + +