党群1+1 新用户信息完善+党群排序

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/PartyGroupTask.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.async;
+
+import com.elink.esua.epdc.dto.form.PartyUserNewInfoFormDTO;
+import com.elink.esua.epdc.feign.PartyGroupFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author songyunpeng
+ * @Description 党群模块
+ * @create 2020-06-08
+ */
+@Component
+public class PartyGroupTask {
+
+    @Autowired
+    private PartyGroupFeignClient partyGroupFeignClient;
+
+
+    /**
+     * @Description  用户完善信息后更新党群群员信息
+     * @Author songyunpeng
+     * @Date  2020/6/8
+     * @Param [formDTO]
+     * @return void
+     **/
+    @Async
+    public void updateInfo(PartyUserNewInfoFormDTO formDTO) {
+        partyGroupFeignClient.updateInfo(formDTO);
+    }
+}

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

@@ -131,4 +131,13 @@ public interface PartyGroupFeignClient {
      **/
     @GetMapping(value = "partyGroup/group/join", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result joinGroup(PartyUserJoinGroupFormDTO formDto);
+    /**
+     * @Description  用户完善信息后更新党群群员信息
+     * @Author songyunpeng
+     * @Date  2020/6/8
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping(value = "partyGroup/user/updateInfo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result updateInfo(@RequestBody PartyUserNewInfoFormDTO formDTO);
 }

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

@@ -75,4 +75,9 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient {
     public Result joinGroup(PartyUserJoinGroupFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "joinGroup",formDto);
     }
+
+    @Override
+    public Result updateInfo(PartyUserNewInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "updateInfo",formDTO);
+    }
 }

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

@@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.async.GroupTask;
+import com.elink.esua.epdc.async.PartyGroupTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@@ -34,10 +35,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.enums.*;
-import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.*;
-import com.elink.esua.epdc.feign.GroupFeignClient;
-import com.elink.esua.epdc.feign.OssFeignClient;
-import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
 import com.elink.esua.epdc.jwt.JwtTokenUtils;
 import com.elink.esua.epdc.redis.AppUserRedis;
@@ -107,9 +105,15 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private GroupTask groupTask;
 
+    @Autowired
+    private PartyGroupTask partyGroupTask;
+
     @Autowired
     private GroupFeignClient groupFeignClient;
 
+    @Autowired
+    private PartyGroupFeignClient partyGroupFeignClient;
+
     //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png";
     private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png";
 
@@ -1423,6 +1427,16 @@ public class AppUserServiceImpl implements AppUserService {
         if (partyFlag) {
             initPartyGroupInfo(cachingUserInfoDTO);
         }
+        //异步更新党群群众信息
+        PartyUserNewInfoFormDTO formDTO  = new PartyUserNewInfoFormDTO();
+        formDTO.setUserId(cachingUserInfoDTO.getUserId());
+        formDTO.setMobile(cachingUserInfoDTO.getMobile());
+        formDTO.setNickname(cachingUserInfoDTO.getNickname());
+        formDTO.setPartyMember(cachingUserInfoDTO.getPartyFlag());
+        formDTO.setUserAvatar(cachingUserInfoDTO.getFaceImg());
+//        partyGroupTask.updateInfo(formDTO);
+        partyGroupFeignClient.updateInfo(formDTO);
+
         return new Result().ok(authorizationDto);
     }
 

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

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -126,4 +127,9 @@ public class PartyGroupDTO implements Serializable {
      */
     private String nickname;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }

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

@@ -46,5 +46,9 @@ public class PartyTopicFormDTO implements Serializable {
      */
     @NotNull(message = "党群ID不能为空")
     private String partyGroupId;
+    /**
+     * 话题ID
+     */
+    private String partyTopicId;
 
 }

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

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description 完善党群群员表信息
+ * @create 2020-06-08
+ */
+@Data
+public class PartyUserNewInfoFormDTO implements Serializable {
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空")
+    private String userId;
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String userAvatar;
+
+    /**
+     * 手机
+     */
+    private String mobile;
+
+    /**
+     * 党员标识
+     */
+    private String partyMember;
+
+}

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.form.PartyUserBannedFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserIdentityFormDTO;
+import com.elink.esua.epdc.dto.form.PartyUserNewInfoFormDTO;
 import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO;
 import com.elink.esua.epdc.service.PartyUserGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,4 +64,16 @@ public class AppPartyUserGroupController {
         return partyUserGroupService.modifyIdentity(formDTO);
 
     }
+    /**
+     * @Description  用户完善信息后更新党群群员信息
+     * @Author songyunpeng
+     * @Date  2020/6/8
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("updateInfo")
+    public Result updateInfo(@RequestBody PartyUserNewInfoFormDTO formDTO){
+        return partyUserGroupService.updateInfo(formDTO);
+
+    }
 }

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO;
+import com.elink.esua.epdc.dto.form.PartyUserNewInfoFormDTO;
 import com.elink.esua.epdc.dto.result.AllUsers;
 import com.elink.esua.epdc.dto.result.CurrentUser;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
@@ -77,5 +78,12 @@ public interface PartyUserGroupDao extends BaseDao<PartyUserGroupEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.result.CurrentUser>
      **/
     CurrentUser selectOneOfPartyUserGroup(PartyUserGroupFormDTO formDTO);
-
+    /**
+     * @Description  用户完善信息后更新党群群员信息
+     * @Author songyunpeng
+     * @Date  2020/6/8
+     * @Param [formDTO]
+     * @return void
+     **/
+    void updateInfoByUserId(PartyUserNewInfoFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupEntity.java

@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党群表 
  *
@@ -88,6 +85,10 @@ public class PartyGroupEntity extends BaseEpdcEntity {
      */
 	private String parentDeptNames;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 
 

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

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.dto.form.PartyUserBannedFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserIdentityFormDTO;
+import com.elink.esua.epdc.dto.form.PartyUserNewInfoFormDTO;
 import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
 
@@ -164,5 +165,12 @@ public interface PartyUserGroupService extends BaseService<PartyUserGroupEntity>
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result modifyIdentity(PartyUserIdentityFormDTO formDTO);
-
+    /**
+     * @Description   用户完善信息后更新党群群员信息
+     * @Author songyunpeng
+     * @Date  2020/6/8
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result updateInfo(PartyUserNewInfoFormDTO formDTO);
 }

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

@@ -35,6 +35,7 @@ import com.elink.esua.epdc.dto.constant.PartyGroupConstant;
 import com.elink.esua.epdc.dto.form.PartyUserBannedFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserIdentityFormDTO;
+import com.elink.esua.epdc.dto.form.PartyUserNewInfoFormDTO;
 import com.elink.esua.epdc.dto.result.AllUsers;
 import com.elink.esua.epdc.dto.result.CurrentUser;
 import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO;
@@ -200,6 +201,13 @@ public class PartyUserGroupServiceImpl extends BaseServiceImpl<PartyUserGroupDao
         return new Result();
     }
 
+    @Override
+    public Result updateInfo(PartyUserNewInfoFormDTO formDTO) {
+        baseDao.updateInfoByUserId(formDTO);
+        return new Result();
+    }
+
+
     private void modifyIdentityFlag(String groupUserId, String identityFlag) {
         //判断是否是指定群主操作
         if(PartyGroupConstant.PARTY_GROUP_IDENTITY_FLAG.equals(identityFlag)){

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

@@ -59,7 +59,8 @@
             t.CREATED_TIME,
             t.UPDATED_BY,
             t.UPDATED_TIME,
-            t1.NICKNAME
+            t1.NICKNAME,
+            t.SORT
         from epdc_party_group t
         left join (select PARTY_GROUP_ID,NICKNAME from epdc_party_user_group where IDENTITY_FLAG = '0' and DEL_FLAG='0' and STATE='0') t1 on t.ID = t1.PARTY_GROUP_ID
         where t.DEL_FLAG ='0'
@@ -87,7 +88,8 @@
             t.UPDATED_BY,
             t.UPDATED_TIME,
             t1.NICKNAME,
-            t1.USER_ID
+            t1.USER_ID,
+            t.SORT
         from epdc_party_group t
         left join (select PARTY_GROUP_ID,NICKNAME,USER_ID from epdc_party_user_group where IDENTITY_FLAG = '0' and DEL_FLAG='0' and STATE='0') t1 on t.ID = t1.PARTY_GROUP_ID
         where t.DEL_FLAG ='0' and t.ID = #{id}
@@ -102,7 +104,7 @@
             if(t1.ID is not null ,1,0) as isJoin
         from epdc_party_group t
      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'  and t.DEPT_ID = #{streetId} order by t.CREATED_TIME desc
+         where t.DEL_FLAG ='0' and t.STATE ='0'  and t.DEPT_ID = #{streetId} order by t.SORT, t.CREATED_TIME desc
     </select>
     <select id="getPartyGroupDTOByName" resultType="com.elink.esua.epdc.dto.PartyGroupDTO">
         select ID from epdc_party_group where PARTY_GROUP_NAME = #{partyGroupName} and DEL_FLAG='0' limit 1;

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

@@ -187,6 +187,9 @@
             <if test="topicType != null and topicType != ''">
                 and t.TOPIC_MODULE = #{topicType}
             </if>
+            <if test="partyTopicId!=null and partyTopicId != ''">
+                and t.ID = #{partyTopicId}
+            </if>
         order by t.CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>

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

@@ -23,6 +23,11 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <update id="updateInfoByUserId" parameterType="com.elink.esua.epdc.dto.form.PartyUserNewInfoFormDTO">
+        update epdc_party_user_group set NICKNAME = #{nickname},
+        USER_AVATAR = #{userAvatar},MOBILE=#{mobile},PARTY_MEMBER=#{partyMember}
+        where USER_ID = #{userId} and DEL_FLAG = '0'
+    </update>
 
 
     <select id="getManagerByGroupId" resultType="com.elink.esua.epdc.dto.PartyUserGroupDTO">