From 44415109d57e11ebb10aa275289cfc6893fbe9d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 27 Apr 2020 13:07:28 +0800 Subject: [PATCH 01/17] =?UTF-8?q?user,govorg=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index 5e17e279db..25761f4458 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.8 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 4854e648d9..0b163e1d1a 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.7 + 0.3.8 com.epmet gov-org diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 12dee46098..2d1edbff2b 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.5 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.6 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index dfa4b9f1c0..c1773add7f 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.5 + 0.3.6 com.epmet epmet-user From 40980527f66e1ee4df73ea96794d732f903529af Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Mon, 27 Apr 2020 13:29:35 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/CertifiedResultDTO.java | 15 +++++++++++++ .../epmet/service/ResiPartyMemberService.java | 3 +-- .../result/CertifiedResultDTO.java | 15 +++++++++++++ .../mapper/partymember/PartymemberInfoDao.xml | 21 ++++++++++++------- .../epmet/dto/result/CertifiedResultDTO.java | 15 +++++++++++++ 5 files changed, 59 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java index f7540d8b0b..db42fbe84d 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java @@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable { */ private String gridFullPath; + /** + * 党员认证信息表id + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index 7efe7528f3..0d274382e6 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -1,12 +1,10 @@ package com.epmet.service; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import com.epmet.dto.result.AuditedPartyMemberResultDTO; @@ -36,6 +34,7 @@ public interface ResiPartyMemberService { * @Date 2020/4/26 23:32 **/ Result> audited(AuditedPartyMemberFormDTO formDTO); + /** * * @Description 获取已认证党员 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java index 9e5568441b..1c4dddc50c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java @@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable { */ private String gridFullPath; + /** + * 党员认证信息表id + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index ca2314e514..b30353f09d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -61,16 +61,21 @@ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java index f7540d8b0b..db42fbe84d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java @@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable { */ private String gridFullPath; + /** + * 党员认证信息表id + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + } From 3f3d7de1d30626f55f5e33e426748d9666d65235 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Mon, 27 Apr 2020 14:21:13 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerGridDao.java | 2 +- .../com/epmet/service/impl/CustomerGridServiceImpl.java | 6 +++--- .../src/main/resources/mapper/CustomerGridDao.xml | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) 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 37e60a010a..7e4219012e 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 @@ -123,7 +123,7 @@ public interface CustomerGridDao extends BaseDao { * @param gridName * @return */ - String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid); + String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid,@Param("gridId")String gridId); /** * 编辑网格信息 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 b5a83ee724..cb544cba9f 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 @@ -202,7 +202,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) { - String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId()); + String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null); if (checkGridName!=null){ return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode()); } @@ -217,7 +217,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl().ok(addGridResultDTO); @@ -231,7 +231,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl + AND id != #{gridId} + AND del_flag = 0 From 929f7c5e04d33230e2fe69cf274ba8d72f692c7e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 27 Apr 2020 15:52:21 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=AE=A4=E8=AF=81=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- .../controller/ResiPartyMemberController.java | 55 +++++ .../feign/ResiPartymemberFeignClient.java | 45 +++- .../ResiPartymemberFeignClientFallBack.java | 26 ++- .../epmet/service/ResiPartyMemberService.java | 43 ++++ .../impl/ResiPartyMemberServiceImpl.java | 26 ++- .../service/impl/PartyMemberServiceImpl.java | 5 + .../form/AuditingDetailFromDTO.java | 29 +++ .../form/AutoFailedDetailFromDTO.java | 24 ++ .../form/PartyMemberConfirmFromDTO.java | 39 ++++ .../form/RejectedDetailFromDTO.java | 29 +++ .../partymember/result/AdditionalInfoDTO.java | 32 +++ .../result/AuditingDetailResultDTO.java | 65 ++++++ .../result/AutoFailedDetailResultDTO.java | 49 ++++ .../result/RejectedDetailResultDTO.java | 66 ++++++ .../epmet/constant/PartyMemberConstant.java | 12 +- .../PartyMemberConfirmController.java | 53 +++++ .../PartymemberConfirmManualEntity.java | 5 + .../service/PartyMemberConfirmService.java | 38 +++ .../impl/PartyMemberConfirmServiceImpl.java | 217 +++++++++++++++++- .../PartymemberConfirmManualServiceImpl.java | 5 +- .../mapper/partymember/PartymemberInfoDao.xml | 4 +- 23 files changed, 846 insertions(+), 24 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 5dbc9f0cf2..948e607ed1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -26,6 +26,7 @@ public enum EpmetErrorCode { MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"), MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), NOT_DEL_GRID(8106,"该网格存在工作人员，不允许删除"), + ORG_IS_NOT_NULL(8107,"党组织关系不能为空"), CANNOT_AUDIT_WARM(8201, "请完善居民信息"), NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"), diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 965969714d..a784496cac 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -102,7 +102,7 @@ 0 - 127.0.0.1 + 192.168.1.130 6379 123456 diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index 18e000ed9a..de92cc128b 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -9,6 +9,13 @@ import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import com.epmet.service.ResiPartyMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -65,6 +72,54 @@ public class ResiPartyMemberController { public Result> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){ return resiPartyMemberService.certifiedList(certifiedFormDTO); } + + /** + * 审核党员 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("audit") + public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) { + return resiPartyMemberService.manualConfirmResult(fromDTO); + } + + /** + * 待审核详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("auditingdetail") + public Result auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) { + return resiPartyMemberService.auditingDetail(fromDTO); + } + + /** + * 自动审核失败详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("auditingdetail") + public Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) { + return resiPartyMemberService.autoFailedDetail(fromDTO); + } + + /** + * 拒绝详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("rejecteddetail") + public Result rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO) { + return resiPartyMemberService.rejectedDetail(fromDTO); + } } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java index c26f3978e6..25b586513b 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -5,10 +5,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; -import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO; -import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO; -import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.*; +import com.epmet.resi.partymember.dto.partymember.result.*; import com.epmet.resi.partymember.dto.warmhearted.form.*; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; @@ -99,4 +97,43 @@ public interface ResiPartymemberFeignClient { @PostMapping(value = "/resi/partymember/partymemberinfo/certified") Result> certified(@RequestBody CertifiedFormDTO certifiedFormDTO); + /** + * 审核党员 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/audit") + Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO); + + /** + * 待审核详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/auditingdetail") + Result auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO); + /** + * 自动审核失败详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/auditingdetail") + Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO); + + /** + * 拒绝详情 + * + * @param fromDTO 参数 + * @return Result + * @author zhaoqifeng + */ + @PostMapping("/resi/partymember/confirm/rejecteddetail") + Result rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO); + } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java index 81621574bd..aedb5b3d0e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -6,10 +6,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.ResiPartymemberFeignClient; -import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO; -import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO; -import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.*; +import com.epmet.resi.partymember.dto.partymember.result.*; import com.epmet.resi.partymember.dto.warmhearted.form.*; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; @@ -64,4 +62,24 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO); } + @Override + public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manualConfirmResult", fromDTO); + } + + @Override + public Result auditingDetail(AuditingDetailFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "auditingDetail", fromDTO); + } + + @Override + public Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoFailedDetail", fromDTO); + } + + @Override + public Result rejectedDetail(RejectedDetailFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "rejectedDetail", fromDTO); + } + } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index 0d274382e6..93512bde0e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -9,6 +9,13 @@ import com.epmet.dto.result.CertifiedResultDTO; import java.util.List; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import java.util.List; @@ -44,4 +51,40 @@ public interface ResiPartyMemberService { * @CreatedTime 2020/4/26 16:18 */ Result> certifiedList(CertifiedFormDTO certifiedFormDTO); + + /** + * 人工审核结果 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO); + + /** + * 待审核详情 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result auditingDetail(AuditingDetailFromDTO fromDTO); + + /** + * 自动审核失败详情 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO); + + /** + * 拒绝详情 + * + * @param fromDTO + * @return + * @author zhaoqifeng + */ + Result rejectedDetail(RejectedDetailFromDTO fromDTO); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java index 2345960135..a97b886619 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java @@ -12,10 +12,8 @@ import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; import com.epmet.feign.ResiPartymemberFeignClient; -import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO; -import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO; -import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.form.*; +import com.epmet.resi.partymember.dto.partymember.result.*; import com.epmet.service.ResiPartyMemberService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,5 +82,25 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService { public Result> certifiedList(CertifiedFormDTO certifiedFormDTO) { return resiPartymemberFeignClient.certified(certifiedFormDTO); } + + @Override + public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { + return resiPartymemberFeignClient.manualConfirmResult(fromDTO); + } + + @Override + public Result auditingDetail(AuditingDetailFromDTO fromDTO) { + return resiPartymemberFeignClient.auditingDetail(fromDTO); + } + + @Override + public Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO) { + return resiPartymemberFeignClient.autoFailedDetail(fromDTO); + } + + @Override + public Result rejectedDetail(RejectedDetailFromDTO fromDTO) { + return resiPartymemberFeignClient.rejectedDetail(fromDTO); + } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java index eb13aa4bd1..447055431a 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.modules.partymember.service.impl; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.feign.ResiPartymemberFeignClient; @@ -9,6 +10,7 @@ import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import org.apache.poi.ss.formula.constant.ErrorConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +51,9 @@ public class PartyMemberServiceImpl implements PartyMemberService { @Override public Result partyMemberInfoExtra(TokenDto tokenDto, PartyMemberSubmitFromDTO fromDTO) { PartymemberInfoDTO partyMemberInfo = fromDTO.getPartyMemberInfo(); + if (null == partyMemberInfo.getExtraOrganization() || partyMemberInfo.getExtraOrganization().isEmpty()) { + return new Result().error(EpmetErrorCode.ORG_IS_NOT_NULL.getCode(), EpmetErrorCode.ORG_IS_NOT_NULL.getMsg()); + } partyMemberInfo.setCustomerId(fromDTO.getCustomerId()); partyMemberInfo.setGridId(fromDTO.getGridId()); partyMemberInfo.setUserId(tokenDto.getUserId()); diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java new file mode 100644 index 0000000000..387c68772c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AuditingDetailFromDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 13:48 + */ +@Data +public class AuditingDetailFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java new file mode 100644 index 0000000000..f1f438117e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/AutoFailedDetailFromDTO.java @@ -0,0 +1,24 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 14:48 + */ +@Data +public class AutoFailedDetailFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java new file mode 100644 index 0000000000..a530da6850 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberConfirmFromDTO.java @@ -0,0 +1,39 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/10 11:11 + */ +@Data +public class PartyMemberConfirmFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + + /** + * 审核状态 yes,no + */ + private String partyMemberFlag; + + /** + * 审核理由 + */ + private String reason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java new file mode 100644 index 0000000000..5b8f84da86 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/RejectedDetailFromDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 15:16 + */ +@Data +public class RejectedDetailFromDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息表ID + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java new file mode 100644 index 0000000000..b6a981f6d0 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AdditionalInfoDTO.java @@ -0,0 +1,32 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 13:52 + */ +@Data +public class AdditionalInfoDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 工作单位或所属街道 + */ + private String extraOrganization; + /** + * 联系人 + */ + private String contactPeople; + /** + * 联系方式 + */ + private String contactMobile; + /** + * 自动审核失败原因 + */ + private List failedReason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java new file mode 100644 index 0000000000..a86ee343bb --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AuditingDetailResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 13:50 + */ +@NoArgsConstructor +@Data +public class AuditingDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党员认证信息ID + */ + private String partyMemberId; + /** + * 党员自动审核ID + */ + private String autoId; + /** + * 党员人工审核ID + */ + private String manualId; + /** + * 居民id + */ + private String userId; + /** + * 真实姓名 + */ + private String realName; + /** + * 联系方式 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 提交网格：XXX街道-XXX社区-XXX网格 + */ + private String gridFullPath; + /** + * 居民住址 + */ + private String address; + /** + * 提交认证时间 + */ + private Long certifyTime; + + /** + * 补充信息 + */ + private AdditionalInfoDTO additionalInfo; + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java new file mode 100644 index 0000000000..7000c5f240 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AutoFailedDetailResultDTO.java @@ -0,0 +1,49 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 14:49 + */ +@NoArgsConstructor +@Data +public class AutoFailedDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 居民ID + */ + private String userId; + /** + * 姓名 + */ + private String realName; + /** + * 联系方式 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 提交网格 + */ + private String gridFullPath; + /** + * 居住地址 + */ + private String address; + /** + * 提交时间 + */ + private Long certifyTime; + /** + * 自动审核失败原因以逗号隔开 + */ + private String failedReason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java new file mode 100644 index 0000000000..275490c991 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/RejectedDetailResultDTO.java @@ -0,0 +1,66 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/27 15:17 + */ +@NoArgsConstructor +@Data +public class RejectedDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 居民ID + */ + private String userId; + /** + * 姓名 + */ + private String realName; + /** + * 联系方式 + */ + private String mobile; + /** + * 身份证号 + */ + private String idCard; + /** + * 提交网格XXX街道-XXX社区-XXX网格 + */ + private String gridFullPath; + /** + * 居住地址 + */ + private String address; + /** + * 提交认证时间 + */ + private Long certifyTime; + /** + * 拒绝理由 + */ + private String rejectedReason; + /** + * 工作单位/所属街道 + */ + private String extraOrganization; + /** + * 联系人 + */ + private String contactPeople; + /** + * 联系方式 + */ + private String contactMobile; + /** + * 自动审核失败的原因 + */ + private String failedReason; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index d73c5178bc..bb0795b43b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -122,17 +122,17 @@ public interface PartyMemberConstant { String ALL = "all"; /** - * 认证成功 + * 居民端 */ - String CONFIRM_SUCCESS = "0"; + String RESI = "resi"; /** - * 认证失败 + * 未读 */ - String CONFIRM_FAILED = "1"; + String UNREAD = "unread"; /** - * 居民端 + * 已读 */ - String RESI = "resi"; + String READ = "read"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java index 22be95f523..63dde1c984 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java @@ -5,7 +5,15 @@ import com.epmet.modules.partymember.service.PartyMemberConfirmService; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; +import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -71,4 +79,49 @@ public class PartyMemberConfirmController { public Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO) { return partyMemberConfirmService.partyMemberInfoExtra(partyMemberInfoDTO); } + + /** + * 审核党员 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("audit") + public Result manualConfirmResult(@RequestBody PartyMemberConfirmFromDTO fromDTO) { + return partyMemberConfirmService.manualConfirmResult(fromDTO); + } + + /** + * 待审核详情 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("auditingdetail") + public Result auditingDetail(@RequestBody AuditingDetailFromDTO fromDTO) { + return partyMemberConfirmService.auditingDetail(fromDTO); + } + + /** + * 自动审核失败详情 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("auditingdetail") + public Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) { + return partyMemberConfirmService.autoFailedDetail(fromDTO); + } + + /** + * 拒绝详情 + * + * @param fromDTO 参数 + * @return Result + */ + @PostMapping("rejecteddetail") + public Result rejectedDetail(@RequestBody RejectedDetailFromDTO fromDTO) { + return partyMemberConfirmService.rejectedDetail(fromDTO); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java index 8b65fc2930..6be68841fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberConfirmManualEntity.java @@ -68,4 +68,9 @@ public class PartymemberConfirmManualEntity extends BaseEpmetEntity { */ private String refuseReason; + /** + * 是否已读 未读:unread 已读:read + */ + private String readFlag; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java index feee93b3cc..e2644fb607 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java @@ -4,7 +4,15 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; +import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; /** * 党员认证 @@ -46,5 +54,35 @@ public interface PartyMemberConfirmService { */ Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO); + /** + * 人工审核结果 + * + * @param fromDTO + * @return + */ + Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO); + + /** + * 待审核详情 + * + * @param fromDTO + * @return + */ + Result auditingDetail(AuditingDetailFromDTO fromDTO); + /** + * 自动审核失败详情 + * + * @param fromDTO + * @return + */ + Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO); + + /** + * 拒绝详情 + * + * @param fromDTO + * @return + */ + Result rejectedDetail(RejectedDetailFromDTO fromDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 28959478c1..d5e6be5621 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -8,9 +8,11 @@ import com.epmet.constant.PartyMemberConstant; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -20,12 +22,22 @@ import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; +import com.epmet.resi.partymember.dto.partymember.form.RejectedDetailFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.AdditionalInfoDTO; +import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -56,6 +68,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private PartymemberRegisterRelationService partymemberRegisterRelationService; @Autowired private EpmetMessageFeignClient messageFeignClient; + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override @Transactional(rollbackFor = Exception.class) @@ -158,7 +172,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //自动认证失败 - partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.AUTO_CONFIRM_FAILED); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { @@ -172,7 +186,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); //自动认证成功 - partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS); + partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.AUTO_CONFIRM_SUCCESS); if (partyMemberInfoEntity.getId().isEmpty()) { partymemberInfoService.insert(partyMemberInfoEntity); } else { @@ -242,6 +256,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService manualEntity.setUserId(infoDTO.getUserId()); manualEntity.setPartymemberInfoId(infoDTO.getId()); manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); + manualEntity.setReadFlag(PartyMemberConstant.UNREAD); partymemberConfirmManualService.insert(manualEntity); } @@ -249,6 +264,204 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return new Result(); } + @Override + public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { + PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); + PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + partyMemberInfoEntity.setId(manualEntity.getPartymemberInfoId()); + partyMemberInfoEntity.setConfirmResult(fromDTO.getPartyMemberFlag()); + + partymemberInfoService.updateById(partyMemberInfoEntity); + + manualEntity.setAuditStatus(fromDTO.getPartyMemberFlag()); + manualEntity.setRefuseReason(fromDTO.getReason()); + partymemberConfirmManualService.updateById(manualEntity); + + if (PartyMemberConstant.APPROVED.equals(fromDTO.getPartyMemberFlag())) { + //添加用户党员角色关系 + UserRoleDTO userRole = new UserRoleDTO(); + userRole.setCustomerId(partyMemberInfoEntity.getCustomerId()); + userRole.setGridId(PartyMemberConstant.ALL); + userRole.setUserId(partyMemberInfoEntity.getUserId()); + userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER); + userRole.setApp(PartyMemberConstant.RESI); + epmetUserFeignClient.saveUserRole(userRole); + //存入党员注册关系表 用于统计客户网格的认证党员数 + saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity, + PartymemberInfoDTO.class)); + } + + return new Result(); + } + + @Override + public Result auditingDetail(AuditingDetailFromDTO fromDTO) { + AuditingDetailResultDTO resultDTO = new AuditingDetailResultDTO(); + AdditionalInfoDTO additionalInfoDTO = new AdditionalInfoDTO(); + resultDTO.setPartyMemberId(fromDTO.getPartyMemberId()); + resultDTO.setAutoId(fromDTO.getAutoId()); + resultDTO.setManualId(fromDTO.getManualId()); + + //获取人工审核信息 + PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); + //人工审核信息设为已读 + manualEntity.setReadFlag(PartyMemberConstant.READ); + partymemberConfirmManualService.updateById(manualEntity); + + //获取党员认证信息 + PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + resultDTO.setUserId(partyMemberInfoEntity.getUserId()); + resultDTO.setRealName(partyMemberInfoEntity.getSurname() + partyMemberInfoEntity.getName()); + resultDTO.setIdCard(partyMemberInfoEntity.getIdCard()); + resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setAddress(partyMemberInfoEntity.getStreet() + partyMemberInfoEntity.getEstate() + partyMemberInfoEntity.getBuilding()); + resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()); + + //获取党员自动认证信息 + List failedReason = new ArrayList<>(); + + if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { + PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); + if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { + failedReason.add("手机号匹配"); + } else { + failedReason.add("手机号未匹配"); + } + if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { + failedReason.add("身份证匹配"); + } else { + failedReason.add("身份证未匹配"); + } + if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { + failedReason.add("姓名匹配"); + } else { + failedReason.add("姓名未匹配"); + } + } else { + failedReason.add("手机号未匹配"); + failedReason.add("身份证未匹配"); + failedReason.add("姓名未匹配"); + } + //补充信息 + additionalInfoDTO.setExtraOrganization(partyMemberInfoEntity.getExtraOrganization()); + additionalInfoDTO.setContactMobile(partyMemberInfoEntity.getExtraCertifierMobile() == null ? "" : partyMemberInfoEntity.getExtraCertifierMobile()); + additionalInfoDTO.setContactPeople(partyMemberInfoEntity.getExtraCertifierName() == null ? "" : partyMemberInfoEntity.getExtraCertifierName()); + additionalInfoDTO.setFailedReason(failedReason); + resultDTO.setAdditionalInfo(additionalInfoDTO); + //查询网格信息 + Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfoEntity.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } + resultDTO.setGridFullPath(gridFullPath); + + return new Result().ok(resultDTO); + } + + @Override + public Result autoFailedDetail(AutoFailedDetailFromDTO fromDTO) { + AutoFailedDetailResultDTO resultDTO = new AutoFailedDetailResultDTO(); + //获取党员认证信息 + PartymemberInfoEntity partyMemberInfo = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + resultDTO.setUserId(partyMemberInfo.getUserId()); + resultDTO.setRealName(partyMemberInfo.getSurname() + partyMemberInfo.getName()); + resultDTO.setIdCard(partyMemberInfo.getIdCard()); + resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); + String failedReason = ""; + if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { + PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); + resultDTO.setCertifyTime(autoEntity.getContrastTime().getTime()); + if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { + failedReason = failedReason + "手机号匹配,"; + } else { + failedReason = failedReason + "手机号未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { + failedReason = failedReason + "身份证匹配,"; + } else { + failedReason = failedReason + "身份证未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { + failedReason = failedReason + "姓名匹配"; + } else { + failedReason = failedReason + "姓名未匹配"; + } + } else { + failedReason = "手机号未匹配,身份证未匹配，姓名未匹配"; + resultDTO.setCertifyTime(partyMemberInfo.getUpdatedTime().getTime()); + } + resultDTO.setFailedReason(failedReason); + //查询网格信息 + Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } + resultDTO.setGridFullPath(gridFullPath); + + return new Result().ok(resultDTO); + } + + @Override + public Result rejectedDetail(RejectedDetailFromDTO fromDTO) { + RejectedDetailResultDTO resultDTO = new RejectedDetailResultDTO(); + //获取党员认证信息 + PartymemberInfoEntity partyMemberInfo = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); + resultDTO.setUserId(partyMemberInfo.getUserId()); + resultDTO.setRealName(partyMemberInfo.getSurname() + partyMemberInfo.getName()); + resultDTO.setIdCard(partyMemberInfo.getIdCard()); + resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); + resultDTO.setExtraOrganization(partyMemberInfo.getExtraOrganization()); + resultDTO.setContactMobile(partyMemberInfo.getExtraCertifierMobile() == null ? "" : partyMemberInfo.getExtraCertifierMobile()); + resultDTO.setContactPeople(partyMemberInfo.getExtraCertifierName() == null ? "" : partyMemberInfo.getExtraCertifierName()); + String failedReason =""; + if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { + PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId()); + if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) { + failedReason = failedReason + "手机号匹配,"; + } else { + failedReason = failedReason + "手机号未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) { + failedReason = failedReason + "身份证匹配,"; + } else { + failedReason = failedReason + "身份证未匹配,"; + } + if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) { + failedReason = failedReason + "姓名匹配"; + } else { + failedReason = failedReason + "姓名未匹配"; + } + } else { + failedReason = "手机号未匹配,身份证未匹配，姓名未匹配"; + } + resultDTO.setFailedReason(failedReason); + //获取人工审核信息 + PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); + resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()); + resultDTO.setFailedReason(manualEntity.getRefuseReason()); + //查询网格信息 + Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } + resultDTO.setGridFullPath(gridFullPath); + return new Result().ok(resultDTO); + } + /** * 判断是否已注册居民，如果没有则注册居民 * diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java index 926218c9ef..184ed1e49f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.PartyMemberConstant; import com.epmet.modules.partymember.dao.PartymemberConfirmManualDao; import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity; import com.epmet.modules.partymember.redis.PartymemberConfirmManualRedis; @@ -104,7 +105,9 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId); + wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId) + .eq("AUDIT_STATUS", PartyMemberConstant.UNDER_AUDITTING); + PartymemberConfirmManualEntity entity = baseDao.selectOne(wrapper); return ConvertUtils.sourceToTarget(entity, PartymemberConfirmManualDTO.class); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index b30353f09d..3e6a3b68d4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -40,7 +40,7 @@ pi.CUSTOMER_ID = #{customerId} AND pi.GRID_ID = #{gridId} AND pi.USER_ID = #{userId} - AND pi.CONFIRM_RESULT = '1' + AND pi.CONFIRM_RESULT = 'auto_confirm_failed' AND pi.DEL_FLAG = 0 AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL ) @@ -54,7 +54,7 @@ WHERE CUSTOMER_ID = #{customerId} AND MOBILE = #{mobile} - AND CONFIRM_RESULT = '0' + AND (CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved') AND DEL_FLAG = 0 From 4aa5bc205c35beb4db7160bb63d67b6075335a71 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 27 Apr 2020 15:29:07 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3Bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 4 ++-- .../java/com/epmet/dto/form/CommonUserIdListFormDTO.java | 2 +- .../src/main/resources/mapper/CustomerStaffDao.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) 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 7af8c21e98..e5873c263f 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 @@ -233,8 +233,8 @@ SELECT USER_ID AS staffId, - REAL_NAME AS staffName, - HEAD_PHOTO AS staffHeadPhoto , - GENDER + IFNULL(REAL_NAME,"") AS staffName, + IFNULL(HEAD_PHOTO,"") AS staffHeadPhoto , + IFNULL(GENDER,0) AS gender FROM CUSTOMER_STAFF WHERE From 4340e7116c0b39c4bd3f1e05f46958eec13c1138 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Apr 2020 13:42:57 +0800 Subject: [PATCH 06/17] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9@Datafilter=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=EF=BC=8C=E5=B0=86tableAlias=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=95=B0=E7=BB=84=EF=BC=8C=E9=A2=84=E7=95=99=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E4=B8=BA=E5=90=8E=E9=9D=A2=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/mybatis/annotation/DataFilter.java | 2 +- .../com/epmet/commons/mybatis/aspect/DataFilterAspect.java | 3 ++- .../src/main/java/com/epmet/dao/StaffRoleDao.java | 3 +++ .../main/java/com/epmet/service/impl/StaffRoleServiceImpl.java | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java index 96b7691f22..6947d92619 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java @@ -23,6 +23,6 @@ public @interface DataFilter { /** * 表的别名 */ - String tableAlias() default ""; + String[] tableAliases() default ""; } diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java index c9965192cf..a7c5fc1683 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java @@ -71,7 +71,8 @@ public class DataFilterAspect { // 通过反射，取到注解属性 DataFilter dataFilterAnno = ((MethodSignature) point.getSignature()).getMethod().getAnnotation(DataFilter.class); - String tableAlias = dataFilterAnno.tableAlias(); + String[] tableAliases = dataFilterAnno.tableAliases(); + String tableAlias = tableAliases[0]; // 从ThreadLocal中取所需权限 String requirePermission = AccessOpeAspect.requirePermissionTl.get(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java index 85dae3de67..b943b44be7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java @@ -17,6 +17,7 @@ package com.epmet.dao; +import com.epmet.commons.mybatis.annotation.DataFilter; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.dto.StaffRoleDTO; @@ -44,6 +45,7 @@ public interface StaffRoleDao extends BaseDao { * @param orgId * @return */ + //@DataFilter(tableAliases = { "sr" }) List listStaffIdsByRoleKeyAndOrgId(@Param("roleKey") String roleKey, @Param("orgId") String orgId, @Param("dataScope") DataScope dataScope); @@ -61,6 +63,7 @@ public interface StaffRoleDao extends BaseDao { * @Author wangc * @Date 2020.04.26 11:01 **/ + //@DataFilter(tableAliases = { "role" }) StaffRolesResultDTO getStaffRoles(CommonUserFormDTO commonUserFormDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index 0c4365e9fb..f76d6545c5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -114,7 +114,6 @@ public class StaffRoleServiceImpl extends BaseServiceImpl listStaffsInRole(String roleKey, String orgId, DataScope dataScope) { return baseDao.listStaffIdsByRoleKeyAndOrgId(roleKey, orgId, dataScope); } @@ -133,7 +132,6 @@ public class StaffRoleServiceImpl extends BaseServiceImpl getStaffRoles(CommonUserFormDTO userParam) { return new Result().ok(baseDao.getStaffRoles(userParam)); } From a7341b86292a4eefe9e6dd72ebaec02fde3f6dc2 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Mon, 27 Apr 2020 13:29:35 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/CertifiedResultDTO.java | 15 +++++++++++++ .../epmet/service/ResiPartyMemberService.java | 3 +-- .../result/CertifiedResultDTO.java | 15 +++++++++++++ .../mapper/partymember/PartymemberInfoDao.xml | 21 ++++++++++++------- .../epmet/dto/result/CertifiedResultDTO.java | 15 +++++++++++++ 5 files changed, 59 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java index f7540d8b0b..db42fbe84d 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java @@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable { */ private String gridFullPath; + /** + * 党员认证信息表id + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index 7efe7528f3..0d274382e6 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -1,12 +1,10 @@ package com.epmet.service; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; import com.epmet.dto.form.CertifiedFormDTO; import com.epmet.dto.result.CertifiedResultDTO; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import com.epmet.dto.result.AuditedPartyMemberResultDTO; @@ -36,6 +34,7 @@ public interface ResiPartyMemberService { * @Date 2020/4/26 23:32 **/ Result> audited(AuditedPartyMemberFormDTO formDTO); + /** * * @Description 获取已认证党员 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java index 9e5568441b..1c4dddc50c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java @@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable { */ private String gridFullPath; + /** + * 党员认证信息表id + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index ca2314e514..b30353f09d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -61,16 +61,21 @@ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java index f7540d8b0b..db42fbe84d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java @@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable { */ private String gridFullPath; + /** + * 党员认证信息表id + */ + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + } From 59ca5cc03fd0d56fe8ff914867a6395334d87ab6 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Mon, 27 Apr 2020 14:21:13 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerGridDao.java | 2 +- .../com/epmet/service/impl/CustomerGridServiceImpl.java | 6 +++--- .../src/main/resources/mapper/CustomerGridDao.xml | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) 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 37e60a010a..7e4219012e 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 @@ -123,7 +123,7 @@ public interface CustomerGridDao extends BaseDao { * @param gridName * @return */ - String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid); + String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid,@Param("gridId")String gridId); /** * 编辑网格信息 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 b5a83ee724..cb544cba9f 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 @@ -202,7 +202,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) { - String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId()); + String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null); if (checkGridName!=null){ return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode()); } @@ -217,7 +217,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl().ok(addGridResultDTO); @@ -231,7 +231,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl + AND id != #{gridId} + AND del_flag = 0 From 42757f8d7bec63bb949f597663261a0736d56f8e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 27 Apr 2020 15:52:59 +0800 Subject: [PATCH 09/17] =?UTF-8?q?customer=5Fgrid=E8=A1=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4org=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/epmet_gov_org.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql index aa68f1c8fa..5e1a40bd0b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql @@ -102,8 +102,8 @@ ALTER TABLE customer_grid MODIFY COLUMN LATITUDE VARCHAR(32) DEFAULT NULL COMME ALTER TABLE customer_grid MODIFY COLUMN AREA_CODE VARCHAR(32) DEFAULT NULL COMMENT '所属地区码（所属组织地区码）'; alter table customer_grid drop column GRID_CODE; alter table customer_grid drop column SORT; +alter table customer_grid drop column ORG_ID; -alter table customer_grid add column ORG_ID varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）'; alter table customer_grid add column MANAGE_DISTRICT varchar(255) DEFAULT "" NOT NULL COMMENT '管辖区域'; alter table customer_grid add column TOTAL_USER INT(11) DEFAULT 0 NOT NULL COMMENT '当前网格总人数'; ALTER TABLE customer_agency ADD ( From a5bad0ebc69e499c662596e8e3b0883a410268ee Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 27 Apr 2020 16:05:01 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E7=83=AD?= =?UTF-8?q?=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4?= =?UTF-8?q?-=E6=B7=BB=E5=8A=A0=E7=BB=99=E5=AF=B9=E5=BA=94=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E9=95=BF=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserMessageController.java | 12 ++++ .../com/epmet/service/UserMessageService.java | 8 +++ .../service/impl/UserMessageServiceImpl.java | 5 ++ .../dto/result/AgencyAndStaffsResultDTO.java | 47 +++++++++++++ .../epmet/constant/CustomerGridConstant.java | 13 ++++ .../controller/CustomerGridController.java | 17 +++-- .../com/epmet/dao/CustomerStaffGridDao.java | 8 +++ .../epmet/service/CustomerGridService.java | 7 ++ .../service/impl/CustomerGridServiceImpl.java | 33 +++++++--- .../resources/mapper/CustomerStaffGridDao.xml | 35 ++++++---- .../resi-partymember-server/pom.xml | 6 ++ .../constant/ResiWarmheartedConstant.java | 10 +++ .../feign/EpmetMessageFeignClient.java | 12 ++++ .../modules/feign/EpmetUserFeignClient.java | 10 +++ .../modules/feign/GovOrgFeignClient.java | 13 ++-- .../EpmetMessageFeignClientFallback.java | 8 +++ .../EpmetUserFeignClientFallBack.java | 7 ++ .../fallback/GovOrgFeignClientFallBack.java | 7 ++ .../constant/ResiWarmUserMessageConstant.java | 2 +- .../ResiWarmheartedVisitConstant.java | 6 ++ .../impl/ResiWarmheartedApplyServiceImpl.java | 66 ++++++++++++++----- 21 files changed, 284 insertions(+), 48 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java index 3c9a2ba01a..782ab153dd 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.excel.UserMessageExcel; import com.epmet.service.UserMessageService; import org.springframework.beans.factory.annotation.Autowired; @@ -132,4 +133,15 @@ public class UserMessageController { public Result> getMyMessageList(@RequestBody MymessageFormDTO params){ return userMessageService.getMyMessageList(params); } + + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 批量插入未读消息 + **/ + @PostMapping("saveusermessagelist") + public Result saveUserMessageList(@RequestBody List msgList) { + return userMessageService.saveUserMessageList(msgList); + } } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index 1555f73aed..7623d45e0d 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -127,4 +127,12 @@ public interface UserMessageService extends BaseService { * @return */ Result> getMyMessageList(MymessageFormDTO param); + + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 批量插入未读消息 + **/ + Result saveUserMessageList(List msgList); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index 8354b9166c..cdbfe87ead 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -165,4 +165,9 @@ public class UserMessageServiceImpl extends BaseServiceImpl>().ok(ConvertUtils.sourceToTarget(myMessageList, UserMessageDTO.class)); } + @Override + public Result saveUserMessageList(List msgList) { + insertBatch(msgList); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java new file mode 100644 index 0000000000..cde61478b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyAndStaffsResultDTO.java @@ -0,0 +1,47 @@ +/** + * 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.dto.result; + +import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.CustomerStaffGridDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 根据网格ID查询网格信息、查询网格下所有工作人员列表-接口返参 + * + * @author sun + */ +@Data +public class AgencyAndStaffsResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格基本信息 + */ + private CustomerGridDTO customerGridDTO; + /** + * 网格下工作人员列表 + */ + private List staffList; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java new file mode 100644 index 0000000000..fe636fdcc2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java @@ -0,0 +1,13 @@ +package com.epmet.constant; + +/** + * @author sun + * @dscription + */ +public interface CustomerGridConstant { + + /** + * 根据网格Id未查询到网格信息 + */ + String SELECT_EXCEPTION = "根据网格Id未查询到网格信息"; +} 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 77e3b82908..834aa9bd1c 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 @@ -27,12 +27,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; -import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.result.CustomerGridByUserIdResultDTO; -import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.excel.CustomerGridExcel; import com.epmet.service.CustomerGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -162,4 +159,16 @@ public class CustomerGridController { public Result> getMyGrids(@PathVariable("userId") String userId) { return customerGridService.getMyGrids(userId); } + + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + @PostMapping("getagencyandstaffsbygridid/{gridId}") + public Result getAgencyAndStaffsBygridId(@PathVariable("gridId") String gridId) { + return customerGridService.getAgencyAndStaffsBygridId(gridId); + } + } diff --git a/epmet-module/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 index c0e8691363..07d59946ca 100644 --- a/epmet-module/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 @@ -65,4 +65,12 @@ public interface CustomerStaffGridDao extends BaseDao { * @Date 2020.04.26 14:57 **/ void insertBatch(List list); + + /** + * @param gridId + * @return + * @Description 根据网格Id查询网格下工作人员列表 + * @Author sun + */ + List selectByGridId(@Param("gridId")String gridId); } \ No newline at end of file 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 cb9c9724e2..76459d1de6 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 @@ -212,4 +212,11 @@ public interface CustomerGridService extends BaseService { **/ Result addGridStaffs(CommonGridStaffListFromDTO staffListFormDTO); + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + Result getAgencyAndStaffsBygridId(String gridId); } \ 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 cb544cba9f..c2078c1360 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 @@ -23,25 +23,20 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.CustomerGridDao; -import com.epmet.dto.CustomerAgencyDTO; -import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.form.CustomerGridFormDTO; -import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; -import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; -import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dao.CustomerStaffGridDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; import com.epmet.service.CustomerStaffGridService; @@ -473,4 +468,26 @@ public class CustomerGridServiceImpl extends BaseServiceImpl().ok(baseDao.selectGridNameByGridId(formDTO)); } + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + @Override + public Result getAgencyAndStaffsBygridId(String gridId) { + Result result = new Result<>(); + AgencyAndStaffsResultDTO agencyAndStaffsResultDTO = new AgencyAndStaffsResultDTO(); + //1:查询网格基本信息 + CustomerGridEntity gridEntity = baseDao.selectById(gridId); + if (null == gridEntity) { + throw new RenException(CustomerGridConstant.SELECT_EXCEPTION); + } + CustomerGridDTO CustomerGridDTO = ConvertUtils.sourceToTarget(gridEntity, CustomerGridDTO.class); + agencyAndStaffsResultDTO.setCustomerGridDTO(CustomerGridDTO); + //2:查询网格下工作人员列表 + List staffList = customerStaffGridDao.selectByGridId(gridId); + agencyAndStaffsResultDTO.setStaffList(staffList); + return result.ok(agencyAndStaffsResultDTO); + } } diff --git a/epmet-module/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 index 5e4c9bd1a3..c1721ea685 100644 --- a/epmet-module/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 @@ -3,19 +3,18 @@ - - - - - - - - - - - - - + + csg.id AS "id", + csg.user_id AS "userId", + csg.grid_id AS "gridId", + csg.customer_id AS "customerId", + csg.del_flag AS "delflag", + csg.revision AS "revision", + csg.created_by AS "createdby", + csg.created_time AS "createdtime", + csg.updated_by AS "updatedby", + csg.updated_time AS "updatedtime" + + + insert into customer_staff_grid diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index ce7eabb912..80a2fd38cf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -93,6 +93,12 @@ 2.0.0 compile + + com.epmet + epmet-message-server + 0.3.1 + compile + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java new file mode 100644 index 0000000000..6945685c92 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java @@ -0,0 +1,10 @@ +package com.epmet.constant; + +/** + * @author sun + * @dscription + */ +public interface ResiWarmheartedConstant { + + String SELECT_EXCEPTION = "根据网格Id查询数据失败"; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java index 50b8cf9bb5..21a57747e2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import java.util.List; + /** * @author kamui */ @@ -33,4 +36,13 @@ public interface EpmetMessageFeignClient { @PostMapping(value = "message/usermessage/saveusermessage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result saveUserMessage(UserMessageFormDTO formDto); + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 热心居民申请给网格长们发送消息 + **/ + @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveUserMessageList(List msgList); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 7b3b142878..85d810e05e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -4,9 +4,11 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.StaffRoleFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.CertifiedResultDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack; import com.epmet.resi.partymember.dto.partymember.UserHeadPhotoDTO; @@ -69,4 +71,12 @@ public interface EpmetUserFeignClient { @PostMapping("/epmetuser/userwechat/selectuserheadphotobyuserid") Result> selectUserHeadPhotoByUserId(List certifiedResultDTOS); + /** + * 根据机构Id查询机构下是网格长角色的用户 + * @param staffRoleFormDTO + * @return + * @Author sun + */ + @PostMapping("/epmetuser/staffrole/staffsinrole") + Result> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java index 4615564826..b3cd8ab7aa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.AgencyAndStaffsResultDTO; import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; @@ -50,8 +51,12 @@ public interface GovOrgFeignClient { @PostMapping("/gov/org/customergrid/selectGridNameByGridId") Result selectGridNameByGridId(@RequestBody CertifiedFormDTO formDTO); - - - - + /** + * @param gridId + * @return + * @Author sun + * @Description 根据网格id查询所属组织信息、根据网格Id查询网格下所有工作人员列表 + **/ + @PostMapping("/gov/org/customergrid/getagencyandstaffsbygridid/{gridId}") + Result getAgencyAndStaffsBygridId(@PathVariable("gridId") String gridId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java index f588f55781..b356a338b9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java @@ -4,9 +4,12 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.EpmetMessageFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * 消息服务降级 * @author zhaoqifeng @@ -24,4 +27,9 @@ public class EpmetMessageFeignClientFallback implements EpmetMessageFeignClient return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessage", formDto); } + @Override + public Result saveUserMessageList(List msgList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index d7844431b9..e9125c16e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -5,9 +5,11 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.StaffRoleFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.CertifiedResultDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -45,4 +47,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result> selectUserHeadPhotoByUserId(List certifiedResultDTOS) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectUserHeadPhotoByUserId", certifiedResultDTOS); } + + @Override + public Result> getStaffsInRole(StaffRoleFormDTO staffRoleFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRole", staffRoleFormDTO); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java index 07775a8fb8..3098308b28 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.AgencyAndStaffsResultDTO; import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.modules.feign.GovOrgFeignClient; @@ -38,4 +39,10 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { public Result selectGridNameByGridId(CertifiedFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridNameByGridId",formDTO); } + + @Override + public Result getAgencyAndStaffsBygridId(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyAndStaffsBygridId",gridId); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java index dbb6990310..3f85a6d199 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java @@ -9,7 +9,7 @@ public interface ResiWarmUserMessageConstant { /** * 消息标题 */ - String GROUP_TITLE = "您有一条小组消息"; + String GROUP_TITLE = "您有一条热心居民申请消息"; /** * 热心居民提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为热心居民，请审核。 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java index 56946307cb..a0c0442d72 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java @@ -77,4 +77,10 @@ public interface ResiWarmheartedVisitConstant { String SELECT_EXCEPTION = "根据申请Id未查询到热心居民申请详情信息"; String AUDIT_EXCEPTION = "该申请数据已审核，不能再次审核"; + + /** + * 网格长角色 + */ + String GRID_MANAGER = "grid_manager"; + String SAVE_MSG_EXCEPTION = "发送消息给网格长操作失败"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index b78ffa53eb..b3f9018fa0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -31,13 +31,15 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; import com.epmet.constant.ReadFlagConstant; +import com.epmet.constant.ResiWarmheartedConstant; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.UserRoleDTO; -import com.epmet.dto.form.CustomerGridFormDTO; -import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; -import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.AgencyAndStaffsResultDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; +import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -203,7 +205,10 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl resultAgencyAndStaffs = govOrgFeignClient.getAgencyAndStaffsBygridId(formDTO.getGridId()); + if(!resultAgencyAndStaffs.success()){ + throw new RenException(ResiWarmheartedConstant.SELECT_EXCEPTION); + } + AgencyAndStaffsResultDTO agencyAndStaffsResultDTO = resultAgencyAndStaffs.getData(); + //网格下工作人员列表 + CustomerGridDTO customerGridDTO = agencyAndStaffsResultDTO.getCustomerGridDTO(); + List staffList = agencyAndStaffsResultDTO.getStaffList(); + //2:调用epmet-user服务，根据组织机构Id和网格长角色查询组织机构下所有的网格长StaffId + StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); + staffRoleFormDTO.setOrgId(customerGridDTO.getPid()); + staffRoleFormDTO.setRoleKey(ResiWarmheartedVisitConstant.GRID_MANAGER); + Result> resultList = epmetUserFeignClient.getStaffsInRole(staffRoleFormDTO); + List roleList = resultList.getData(); + //3:遍历找出当前网格的所有网格长并给网格长发消息 + List msgList = new ArrayList<>(); + staffList.forEach(staff->{ + roleList.forEach(role->{ + if(staff.getUserId().equals(role.getStaffId())){ + UserMessageEntity msgEntity = new UserMessageEntity(); + msgEntity.setCustomerId(formDTO.getCustomerId()); + msgEntity.setGridId(formDTO.getGridId()); + msgEntity.setUserId(staff.getUserId()); + msgEntity.setApp(formDTO.getApp()); + msgEntity.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE); + msgEntity.setMessageContent(formDTO.getMessageText()); + msgEntity.setReadFlag(ReadFlagConstant.UN_READ); + msgList.add(msgEntity); + } + }); + }); + if (msgList.size() > NumConstant.ZERO) { + result = epmetMessageFeignClient.saveUserMessageList(msgList); + } + return result; } @Override From 34c3786f41aa01a4a382b8b742773d4f99e06c9c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 27 Apr 2020 16:20:08 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9Constant=E7=B1=BB?= =?UTF-8?q?=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiWarmheartedApplyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index b3f9018fa0..66dea040aa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -31,7 +31,6 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; import com.epmet.constant.ReadFlagConstant; -import com.epmet.constant.ResiWarmheartedConstant; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.UserRoleDTO; @@ -44,6 +43,7 @@ import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant; +import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant; import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao; import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; From a5beb0e2ec050ec84986482a732462c966fe40e9 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Mon, 27 Apr 2020 17:16:56 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CertifiedDetailFormDTO.java | 34 ++++++++ .../dto/result/CertifiedDetailResultDTO.java | 72 +++++++++++++++++ .../controller/ResiPartyMemberController.java | 14 ++++ .../feign/ResiPartymemberFeignClient.java | 12 +++ .../ResiPartymemberFeignClientFallBack.java | 7 ++ .../epmet/service/ResiPartyMemberService.java | 15 ++++ .../impl/ResiPartyMemberServiceImpl.java | 16 ++++ .../main/resources/mapper/CustomerGridDao.xml | 2 +- .../form/CertifiedDetailFormDTO.java | 34 ++++++++ .../result/CertifiedDetailResultDTO.java | 77 +++++++++++++++++++ .../modules/feign/EpmetUserFeignClient.java | 12 ++- .../EpmetUserFeignClientFallBack.java | 7 ++ .../controller/PartymemberInfoController.java | 14 ++++ .../partymember/dao/PartymemberInfoDao.java | 11 +++ .../service/PartymemberInfoService.java | 13 ++++ .../impl/PartymemberInfoServiceImpl.java | 31 ++++++++ .../mapper/partymember/PartymemberInfoDao.xml | 23 ++++++ .../dto/form/CreatedTimeByUserIdFormDTO.java | 21 +++++ .../result/CreatedTimeByUserIdResultDTO.java | 21 +++++ .../com/epmet/controller/UserController.java | 13 ++++ .../src/main/java/com/epmet/dao/UserDao.java | 12 +++ .../java/com/epmet/service/UserService.java | 11 +++ .../epmet/service/impl/UserServiceImpl.java | 16 ++++ .../src/main/resources/mapper/UserDao.xml | 11 +++ 24 files changed, 497 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java create mode 100644 epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/CertifiedDetailFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java new file mode 100644 index 0000000000..51dd48ddd8 --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 13:33 + * 已认证党员详情 + */ +@Data +public class CertifiedDetailFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 党员认证信息表ID + */ + @NotBlank(message = "党员认证信息表ID不能为空") + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + +} diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java new file mode 100644 index 0000000000..a14c38629e --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java @@ -0,0 +1,72 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 13:37 + * 已认证党员详情 + */ +@Data +public class CertifiedDetailResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 用户id + */ + private String userId; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 联系手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 认证网格：XXX街道-XXX社区-XXX网格 + */ + private String gridFullPath; + + /** + * 认证方式：自动认证auto、人工认证manual + */ + private String certifyType; + + /** + * 认证时间（提交认证的时间） + */ + private Long applyTime; + + /** + * 注册时间（进入本平台的时间） + */ + private Long certifyTime; + + /** + * 工作单位/所处街道 + */ + private String extraOrganization; + + /** + * 证明联系人 + */ + private String contactPeople; + + /** + * 证明联系人手机号 + */ + private String contactMobile; + +} diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index de92cc128b..5188fbde8e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -5,7 +5,9 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; @@ -73,6 +75,18 @@ public class ResiPartyMemberController { return resiPartyMemberService.certifiedList(certifiedFormDTO); } + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 13:54 + */ + @PostMapping(value = "/certifieddetail") + public Result certifiedDetail(@RequestBody CertifiedDetailFormDTO formDTO){ + return new Result().ok(resiPartyMemberService.certifiedDetail(formDTO)); + } + /** * 审核党员 * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java index 25b586513b..5d8499704e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -2,7 +2,9 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; import com.epmet.resi.partymember.dto.partymember.form.*; @@ -97,6 +99,16 @@ public interface ResiPartymemberFeignClient { @PostMapping(value = "/resi/partymember/partymemberinfo/certified") Result> certified(@RequestBody CertifiedFormDTO certifiedFormDTO); + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 15:22 + */ + @PostMapping(value = "/resi/partymember/partymemberinfo/certifieddetail") + Result certifiedDetail(@RequestBody CertifiedDetailFormDTO formDTO); + /** * 审核党员 * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java index aedb5b3d0e..acab85141f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -3,7 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.resi.partymember.dto.partymember.form.*; @@ -62,6 +64,11 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO); } + @Override + public Result certifiedDetail(CertifiedDetailFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certifiedDetail", formDTO); + } + @Override public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manualConfirmResult", fromDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index 93512bde0e..f0a2bdb58e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -1,14 +1,19 @@ package com.epmet.service; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import java.util.List; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; +import org.springframework.web.bind.annotation.RequestBody; import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; @@ -52,6 +57,16 @@ public interface ResiPartyMemberService { */ Result> certifiedList(CertifiedFormDTO certifiedFormDTO); + + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 14:23 + */ + CertifiedDetailResultDTO certifiedDetail(CertifiedDetailFormDTO formDTO); + /** * 人工审核结果 * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java index a97b886619..68482892fb 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java @@ -6,7 +6,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.dto.result.AuditedPartyMemberResultDTO; @@ -83,6 +85,20 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService { return resiPartymemberFeignClient.certified(certifiedFormDTO); } + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 13:54 + */ + @Override + public CertifiedDetailResultDTO certifiedDetail(CertifiedDetailFormDTO formDTO) { + CertifiedDetailResultDTO partyMemberDetail = resiPartymemberFeignClient.certifiedDetail(formDTO).getData(); + + return partyMemberDetail; + } + @Override public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { return resiPartymemberFeignClient.manualConfirmResult(fromDTO); 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 012d59d276..e6ac610f3c 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 @@ -93,7 +93,7 @@ - + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java new file mode 100644 index 0000000000..409617bc88 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 16:08 + */ +@Data +public class CreatedTimeByUserIdFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private String userId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java new file mode 100644 index 0000000000..d86ec53f57 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 16:08 + */ +@Data +public class CreatedTimeByUserIdResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 注册时间 (empet_user库下的user表中的 created_time) + */ + private Long registerTime; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index 6081d38fe1..5a310b3a87 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -8,9 +8,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -86,4 +88,15 @@ public class UserController { return userService.updateWxUserInfo(wxUserInfoFormDTO); } + /** + * + * @Description 查询用户注册时间 + * @Author zxc + * @CreatedTime 2020/4/27 16:14 + */ + @PostMapping("selectcreatedtimebyuserid") + public Result createdTimeByUserId(@RequestBody CreatedTimeByUserIdFormDTO formDTO){ + return new Result().ok(userService.createdTimeByUserId(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java index a015e34805..62a09ab69e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java @@ -1,6 +1,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +25,14 @@ public interface UserDao extends BaseDao { PasswordLoginUserInfoResultDTO selectOperUserByPhone(String phone); + /** + * + * @Description 查询用户注册时间 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 16:17 + */ + CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 09cd2e5bd1..6a9ea0b96a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -5,9 +5,11 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; @@ -55,4 +57,13 @@ public interface UserService extends BaseService { * @Description 居民端个人信息-同步用户微信信息 **/ Result updateWxUserInfo(WxUserInfoFormDTO wxUserInfoFormDTO); + + /** + * + * @Description 查询用户注册时间 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 16:14 + */ + CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 3d9e344e2a..d20564dadb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -8,9 +8,11 @@ import com.epmet.dao.UserDao; import com.epmet.dao.UserWechatDao; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; @@ -109,4 +111,18 @@ public class UserServiceImpl extends BaseServiceImpl implem userWechatDao.updateByUserId(userWechatDTO); return new Result(); } + + /** + * + * @Description 查询用户注册时间 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 16:14 + */ + @Override + public CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO) { + CreatedTimeByUserIdResultDTO registerTime = baseDao.createdTimeByUserId(formDTO); + registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L); + return registerTime; + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index 34b509b54d..5d34b7878d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -15,4 +15,15 @@ AND ou.PHONE = #{phone} + + + From d8f9a6a6f786988877701db6869b7d7aa1d76f56 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 27 Apr 2020 17:20:08 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96-=E4=B8=8D=E5=BC=95=E7=94=A8server?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserMessageController.java | 3 +-- .../com/epmet/service/UserMessageService.java | 2 +- .../service/impl/UserMessageServiceImpl.java | 5 +++-- .../resi-partymember-server/pom.xml | 6 ------ .../feign/EpmetMessageFeignClient.java | 3 +-- .../EpmetMessageFeignClientFallback.java | 3 +-- .../constant/ResiWarmheartedConstant.java | 2 +- .../impl/ResiWarmheartedApplyServiceImpl.java | 21 +++++++++---------- 8 files changed, 18 insertions(+), 27 deletions(-) rename epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/{ => modules/warmhearted}/constant/ResiWarmheartedConstant.java (75%) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java index 782ab153dd..9f2ca4aea9 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java @@ -28,7 +28,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserMessageDTO; import com.epmet.dto.form.MymessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.entity.UserMessageEntity; import com.epmet.excel.UserMessageExcel; import com.epmet.service.UserMessageService; import org.springframework.beans.factory.annotation.Autowired; @@ -141,7 +140,7 @@ public class UserMessageController { * @Description 批量插入未读消息 **/ @PostMapping("saveusermessagelist") - public Result saveUserMessageList(@RequestBody List msgList) { + public Result saveUserMessageList(@RequestBody List msgList) { return userMessageService.saveUserMessageList(msgList); } } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java index 7623d45e0d..ca08d47299 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java @@ -134,5 +134,5 @@ public interface UserMessageService extends BaseService { * @Author sun * @Description 批量插入未读消息 **/ - Result saveUserMessageList(List msgList); + Result saveUserMessageList(List msgList); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java index cdbfe87ead..e5f3a2ba9e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java @@ -166,8 +166,9 @@ public class UserMessageServiceImpl extends BaseServiceImpl msgList) { - insertBatch(msgList); + public Result saveUserMessageList(List msgList) { + List entityList = ConvertUtils.sourceToTarget(msgList, UserMessageEntity.class); + insertBatch(entityList); return new Result(); } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 80a2fd38cf..ce7eabb912 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -93,12 +93,6 @@ 2.0.0 compile - - com.epmet - epmet-message-server - 0.3.1 - compile - diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java index 21a57747e2..087d63bab0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetMessageFeignClient.java @@ -3,7 +3,6 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -43,6 +42,6 @@ public interface EpmetMessageFeignClient { * @Description 热心居民申请给网格长们发送消息 **/ @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result saveUserMessageList(List msgList); + Result saveUserMessageList(List msgList); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java index b356a338b9..2b47ff9a9c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetMessageFeignClientFallback.java @@ -4,7 +4,6 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.EpmetMessageFeignClient; import org.springframework.stereotype.Component; @@ -28,7 +27,7 @@ public class EpmetMessageFeignClientFallback implements EpmetMessageFeignClient } @Override - public Result saveUserMessageList(List msgList) { + public Result saveUserMessageList(List msgList) { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedConstant.java similarity index 75% rename from epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java rename to epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedConstant.java index 6945685c92..afc576e837 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/ResiWarmheartedConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedConstant.java @@ -1,4 +1,4 @@ -package com.epmet.constant; +package com.epmet.modules.warmhearted.constant; /** * @author sun diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index 66dea040aa..4eaef1114e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -38,7 +38,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.AgencyAndStaffsResultDTO; import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; -import com.epmet.entity.UserMessageEntity; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -257,19 +256,19 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl> resultList = epmetUserFeignClient.getStaffsInRole(staffRoleFormDTO); List roleList = resultList.getData(); //3:遍历找出当前网格的所有网格长并给网格长发消息 - List msgList = new ArrayList<>(); + List msgList = new ArrayList<>(); staffList.forEach(staff->{ roleList.forEach(role->{ if(staff.getUserId().equals(role.getStaffId())){ - UserMessageEntity msgEntity = new UserMessageEntity(); - msgEntity.setCustomerId(formDTO.getCustomerId()); - msgEntity.setGridId(formDTO.getGridId()); - msgEntity.setUserId(staff.getUserId()); - msgEntity.setApp(formDTO.getApp()); - msgEntity.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE); - msgEntity.setMessageContent(formDTO.getMessageText()); - msgEntity.setReadFlag(ReadFlagConstant.UN_READ); - msgList.add(msgEntity); + UserMessageFormDTO msgDTO = new UserMessageFormDTO(); + msgDTO.setCustomerId(formDTO.getCustomerId()); + msgDTO.setGridId(formDTO.getGridId()); + msgDTO.setUserId(staff.getUserId()); + msgDTO.setApp(formDTO.getApp()); + msgDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE); + msgDTO.setMessageContent(formDTO.getMessageText()); + msgDTO.setReadFlag(ReadFlagConstant.UN_READ); + msgList.add(msgDTO); } }); }); From 3fabcbfa329034845b064dfc92c1eb2510f9f1a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 27 Apr 2020 18:03:03 +0800 Subject: [PATCH 14/17] =?UTF-8?q?message=E3=80=81user=E3=80=81grid?= =?UTF-8?q?=E3=80=81org=E3=80=81resigroup=E3=80=81resipartymember=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message/epmet-message-server/docker-compose.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- epmet-module/gov-grid/gov-grid-server/docker-compose.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml index 76db1b8a99..4acd697b6a 100644 --- a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml +++ b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.2 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index b713085343..46bb33b442 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.1 + 0.3.2 com.epmet epmet-message diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml index 3dd48a1e3b..5f40c06efc 100644 --- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml +++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.4 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index a784496cac..eb06fbbca2 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.3 + 0.3.4 com.epmet gov-grid diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index 25761f4458..566bd36622 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.8 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.9 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 0b163e1d1a..abe230bea2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.8 + 0.3.9 com.epmet gov-org diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml index 4dcf9c6a7e..687b044179 100644 --- a/epmet-module/resi-group/resi-group-server/docker-compose.yml +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.3 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index fb3332aeb1..b246579931 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.2 + 0.3.3 com.epmet resi-group diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index 99851f497e..537e65d4f2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.2 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.3 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index ce7eabb912..4105f82ebd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.2 + 0.3.3 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 2d1edbff2b..9f0a4bfaf7 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.6 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.7 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c1773add7f..b45cc78623 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.6 + 0.3.7 com.epmet epmet-user From fadbd9d73b67fd497fde08d034ab42315030df1e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 27 Apr 2020 18:07:55 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=AE=A4=E8=AF=81=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/ResiPartyMemberController.java | 2 +- .../main/java/com/epmet/feign/ResiPartymemberFeignClient.java | 2 +- .../partymember/controller/PartyMemberConfirmController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index 5188fbde8e..86b3380ce0 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -118,7 +118,7 @@ public class ResiPartyMemberController { * @return Result * @author zhaoqifeng */ - @PostMapping("auditingdetail") + @PostMapping("autofaileddetail") public Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) { return resiPartyMemberService.autoFailedDetail(fromDTO); } diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java index 5d8499704e..c5be8fc73a 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -135,7 +135,7 @@ public interface ResiPartymemberFeignClient { * @return Result * @author zhaoqifeng */ - @PostMapping("/resi/partymember/confirm/auditingdetail") + @PostMapping("/resi/partymember/confirm/autofaileddetail") Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO); /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java index 63dde1c984..58d4d2edc2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java @@ -108,7 +108,7 @@ public class PartyMemberConfirmController { * @param fromDTO 参数 * @return Result */ - @PostMapping("auditingdetail") + @PostMapping("autofaileddetail") public Result autoFailedDetail(@RequestBody AutoFailedDetailFromDTO fromDTO) { return partyMemberConfirmService.autoFailedDetail(fromDTO); } From 3713ce9300266007b00aa7ed19ec5296f7f062f4 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Mon, 27 Apr 2020 18:33:56 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=AF=AB=E7=A7=92=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/CertifiedResultDTO.java | 2 +- .../partymember/service/impl/PartymemberInfoServiceImpl.java | 3 +++ .../src/main/java/com/epmet/dto/result/CertifiedResultDTO.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java index db42fbe84d..ca3e6fd8c1 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java @@ -32,7 +32,7 @@ public class CertifiedResultDTO implements Serializable { /** * applyTime 申请时间 */ - private Integer applyTime; + private Long applyTime; /** * 提交网格：XXX街道-XXX社区-XXX网格 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index 6fd860c6c2..741f2c505b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -144,6 +144,9 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl certified(CertifiedFormDTO certifiedFormDTO) { certifiedFormDTO.setPageNo(certifiedFormDTO.getPageNo() - NumConstant.ONE); List certifiedResultDTOS = partyMemberInfoDao.selectCertifiedList(certifiedFormDTO); + for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) { + certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L); + } if (certifiedResultDTOS.size()==0){ return new ArrayList<>(); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java index db42fbe84d..ca3e6fd8c1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java @@ -32,7 +32,7 @@ public class CertifiedResultDTO implements Serializable { /** * applyTime 申请时间 */ - private Integer applyTime; + private Long applyTime; /** * 提交网格：XXX街道-XXX社区-XXX网格 From 4d9ec910771a8f09b3b77612158d66d45ff64058 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Apr 2020 09:23:16 +0800 Subject: [PATCH 17/17] =?UTF-8?q?user=E3=80=81govgrid=E3=80=81govorg?= =?UTF-8?q?=E3=80=81resipartymember=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-grid/gov-grid-server/docker-compose.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/docker-compose.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../resi-partymember/resi-partymember-server/docker-compose.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/docker-compose.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml index 5f40c06efc..298855f42a 100644 --- a/epmet-module/gov-grid/gov-grid-server/docker-compose.yml +++ b/epmet-module/gov-grid/gov-grid-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.4 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.5 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index eb06fbbca2..2fba18c767 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.4 + 0.3.5 com.epmet gov-grid diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml index 566bd36622..1e52769fd4 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.9 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.10 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index abe230bea2..dd2bd83b35 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.9 + 0.3.10 com.epmet gov-org diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml index 537e65d4f2..301889b368 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.3 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.4 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 4105f82ebd..4fef6fe526 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.3 + 0.3.4 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 9f0a4bfaf7..87cf4c15ed 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.8 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b45cc78623..bb50a92b8d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.7 + 0.3.8 com.epmet epmet-user