党群1+1接口

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

@@ -36,8 +36,8 @@ public class ApiPartyGroupController {
      * @Param []
      **/
     @GetMapping(value = "group/list", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<PartyGroupResultDTO>> groupList() {
+    Result<List<PartyGroupResultDTO>> groupList(@LoginUser TokenDto userDetail) {
-        return partyGroupService.groupList();
+        return partyGroupService.groupList(userDetail);
     }
 
     /**
@@ -151,4 +151,18 @@ public class ApiPartyGroupController {
     Result modifyIdentity(@RequestBody PartyUserIdentityFormDTO formDto) {
         return partyGroupService.modifyIdentity(formDto);
     }
+
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 加入党群
+     * @Author songyunpeng
+     * @Date 2020/6/3
+     * @Param [formDto]
+     **/
+    @GetMapping(value = "group/join", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result join(@LoginUser TokenDto userDetail, PartyUserJoinGroupFormDTO formDto) {
+        return partyGroupService.joinGroup(userDetail, formDto);
+    }
+
 }

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

@@ -22,7 +22,7 @@ import java.util.List;
  * @Description 党群
  * @create 2020-06-03
  */
-@FeignClient(name = ServiceConstant.EPDC_PARTY_GROUP_SERVER, fallback = PartyGroupFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_PARTY_GROUP_SERVER, fallback = PartyGroupFeignClientFallback.class,url = "http://127.0.0.1:9077")
 public interface PartyGroupFeignClient {
     /**
      * @Description  党群列表接口
@@ -31,8 +31,8 @@ public interface PartyGroupFeignClient {
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>>
      **/
-    @GetMapping(value = "partyGroup/group/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "partyGroup/group/list/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<PartyGroupResultDTO>> list();
+    Result<List<PartyGroupResultDTO>> list(@PathVariable("userId") String userId);
 
     /**
      * @Description  网格长列表
@@ -122,4 +122,13 @@ public interface PartyGroupFeignClient {
      **/
     @PostMapping(value = "partyGroup/user/modifyIdentity", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result modifyIdentity(@RequestBody PartyUserIdentityFormDTO formDTO);
+    /**
+     * @Description 加入社群
+     * @Author songyunpeng
+     * @Date  2020/6/4
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping(value = "partyGroup/group/join", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result joinGroup(PartyUserJoinGroupFormDTO formDto);
 }

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

@@ -22,8 +22,8 @@ import java.util.List;
 public class PartyGroupFeignClientFallback implements PartyGroupFeignClient {
 
     @Override
-    public Result<List<PartyGroupResultDTO>> list() {
+    public Result<List<PartyGroupResultDTO>> list(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "list");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "list",userId);
     }
 
     @Override
@@ -70,4 +70,9 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient {
     public Result modifyIdentity(PartyUserIdentityFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "modifyIdentity",formDTO);
     }
+
+    @Override
+    public Result joinGroup(PartyUserJoinGroupFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "joinGroup",formDto);
+    }
 }

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

@@ -24,7 +24,7 @@ public interface PartyGroupService {
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>>
      **/
-    Result<List<PartyGroupResultDTO>> groupList();
+    Result<List<PartyGroupResultDTO>> groupList(TokenDto userDetail);
     /**
      * @Description  网格长列表 
      * @Author songyunpeng
@@ -97,4 +97,12 @@ public interface PartyGroupService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result modifyIdentity(PartyUserIdentityFormDTO formDto);
+    /**
+     * @Description  加入党群 
+     * @Author songyunpeng
+     * @Date  2020/6/4
+     * @Param [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result joinGroup(TokenDto userDetail, PartyUserJoinGroupFormDTO formDto);
 }

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

@@ -30,8 +30,11 @@ public class PartyGroupServiceImpl implements PartyGroupService {
     private AdminFeignClient adminFeignClient;
 
     @Override
-    public Result<List<PartyGroupResultDTO>> groupList() {
+    public Result<List<PartyGroupResultDTO>> groupList(TokenDto userDetail) {
-        return partyGroupFeignClient.list();
+        if(userDetail==null){
+            return new Result<List<PartyGroupResultDTO>>().error("未登录");
+        }
+        return partyGroupFeignClient.list(userDetail.getUserId());
     }
 
     @Override
@@ -112,4 +115,29 @@ public class PartyGroupServiceImpl implements PartyGroupService {
     public Result modifyIdentity(PartyUserIdentityFormDTO formDto) {
         return partyGroupFeignClient.modifyIdentity(formDto);
     }
+
+    @Override
+    public Result joinGroup(TokenDto userDetail, PartyUserJoinGroupFormDTO formDto) {
+        if(userDetail==null){
+            return new Result<>().error("未登录");
+        }
+        //获取所有上级机构名称和ID拼接
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
+        ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+        // 父所有部门
+        formDto.setParentDeptIds(deptDTO.getParentDeptIds());
+        formDto.setParentDeptNames(deptDTO.getParentDeptNames());
+        // 所有部门
+        formDto.setAllDeptIds(deptDTO.getAllDeptIds());
+        formDto.setAllDeptNames(deptDTO.getAllDeptNames());
+        // 网格
+        formDto.setGrid(deptDTO.getGrid());
+        formDto.setGridId(deptDTO.getGridId());
+        formDto.setUserId(userDetail.getUserId());
+        formDto.setPartyMember(userDetail.getPartyFlag());
+        formDto.setUserAvatar(userDetail.getFaceImg());
+        formDto.setNickname(userDetail.getNickname());
+        formDto.setMobile(userDetail.getMobile());
+        return partyGroupFeignClient.joinGroup(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyUserJoinGroupFormDTO.java

@@ -0,0 +1,74 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author songyunpeng
+ * @Date 2020/6/3 16:24
+ */
+@Data
+public class PartyUserJoinGroupFormDTO implements Serializable {
+    private static final long serialVersionUID = -3034807666143092535L;
+
+    /**
+     * 党群ID
+     */
+    @NotNull(message = "党群ID不能为空")
+    private String partyGroupId;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String userAvatar;
+
+    /**
+     * 党员标识 0：否，1：是
+     */
+    private String partyMember;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+
+}

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyGroupResultDTO.java

@@ -48,5 +48,10 @@ public class PartyGroupResultDTO implements Serializable {
      */
 	private String partyGroupAvatar;
 
+    /**
+     * 是否加入
+     */
+    private String isJoin;
+
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyGroupController.java

@@ -2,12 +2,11 @@ package com.elink.esua.epdc.controller;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.PartyUserJoinGroupFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupResultDTO;
 import com.elink.esua.epdc.service.PartyGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -30,10 +29,22 @@ public class AppPartyGroupController {
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>>
      **/
-    @GetMapping("list")
+    @GetMapping("list/{userId}")
-    public Result<List<PartyGroupResultDTO>> list(){
+    public Result<List<PartyGroupResultDTO>> list(@PathVariable("userId") String userId){
-        List<PartyGroupResultDTO> data = partyGroupService.getAllPartyGroup();
+        List<PartyGroupResultDTO> data = partyGroupService.getAllPartyGroup(userId);
         return new Result<List<PartyGroupResultDTO>>().ok(data);
     }
 
+    /**
+     * @Description  加入党群
+     * @Author songyunpeng
+     * @Date  2020/6/4
+     * @Param [partyUserJoinGroupFormDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>>
+     **/
+    @GetMapping("join")
+    public Result joinGroup(@RequestBody  PartyUserJoinGroupFormDTO partyUserJoinGroupFormDTO){
+        return partyGroupService.joinGroup(partyUserJoinGroupFormDTO);
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java

@@ -65,5 +65,5 @@ public interface PartyGroupDao extends BaseDao<PartyGroupEntity> {
      * @Param []
      * @return java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>
      **/
-    List<PartyGroupResultDTO> getAllPartyGroup();
+    List<PartyGroupResultDTO> getAllPartyGroup(String userId);
 }

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

@@ -27,7 +27,7 @@ import java.util.List;
  * @author songyunpeng
  * @since 1.0.0
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient")
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
     
     /**

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java

@@ -19,11 +19,11 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
 import com.elink.esua.epdc.dto.PartyGroupListDTO;
 import com.elink.esua.epdc.dto.UserDTO;
-import com.elink.esua.epdc.dto.form.PartyGroupOfficialsFormDTO;
+import com.elink.esua.epdc.dto.form.PartyUserJoinGroupFormDTO;
-import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupResultDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
 
@@ -128,6 +128,13 @@ public interface PartyGroupService extends BaseService<PartyGroupEntity> {
      * @Param []
      * @return java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>
      **/
-    List<PartyGroupResultDTO> getAllPartyGroup();
+    List<PartyGroupResultDTO> getAllPartyGroup(String userId);
-
+    /**
+     * @Description  加入党群 
+     * @Author songyunpeng
+     * @Date  2020/6/4
+     * @Param [partyUserJoinGroupFormDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result joinGroup(PartyUserJoinGroupFormDTO partyUserJoinGroupFormDTO);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java

@@ -95,10 +95,10 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyGroupOfficialsDTO dto) {
         //处理gridID
-        if (dto.getAllDeptIdsShow().size()!= NumConstant.FOUR) {
+        if (dto.getAllDeptIdsShow().size()!= NumConstant.THREE) {
             throw new RenException("请选择网格！");
         }
-        Result<SysDeptDTO> sysDeptDTO = adminFeignClient.getSysDeptDTO(dto.getAllDeptIdsShow().get(NumConstant.THREE));
+        Result<SysDeptDTO> sysDeptDTO = adminFeignClient.getSysDeptDTO(dto.getAllDeptIdsShow().get(NumConstant.TWO));
         if(!sysDeptDTO.success() || sysDeptDTO.getData()==null){
             throw new RenException(sysDeptDTO.getMsg());
         }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyGroupDao;
 import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.form.PartyUserJoinGroupFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupResultDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
@@ -224,8 +225,22 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
     }
 
     @Override
-    public List<PartyGroupResultDTO> getAllPartyGroup() {
+    public List<PartyGroupResultDTO> getAllPartyGroup(String userId) {
-        return baseDao.getAllPartyGroup();
+        return baseDao.getAllPartyGroup(userId);
+    }
+
+    @Override
+    public Result joinGroup(PartyUserJoinGroupFormDTO partyUserJoinGroupFormDTO) {
+        //判断是够已加入党群
+        PartyUserGroupDTO userByGroupIdAndUserId = partyUserGroupService.getUserByGroupIdAndUserId(partyUserJoinGroupFormDTO.getPartyGroupId(), partyUserJoinGroupFormDTO.getUserId());
+        if(userByGroupIdAndUserId!=null){
+            return new Result().error("用户已加入此群！");
+        }
+        PartyUserGroupDTO partyUserGroupDTO = ConvertUtils.sourceToTarget(partyUserJoinGroupFormDTO,PartyUserGroupDTO.class);
+        partyUserGroupDTO.setIdentityFlag("0");
+        partyUserGroupDTO.setState(0);
+        partyUserGroupService.save(partyUserGroupDTO);
+        return new Result();
     }
 
 

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml

@@ -93,8 +93,10 @@
          select
             t.ID,
             t.PARTY_GROUP_NAME,
-            t.PARTY_GROUP_AVATAR
+            t.PARTY_GROUP_AVATAR,
+            if(t1.ID is not null ,1,0) as isJoin
         from epdc_party_group t
-         where t.DEL_FLAG ='0' and t.STATE ='0' order by CREATED_TIME desc
+     left join epdc_party_user_group t1 on t1.PARTY_GROUP_ID = t.ID and t1.DEL_FLAG ='0' and t1.USER_ID=#{userId}
+         where t.DEL_FLAG ='0' and t.STATE ='0' order by t.CREATED_TIME desc
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml

@@ -173,13 +173,13 @@
             t3.USERNAME as username,
             t3.USER_FACE as commentUserFace,
             t3.CONTENT as content,
-            t3.PARTY_MEMBER as commentPartyMember
+            t3.PARTY_MEMBER as commentPartyMemberDEL_FLAG
          from epdc_party_topic t
         <if test='userId != "" and userId != null'>
             left join epdc_party_topic_user_attitude t1 on t.ID = t1.PARTY_TOPIC_ID and t1.DEL_FLAG='0' and t1.USER_ID = #{userId}
         </if>
         left join epdc_party_topic_img t2 on t.ID = t2.REFERENCE_ID and t2.DEL_FLAG='0'
-        left join epdc_party_topic_comment t3 on t.ID = t3.TOPIC_ID and t3.DEL_FLAG='0'
+        left join (select ID,USERNAME,USER_FACE,PARTY_MEMBER,CONTENT,TOPIC_ID,DEL_FLAG from epdc_party_topic_comment order by CREATED_TIME desc) t3 on t.ID = t3.TOPIC_ID and t3.DEL_FLAG='0'
         where t.DEL_FLAG='0' and t.PARTY_GROUP_ID = #{partyGroupId} and t.STATE = '0'
             <if test="timestamp != null and timestamp.trim() != ''">
                 <![CDATA[ AND DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}