增加feign接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -18,6 +18,11 @@ import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -367,4 +372,61 @@ public class ApiAppUserController {
         return appUserService.standarBearerApply(userDetail);
     }
 
+    /**
+     * 入党申请
+     *
+     * @param tokenDto
+     * @param dto
+     * @return
+     */
+    @PostMapping("/intoparty/save")
+    public Result saveIntoparty(@LoginUser TokenDto tokenDto, @RequestBody IntoPartyFormDTO dto) {
+        dto.setDeptId(tokenDto.getGridId());
+        return appUserService.saveIntoparty(dto);
+    }
+
+    /**
+     * 在职党员报道
+     *
+     * @param tokenDto
+     * @param dto
+     * @return
+     */
+    @PostMapping("/reportparty/save")
+    public Result saveReportparty(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) {
+        dto.setDeptId(tokenDto.getGridId());
+        return appUserService.saveReportparty(dto);
+    }
+
+    /**
+     * 红色尖兵
+     *
+     * @param tokenDto
+     * @param dto
+     * @return
+     */
+    @PostMapping("/redspearhead/save")
+    public Result saveRedspearhead(@LoginUser TokenDto tokenDto, @RequestBody RedSpearheadDTO dto) {
+        dto.setDeptId(tokenDto.getGridId());
+        return appUserService.saveRedspearhead(dto);
+    }
+
+    /**
+     * 骑士先锋
+     */
+    @PostMapping("/knightpionner/save")
+    public Result saveKnightpionner(@LoginUser TokenDto tokenDto, @RequestBody KnightPionnerDTO dto) {
+        dto.setDeptId(tokenDto.getGridId());
+        return appUserService.saveKnightpionner(dto);
+    }
+
+    /**
+     * 流动党员报到
+     */
+    @PostMapping("/flowparty/save")
+    public Result saveFlowparty(@LoginUser TokenDto tokenDto, @RequestBody FlowPartyDTO dto) {
+        dto.setDeptId(tokenDto.getGridId());
+        return appUserService.saveFlowparty(dto);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -8,9 +8,17 @@ import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
 import com.elink.esua.epdc.user.dto.*;
 import com.elink.esua.epdc.user.dto.epdc.form.*;
 import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -465,4 +473,46 @@ public interface UserFeignClient {
      */
     @PostMapping("/app-user/epdc-app/user/filteridlist/bytag")
     Result<List<String>> filterUserIdListByTag(@RequestBody EpdcUserMatchTagFormDTO formDto);
+
+    /**
+     * 入党申请
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/app-user/epdc-app/user/intoparty/save")
+    Result saveIntoparty(IntoPartyFormDTO dto);
+
+    /**
+     * 在职党员报到
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/app-user/epdc-app/user/reportparty/save")
+    Result saveReportparty(ReportPartyDTO dto);
+
+    /**
+     * 红色尖兵
+     * @param dto
+     * @return
+     */
+    @PostMapping("/app-user/epdc-app/user/redspearhead/save")
+    Result saveRedspearhead(RedSpearheadDTO dto);
+
+    /**
+     * 骑士先锋
+     * @param dto
+     * @return
+     */
+    @PostMapping("/app-user/epdc-app/user/knightpionner/save")
+    Result saveKnightpionner(KnightPionnerDTO dto);
+
+    /**
+     * 流动党员报到
+     * @param dto
+     * @return
+     */
+    @PostMapping("/app-user/epdc-app/user/flowparty/save")
+    Result saveFlowparty(FlowPartyDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -1,22 +1,22 @@
 package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
 import com.elink.esua.epdc.dto.result.UserActivePointsResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.user.dto.*;
 import com.elink.esua.epdc.user.dto.epdc.form.*;
 import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author yujintao
@@ -231,4 +231,29 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<List<String>> filterUserIdListByTag(EpdcUserMatchTagFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "filterUserIdListByTag", formDto);
     }
+
+    @Override
+    public Result saveIntoparty(IntoPartyFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveIntoparty", dto);
+    }
+
+    @Override
+    public Result saveReportparty(ReportPartyDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveReportparty", dto);
+    }
+
+    @Override
+    public Result saveRedspearhead(RedSpearheadDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveRedspearhead", dto);
+    }
+
+    @Override
+    public Result saveKnightpionner(KnightPionnerDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveKnightpionner", dto);
+    }
+
+    @Override
+    public Result saveFlowparty(FlowPartyDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveFlowparty", dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -1,11 +1,9 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.epdc.form.*;
-import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
+import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
@@ -16,9 +14,13 @@ import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.UserInvitationRecordResultDTO;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author yujintao
@@ -339,4 +341,39 @@ public interface AppUserService {
      * @date 2022/4/28 15:05
      */
     Result standarBearerApply(TokenDto userDetail);
+
+    /**
+     * 入党申请
+     * @param dto
+     * @return
+     */
+    Result saveIntoparty(IntoPartyFormDTO dto);
+
+    /**
+     * 在职党员报到
+     * @param dto
+     * @return
+     */
+    Result saveReportparty(ReportPartyDTO dto);
+
+    /**
+     * 红色尖兵
+     * @param dto
+     * @return
+     */
+    Result saveRedspearhead(RedSpearheadDTO dto);
+
+    /**
+     * 骑士先锋
+     * @param dto
+     * @return
+     */
+    Result saveKnightpionner(KnightPionnerDTO dto);
+
+    /**
+     * 流动党员报到
+     * @param dto
+     * @return
+     */
+    Result saveFlowparty(FlowPartyDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -40,6 +40,11 @@ import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.*;
 import com.elink.esua.epdc.user.dto.epdc.result.*;
+import com.elink.esua.epdc.user.dto.party.FlowPartyDTO;
+import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO;
+import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO;
+import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO;
 import com.elink.esua.epdc.user.enums.*;
 import com.elink.esua.epdc.utils.UserTagUtils;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
@@ -1487,5 +1492,29 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.standarBearerApply(userDetail.getUserId(), userDetail.getGridId());
     }
 
+    @Override
+    public Result saveIntoparty(IntoPartyFormDTO dto) {
+        return userFeignClient.saveIntoparty(dto);
+    }
+
+    @Override
+    public Result saveReportparty(ReportPartyDTO dto) {
+        return userFeignClient.saveReportparty(dto);
+    }
+
+    @Override
+    public Result saveRedspearhead(RedSpearheadDTO dto) {
+        return userFeignClient.saveRedspearhead(dto);
+    }
+
+    @Override
+    public Result saveKnightpionner(KnightPionnerDTO dto) {
+        return userFeignClient.saveKnightpionner(dto);
+    }
+
+    @Override
+    public Result saveFlowparty(FlowPartyDTO dto) {
+        return userFeignClient.saveFlowparty(dto);
+    }
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java

@@ -37,27 +37,27 @@ public class ReportPartyDTO implements Serializable {
     /**
      * 主键ID
      */
-	private String id;
+    private String id;
 
     /**
      * 党员姓名
      */
-	private String name;
+    private String name;
 
     /**
      * 身份证号码
      */
-	private String idCard;
+    private String idCard;
 
     /**
      * 联系电话
      */
-	private String mobile;
+    private String mobile;
 
     /**
      * 社区id
      */
-	private String deptId;
+    private Long deptId;
 
     /**
      * 单位报到联系社区名称
@@ -67,70 +67,70 @@ public class ReportPartyDTO implements Serializable {
     /**
      * 是否在市北居住
      */
-	private Integer shiBei;
+    private Integer shiBei;
 
     /**
      * 居住小区名称
      */
-	private String homeName;
+    private String homeName;
 
     /**
      * 现工作单位
      */
-	private String workUnit;
+    private String workUnit;
 
     /**
      * 工作单位性质
      */
-	private String workType;
+    private String workType;
 
     /**
      * 工作单位行业
      */
-	private String workIndustry;
+    private String workIndustry;
 
     /**
      * 特长
      */
-	private String specialty;
+    private String specialty;
 
     /**
      * 是否党员 0、否  1、是
      */
-	private Integer party;
+    private Integer party;
 
     /**
      * 是否愿意加入志愿者 0、否  1、是
      */
-	private Integer volunteer;
+    private Integer volunteer;
 
     /**
      * 是否愿意加入网格员 0、否 1、是
      */
-	private Integer gridStaff;
+    private Integer gridStaff;
 
     /**
      * 是否愿意加入业务委员会 0、否  1、是
      */
-	private Integer owners;
+    private Integer owners;
 
     /**
      * 父所有部门
      */
-	private String parentDeptIds;
+    private String parentDeptIds;
 
     /**
      * 父所有部门
      */
-	private String parentDeptNames;
+    private String parentDeptNames;
 
     /**
      * 所有部门ID
      */
-	private String[] allDeptIds;
+    private String[] allDeptIds;
 
     /**
      * 所有部门名称
      */
-	private String allDeptNames;
+    private String allDeptNames;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/form/IntoPartyFormDTO.java

@@ -53,7 +53,7 @@ public class IntoPartyFormDTO {
     /**
      * 街道或者社区ID
      */
-    private String deptId;
+    private Long deptId;
 
     private String[] allDeptIds;
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java

@@ -65,11 +65,9 @@ public class ActivityPartyController {
         return new Result<ActivityPartyDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody ActivityPartyDTO dto) {
         //效验数据
-        UserDetail user = SecurityUser.getUser();
-        dto.setDeptId(user.getDeptId());
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         activityPartyService.save(dto);
         return new Result();

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/FlowPartyController.java

@@ -63,7 +63,7 @@ public class FlowPartyController {
         return new Result<FlowPartyDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody FlowPartyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/IntoPartyController.java

@@ -64,7 +64,7 @@ public class IntoPartyController {
         return new Result<IntoPartyResultDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody IntoPartyFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/KnightPionnerController.java

@@ -63,7 +63,7 @@ public class KnightPionnerController {
         return new Result<KnightPionnerDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody KnightPionnerDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/RedSpearheadController.java

@@ -63,7 +63,7 @@ public class RedSpearheadController {
         return new Result<RedSpearheadDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody RedSpearheadDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java

@@ -63,7 +63,7 @@ public class ReportPartyController {
         return new Result<ReportPartyDTO>().ok(data);
     }
 
-    @PostMapping
+    @PostMapping("save")
     public Result save(@RequestBody ReportPartyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java

@@ -135,7 +135,7 @@ public class IntoPartyServiceImpl extends BaseServiceImpl<IntoPartyDao, IntoPart
     private void setDeptId(IntoPartyFormDTO dto) {
         UserDetail user = SecurityUser.getUser();
         String deptId = String.valueOf(user.getDeptId());
-        dto.setDeptId(deptId);
+        dto.setDeptId(user.getDeptId());
         dto.setAllDeptIds(new String[]{deptId});
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

@@ -88,7 +88,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
         ReportPartyDTO result = ConvertUtils.sourceToTarget(entity, ReportPartyDTO.class);
         if (null != entity.getAllDeptIds()) {
             result.setAllDeptIds(entity.getAllDeptIds().split(","));
-            result.setDeptId(entity.getDeptId());
+            result.setDeptId(Long.parseLong(entity.getDeptId()));
         }
         return result;
     }
@@ -105,7 +105,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
         } else {
-            parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -131,7 +131,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
         } else {
-            parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -155,7 +155,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
     private void setDeptId(ReportPartyDTO dto) {
         UserDetail user = SecurityUser.getUser();
         String deptId = String.valueOf(user.getDeptId());
-        dto.setDeptId(deptId);
+        dto.setDeptId(user.getDeptId());
         dto.setAllDeptIds(new String[]{deptId});
     }