Merge remote-tracking branch 'origin/master' into feature/syp_residentIfo

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

@@ -203,4 +203,19 @@ public class ApiPartyGroupController {
         return partyGroupService.getTopicDetailById(id);
     }
 
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @param userDetail 用户信息
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/8 9:33
+     */
+    @PostMapping("topic/top")
+    public Result topicTop(@LoginUser TokenDto userDetail, @RequestBody PartyGroupTopicTopFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return partyGroupService.modifyTopicTopFlag(userDetail, formDto);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.form.*;
@@ -173,4 +174,16 @@ public interface PartyGroupFeignClient {
      */
     @GetMapping(value = "partyGroup/topic/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<PartyTopicDetailResultDTO> getTopicDetailById(@PathVariable("id") String id);
+
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/8 9:33
+     */
+    @PostMapping("partyGroup/topic/top")
+    Result topicTop(PartyGroupTopicTopFormDTO formDto);
+
 }

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

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.feign.fallback;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -98,4 +99,9 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient {
     public Result<PartyTopicDetailResultDTO> getTopicDetailById(String id) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "getTopicDetailById",id);
     }
+
+    @Override
+    public Result topicTop(PartyGroupTopicTopFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "topicTop",formDto);
+    }
 }

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

@@ -139,4 +139,15 @@ public interface PartyGroupService {
      * @since 2020/8/24 14:48
      */
     Result<PartyTopicDetailResultDTO> getTopicDetailById(String id);
+
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @param userDetail 用户信息
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/8 9:36
+     */
+    Result modifyTopicTopFlag(TokenDto userDetail, PartyGroupTopicTopFormDTO formDto);
 }

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

@@ -167,4 +167,10 @@ public class PartyGroupServiceImpl implements PartyGroupService {
     public Result<PartyTopicDetailResultDTO> getTopicDetailById(String id) {
         return partyGroupFeignClient.getTopicDetailById(id);
     }
+
+    @Override
+    public Result modifyTopicTopFlag(TokenDto userDetail, PartyGroupTopicTopFormDTO formDto) {
+        formDto.setUserId(userDetail.getUserId());
+        return partyGroupFeignClient.topicTop(formDto);
+    }
 }

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

@@ -144,4 +144,9 @@ public class PartyGroupOfficialsDTO implements Serializable {
      */
     private List<Long> allDeptIdsShow;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }

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

@@ -210,4 +210,14 @@ public class PartyTopicDTO implements Serializable {
      */
     private String shieldUserName;
 
+    /**
+     * 置顶标识(0否, 1是)
+     */
+    private String topFlag;
+
+    /**
+     * 置顶时间
+     */
+    private Date topTime;
+
 }

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

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 话题置顶Form DTO
+ *
+ * @author Liuchuang
+ * @since 2020/9/8 9:28
+ */
+@Data
+public class PartyGroupTopicTopFormDTO implements Serializable {
+    private static final long serialVersionUID = 5463476744161662442L;
+
+    /**
+     * 话题ID
+     */
+    @NotBlank(message = "话题ID不能为空")
+    private String topicId;
+
+    /**
+     * 置顶标识：0-取消置顶，1-置顶
+     */
+    @NotBlank(message = "置顶标识不能为空")
+    private String topFlag;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

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

@@ -127,4 +127,9 @@ public class TopicList implements Serializable {
      */
     private List<PartyTopicSupportResultDTO> likes;
 
+    /**
+     * 置顶标识：0-否，1-是
+     */
+    private String topFlag;
+
 }

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

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 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.*;
@@ -115,4 +116,17 @@ public class AppPartyTopicController {
         return new Result<PartyTopicDetailResultDTO>().ok(data);
     }
 
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/8 9:33
+     */
+    @PostMapping("top")
+    public Result topicTop(@RequestBody PartyGroupTopicTopFormDTO formDto) {
+        return partyTopicService.modifyTopicTopFlag(formDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.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.PartyTopicDTO;
 import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO;
+import com.elink.esua.epdc.dto.form.PartyGroupTopicTopFormDTO;
 import com.elink.esua.epdc.dto.form.PartyTopicFormDTO;
 import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO;
 import com.elink.esua.epdc.dto.result.TopicList;
@@ -107,4 +108,24 @@ public interface PartyTopicDao extends BaseDao<PartyTopicEntity> {
      * @since 2020/8/24 14:32
      */
     PartyTopicDetailResultDTO selectOneOfTopicDetailById(@Param("id") String id);
+
+    /**
+     * 获取用户身份
+     *
+     * @param formDto 检索条件
+     * @return int
+     * @author Liuchuang
+     * @since 2020/9/8 13:31
+     */
+    int selectGroupUserByUserIdAndTopicId(@Param("formDto") PartyGroupTopicTopFormDTO formDto);
+
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @param formDto 参数
+     * @return void
+     * @author Liuchuang
+     * @since 2020/9/8 13:55
+     */
+    void updateTopicTopFlagById(@Param("formDto") PartyGroupTopicTopFormDTO formDto);
 }

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

@@ -102,4 +102,9 @@ public class PartyGroupOfficialsEntity 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/entity/PartyTopicEntity.java

@@ -169,4 +169,14 @@ public class PartyTopicEntity extends BaseEpdcEntity {
 	 */
 	private String shieldUserName;
 
+	/**
+	 * 置顶标识(0否, 1是)
+	 */
+	private String topFlag;
+
+	/**
+	 * 置顶时间
+	 */
+	private Date topTime;
+
 }

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

@@ -190,4 +190,14 @@ public interface PartyTopicService extends BaseService<PartyTopicEntity> {
      * @since 2020/8/24 14:33
      */
     PartyTopicDetailResultDTO getTopicDetailById(String id);
+
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/8 9:44
+     */
+    Result modifyTopicTopFlag(PartyGroupTopicTopFormDTO formDto);
 }

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

@@ -47,7 +47,6 @@ import com.elink.esua.epdc.entity.PartyTopicEntity;
 import com.elink.esua.epdc.entity.PartyTopicUserAttitudeEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.ContentSecurityFeignClient;
-import com.elink.esua.epdc.redis.PartyTopicRedis;
 import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO;
 import com.elink.esua.epdc.service.PartyTopicImgService;
 import com.elink.esua.epdc.service.PartyTopicService;
@@ -69,9 +68,6 @@ import java.util.*;
 @Service
 public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyTopicEntity> implements PartyTopicService {
 
-    @Autowired
-    private PartyTopicRedis partyTopicRedis;
-
     @Autowired
     private PartyTopicImgService partyTopicImgService;
 
@@ -327,4 +323,18 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
         return baseDao.selectOneOfTopicDetailById(id);
     }
 
+    @Override
+    public Result modifyTopicTopFlag(PartyGroupTopicTopFormDTO formDto) {
+        // 校验用户是否是群主或者副群主
+        int num = baseDao.selectGroupUserByUserIdAndTopicId(formDto);
+        if (num <= NumConstant.ZERO) {
+            return new Result().error("您不是群主或副群主，不能进行置顶操作");
+        }
+
+        // 更新话题置顶状态
+        baseDao.updateTopicTopFlagById(formDto);
+
+        return new Result();
+    }
+
 }

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

@@ -44,7 +44,8 @@
         t.CREATED_TIME,
         t.UPDATED_BY,
         t.UPDATED_TIME,
-        t1.PARTY_GROUP_NAME
+        t1.PARTY_GROUP_NAME,
+        t.SORT
         from epdc_party_group_officials t
         left join epdc_party_group t1 on t.PARTY_GROUP_ID = t1.ID and t1.DEL_FLAG='0'
         where t.DEL_FLAG ='0'
@@ -61,7 +62,7 @@
             AND (t.GRID_ID = #{gridId}
             OR find_in_set(#{gridId},t.ALL_DEPT_IDS))
         </if>
-        order by  t.CREATED_TIME desc
+        order by t.SORT, t.CREATED_TIME desc
     </select>
 
 
@@ -75,7 +76,7 @@
            AREA_RESPONSIBILITY
         from epdc_party_group_officials
         where DEL_FLAG ='0' and PARTY_GROUP_ID =  #{partyGroupId}
-         order by  CREATED_TIME desc
+         order by SORT, CREATED_TIME desc
          LIMIT #{pageIndex},#{pageSize}
     </select>
 

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

@@ -146,6 +146,7 @@
         <result property="thisCommunity" column="thisCommunity"/>
         <result property="shieldFlag" column="SHIELD_FLAG"/>
         <result property="shieldReason" column="SHIELD_REASON"/>
+        <result property="topFlag" column="TOP_FLAG"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -186,7 +187,8 @@
         t5.USER_ID as supportUserId,
         t5.NICKNAME as supportNickname,
         t5.USER_AVATAR as supportUserAvatar,
-            (if(find_in_set(t7.DEPT_ID,t6.ALL_DEPT_IDS)>0,'1','0'))as thisCommunity
+        (if(find_in_set(t7.DEPT_ID,t6.ALL_DEPT_IDS)>0,'1','0'))as thisCommunity,
+        t.TOP_FLAG
         from epdc_party_topic t
         <if test='userId != "" and userId != null'>
             left join (select * from epdc_party_topic_user_attitude)t1 on t.ID = t1.PARTY_TOPIC_ID and t1.DEL_FLAG='0' and t1.USER_ID = #{userId}
@@ -218,9 +220,10 @@
             and t1.ID = #{partyTopicId}
         </if>
         ORDER BY
+        t1.TOP_TIME DESC,
         t1.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}) tmp)
-        order by t.CREATED_TIME desc,t3.CREATED_TIME,t4.CREATED_TIME
+        order by t.TOP_TIME DESC, t.CREATED_TIME desc,t3.CREATED_TIME,t4.CREATED_TIME
     </select>
     <select id="selectListOfMyPartyTopic" resultMap="partyTopicResult">
 
@@ -319,4 +322,30 @@
         ORDER BY
             i.IMG_URL
     </select>
+
+    <select id="selectGroupUserByUserIdAndTopicId" resultType="Integer">
+        SELECT
+            COUNT(ug.ID)
+        FROM
+            epdc_party_user_group ug
+            LEFT JOIN epdc_party_topic pt ON ug.PARTY_GROUP_ID = pt.PARTY_GROUP_ID
+            AND pt.DEL_FLAG = '0'
+        WHERE
+            ug.DEL_FLAG = '0'
+            AND ug.STATE = 0
+            AND ug.IDENTITY_FLAG IN ( '0', '1' )
+            AND pt.ID = #{formDto.topicId}
+            AND ug.USER_ID = #{formDto.userId}
+    </select>
+
+    <update id="updateTopicTopFlagById">
+        UPDATE epdc_party_topic SET TOP_FLAG = #{formDto.topFlag}
+        <if test='formDto.topFlag == "0"'>
+            , TOP_TIME = NULL
+        </if>
+        <if test='formDto.topFlag == "1"'>
+            , TOP_TIME = NOW()
+        </if>
+        WHERE ID = #{formDto.topicId}
+    </update>
 </mapper>