Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -25,7 +25,8 @@ public enum EpmetErrorCode {
 	 */
 	MOBILE_EXIST(8201, "该手机号已注册居民，请使用其他手机号注册！"),
 	PARAMETER_EXCEPTION(8202, "必要参数存在空值或手机号输入不合规，请检查参数赋值情况！！"),
-	UPDATE_EXCEPTION(8203, "用户居民注册访问记录表更新数据失败！");
+	UPDATE_EXCEPTION(8203, "用户居民注册访问记录表更新数据失败！"),
+	PARTICIPATION_EXCEPTION(8204, "参数异常，请检查所传参数是否合规！");
 
 
 	private int value;

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicCancelHiddenFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @ClassName ResiTopicCancelHiddenFormDTO
+ * @Author wangc
+ * @date 2020.04.07 15:10
+ */
+@Data
+public class ResiTopicCancelHiddenFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 需要解除屏蔽的话题Id集合
+     * */
+    private List<String> topicIds;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java

@@ -32,13 +32,11 @@ public class ResiTopicPublishFormDTO implements Serializable {
     /**
      * 经度
      * */
-    @NotBlank(message = "缺失经纬度信息")
     private String longitude;
 
     /**
      * 纬度
      * */
-    @NotBlank(message = "缺失经纬度信息")
     private String dimension;
 
     /**

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java

@@ -36,11 +36,21 @@ public class ResiTopicDetailResultDTO implements Serializable {
      * */
     private String releaseTime;
 
+    /**
+     * 发布地址
+     * */
+    private String releaseAddress;
+
     /**
      * 话题内容
      * */
     private String topicContent;
 
+    /**
+     * 话题状态
+     * */
+    private String topicStatus;
+
     /**
      * 图片访问地址
      * */

epmet-module/resi-group/resi-group-server/pom.xml

@@ -128,7 +128,7 @@
         </profile>
         <profile>
             <id>test</id>
-          <!--  <activation>
+           <!-- <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.redis;
+package com.epmet.modules.group.redis;
 
 import com.epmet.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -25,7 +25,6 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
@@ -45,7 +44,6 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.utils.ModuleConstant;
-import com.epmet.redis.ResiGroupRedis;
 import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.GroupStateConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -78,10 +78,10 @@ public class ResiTopicController {
      * @Author wangc
      * @Date 2020.04.02 00:01
      **/
-    @PostMapping("getlatesttentopics")
+    @PostMapping("getlatesttopics")
-    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
+    Result<List<ResiTopicInfoResultDTO>> getLatestTopics(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
         ValidatorUtils.validateEntity(topicDefaultPageFormDTO);
-        return topicService.getLatestTenTopics(tokenDto,topicDefaultPageFormDTO.getGroupId());
+        return topicService.getLatestTopics(tokenDto,topicDefaultPageFormDTO.getGroupId());
     }
 
     /**
@@ -121,8 +121,8 @@ public class ResiTopicController {
      * @Date 2020.04.01 14:17
      **/
     @PostMapping("cancelhiddentopics")
-    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestBody List<String> topicIds){
+    Result cancelHiddenTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicCancelHiddenFormDTO cancelHiddenFormDTO){
-        return topicService.cancelHiddenTopics(tokenDto,topicIds);
+        return topicService.cancelHiddenTopics(tokenDto,cancelHiddenFormDTO.getTopicIds());
     }
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -120,7 +120,7 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @Author wangc
      * @Date 2020.04.01 08:59
      **/
-    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(TokenDto tokenDto,String groupId);
+    Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto,String groupId);
 
     /**
      * @Description 查看历史话题(分页,允许状态筛选)

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.topic.dao.ResiTopicCommentDao;
 import com.epmet.modules.topic.service.ResiTopicCommentService;
 import com.epmet.modules.topic.service.ResiTopicService;
+import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
@@ -139,20 +140,20 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
         if(null != resiGroupMemberDTO){
             if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){
                 //当前用户被禁言
-                return new Result().error();
+                return new Result().error(ModuleConstant.SLIENT_MEMBER);
             }else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){
                 //当前用户已被移出群
-                return new Result().error();
+                return new Result().error(ModuleConstant.REMOVED_MEMBER);
             }
         }else{
             //当前用户非组内成员
-            return new Result().error();
+            return new Result().error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
         }
 
 
         if(resiCommentFormDTO.getCommentContent().length() > TopicConstant.MAX_NUMBER_OF_COMMENT){
 
-            return new Result().error();
+            return new Result().error(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED);
         }
         ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class);
         comment.setStatus(TopicConstant.PUBLISHMENT);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -172,7 +172,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //2.创建话题
         if(resiTopicPublishFormDTO.getTopicContent().length() > TopicConstant.MAX_NUMBER_OF_CONTENT){
             //内容超过最大限制
-            return new Result().error();
+            return new Result().error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED);
         }
         ResiTopicEntity topic = ConvertUtils.sourceToTarget(resiTopicPublishFormDTO,ResiTopicEntity.class);
         topic.setCreatedBy(tokenDto.getUserId());
@@ -180,7 +180,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         baseDao.insertOne(topic);
         if(StringUtils.isBlank(topic.getId())){
             //没有返回主键
-            return new Result().error();
+            return new Result().error(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
         }
         if(null != resiTopicPublishFormDTO.getAttachmentList() && resiTopicPublishFormDTO.getAttachmentList().size() > 0){
             ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
@@ -211,7 +211,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 08:59
      **/
     @Override
-    public Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(TokenDto tokenDto, String groupId) {
+    public Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId) {
         if (null == tokenDto) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
@@ -314,6 +314,10 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Transactional(rollbackFor = Exception.class)
     public Result cancelHiddenTopics(TokenDto tokenDto, List<String> topicIds) {
 
+        if(null == topicIds || topicIds.size() <= 0){
+            return new Result().error(ModuleConstant.TOPIC_ID_LIST_NOT_NULL);
+        }
+
         //1.1拿到组Id
         ResiTopicEntity topic = baseDao.selectById(topicIds.get(0));
 
@@ -393,10 +397,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         //1.获取话题基本信息
         ResiTopicEntity topicDetail = baseDao.selectById(topicId);
         if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){
-            return new Result().error();
+            return new Result().error(ModuleConstant.NO_SUCH_TOPIC);
         }
         ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO();
         resultDTO.setTopicId(topicId);
+        resultDTO.setReleaseTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(topicDetail.getCreatedTime()));
+        resultDTO.setTopicContent(topicDetail.getTopicContent());
+        resultDTO.setReleaseAddress(topicDetail.getAddress());
+        resultDTO.setTopicStatus(topicDetail.getStatus());
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(TopicConstant.TOPIC_ID,topicId);
@@ -409,8 +417,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
 
         resultDTO.setTopicImgs(attachmentUrls);
-        resultDTO.setReleaseTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(topicDetail.getCreatedTime()));
-        resultDTO.setTopicContent(topicDetail.getTopicContent());
 
         //3.拿取用户信息
         ResiTopicDTO topic = get(topicId);
@@ -467,16 +473,16 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         if(null != resiGroupMemberDTO){
             if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){
                 //当前用户被禁言
-                return new Result().error();
+                return new Result().error(ModuleConstant.SLIENT_MEMBER);
             }else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){
                 //当前用户已被移出群
-                return new Result().error();
+                return new Result().error(ModuleConstant.REMOVED_MEMBER);
             }else{
                 return new Result();
             }
         }else{
             //当前用户非组内成员
-            return new Result().error();
+            return new Result().error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
         }
     }
 
@@ -494,15 +500,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 //1.2判断是否是组长
                 if(!StringUtils.equals(leaderVerify.getCustomerUserId(),userId)){
                     //非组长，无权限进行操作
-                    return new Result().error();
+                    return new Result().error(ModuleConstant.NO_TEAMLEADER_AUTH);
                 }else{
+                    //是组长
                     return new Result();
                 }
             }else{
-                return new Result().error();
+                //未找到当前用户的成员信息
+                return new Result().error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
             }
         }else{
-            return new Result().error();
+            //未能识别该话题基本信息
+            return new Result().error(ModuleConstant.NO_SUCH_TOPIC);
         }
     }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -97,4 +97,44 @@ public interface ModuleConstant extends Constant {
 	 * 生成邀请新成员链接时，判断群状态
 	 */
 	String CANNOT_SHARED="只有讨论中的群才可以邀请新成员";
+
+	/**
+	 * 话题内容超过字数限制
+	 * */
+	String TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED = "话题内容超过字数限制(3000)";
+
+	/**
+	 * 评论内容超过字数限制
+	 * */
+	String COMMENT_NUMBER_OF_WORDS_EXCEEDED = "评论内容超过字数限制(300)";
+
+	/**
+	 * 没有返回主键
+	 */
+	String NO_PRIMARY_KEY_RETURNED = "没有返回主键";
+
+	/**
+	 * 没有找到所在话题
+	 * */
+	String NO_SUCH_TOPIC = "没有找到所在话题";
+
+	/**
+	 * 当前用户被禁言
+	 * */
+	String SLIENT_MEMBER = "您已被禁言";
+
+	/**
+	 * 当前用户被移出群
+	 * */
+	String REMOVED_MEMBER = "您已被移除群";
+
+	/**
+	 * 当前用户不是组长
+	 * */
+	String NO_TEAMLEADER_AUTH = "您没有组长权限";
+
+	/**
+	 * 话题Id集合不能为空
+	 * */
+	String TOPIC_ID_LIST_NOT_NULL = "话题Id集合不能为空";
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml

@@ -65,6 +65,7 @@
         DEL_FLAG = '0'
         AND
         TOPIC_ID = #{topicId}
+        ORDER BY CREATED_TIME DESC
         LIMIT
         #{pageNo},#{pageSize}
     </select>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -93,56 +93,86 @@
     <!-- 查询最近十条话题 -->
     <select id="getLatestTenTopics" parameterType="string" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO">
         SELECT
-        ID AS topicId,
+        topic.ID AS topicId,
-        GROUP_ID,
+        topic.GROUP_ID,
-        TOPIC_CONTENT,
+        topic.TOPIC_CONTENT,
-        STATUS,
+        topic.STATUS,
-        CREATED_TIME AS releaseTime,
+        topic.CREATED_TIME AS releaseTime,
-        CREATED_BY AS userId,
+        topic.CREATED_BY AS userId,
+        attachement2.firstPhoto,
         CASE
-          WHEN CREATED_BY = #{userId} THEN 'me'
+          WHEN topic.CREATED_BY = #{userId} THEN 'me'
           ELSE 'other'
         END  AS releaseUserFlag
 
         FROM
-        RESI_TOPIC
+        RESI_TOPIC topic
+        LEFT JOIN
+        (
+         SELECT
+          attachment.TOPIC_ID AS attachmentTopicId,
+          attachment.ATTACHMENT_URL as firstPhoto,
+          MIN(attachment.CREATED_TIME) AS ATTACHMENT_CREATED_TIME
+          FROM
+          RESI_TOPIC_ATTACHMENT attachment
+          WHERE
+          attachment.DEL_FLAG = '0'
+          GROUP BY attachment.TOPIC_ID
+        ) attachement2
+        ON
+        topic.ID = attachement2.attachmentTopicId
         WHERE
-        DEL_FLAG = '0'
+        topic.DEL_FLAG = '0'
-        AND <![CDATA[ STATUS <> 'hidden' ]]>
+        AND <![CDATA[ topic.STATUS <> 'hidden' ]]>
-        AND GROUP_ID = #{groupId}
+        AND topic.GROUP_ID = #{groupId}
         ORDER BY
-        CREATED_TIME DESC
+        topic.CREATED_TIME DESC
         LIMIT 10
     </select>
 
     <!-- 查询历史话题，分页，参数查询 -->
     <select id="getPastTopics" parameterType="com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO" resultType="com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO">
         SELECT
-        ID AS topicId,
+        topic.ID AS topicId,
-        GROUP_ID,
+        topic.GROUP_ID,
-        TOPIC_CONTENT,
+        topic.TOPIC_CONTENT,
-        STATUS,
+        topic.STATUS,
-        CREATED_TIME AS releaseTime,
+        topic.CREATED_TIME AS releaseTime,
-        CREATED_BY AS userId,
+        topic.CREATED_BY AS userId,
+        attachement2.firstPhoto,
         CASE
-        WHEN CREATED_BY = #{userId} THEN 'me'
+        WHEN topic.CREATED_BY = #{userId} THEN 'me'
         ELSE 'other'
         END  AS releaseUserFlag
         FROM
-        RESI_TOPIC
+        RESI_TOPIC topic
+        LEFT JOIN
+        (
+        SELECT
+        attachment.TOPIC_ID AS attachmentTopicId,
+        attachment.ATTACHMENT_URL as firstPhoto,
+        MIN(attachment.CREATED_TIME) AS ATTACHMENT_CREATED_TIME
+        FROM
+        RESI_TOPIC_ATTACHMENT attachment
+        WHERE
+        attachment.DEL_FLAG = '0'
+        GROUP BY attachment.TOPIC_ID
+        ) attachement2
+        ON
+        topic.ID = attachement2.attachmentTopicId
         <where>
-            DEL_FLAG = '0'
+            topic.DEL_FLAG = '0'
-            AND GROUP_ID = #{groupId}
+            AND topic.GROUP_ID = #{groupId}
             <if test='"hidden" != status'>
-                AND <![CDATA[ STATUS <> 'hidden' ]]>
+                AND <![CDATA[ topic.STATUS <> 'hidden' ]]>
             </if>
             <if test='null != status and "" != status'>
-                AND STATUS = #{status}
+                AND topic.STATUS = #{status}
             </if>
 
         </where>
         ORDER BY
-        CREATED_TIME DESC
+        topic.CREATED_TIME DESC
         LIMIT #{pageNo},#{pageSize}
 
     </select>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@@ -7,6 +7,7 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -76,4 +77,13 @@ public interface ResiPartymemberFeignClient {
      */
     @PostMapping("/resi/partymember/confirm/extra")
     Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO);
+
+    /**
+     * @Author sun
+     * @Description 政府端-热心居民申请人工审核
+     **/
+    @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit")
+    Result manageAudit(ResiWarmheartedAuditFormDTO formDTO);
+
+
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -8,6 +8,7 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -61,4 +62,9 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
     public Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberInfoExtra", partyMemberInfoDTO);
     }
+
+    @Override
+    public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO);
+    }
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -44,5 +45,15 @@ public class ResiWarmheartedController {
         return resiWarmheartedService.submit(tokenDTO, formDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 政府端-热心居民申请人工审核
+     **/
+    @PostMapping("manageaudit")
+    public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) {
+        return resiWarmheartedService.manageAudit(tokenDTO, formDTO);
+    }
+
 
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java

@@ -2,6 +2,7 @@ package com.epmet.modules.warmhearted.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -31,4 +32,13 @@ public interface ResiWarmheartedService {
      */
     Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO);
 
+    /**
+     * 政府端-热心居民申请人工审核
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO);
+
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java

@@ -1,11 +1,13 @@
 package com.epmet.modules.warmhearted.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -51,15 +53,36 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
     @Override
     public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
         if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getResiWarmVisitId())
                 || StringUtils.isBlank(formDTO.getReason())) {
-            return new Result<ResiWarmheartedResultDTO>().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
+            return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
         }
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.submit(formDTO);
     }
+
+    /**
+     * @param
+     * @Author sun
+     * @Description 政府端-热心居民申请人工审核
+     **/
+    @Override
+    public Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
+        }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getResiWarmApplyId())
+                || StringUtils.isBlank(formDTO.getAuditStatus())
+                || (!NumConstant.ZERO_STR.equals(formDTO.getAuditStatus())&&!NumConstant.ONE_STR.equals(formDTO.getAuditStatus()))) {
+            return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return resiPartymemberFeignClient.manageAudit(formDTO);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java

@@ -0,0 +1,65 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.partymember.dto.warmhearted.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 政府端-人工审核热心居民申请-配置入参
+ * @author sun
+ */
+@Data
+public class ResiWarmheartedAuditFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 热心居民申请id
+     */
+    @NotBlank(message = "申请ID不能为空")
+    private String resiWarmApplyId;
+
+    /**
+     * 审核状态(0:取消驳回 1:审核通过)
+     */
+    @NotBlank(message = "审核状态不能为空")
+    private String auditStatus;
+
+    /**
+     * 驳回理由
+     */
+    @NotBlank(message = "驳回理由不能为空")
+    private String refuseReason;
+
+    /**
+     * 客户Id CUSTOMER.id
+     */
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    /**
+     * 用户Id
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -53,19 +54,19 @@ public class ResiWarmheartedApplyController {
     private ResiWarmheartedApplyService resiWarmheartedApplyService;
 
     @GetMapping("page")
-    public Result<PageData<ResiWarmheartedApplyDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<ResiWarmheartedApplyDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<ResiWarmheartedApplyDTO> page = resiWarmheartedApplyService.page(params);
         return new Result<PageData<ResiWarmheartedApplyDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<ResiWarmheartedApplyDTO> get(@PathVariable("id") String id){
+    public Result<ResiWarmheartedApplyDTO> get(@PathVariable("id") String id) {
         ResiWarmheartedApplyDTO data = resiWarmheartedApplyService.get(id);
         return new Result<ResiWarmheartedApplyDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody ResiWarmheartedApplyDTO dto){
+    public Result save(@RequestBody ResiWarmheartedApplyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         resiWarmheartedApplyService.save(dto);
@@ -73,7 +74,7 @@ public class ResiWarmheartedApplyController {
     }
 
     @PutMapping
-    public Result update(@RequestBody ResiWarmheartedApplyDTO dto){
+    public Result update(@RequestBody ResiWarmheartedApplyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         resiWarmheartedApplyService.update(dto);
@@ -81,7 +82,7 @@ public class ResiWarmheartedApplyController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         resiWarmheartedApplyService.delete(ids);
@@ -95,13 +96,18 @@ public class ResiWarmheartedApplyController {
     }
 
     @PostMapping("init")
-    public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO formDTO){
+    public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO formDTO) {
         return resiWarmheartedApplyService.init(formDTO);
     }
 
     @PostMapping("submit")
-    public Result submit(@RequestBody ResiWarmheartedSubmitFormDTO formDTO){
+    public Result submit(@RequestBody ResiWarmheartedSubmitFormDTO formDTO) {
         return resiWarmheartedApplyService.submit(formDTO);
     }
 
+    @PostMapping("manageaudit")
+    public Result manageAudit(@RequestBody ResiWarmheartedAuditFormDTO formDTO) {
+        return resiWarmheartedApplyService.manageAudit(formDTO);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -114,4 +115,13 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
      * @author sun
      */
     Result submit(ResiWarmheartedSubmitFormDTO formDTO);
+
+    /**
+     * 政府端-热心居民申请人工审核
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result manageAudit(ResiWarmheartedAuditFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -21,11 +21,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.PartyMemberConstant;
+import com.epmet.dto.UserRoleDTO;
+import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
@@ -33,6 +38,7 @@ import com.epmet.modules.warmhearted.redis.ResiWarmheartedApplyRedis;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -65,6 +71,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     private ResiWarmheartedVisitService resiWarmheartedVisitService;
     @Autowired
     private ResiWarmheartedApplyDao resiWarmheartedApplyDao;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
 
     @Override
     public PageData<ResiWarmheartedApplyDTO> page(Map<String, Object> params) {
@@ -123,7 +131,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
         //1:热心居民申请行为记录表新增数据
         Result<ResiWarmheartedResultDTO> result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
-        if(!result.success()){
+        if (!result.success()) {
             log.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
         }
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData();
@@ -150,6 +158,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 
     /**
      * 热心居民申请表新增数据
+     *
      * @param formDTO
      * @return
      */
@@ -165,4 +174,33 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         baseDao.insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) {
+        Result result = new Result();
+        //1:更新热心居民申请表数据
+        ResiWarmheartedApplyEntity entity = new ResiWarmheartedApplyEntity();
+        entity.setId(formDTO.getResiWarmApplyId());
+        if (NumConstant.ZERO_STR.equals(formDTO.getAuditStatus())) {
+            //审核状态-未通过
+            entity.setAuditStatus(PartyMemberConstant.REJECTED);
+        } else {
+            //审核状态-通过
+            entity.setAuditStatus(PartyMemberConstant.APPROVED);
+        }
+        entity.setRefuseReason(formDTO.getRefuseReason());
+        baseDao.updateById(entity);
+        //2:审核通过的添加热心居民的角色
+        if(NumConstant.ONE_STR.equals(formDTO.getAuditStatus())){
+            UserRoleDTO dto = new UserRoleDTO();
+            dto.setCustomerId(formDTO.getCustomerId());
+            dto.setUserId(formDTO.getUserId());
+            //所属端-居民端
+            dto.setApp(AppClientConstant.APP_RESI);
+            //角色-热心居民
+            dto.setRoleKey(EpmetRoleKeyConstant.WARMHEARTED);
+            result = epmetUserFeignClient.saveUserRole(dto);
+        }
+        return result;
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -17,7 +17,7 @@
 
 package com.epmet.service.impl;
 
-import cn.hutool.json.JSONObject;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -34,8 +34,6 @@ import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 import com.epmet.redis.GridLatestRedis;
 import com.epmet.service.GridLatestService;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -133,6 +131,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         } else {
             dto.setUpdatedBy(visitedFormDTO.getUserId());
             dto.setUpdatedTime(date);
+            dto.setLatestTime(date);
             return BaseServiceImpl.retBool(gridLatestDao.updateByLatestId(dto));
         }