代码提交 小程序网格员列表、党员亮身份及详情、pc端党员亮身份推荐及取消推荐

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<EpdcAppGridManListResultDTO> getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridManFormDTO formDto){
+    public Result<List<EpdcAppGridManListResultDTO>> getGridmanList(@LoginUser UserDetail userDetail, EpdcAppGridManFormDTO formDto){
         ValidatorUtils.validateEntity(formDto);
-        return adminService.getGridmanList(tokenDto,formDto);
+        return adminService.getGridmanList(userDetail,formDto);
     }
 }

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);
     }

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);
+
+    }
     /**
      * 党建引领-党员画像
      *

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<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridManFormDTO formDto);
+    Result<List<EpdcAppGridManListResultDTO>> getGridmanList(EpdcAppGridManFormDTO formDto);
 }

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<List<EpdcScreenPartyBuildingBrightIdentityResultDTO>> 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);
+
     /**
      * 党建引领-党员画像
      *

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<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridManFormDTO formDto) {
+    public Result<List<EpdcAppGridManListResultDTO>> getGridmanList(EpdcAppGridManFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getGridmanList",formDto);
     }
 }

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<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyMemberAge");

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<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto);
+    Result<List<EpdcAppGridManListResultDTO>> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java

@@ -117,6 +117,24 @@ public interface EpdcScreenService {
      */
     Result<List<EpdcScreenPartyBuildingBrightIdentityResultDTO>> 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);
+
     /**
      * 党建引领-党员画像
      *

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<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto) {
-        if(null == tokenDto){
-          return  new Result<EpdcAppGridManListResultDTO>().error("获取Token信息失败");
-        }
+    public Result<List<EpdcAppGridManListResultDTO>> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) {
+        /*if(null == userDetail){
+          return  new Result<List<EpdcAppGridManListResultDTO>>().error("获取Token信息失败");
+        }*/
+        //formDto.setDeptId(userDetail.getDeptId());
         return adminFeignClient.getGridmanList(formDto);
     }
 }

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<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge() {
         return analysisFeignClient.partyMemberAge();

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 7c93eb1622946c99e4476b6d586628a04c344f7d
+Subproject commit c1da2d73a394c61eb364da793050bb4aa03a3ac3

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13
+Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2