新增功能

1、活动增加公益时长字段
2、志友朵朵列表接口增加昵称检索条件
3、党群1+1话题屏蔽功能

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 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.*;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.service.PartyGroupService;
@@ -173,4 +174,33 @@ public class ApiPartyGroupController {
         return partyGroupService.getGuideInfo(partyGroupId);
     }
 
+    /**
+     * 屏蔽话题
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/8/24 13:38
+     */
+    @PostMapping("shield")
+    public Result shieldTopic(@LoginUser TokenDto userDetail, @RequestBody PartyTopicShieldFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        formDto.setShieldUserId(userDetail.getUserId());
+        formDto.setShieldUserName(userDetail.getNickname());
+        return partyGroupService.shieldTopic(formDto);
+    }
+
+    /**
+     * 话题详情
+     *
+     * @param id 话题ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO>
+     * @author Liuchuang
+     * @since 2020/8/24 14:35
+     */
+    @GetMapping("detail/{id}")
+    public Result<PartyTopicDetailResultDTO> topicDetail(@PathVariable("id") String id) {
+        return partyGroupService.getTopicDetailById(id);
+    }
+
 }

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

@@ -151,4 +151,26 @@ public interface PartyGroupFeignClient {
      **/
     @GetMapping(value = "partyGroup/epdc-app/partygroupguide/group/guideInfo/{partyGroupId}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EpdcPartyGroupGuideResultDTO>> getGuideInfo(@PathVariable("partyGroupId") String partyGroupId);
+
+    /**
+     * 屏蔽话题
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/8/24 13:55
+     */
+    @PostMapping(value = "partyGroup/topic/shield", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result shieldTopic(PartyTopicShieldFormDTO formDto);
+
+    /**
+     * 话题详情
+     *
+     * @param id 话题ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO>
+     * @author Liuchuang
+     * @since 2020/8/24 14:50
+     */
+    @GetMapping(value = "partyGroup/topic/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<PartyTopicDetailResultDTO> getTopicDetailById(@PathVariable("id") String id);
 }

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

@@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.feign.PartyGroupFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -87,4 +88,14 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient {
     public Result<List<EpdcPartyGroupGuideResultDTO>> getGuideInfo(String partyGroupId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "getGuideInfo",partyGroupId);
     }
+
+    @Override
+    public Result shieldTopic(PartyTopicShieldFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "shieldTopic",formDto);
+    }
+
+    @Override
+    public Result<PartyTopicDetailResultDTO> getTopicDetailById(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "getTopicDetailById",id);
+    }
 }

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

@@ -119,4 +119,24 @@ public interface PartyGroupService {
      * @Date 13:48 2020-06-17
      **/
     Result<List<EpdcPartyGroupGuideResultDTO>> getGuideInfo(String partyGroupId);
+
+    /**
+     * 屏蔽话题
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/8/24 13:40
+     */
+    Result shieldTopic(PartyTopicShieldFormDTO formDto);
+
+    /**
+     * 话题详情
+     *
+     * @param id 话题ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO>
+     * @author Liuchuang
+     * @since 2020/8/24 14:48
+     */
+    Result<PartyTopicDetailResultDTO> getTopicDetailById(String id);
 }

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

@@ -157,4 +157,14 @@ public class PartyGroupServiceImpl implements PartyGroupService {
     public Result<List<EpdcPartyGroupGuideResultDTO>> getGuideInfo(String partyGroupId) {
         return partyGroupFeignClient.getGuideInfo(partyGroupId);
     }
+
+    @Override
+    public Result shieldTopic(PartyTopicShieldFormDTO formDto) {
+        return partyGroupFeignClient.shieldTopic(formDto);
+    }
+
+    @Override
+    public Result<PartyTopicDetailResultDTO> getTopicDetailById(String id) {
+        return partyGroupFeignClient.getTopicDetailById(id);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java

@@ -224,4 +224,9 @@ public class ActInfoDTO implements Serializable {
      *是否提交为内容待审核状态
      */
     private Boolean isConReview;
+
+    /**
+     * 公益时长
+     */
+    private Integer kindnessTime;
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java

@@ -205,4 +205,9 @@ public class ActInfoEntity extends BaseEpdcEntity {
 	 * 活动新闻稿
 	 */
 	private String actNewsContent;
+
+	/**
+	 * 公益时长
+	 */
+	private Integer kindnessTime;
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -64,6 +64,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -410,7 +411,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         ActUserRelationDTO actUserRelationDto = actUserRelationService.get(actUserId);
         if (null != actUserRelationDto) {
             EpdcVolunteerKindnessTimeFormDTO formDto = new EpdcVolunteerKindnessTimeFormDTO();
-            formDto.setKindnessTime(LocalDateUtils.durationMinutes(actInfo.getActStartTime(), actInfo.getActEndTime(), NumConstant.TWO));
+            formDto.setKindnessTime(BigDecimal.valueOf(actInfo.getKindnessTime() * NumConstant.SIXTY));
             formDto.setUserId(actUserRelationDto.getUserId());
             return userInfoFeignClient.addKindnessTime(formDto);
         }

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

@@ -190,4 +190,24 @@ public class PartyTopicDTO implements Serializable {
      */
     private String remark;
 
+    /**
+     * 屏蔽标识：0-否，1-是
+     */
+    private String shieldFlag;
+
+    /**
+     * 屏蔽原因
+     */
+    private String shieldReason;
+
+    /**
+     * 屏蔽人ID
+     */
+    private String shieldUserId;
+
+    /**
+     * 屏蔽人
+     */
+    private String shieldUserName;
+
 }

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

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 屏蔽话题 from dto
+ *
+ * @author Liuchuang
+ * @since 2020/8/24 13:32
+ */
+@Data
+public class PartyTopicShieldFormDTO implements Serializable {
+    private static final long serialVersionUID = -7738674444788952509L;
+
+    /**
+     * 话题ID
+     */
+    @NotBlank(message = "话题ID不能为空")
+    private String id;
+
+    /**
+     * 屏蔽原因
+     */
+    @NotBlank(message = "屏蔽原因")
+    @Size(min = 1, max = 100, message = "屏蔽原因在100字以内")
+    private String shieldReason;
+
+    /**
+     * 屏蔽人ID
+     */
+    private String shieldUserId;
+
+    /**
+     * 屏蔽人
+     */
+    private String shieldUserName;
+}

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

@@ -0,0 +1,62 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 话题详情
+ *
+ * @author Liuchuang
+ * @since 2020/8/24 14:20
+ */
+@Data
+public class PartyTopicDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -6886266329033076598L;
+
+    /**
+     * 话题ID
+     */
+    private String id;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String userFace;
+
+    /**
+     * 党员标识：0-否，1-是
+     */
+    private String partyMember;
+
+    /**
+     * 发布时间
+     */
+    private String createdTime;
+
+    /**
+     * 话题图片
+     */
+    private List<String> images;
+
+    /**
+     * 屏蔽标识：0-否，1-是
+     */
+    private String shieldFlag;
+
+    /**
+     * 屏蔽原因
+     */
+    private String shieldReason;
+}

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

@@ -106,6 +106,16 @@ public class TopicList implements Serializable {
      */
 	private String thisCommunity;
 
+    /**
+     * 屏蔽标识：0-否，1-是
+     */
+	private String shieldFlag;
+
+    /**
+     * 屏蔽原因
+     */
+	private String shieldReason;
+
     /**
      * 评论列表
      */

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

@@ -19,10 +19,8 @@ package com.elink.esua.epdc.controller;
 
 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.MyPartyTopicFormDTO;
+import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.form.PartyTopicFormDTO;
+import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO;
-import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO;
-import com.elink.esua.epdc.dto.form.TopicStatementFormDTO;
 import com.elink.esua.epdc.dto.result.PartyTopicResultDTO;
 import com.elink.esua.epdc.service.PartyTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,4 +87,32 @@ public class AppPartyTopicController {
         return new Result();
     }
 
+    /**
+     * 屏蔽话题
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/8/24 13:38
+     */
+    @PostMapping("shield")
+    public Result shieldTopic(@RequestBody PartyTopicShieldFormDTO formDto) {
+        return partyTopicService.shieldTopic(formDto);
+    }
+
+    /**
+     * 话题详情
+     *
+     * @param id 话题ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO>
+     * @author Liuchuang
+     * @since 2020/8/24 14:35
+     */
+    @GetMapping("detail/{id}")
+    public Result<PartyTopicDetailResultDTO> topicDetail(@PathVariable("id") String id) {
+        PartyTopicDetailResultDTO data = partyTopicService.getTopicDetailById(id);
+
+        return new Result<PartyTopicDetailResultDTO>().ok(data);
+    }
+
 }

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

@@ -21,6 +21,7 @@ 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.PartyTopicFormDTO;
+import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO;
 import com.elink.esua.epdc.dto.result.TopicList;
 import com.elink.esua.epdc.entity.PartyTopicEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -96,4 +97,14 @@ public interface PartyTopicDao extends BaseDao<PartyTopicEntity> {
      * @return void
      */
     void rejectTopicInfo(@Param("relationId") String relationId);
+
+    /**
+     * 话题详情
+     *
+     * @param id 话题ID
+     * @return com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO
+     * @author Liuchuang
+     * @since 2020/8/24 14:32
+     */
+    PartyTopicDetailResultDTO selectOneOfTopicDetailById(@Param("id") String id);
 }

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

@@ -149,4 +149,24 @@ public class PartyTopicEntity extends BaseEpdcEntity {
      */
 	private String remark;
 
+	/**
+	 * 屏蔽标识：0-否，1-是
+	 */
+	private String shieldFlag;
+
+	/**
+	 * 屏蔽原因
+	 */
+	private String shieldReason;
+
+	/**
+	 * 屏蔽人ID
+	 */
+	private String shieldUserId;
+
+	/**
+	 * 屏蔽人
+	 */
+	private String shieldUserName;
+
 }

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

@@ -22,10 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO;
 import com.elink.esua.epdc.dto.PartyTopicDTO;
-import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO;
+import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.form.PartyTopicFormDTO;
+import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO;
-import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO;
-import com.elink.esua.epdc.dto.form.TopicStatementFormDTO;
 import com.elink.esua.epdc.dto.result.PartyTopicResultDTO;
 import com.elink.esua.epdc.entity.PartyTopicEntity;
 import com.elink.esua.epdc.rocketmq.dto.RejectRecordDTO;
@@ -172,4 +170,24 @@ public interface PartyTopicService extends BaseService<PartyTopicEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result rejectTopicInfo(RejectRecordDTO dto);
+
+    /**
+     * 屏蔽话题
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/8/24 13:40
+     */
+    Result shieldTopic(PartyTopicShieldFormDTO formDto);
+
+    /**
+     * 话题详情
+     *
+     * @param id 话题ID
+     * @return com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO
+     * @author Liuchuang
+     * @since 2020/8/24 14:33
+     */
+    PartyTopicDetailResultDTO getTopicDetailById(String id);
 }

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

@@ -39,10 +39,8 @@ import com.elink.esua.epdc.dto.PartyTopicDTO;
 import com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.dto.constant.PartyGroupConstant;
-import com.elink.esua.epdc.dto.form.MyPartyTopicFormDTO;
+import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.form.PartyTopicFormDTO;
+import com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO;
-import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO;
-import com.elink.esua.epdc.dto.form.TopicStatementFormDTO;
 import com.elink.esua.epdc.dto.result.PartyTopicResultDTO;
 import com.elink.esua.epdc.dto.result.TopicList;
 import com.elink.esua.epdc.entity.PartyTopicEntity;
@@ -312,4 +310,18 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
         return new Result();
     }
 
+    @Override
+    @Transactional
+    public Result shieldTopic(PartyTopicShieldFormDTO formDto) {
+        PartyTopicEntity entity = ConvertUtils.sourceToTarget(formDto, PartyTopicEntity.class);
+        entity.setShieldFlag(NumConstant.ONE_STR);
+        baseDao.updateById(entity);
+        return new Result();
+    }
+
+    @Override
+    public PartyTopicDetailResultDTO getTopicDetailById(String id) {
+        return baseDao.selectOneOfTopicDetailById(id);
+    }
+
 }

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

@@ -144,6 +144,8 @@
         <result property="likeFlag" column="likeFlag"/>
         <result property="identityFlag" column="IDENTITY_FLAG"/>
         <result property="thisCommunity" column="thisCommunity"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
+        <result property="shieldReason" column="SHIELD_REASON"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -202,6 +204,7 @@
         epdc_party_topic t1
         WHERE
         t1.DEL_FLAG = '0' and t1.STATE = '0'
+        AND t1.SHIELD_FLAG = '0'
         <if test="timestamp != null and timestamp.trim() != ''">
             <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
@@ -231,6 +234,8 @@
         t.SUPPORT_NUM,
         t.COMMENT_NUM,
         t.TOPIC_ADDRESS,
+        t.SHIELD_FLAG,
+        t.SHIELD_REASON,
         <if test='userId != "" and userId != null'>
             if( ATTITUDE_FLAG='0',1,0)likeFlag,
         </if>
@@ -279,4 +284,39 @@
         UPDATE epdc_party_topic SET DEL_FLAG = 1,UPDATED_TIME=NOW()
         where id=#{relationId}
     </update>
+
+    <resultMap id="partyTopicResult" type="com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO">
+        <result property="id" column="ID"/>
+        <result property="topicContent" column="TOPIC_CONTENT"/>
+        <result property="nickname" column="NICKNAME"/>
+        <result property="userFace" column="USER_FACE"/>
+        <result property="partyMember" column="PARTY_MEMBER"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
+        <result property="shieldReason" column="SHIELD_REASON"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectOneOfTopicDetailById" resultType="partyTopicDetailMap">
+        SELECT
+            t.ID,
+            t.TOPIC_CONTENT,
+            t.CREATED_TIME,
+            t.NICKNAME,
+            t.USER_FACE,
+            t.PARTY_MEMBER,
+            i.IMG_URL,
+            t.SHIELD_FLAG,
+            t.SHIELD_REASON
+        FROM
+            epdc_party_topic t
+            LEFT JOIN epdc_party_topic_img i ON i.REFERENCE_ID = t.ID
+            AND i.DEL_FLAG = '0'
+        WHERE
+            t.DEL_FLAG = '0'
+            AND t.ID = #{id}
+        ORDER BY
+            i.IMG_URL
+    </select>
 </mapper>

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

@@ -30,4 +30,9 @@ public class EpdcAppVolunteerListFormDTO {
      * 数据权限
      */
     private Long gridId;
+
+    /**
+     * 搜索条件：昵称
+     */
+    private String nickname;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -228,6 +228,9 @@
         WHERE
           v.DEL_FLAG = 0
           AND v.AUDIT_STATUS != 2
+        <if test="nickname != null and nickname.trim() != '' ">
+          AND v.VOLUNTEER_NICKNAME like concat('%', #{nickname.trim()}, '%')
+        </if>
         ORDER BY v.VOLUNTEER_ORDER ASC ,CONVERT(v.VOLUNTEER_NICKNAME USING gbk)
         LIMIT #{pageIndex},#{pageSize}
     </select>