From 1c0f24077a6df8a1537c6fb9c28d3428922454d3 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 17:31:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BD=91=E6=A0=BC=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E5=8F=8A=E8=AF=A6=E6=83=85=E3=80=81pc=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD=E6=8E=A8=E8=8D=90=E5=8F=8A?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAdminController.java | 9 ++++--- .../epdc/controller/ApiAppUserController.java | 2 +- .../epdc/controller/ApiScreenController.java | 25 ++++++++++++++++++ .../esua/epdc/feign/AdminFeignClient.java | 2 +- .../esua/epdc/feign/AnalysisFeignClient.java | 26 ++++++++++++++++--- .../fallback/AdminFeignClientFallback.java | 2 +- .../fallback/AnalysisFeignClientFallback.java | 10 +++++++ .../elink/esua/epdc/service/AdminService.java | 5 +++- .../esua/epdc/service/EpdcScreenService.java | 18 +++++++++++++ .../epdc/service/impl/AdminServiceImpl.java | 11 +++++--- .../service/impl/EpdcScreenServiceImpl.java | 10 +++++++ epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 13 files changed, 106 insertions(+), 18 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index 918f511..05a2e64 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -1,7 +1,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.annotation.LoginUser; -import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; @@ -9,10 +9,11 @@ import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 管理端对外接口 * @@ -61,8 +62,8 @@ public class ApiAdminController { * @since 2021/8/28 18:43 */ @GetMapping("/sysUser/gridmanList") - public Result getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridManFormDTO formDto){ + public Result> getGridmanList(@LoginUser UserDetail userDetail, EpdcAppGridManFormDTO formDto){ ValidatorUtils.validateEntity(formDto); - return adminService.getGridmanList(tokenDto,formDto); + return adminService.getGridmanList(userDetail,formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 63566d7..aa2f4f0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -375,7 +375,7 @@ public class ApiAppUserController { * @since 2021/8/28 19:43 */ @PostMapping("partyMember/showIdentity") - public Result saveShowIdentity(@LoginUser UserDetail userDetail,@RequestBody EpdcAppShowIdentityFormDTO formDto){ + public Result saveShowIdentity(@LoginUser UserDetail userDetail,EpdcAppShowIdentityFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return appUserService.saveShowIdentity(userDetail,formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index 183cb7b..b40bce1 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -158,6 +158,31 @@ public class ApiScreenController { return epdcScreenService.brightIdentity(formDto); } + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping("partyBuilding/brightIdentity/recommended") + public Result recommended(String id){ + return epdcScreenService.recommended(id); + + } + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping("partyBuilding/brightIdentity/recommendedCancel") + public Result recommendedCancel(String id){ + return epdcScreenService.recommendedCancel(id); + + } /** * 党建引领-党员画像 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index f11ea47..d5d86bb 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -168,5 +168,5 @@ public interface AdminFeignClient { * @since 2021/8/28 18:41 */ @GetMapping("admin/sysUser/gridmanList") - Result getGridmanList(EpdcAppGridManFormDTO formDto); + Result> getGridmanList(EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 02afdab..e88529b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -3,15 +3,12 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -140,6 +137,27 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/screen/partyBuilding/brightIdentity", consumes = MediaType.APPLICATION_JSON_VALUE) Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping(value = "analysis/screen/partyBuilding/brightIdentity/recommended",consumes = MediaType.APPLICATION_JSON_VALUE) + Result recommended(String id); + + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping(value = "analysis/screen/partyBuilding/brightIdentity/recommendedCancel",consumes = MediaType.APPLICATION_JSON_VALUE) + Result recommendedCaancel(String id); + /** * 党建引领-党员画像 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index b1c3a8b..1b655d0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -86,7 +86,7 @@ public class AdminFeignClientFallback implements AdminFeignClient { } @Override - public Result getGridmanList(EpdcAppGridManFormDTO formDto) { + public Result> getGridmanList(EpdcAppGridManFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getGridmanList",formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index f83ef22..95aa239 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -76,6 +76,16 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "brightIdentity", formDto); } + @Override + public Result recommended(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"recommended",id); + } + + @Override + public Result recommendedCaancel(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"recommendedCaancel",id); + } + @Override public Result> partyMemberAge() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyMemberAge"); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index b73b33c..1492218 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -1,12 +1,15 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; +import java.util.List; + /** * 管理端相关接口 * @@ -71,5 +74,5 @@ public interface AdminService { * @author zhangfenghe * @since 2021/8/28 18:41 */ - Result getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto); + Result> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index 44862b9..3676d77 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -117,6 +117,24 @@ public interface EpdcScreenService { */ Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + Result recommended(String id); + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + Result recommendedCancel(String id); + /** * 党建引领-党员画像 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index 31141ec..0153ea0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -21,6 +21,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author yujintao * @email yujintao@elink-cn.com @@ -124,10 +126,11 @@ public class AdminServiceImpl implements AdminService { } @Override - public Result getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto) { - if(null == tokenDto){ - return new Result().error("获取Token信息失败"); - } + public Result> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) { + /*if(null == userDetail){ + return new Result>().error("获取Token信息失败"); + }*/ + //formDto.setDeptId(userDetail.getDeptId()); return adminFeignClient.getGridmanList(formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java index 76915ca..616d0c2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -77,6 +77,16 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.brightIdentity(formDto); } + @Override + public Result recommended(String id) { + return analysisFeignClient.recommended(id); + } + + @Override + public Result recommendedCancel(String id) { + return analysisFeignClient.recommendedCaancel(id); + } + @Override public Result> partyMemberAge() { return analysisFeignClient.partyMemberAge(); diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 7c93eb1..c1da2d7 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 7c93eb1622946c99e4476b6d586628a04c344f7d +Subproject commit c1da2d73a394c61eb364da793050bb4aa03a3ac3 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 31d32c8..9d7cf7e 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13 +Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2