PC端党群1+1增加置顶和取消置顶操作

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

@@ -31,4 +31,9 @@ public class PartyGroupTopicTopFormDTO implements Serializable {
      * 用户ID
      */
     private String userId;
+
+    /**
+     * 系统标识：0-居民端，1-pc端
+     */
+    private String systemFlag;
 }

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 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.*;
@@ -126,6 +127,7 @@ public class AppPartyTopicController {
      */
     @PostMapping("top")
     public Result topicTop(@RequestBody PartyGroupTopicTopFormDTO formDto) {
+        formDto.setSystemFlag(NumConstant.ZERO_STR);
         return partyTopicService.modifyTopicTopFlag(formDto);
     }
 

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

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -27,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO;
 import com.elink.esua.epdc.dto.PartyTopicDTO;
+import com.elink.esua.epdc.dto.form.PartyGroupTopicTopFormDTO;
 import com.elink.esua.epdc.excel.PartyTopicExcel;
 import com.elink.esua.epdc.service.PartyTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,4 +100,19 @@ public class PartyTopicController {
         return partyTopicService.modifyTopicState(formDto);
     }
 
+    /**
+     * 话题置顶或取消置顶
+     *
+     * @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) {
+        ValidatorUtils.validateEntity(formDto);
+        formDto.setSystemFlag(NumConstant.ONE_STR);
+        return partyTopicService.modifyTopicTopFlag(formDto);
+    }
+
 }

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

@@ -325,11 +325,13 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
 
     @Override
     public Result modifyTopicTopFlag(PartyGroupTopicTopFormDTO formDto) {
+        if (NumConstant.ZERO_STR.equals(formDto.getSystemFlag())) {
             // 校验用户是否是群主或者副群主
             int num = baseDao.selectGroupUserByUserIdAndTopicId(formDto);
             if (num <= NumConstant.ZERO) {
                 return new Result().error("您不是群主或副群主，不能进行置顶操作");
             }
+        }
 
         // 更新话题置顶状态
         baseDao.updateTopicTopFlagById(formDto);

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

@@ -32,6 +32,8 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="topFlag" column="TOP_FLAG"/>
+        <result property="topTime" column="TOP_TIME"/>
     </resultMap>
 
 
@@ -64,7 +66,9 @@
             t.CREATED_BY,
             t.CREATED_TIME,
             t.UPDATED_BY,
-            t.UPDATED_TIME
+            t.UPDATED_TIME,
+            t.TOP_FLAG,
+            t.TOP_TIME
         from epdc_party_topic t
         where t.DEL_FLAG ='0'
         <if test="groupId!=null and groupId!=''">
@@ -79,7 +83,7 @@
         <if test="endTime != null and endTime != '' ">
             <![CDATA[ and t.CREATED_TIME <= ]]> #{endTime}
         </if>
-        order by  CREATED_TIME desc
+        order by t.TOP_TIME DESC, t.CREATED_TIME desc
     </select>
 
     <resultMap id="topicDetail" type="com.elink.esua.epdc.dto.PartyTopicDTO">