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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java

@@ -108,4 +108,14 @@ public interface Constant {
      * 版本控制用
      */
     String VERSION_CONTROL = "/{version}";
+
+    /**
+     * 是
+     */
+    String YES="yes";
+
+    /**
+     * 否
+     */
+    String NO="no";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/FieldConstant.java

@@ -46,6 +46,9 @@ public interface FieldConstant {
     String COMMUNITY_ID = "COMMUNITY_ID";
     String COMMUNITY_ID_HUMP = "communityId";
 
+    String CUSTOMER_ID = "CUSTOMER_ID";
+    String CUSTOMER_ID_HUMP = "customerId";
+
     String GRID_ID = "GRID_ID";
     String GRID_ID_HUMP = "gridId";
 

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

@@ -17,16 +17,7 @@ public enum EpmetErrorCode {
 	MOBILE_CODE_ERROR(8102, "手机验证码错误"),
 	AUTO_CONFIRM_FAILED(8103, "自动认证失败"),
 	MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"),
-	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
+	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败");
-
-
-	/**
-	 * 手机号已存在
-	 */
-	MOBILE_EXIST(8201, "该手机号已注册居民，请使用其他手机号注册！"),
-	PARAMETER_EXCEPTION(8202, "必要参数存在空值或手机号输入不合规，请检查参数赋值情况！！"),
-	UPDATE_EXCEPTION(8203, "用户居民注册访问记录表更新数据失败！"),
-	PARTICIPATION_EXCEPTION(8204, "参数异常，请检查所传参数是否合规！");
 
 
 	private int value;

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java

@@ -17,12 +17,12 @@ public class MymessageResultDTO implements Serializable {
 	/**
 	 * 消息主键
 	 */
-	private String messageId;
+	private String id;
 
 	/**
 	 * 消息标题
 	 */
-	private String messageTitle;
+	private String title;
 
 	/**
 	 * 消息内容
@@ -32,5 +32,5 @@ public class MymessageResultDTO implements Serializable {
 	/**
 	 * 发布消息时间
 	 */
-	private Date noticeTime;
+	private Date createdTime;
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java

@@ -0,0 +1,11 @@
+package com.epmet.constant;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/7 14:40
+ */
+public interface UserMessageConstans {
+	String READ = "read";
+	String UNREAD = "unread";
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java

@@ -23,9 +23,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.excel.UserMessageExcel;
 import com.epmet.service.UserMessageService;
@@ -47,11 +48,11 @@ import java.util.Map;
 @RequestMapping("usermessage")
 public class UserMessageController {
 
-    @Autowired
+	@Autowired
-    private UserMessageService userMessageService;
+	private UserMessageService userMessageService;
 
-    @GetMapping("page")
+    @PostMapping("page")
-    public Result<PageData<UserMessageDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<UserMessageDTO>> page(@RequestBody Map<String, Object> params){
         PageData<UserMessageDTO> page = userMessageService.page(params);
         return new Result<PageData<UserMessageDTO>>().ok(page);
     }
@@ -92,6 +93,28 @@ public class UserMessageController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserMessageExcel.class);
     }
 
+	/**
+	 * 单条消息标记为已读
+	 *
+	 * @param messageDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("readmsg")
+	public Result readMessage(@RequestBody UserMessageDTO messageDTO) {
+		return userMessageService.readMessage(messageDTO);
+	}
+
+	/**
+	 * 消息全部已读
+	 *
+	 * @param messageDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("readall")
+	public Result readAllMessage(@RequestBody UserMessageDTO messageDTO) {
+		return userMessageService.readAllMessage(messageDTO);
+	}
+
     /**
      * @param formDto
      * @return com.epmet.commons.tools.utils.Result
@@ -104,4 +127,9 @@ public class UserMessageController {
         ValidatorUtils.validateEntity(formDto);
         return userMessageService.saveUserMessage(formDto);
     }
-}
+
+	@PostMapping("mymsg")
+	public Result<List<UserMessageDTO>> getMyMessageList(@RequestBody MymessageFormDTO params){
+		return userMessageService.getMyMessageList(params);
+	}
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java

@@ -18,9 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.entity.UserMessageEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户消息表
  *
@@ -29,11 +32,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserMessageDao extends BaseDao<UserMessageEntity> {
+
 	/**
-	 * 更新阅读状态为已读
+	 * 获取消息分页
-	 *
+	 * @param messageFromDTO
-	 * @param entity 参数
+	 * @return
 	 */
-	void updateReadFlag(UserMessageEntity entity);
+	List<UserMessageEntity> selectMyMessageList(MymessageFormDTO messageFromDTO);
 
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.entity.UserMessageEntity;
 
@@ -95,13 +96,21 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
 	 */
 	void delete(String[] ids);
 
+	/**
+	 * 单条消息标记为已读
+	 *
+	 * @param messageDTO 参数
+	 * @return Result
+	 */
+	Result readMessage(UserMessageDTO messageDTO);
+
 	/**
 	 * 全部已读
 	 *
 	 * @param messageDTO 参数
 	 * @return Result
 	 */
-	Result allRead(UserMessageDTO messageDTO);
+	Result readAllMessage(UserMessageDTO messageDTO);
 
 	/**
 	 * @param formDto
@@ -111,4 +120,11 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
 	 * @Date 2020/4/7 15:34
 	 **/
 	Result saveUserMessage(UserMessageFormDTO formDto);
-}
+
+	/**
+	 * 获取我的消息列表
+	 * @param param 参数
+	 * @return
+	 */
+	Result<List<UserMessageDTO>> getMyMessageList(MymessageFormDTO param);
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java

@@ -20,12 +20,15 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+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.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.UserMessageConstans;
 import com.epmet.dao.UserMessageDao;
 import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.entity.UserMessageEntity;
 import com.epmet.redis.UserMessageRedis;
@@ -69,15 +72,15 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 
 	private QueryWrapper<UserMessageEntity> getWrapper(Map<String, Object> params) {
 		String id = (String) params.get(FieldConstant.ID_HUMP);
-		String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP);
+		String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP);
 		String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP);
-        String userId = (String) params.get(FieldConstant.USER_ID_HUMP);
+		String userId = (String) params.get(FieldConstant.USER_ID_HUMP);
 
 		QueryWrapper<UserMessageEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
-                .eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId)
+				.eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId)
-                .eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId)
+				.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId)
-                .eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId);
+				.eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId);
 
 		return wrapper;
 	}
@@ -109,10 +112,43 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 		baseDao.deleteBatchIds(Arrays.asList(ids));
 	}
 
-    @Override
+	@Override
-    public Result allRead(UserMessageDTO messageDTO) {
+	public Result readMessage(UserMessageDTO messageDTO) {
-        return null;
+		UserMessageEntity messageEntity = new UserMessageEntity();
-    }
+		messageEntity.setReadFlag(UserMessageConstans.READ);
+		messageDTO.setReadFlag(UserMessageConstans.UNREAD);
+		baseDao.update(messageEntity, getWrapper(messageDTO));
+		return new Result();
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Result readAllMessage(UserMessageDTO messageDTO) {
+		UserMessageEntity messageEntity = new UserMessageEntity();
+		messageEntity.setReadFlag(UserMessageConstans.READ);
+		messageDTO.setReadFlag(UserMessageConstans.UNREAD);
+		baseDao.update(messageEntity, getWrapper(messageDTO));
+		return new Result();
+	}
+
+	private QueryWrapper<UserMessageEntity> getWrapper(UserMessageDTO messageDTO) {
+		String id = messageDTO.getId();
+		String customerId = messageDTO.getCustomerId();
+		String gridId = messageDTO.getGridId();
+		String userId = messageDTO.getUserId();
+		String readFlag = messageDTO.getReadFlag();
+		String deFlag = messageDTO.getDelFlag();
+
+		QueryWrapper<UserMessageEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+				.eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId)
+				.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId)
+				.eq(StringUtils.isNotBlank(userId), FieldConstant.USER_ID, userId)
+				.eq(StringUtils.isNotBlank(deFlag), FieldConstant.DEL_FLAG, deFlag)
+				.eq(StringUtils.isNotBlank(readFlag), "read_flag", readFlag);
+
+		return wrapper;
+	}
 
 	@Override
 	public Result saveUserMessage(UserMessageFormDTO formDto) {
@@ -121,4 +157,12 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 		return new Result();
 	}
 
-}
+	@Override
+	public Result<List<UserMessageDTO>> getMyMessageList(MymessageFormDTO params) {
+		int pageIndex = (params.getPageNo() - NumConstant.ONE) * params.getPageSize();
+		params.setPageNo(pageIndex);
+		List<UserMessageEntity> myMessageList = baseDao.selectMyMessageList(params);
+		return new Result<List<UserMessageDTO>>().ok(ConvertUtils.sourceToTarget(myMessageList, UserMessageDTO.class));
+	}
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.UserMessageDao">
 
-    <resultMap type="com.epmet.entity.UserMessageEntity" id="userMessageMap">
+    <resultMap id="userMessageMap" type="com.epmet.entity.UserMessageEntity">
         <result property="id" column="ID"/>
         <result property="customerId" column="customer_id"/>
         <result property="gridId" column="grid_id"/>
@@ -19,9 +19,35 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-    <update id="updateReadFlag" parameterType="com.epmet.entity.UserMessageEntity">
 
-    </update>
+    <select id="selectMyMessageList" resultType="com.epmet.entity.UserMessageEntity">
+        SELECT
+            id,
+            app,
+            updated_time,
+            updated_by,
+            read_flag,
+            title,
+            del_flag,
+            user_id,
+            revision,
+            created_by,
+            customer_id,
+            created_time,
+            grid_id,
+            message_content
+        FROM
+            epmet_message.user_message
+        WHERE
+            del_flag = '0'
+          AND (
+                CUSTOMER_ID = #{customerId}
+                AND GRID_ID = #{gridId}
+                AND USER_ID = #{userId})
+        ORDER BY
+            CREATED_TIME DESC
+        LIMIT #{pageNo}, #{pageSize}
+    </select>
 
 
 </mapper>

epmet-module/gov-org/gov-org-server/pom.xml

@@ -61,6 +61,12 @@
             <artifactId>gov-org-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-partymember-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java

@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -27,6 +29,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.excel.CustomerStaffGridExcel;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.service.CustomerStaffGridService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -91,4 +94,14 @@ public class CustomerStaffGridController {
         ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffGridExcel.class);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 政府端-热心居民申请人工审核
+     **/
+    @PostMapping("manageaudit")
+    public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) {
+        return customerStaffGridService.manageAudit(tokenDTO, formDTO);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java

@@ -0,0 +1,25 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description 政府端工作人员审核
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
+public interface ResiPartymemberFeignClient {
+
+    /**
+     * @Author sun
+     * @Description 政府端-热心居民申请人工审核
+     **/
+    @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit")
+    Result manageAudit(ResiWarmheartedAuditFormDTO formDTO);
+
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -0,0 +1,21 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 政府端工作人员审核
+ * @Author sun
+ */
+@Component
+public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
+
+    @Override
+    public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO);
+    }
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java

@@ -19,8 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -92,4 +95,14 @@ public interface CustomerStaffGridService extends BaseService<CustomerStaffGridE
      * @date 2020-03-16
      */
     void delete(String[] ids);
+
+    /**
+     * 政府端-热心居民申请人工审核
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -20,14 +20,21 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+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.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
+import com.epmet.feign.ResiPartymemberFeignClient;
 import com.epmet.redis.CustomerStaffGridRedis;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.service.CustomerStaffGridService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,7 +45,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 客户人员网格表 
+ * 客户人员网格表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-16
@@ -48,6 +55,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
 
     @Autowired
     private CustomerStaffGridRedis customerStaffGridRedis;
+    @Autowired
+    private ResiPartymemberFeignClient resiPartymemberFeignClient;
 
     @Override
     public PageData<CustomerStaffGridDTO> page(Map<String, Object> params) {
@@ -65,8 +74,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         return ConvertUtils.sourceToTarget(entityList, CustomerStaffGridDTO.class);
     }
 
-    private QueryWrapper<CustomerStaffGridEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<CustomerStaffGridEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CustomerStaffGridEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +110,25 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @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/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java

@@ -13,4 +13,9 @@ public interface ModuleConstant {
     String LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE = "00";
 
     int SUCCESS_CODE_RESULT = 0;
+
+    /**
+     * tokenDto不能为null userId不能为空
+     */
+    String USER_NOT_NULL="用户信息不能为空";
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java

@@ -0,0 +1,50 @@
+package com.epmet.resi.group.dto.invitation.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 点击链接，查看组信息返参DTO
+ * @Author yinzuomei
+ * @Date 2020/4/8 11:22
+ */
+@Data
+public class LinkGroupInfoDTO implements Serializable {
+	private static final long serialVersionUID = 6136787210623326830L;
+	/**
+	 * 群组id
+	 */
+	private String groupId;
+
+	/**
+	 * 群组头像
+	 */
+	private String groupHeadPhoto;
+
+	/**
+	 * 组长名称！！！！！！！！
+	 * 暂定街道-姓名
+	 */
+	private String leaderName;
+
+	/**
+	 * 群组名称
+	 */
+	private String groupName;
+
+	/**
+	 * 组介绍
+	 */
+	private String groupIntroduction;
+
+	/**
+	 * 成员总数
+	 */
+	private Integer totalMember;
+
+	/**
+	 * 党员总数
+	 */
+	private Integer totalPartyMember;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java

@@ -14,38 +14,13 @@ public class LinkGroupInfoResultDTO implements Serializable {
 	private static final long serialVersionUID = 8860336693592035343L;
 
 	/**
-	 * 群组id
+	 * 是否在群内标志，已经在群内yes 不在群内no
 	 */
-	private String groupId;
+	private String inGroup;
 
 	/**
-	 * 群组头像
+	 * 小组相关信息
 	 */
-	private String groupHeadPhoto;
+	private LinkGroupInfoDTO groupInfo;
 
-	/**
-	 * 组长名称！！！！！！！！
-	 * 暂定街道-姓名
-	 */
-	private String leaderName;
-
-	/**
-	 * 群组名称
-	 */
-	private String groupName;
-
-	/**
-	 * 组介绍
-	 */
-	private String groupIntroduction;
-
-	/**
-	 * 成员总数
-	 */
-	private Integer totalMember;
-
-	/**
-	 * 党员总数
-	 */
-	private Integer totalPartyMember;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -2,14 +2,16 @@ package com.epmet.modules.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -28,8 +30,8 @@ public interface EpmetUserFeignClient {
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 10:45
 	 **/
-	@PostMapping(value = "epmetuser/userresiinfo/getUserResiInfoDTO", consumes = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "epmetuser/userresiinfo/getuserresiinfo", consumes = MediaType.APPLICATION_JSON_VALUE)
-	Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * @param userRoleFormDTO
@@ -40,4 +42,14 @@ public interface EpmetUserFeignClient {
 	 **/
 	@PostMapping(value = "epmetuser/userrole/getuserroleinfo", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
+	/**
+	 * @param userResiInfoListFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.UserResiInfoResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 根据userId集合，查询用户注册信息
+	 * @Date 2020/4/7 22:14
+	 **/
+	@PostMapping(value = "epmetuser/userresiinfo/getuserresiinfolist", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java

@@ -3,9 +3,10 @@ package com.epmet.modules.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -21,7 +22,7 @@ import java.util.List;
 public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 
 	@Override
-	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
+	public Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO);
 	}
 
@@ -29,4 +30,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 	public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfo", userRoleFormDTO);
 	}
+
+	@Override
+	public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
+	}
 }

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

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
@@ -244,7 +245,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			return new Result<GroupSummarizeResultDTO>().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
 		}
 		//获取组长信息
-		Result<UserResiInfoDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
+		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
@@ -260,7 +261,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Description 根据组id查询组长信息
 	 * @Date 2020/3/30 15:07
 	 **/
-	private Result<UserResiInfoDTO> getGroupLeaderUserInfo(String groupId) {
+	private Result<UserResiInfoResultDTO> getGroupLeaderUserInfo(String groupId) {
 		//群主名称需要调用feign查询
 		ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId);
 		if (null == resiGroupEntity) {
@@ -370,7 +371,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
 		resiUserInfoFormDTO.setUserId(initApplyGroupFormDTO.getUserId());
 		resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId());
-		Result<UserResiInfoDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+		Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
 			logger.info("居民注册信息查询失败");
 			return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java

@@ -19,8 +19,7 @@ package com.epmet.modules.invitation.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.invitation.entity.GroupInvitationEntity;
-import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
+import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO;
-import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,5 +39,5 @@ public interface GroupInvitationDao extends BaseDao<GroupInvitationEntity> {
 	 * @Description 根据群邀请连接查询群基本信息
 	 * @Date 2020/3/31 23:22
 	 **/
-	LinkGroupInfoResultDTO selectLinkGroupInfo(@Param("groupId") String groupId);
+	LinkGroupInfoDTO selectLinkGroupInfo(@Param("groupId") String groupId);
 }

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -31,10 +32,12 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
+import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.invitation.dao.GroupInvitationDao;
 import com.epmet.modules.invitation.entity.GroupInvitationEntity;
@@ -54,10 +57,13 @@ import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
 import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
 import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
+import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO;
 import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -72,7 +78,7 @@ import java.util.*;
  */
 @Service
 public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationDao, GroupInvitationEntity> implements GroupInvitationService {
-
+	private Logger logger = LoggerFactory.getLogger(getClass());
 	@Autowired
 	private ResiGroupMemberDao resiGroupMemberDao;
 
@@ -165,7 +171,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//2、审核通过（讨论中）的群才可以分享邀请连接
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
-		if(!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())){
+		if (!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
 			return new Result<CreateGroupInvitationResultDTO>().error(ModuleConstant.CANNOT_SHARED);
 		}
 		//3、插入一条邀请记录
@@ -195,22 +201,63 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
 		//校验是否存在该邀请连接
 		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
-		if(!validResult.success()){
+		if (!validResult.success()) {
-			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
+			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(), validResult.getMsg());
+		}
+		LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO();
+		//1、查询是否在群内
+		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(validResult.getData().getResiGroupId(), formDTO.getUserId());
+		if (null != resiGroupMemberDTO && !MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())) {
+			linkGroupInfoResultDTO.setInGroup(Constant.YES);
+			return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
+		} else {
+			linkGroupInfoResultDTO.setInGroup(Constant.NO);
+		}
+		//2、查询组信息
+		LinkGroupInfoDTO groupInfo = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId());
+		//3、获取组长信息
+		Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupInfo.getGroupId());
+		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+			groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+		} else {
+			logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
 		}
-		LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId());
+		linkGroupInfoResultDTO.setGroupInfo(groupInfo);
 		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
 	}
 
-	private Result<GroupInvitationDTO> checkLinkValid(String invitationId){
+	/**
+	 * @param groupId
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
+	 * @Author yinzuomei
+	 * @Description 根据组id查询组长信息
+	 * @Date 2020/3/30 15:07
+	 **/
+	private Result<UserResiInfoResultDTO> getGroupLeaderUserInfo(String groupId) {
+		//群主名称需要调用feign查询
+		ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId);
+		if (null == resiGroupEntity) {
+			return new Result<>();
+		}
+		ResiGroupMemberDTO groupMemberDTO = resiGroupDao.selectGroupLeader(groupId);
+		if (null == groupMemberDTO) {
+			return new Result<>();
+		}
+		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
+		resiUserInfoFormDTO.setCustomerId(resiGroupEntity.getCustomerId());
+		resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
+		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+	}
+
+	private Result<GroupInvitationDTO> checkLinkValid(String invitationId) {
 		//校验是否存在该邀请连接
 		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);
 		//Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false；
 		if (null == groupInvitationDTO) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName());
+			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName());
 		}
-		if (null != groupInvitationDTO && groupInvitationDTO.getValidEndTime().after(new Date())) {
+		if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(),EpmetErrorCode.LOSE_EFFICACY.getName());
+			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName());
 		}
 		return new Result<GroupInvitationDTO>().ok(groupInvitationDTO);
 	}
@@ -226,8 +273,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	public Result accetInvitation(AccetInvitationFormDTO formDTO) {
 		//1、申请是否有效
 		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
-		if(!validResult.success()){
+		if (!validResult.success()) {
-			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
+			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(), validResult.getMsg());
 		}
 		//2、校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(validResult.getData().getResiGroupId());
@@ -236,65 +283,69 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 					formDTO.getUserId(),
 					resiGroupDTO.getCustomerId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
+				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(), EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
 			}
 		}
 		//3、新增一条邀请入群、直接审核通过的入群记录
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
 		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
 		groupMemeberOperation.setCustomerUserId(formDTO.getUserId());
-		groupMemeberOperation.setGroupId(resiGroupDTO.getId());
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.INVITED);
 		groupMemeberOperation.setCreatedBy(formDTO.getUserId());
 		groupMemeberOperation.setOperateUserId(formDTO.getUserId());
 		groupMemeberOperationService.save(groupMemeberOperation);
 		//4、直接加入群成员关系表
+		//如果是之前被移除的，则修改resi_group_member记录
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
+		ResiGroupMemberDTO resiGroupMember = resiGroupMemberDao.selectGroupMemberInfo(validResult.getData().getResiGroupId(), formDTO.getUserId());
+		if (null != resiGroupMember) {
+			resiGroupMemberDTO.setId(resiGroupMember.getId());
+		}
 		resiGroupMemberDTO.setCustomerUserId(groupMemeberOperation.getCustomerUserId());
 		resiGroupMemberDTO.setResiGroupId(groupMemeberOperation.getGroupId());
 		resiGroupMemberDTO.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
 		resiGroupMemberDTO.setEnterGroupType(groupMemeberOperation.getEnterGroupType());
 		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
-		resiGroupMemberService.save(resiGroupMemberDTO);
+		resiGroupMemberService.saveOrUpdate(resiGroupMemberDTO);
 		//5、修改群统计值
 		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
 				formDTO.getUserId(),
 				resiGroupDTO.getCustomerId());
 		resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
 		//6、发送消息
-		this.sendMessageToLeader(formDTO,resiGroupDTO);
+		this.sendMessageToLeader(formDTO, resiGroupDTO);
 		return new Result();
 	}
 
 	/**
-	 * @return void
 	 * @param formDTO
 	 * @param resiGroupDTO
+	 * @return void
 	 * @Author yinzuomei
 	 * @Description 用户通过邀请进群之后，通知群主：您的好友-【认证的居民名字 xxx路-王先生】通过邀请链接，加入了【组名】
 	 * @Date 2020/4/7 14:46
 	 **/
 	private void sendMessageToLeader(AccetInvitationFormDTO formDTO, ResiGroupDTO resiGroupDTO) {
 		//1、查询群主信息
-		ResiGroupMemberDTO leader=resiGroupDao.selectGroupLeader(resiGroupDTO.getId());
+		ResiGroupMemberDTO leader = resiGroupDao.selectGroupLeader(resiGroupDTO.getId());
-		if(null==leader){
+		if (null == leader) {
 			return;
 		}
 		//2、根据用户id用户认证注册信息
-		UserResiInfoFormDTO userResiInfoFormDTO=new UserResiInfoFormDTO();
+		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setUserId(formDTO.getUserId());
 		userResiInfoFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
-		Result<UserResiInfoDTO> userResiInfoDTOResult=epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+		Result<UserResiInfoResultDTO> userResiInfoDTOResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
-		if(!userResiInfoDTOResult.success()||null==userResiInfoDTOResult.getData()){
+		if (!userResiInfoDTOResult.success() || null == userResiInfoDTOResult.getData()) {
-			return ;
+			return;
 		}
-		UserMessageFormDTO userMessage=new UserMessageFormDTO();
+		UserMessageFormDTO userMessage = new UserMessageFormDTO();
 		userMessage.setApp(AppClientConstant.APP_RESI);
 		userMessage.setCustomerId(resiGroupDTO.getCustomerId());
 		userMessage.setGridId(resiGroupDTO.getGridId());
-		String messageContent=String.format(UserMessageConstant.INVITED_JOIN_GROUP,userResiInfoDTOResult.getData().getShowName(),resiGroupDTO.getGroupName());
+		String messageContent = String.format(UserMessageConstant.INVITED_JOIN_GROUP, userResiInfoDTOResult.getData().getShowName(), resiGroupDTO.getGroupName());
 		userMessage.setMessageContent(messageContent);
 		userMessage.setReadFlag(ReadFlagConstant.UN_READ);
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java

@@ -151,4 +151,13 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Date 2020/3/30 22:07
      **/
     Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO);
+
+    /**
+     * @param resiGroupMemberDTO
+     * @return void
+     * @Author yinzuomei
+     * @Description 保存或更新resi_group_member
+     * @Date 2020/4/8 12:37
+     **/
+    void saveOrUpdate(ResiGroupMemberDTO resiGroupMemberDTO);
 }

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

@@ -29,6 +29,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -55,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -210,10 +213,23 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemberListFormDTO.setPageNo(pageIndex);
 		List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
 		if (null != list && list.size() > 0) {
+			List<String> userIdList=new ArrayList<>();
 			for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
-				groupMemberListResultDTO.setUserShowName("测试昵称");
+				userIdList.add(groupMemberListResultDTO.getUserId());
-				groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+			}
-
+			UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
+			formDTO.setUserIdList(userIdList);
+			Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
+			if(userResiInfoDTOListResult.success()){
+				for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
+					for (GroupMemberListResultDTO groupMember : list) {
+						if(groupMember.getUserId().equals(userResiInfo.getUserId())){
+							groupMember.setUserShowName(userResiInfo.getShowName());
+							groupMember.setHeadPhoto(userResiInfo.getHeadPhoto());
+							break;
+						}
+					}
+				}
 			}
 		}
 		return new Result<List<GroupMemberListResultDTO>>().ok(list);
@@ -232,10 +248,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		applyingMemberFormDTO.setPageNo(pageIndex);
 		List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
 		if (null != list && list.size() > 0) {
+			List<String> userIdList=new ArrayList<>();
 			for (ApplyingMemberResultDTO applyingMemberResultDTO : list) {
-				applyingMemberResultDTO.setApplyUserName("测试昵称");
+				userIdList.add(applyingMemberResultDTO.getApplyUserId());
-				applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
+			}
+			UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
+			formDTO.setUserIdList(userIdList);
+			Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
+			if(userResiInfoDTOListResult.success()){
+				for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
+					for (ApplyingMemberResultDTO memberInfo : list) {
+						if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){
+							memberInfo.setApplyUserName(userResiInfo.getShowName());
+							memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto());
+							break;
+						}
+					}
+				}
 			}
+
 		}
 		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
 	}
@@ -250,35 +281,40 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	@Override
 	public Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
-		//当前申请单是否是待审核
+		//1、当前申请单是否是待审核
 		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
 			return new Result().error(ModuleConstant.APPLY_NOEXISTS);
 		}
-		//只有群主才可以审批入群申请
+		//2、只有群主才可以审批入群申请
 		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
 		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
 			return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
 		}
-		//修改操作状态
+		//3、修改操作状态
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperationDTO.setUpdatedBy(agreeApplyFormDTO.getUserId());
 		groupMemeberOperationDTO.setOperateUserId(agreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
-		//加入群成员关系表
+		//4、加入群成员关系表
+		//4.1如果是之前被移除的，则修改resi_group_member记录
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
+		ResiGroupMemberDTO resiGroupMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), groupMemeberOperationDTO.getCustomerUserId());
+		if (null != resiGroupMember) {
+			resiGroupMemberDTO.setId(resiGroupMember.getId());
+		}
 		resiGroupMemberDTO.setCustomerUserId(groupMemeberOperationDTO.getCustomerUserId());
 		resiGroupMemberDTO.setResiGroupId(groupMemeberOperationDTO.getGroupId());
 		resiGroupMemberDTO.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
 		resiGroupMemberDTO.setEnterGroupType(groupMemeberOperationDTO.getEnterGroupType());
 		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
 		resiGroupMemberDTO.setCreatedBy(groupMemeberOperationDTO.getCustomerUserId());
-		resiGroupMemberService.save(resiGroupMemberDTO);
+		resiGroupMemberService.saveOrUpdate(resiGroupMemberDTO);
-		//修改群统计值
+		//5、修改群统计值
 		UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
                 groupMemeberOperationDTO.getCustomerUserId(),
 				agreeApplyFormDTO.getCustomerId());
 		baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
-		//给用户发送消息
+		//6、给用户发送消息
 		this.sendUserApprovedMessage(resiGroupMemberDTO);
 		return new Result();
 	}
@@ -316,26 +352,36 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	@Override
 	public Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
-		//当前申请单是否是待审核
+		//1、当前申请单是否是待审核
 		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
 			return new Result().error(ModuleConstant.APPLY_NOEXISTS);
 		}
-		//只有群主才可以审批入群申请
+		//2、只有群主才可以审批入群申请
 		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
 		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
 			return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
 		}
-		//修改操作状态
+		//3、修改操作状态
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED);
 		groupMemeberOperationDTO.setOperateDes(disagreeApplyFormDTO.getOperateDesc());
 		groupMemeberOperationDTO.setUpdatedBy(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationDTO.setOperateUserId(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
-		//给用户发送消息
+		//4、给用户发送消息
 		this.sendUserRejectedMessage(groupMemeberOperationDTO,disagreeApplyFormDTO);
 		return new Result();
 	}
 
+	@Override
+	public void saveOrUpdate(ResiGroupMemberDTO resiGroupMemberDTO) {
+		ResiGroupMemberEntity entity = ConvertUtils.sourceToTarget(resiGroupMemberDTO, ResiGroupMemberEntity.class);
+		if(StringUtils.isNotBlank(entity.getId())){
+			updateById(entity);
+		}else{
+			insert(entity);
+		}
+	}
+
 	/**
 	 * @return void
 	 * @param groupMemeberOperationDTO

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

@@ -27,8 +27,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
@@ -468,8 +468,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         UserResiInfoFormDTO userParam = new UserResiInfoFormDTO();
         userParam.setUserId(tokenDto.getUserId());
         userParam.setCustomerId(group.getCustomerId());
-        Result<UserResiInfoDTO> userInfo =
+        Result<UserResiInfoResultDTO> userInfo =  epmetUserFeignClient.getUserResiInfoDTO(userParam);
-        epmetUserFeignClient.getUserResiInfoDTO(userParam);
         if(userInfo.success()){
             resultDTO.setReleaseUserName(userInfo.getData().getSurname() + userInfo.getData().getName());
 
@@ -559,4 +558,4 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
     }
 
-}
+}

epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml

@@ -136,6 +136,7 @@
         <logger name="com.epmet.modules.topic.dao" level="DEBUG"/>
         <logger name="com.epmet.modules.group.dao" level="DEBUG"/>
         <logger name="com.epmet.modules.member.dao" level="DEBUG"/>
+        <logger name="com.epmet.modules.invitation.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -152,6 +153,7 @@
         <logger name="com.epmet.modules.topic.dao" level="INFO"/>
         <logger name="com.epmet.modules.group.dao" level="INFO"/>
         <logger name="com.epmet.modules.member.dao" level="INFO"/>
+        <logger name="com.epmet.modules.invitation.dao" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.modules.invitation.dao.GroupInvitationDao">
 
     <!-- 根据群邀请连接查询群基本信息 -根据groupId 查询群基本信息  -->
-    <select id="selectLinkGroupInfo" parameterType="map" resultType="com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO">
+    <select id="selectLinkGroupInfo" parameterType="map" resultType="com.epmet.resi.group.dto.invitation.result.LinkGroupInfoDTO">
         SELECT
             rg.id AS groupId,
             rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -22,4 +22,6 @@ import com.epmet.commons.tools.exception.ErrorCode;
  */
 public interface ModuleErrorCode extends ErrorCode {
 
+    String PARTICIPATION_EXCEPTION = "参数异常,请检查所传参数是否符合规范以及是否存在空值";
+    String MOBILE_EXCEPTION = "手机号输入不符合规范，请重新输入";
 }

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

@@ -0,0 +1,48 @@
+package com.epmet.modules.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.modules.feign.fallback.EpmetMessageFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/7 14:55
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageFeignClientFallBack.class)
+public interface EpmetMessageFeignClient {
+
+	/**
+	 * 获取消息列表
+	 *
+	 * @param params 参数
+	 * @return Result<PageData<UserMessageDTO>>
+	 */
+	@PostMapping("/message/usermessage/mymsg")
+	Result<List<UserMessageDTO>> getMyMessageList(@RequestBody MymessageFormDTO params);
+
+	/**
+	 * 单条消息已读
+	 *
+	 * @param messageDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("/message/usermessage/readmsg")
+	Result readMessage(@RequestBody UserMessageDTO messageDTO);
+
+	/**
+	 * 消息全部已读
+	 *
+	 * @param messageDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("/message/usermessage/readall")
+	Result readAllMessage(@RequestBody UserMessageDTO messageDTO);
+}

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

@@ -7,7 +7,6 @@ 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;
@@ -78,12 +77,4 @@ 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/EpmetMessageFeignClientFallBack.java

@@ -0,0 +1,34 @@
+package com.epmet.modules.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.modules.feign.EpmetMessageFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/7 14:58
+ */
+@Component
+public class EpmetMessageFeignClientFallBack implements EpmetMessageFeignClient {
+	@Override
+	public Result<List<UserMessageDTO>> getMyMessageList(MymessageFormDTO params) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "getMyMessageList", params);
+	}
+
+	@Override
+	public Result readMessage(UserMessageDTO messageDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "readMessage", messageDTO);
+	}
+
+	@Override
+	public Result readAllMessage(UserMessageDTO messageDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "allRead", messageDTO);
+	}
+}

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

@@ -8,7 +8,6 @@ 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;
@@ -62,9 +61,4 @@ 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/message/controller/UserMessageController.java

@@ -4,8 +4,8 @@ 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.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
-import com.epmet.dto.result.MymessageResultDTO;
 import com.epmet.modules.message.service.UserMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,12 +31,12 @@ public class UserMessageController {
 	 * @Date 2020/3/29 20:53
 	 **/
 	@PostMapping("getmymessage")
-	public Result<List<MymessageResultDTO>> getMyMessage(@LoginUser TokenDto tokenDto,
+	public Result<List<UserMessageDTO>> getMyMessage(@LoginUser TokenDto tokenDto,
-														 @RequestBody MymessageFormDTO mymessageFormDTO) {
+													 @RequestBody MymessageFormDTO mymessageFormDTO) {
 		mymessageFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(mymessageFormDTO);
 		//逻辑待实现
-		return new Result();
+		return userMessageService.getMessageList(tokenDto, mymessageFormDTO);
 	}
 
 	/**
@@ -51,7 +51,7 @@ public class UserMessageController {
 	public Result readMessage(@LoginUser TokenDto tokenDto,
 							  @RequestParam("messageId") String messageId) {
 		//逻辑待实现
-		return new Result();
+		return userMessageService.readMessage(messageId);
 	}
 
 	/**
@@ -62,8 +62,8 @@ public class UserMessageController {
 	 * @Date 2020/3/29 21:06
 	 **/
 	@PostMapping("readallmsg")
-	public Result readAllMessage(@LoginUser TokenDto tokenDto) {
+	public Result readAllMessage(@LoginUser TokenDto tokenDto, @RequestBody UserMessageDTO userMessageDTO) {
 		//逻辑待实现
-		return new Result();
+		return userMessageService.readAllMessage(tokenDto, userMessageDTO);
 	}
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java

@@ -1,9 +1,42 @@
 package com.epmet.modules.message.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
+
+import java.util.List;
+
 /**
  * @Description 我的消息
  * @Author yinzuomei
  * @Date 2020/3/29 20:50
  */
 public interface UserMessageService {
+
+	/**
+	 * 获取消息列表
+	 *
+	 * @param tokenDto       token
+	 * @param messageFromDTO 参数
+	 * @return Result<PageData < MymessageResultDTO>>
+	 */
+	Result<List<UserMessageDTO>> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO);
+
+	/**
+	 * 单条消息标记为已读
+	 *
+	 * @param messageId 参数
+	 * @return Result
+	 */
+	Result readMessage(String messageId);
+
+	/**
+	 * 消息全部已读
+	 *
+	 * @param tokenDto   token
+	 * @param messageDTO 参数
+	 * @return Result
+	 */
+	Result readAllMessage(TokenDto tokenDto, UserMessageDTO messageDTO);
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java

@@ -1,8 +1,16 @@
 package com.epmet.modules.message.service.impl;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.UserMessageDTO;
+import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.message.service.UserMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description 我的消息
  * @Author yinzuomei
@@ -10,4 +18,27 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class UserMessageServiceImpl implements UserMessageService {
+	@Autowired
+	private EpmetMessageFeignClient messageFeignClient;
+
+	@Override
+	public Result<List<UserMessageDTO>> getMessageList(TokenDto tokenDto, MymessageFormDTO messageFromDTO) {
+		messageFromDTO.setUserId(tokenDto.getUserId());
+		Result<List<UserMessageDTO>> result = messageFeignClient.getMyMessageList(messageFromDTO);
+		return result;
+	}
+
+	@Override
+	public Result readMessage(String messageId) {
+		UserMessageDTO messageDTO = new UserMessageDTO();
+		messageDTO.setId(messageId);
+		return messageFeignClient.readMessage(messageDTO);
+	}
+
+	@Override
+	public Result readAllMessage(TokenDto tokenDto, UserMessageDTO messageDTO) {
+		messageDTO.setUserId(tokenDto.getUserId());
+		messageDTO.setDelFlag("0");
+		return messageFeignClient.readAllMessage(messageDTO);
+	}
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -1,6 +1,5 @@
 package com.epmet.modules.resiregister.service.impl;
 
-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.dto.UserResiInfoDTO;
@@ -8,6 +7,7 @@ import com.epmet.dto.form.ResiInfoSubmitFormDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.resiregister.service.ResiRegisterService;
 import com.epmet.modules.utils.ModuleConstant;
@@ -38,11 +38,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+        /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getVisitFrom())) {
-            return new Result<ResiRegisterResultDTO>().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
+            return new Result<ResiRegisterResultDTO>().error(ModuleErrorCode.PARTICIPATION_EXCEPTION);
-        }
+        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.init(formDTO);
     }
@@ -57,11 +57,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId())
+        /*if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId())
                 || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId())
                 || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) {
             return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
-        }
+        }*/
         UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo();
         userResiInfoDTO.setUserId(tokenDTO.getUserId());
         userResiInfoDTO.setApp(tokenDTO.getApp());
@@ -81,10 +81,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
+        /*if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
                 || StringUtils.isBlank(formDTO.getResiVisitId())
                 || !validateMobile(formDTO.getMobile())) {
             return new Result<ResiRegisterResultDTO>().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
+        }*/
+        if (!validateMobile(formDTO.getMobile())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleErrorCode.MOBILE_EXCEPTION);
         }
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.getVerificationCode(formDTO);

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

@@ -4,7 +4,6 @@ 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;
@@ -45,15 +44,4 @@ 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,7 +2,6 @@ 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;
@@ -32,13 +31,4 @@ 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,13 +1,11 @@
 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;
@@ -36,11 +34,11 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+       /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getVisitFrom())) {
-            return new Result<ResiWarmheartedResultDTO>().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
+            return new Result<ResiWarmheartedResultDTO>().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }
+        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.init(formDTO);
     }
@@ -55,34 +53,14 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+        /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getResiWarmVisitId())
                 || StringUtils.isBlank(formDTO.getReason())) {
-            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);
+        return resiPartymemberFeignClient.submit(formDTO);
     }
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,8 +24,8 @@ public interface EpmetUserFeignClient {
 	 * @param userResiInfoFormDTO 参数
 	 * @return Result<UserResiInfoDTO>
 	 */
-	@PostMapping("/epmetuser/userresiinfo/getUserResiInfoDTO")
+	@PostMapping("/epmetuser/userresiinfo/getuserresiinfo")
-	Result<UserResiInfoDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO);
+	Result<UserResiInfoResultDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * 党员认证时，如果没有注册居民，则注册居民信息

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 	@Override
-	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
+	public Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO);
 	}
 

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

@@ -8,6 +8,7 @@ import com.epmet.constant.PartyMemberConstant;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.partymember.entity.*;
@@ -78,15 +79,17 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 			userResiInfoFormDTO.setCustomerId(fromDto.getCustomerId());
 			userResiInfoFormDTO.setUserId(fromDto.getUserId());
-			UserResiInfoDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData();
+			UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData();
-			PartymemberInfoDTO partyMemberInfo =  ConvertUtils.sourceToTarget(userResiInfoResult,
+			if (null != userResiInfoResult) {
-					PartymemberInfoDTO.class);
+				PartymemberInfoDTO partyMemberInfo =  ConvertUtils.sourceToTarget(userResiInfoResult,
-			partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
+						PartymemberInfoDTO.class);
-			partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
+				partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
-			partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
+				partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
-			result.setPartyMemberInfo(partyMemberInfo);
+				partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
-		}
+				result.setPartyMemberInfo(partyMemberInfo);
+			}
 
+		}
 		// 将访问行为存入热心居民申请行为记录表
 		String visitId = saveOrUpdateVisit(null, fromDto, PartyMemberConstant.OPERATE_INITIALIZE);
 
@@ -228,7 +231,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
 		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
-		Result<UserResiInfoDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+		Result<UserResiInfoResultDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
 		if (null == userResiInfoResult.getData()) {
 			UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class);
 			userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile());

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

@@ -163,7 +163,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
      * @return
      */
     public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
-        Date date = new Date();
         ResiWarmheartedApplyEntity entity = new ResiWarmheartedApplyEntity();
         entity.setCustomerId(formDTO.getCustomerId());
         entity.setGridId(formDTO.getGridId());
@@ -188,7 +187,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             //审核状态-通过
             entity.setAuditStatus(PartyMemberConstant.APPROVED);
         }
-        entity.setRefuseReason(formDTO.getRefuseReason());
+        if(!StringUtils.isBlank(formDTO.getRefuseReason())){
+            entity.setRefuseReason(formDTO.getRefuseReason());
+        }
         baseDao.updateById(entity);
         //2:审核通过的添加热心居民的角色
         if(NumConstant.ONE_STR.equals(formDTO.getAuditStatus())){

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java

@@ -20,6 +20,7 @@ package com.epmet.dto.form;
 import com.epmet.dto.UserResiInfoDTO;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -39,21 +40,25 @@ public class ResiInfoSubmitFormDTO implements Serializable {
 	/**
 	 * 客户Id (customer.id)
 	 */
+	@NotBlank(message = "客户ID不能为空")
 	private String customerId;
 
 	/**
 	 * 网格Id (customer_grid.id)
 	 */
+	@NotBlank(message = "网格ID不能为空")
 	private String gridId;
 
 	/**
 	 * 居民注册行为记录表Id resi_visit.id
 	 */
+	@NotBlank(message = "注册行为表ID不能为空")
 	private String resiVisitId;
 
 	/**
 	 * 用户在居民端完善的个人信息
 	 */
+	@NotBlank(message = "个人信息不能为空")
 	private UserResiInfoDTO resiInfo;
 
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description userId集合
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:20
+ */
+@Data
+public class UserResiInfoListFormDTO implements Serializable {
+	private static final long serialVersionUID = -4454561042197166135L;
+
+	private List<String> userIdList;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java

@@ -18,16 +18,19 @@ public class VerificationCodeFormDTO implements Serializable {
     /**
      * 手机号(注册手机号)
      */
+    @NotBlank(message = "手机号不能为空")
     private String mobile;
 
     /**
      * 居民注册行为记录表Id resi_visit.id
      */
+    @NotBlank(message = "注册行为表ID不能为空")
     private String resiVisitId;
 
     /**
      * 用户ID
      */
+    @NotBlank(message = "用户ID不能为空")
     private String userId;
 
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java

@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户注册信息返参DTO
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:45
+ */
+@Data
+public class UserResiInfoResultDTO implements Serializable {
+
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 用户Id(主键) user.id
+	 */
+	private String userId;
+
+	/**
+	 * 手机号(注册手机号)
+	 */
+	private String regMobile;
+
+	/**
+	 * 姓氏
+	 */
+	private String surname;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 小区名称
+	 */
+	private String district;
+
+	/**
+	 * 楼栋单元
+	 */
+	private String buildingAddress;
+
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+	/**
+	 * 用户头像
+	 */
+	private String headPhoto;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java

@@ -10,6 +10,7 @@ package com.epmet.constant;
 
 /**
  * 常量
+ *
  * @author sun
  * @since 1.0.0
  */
@@ -33,6 +34,9 @@ public interface UserResiRegisterConstant {
     /**
      * 最后一次操作行为-提交失败
      */
-    String FAILD="faild";
+    String FAILD = "faild";
 
+    String MOBILE_EXIST = "该手机号已注册居民，请使用其他手机号注册";
+
+    String UPDATE_EXCEPTION = "用户居民注册访问记录表更新数据失败";
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@@ -27,7 +27,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,12 +102,24 @@ public class UserResiInfoController {
      * @Description 查询用户注册信息
      * @Date 2020/3/30 10:49
      **/
-    @PostMapping("getUserResiInfoDTO")
+    @PostMapping("getuserresiinfo")
-    public Result<UserResiInfoDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) {
+    public Result<UserResiInfoResultDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO) {
         ValidatorUtils.validateEntity(userResiInfoFormDTO);
         return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO);
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.UserResiInfoDTO>>
+     * @param userResiInfoListFormDTO
+     * @Author yinzuomei
+     * @Description 根据userId集合查询用户注册信息
+     * @Date 2020/4/7 18:24
+     **/
+    @PostMapping("getuserresiinfolist")
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO){
+        return userResiInfoService.getUserResiInfoList(userResiInfoListFormDTO);
+    }
+
     /**
      * @param userResiInfoDTO
      * @Author sun

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@@ -20,8 +20,10 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -41,7 +43,7 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 11:10
 	 **/
-	UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * @Author sun
@@ -49,4 +51,12 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 **/
 	List<UserResiInfoDTO> selectResiInfoByMobile(String regMobile);
 
+	/**
+	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
+	 * @param userIdList
+	 * @Author yinzuomei
+	 * @Description 根据userId集合查询用户注册信息
+	 * @Date 2020/4/7 18:26
+	 **/
+	List<UserResiInfoResultDTO> selectListUserResiInfoDTO(@Param("userIdList") List<String> userIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java

@@ -22,7 +22,9 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 
 import java.util.List;
@@ -103,7 +105,7 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 11:07
 	 **/
-	Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * 居民端-居民注册信息提交
@@ -130,4 +132,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @author zhaoqifeng
 	 */
 	Result saveResiInfo(UserResiInfoDTO userResiInfoDTO);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.UserResiInfoDTO>>
+	 * @param userResiInfoListFormDTO
+	 * @Author yinzuomei
+	 * @Description 根据userId集合查询用户注册信息
+	 * @Date 2020/4/7 18:21
+	 **/
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO);
 }

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

@@ -37,6 +37,7 @@ import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
@@ -232,7 +233,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
             userResiInfoFormDTO.setUserId(enterGridFormDTO.getUserId());
             userResiInfoFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
-            UserResiInfoDTO userResiInfo =  userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
+            UserResiInfoResultDTO userResiInfo =  userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
             resultObj.setNickname(userResiInfo.getSurname() + userResiInfo.getName());
 
         }
@@ -287,4 +288,4 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         return new Result();
     }
 
-}
+}

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

@@ -34,7 +34,9 @@ import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.entity.UserRoleEntity;
 import com.epmet.feign.MessageFeignClient;
@@ -50,10 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 用户居民端注册信息表  用户在居民端完善的个人信息
@@ -138,13 +137,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 * @Date 2020/3/30 11:07
 	 **/
 	@Override
-	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
+	public Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
-		UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
+		UserResiInfoResultDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
-		if (null != userResiInfoDTO) {
+		return new Result<UserResiInfoResultDTO>().ok(userResiInfoDTO);
-			String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName();
-			userResiInfoDTO.setShowName(showName);
-		}
-		return new Result<UserResiInfoDTO>().ok(userResiInfoDTO);
 	}
 
 	/**
@@ -212,8 +207,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
 		//2:判断手机号是否可用
 		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
-			result.setCode(EpmetErrorCode.MOBILE_EXIST.getValue());
+			result.error(UserResiRegisterConstant.MOBILE_EXIST);
-			result.setMsg(EpmetErrorCode.MOBILE_EXIST.getName());
 			return result;
 		}
 		//3:调用短信服务 生成验证码发送短信
@@ -244,6 +238,23 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		return result;
 	}
 
+	/**
+	 * @param userResiInfoListFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.UserResiInfoDTO>>
+	 * @Author yinzuomei
+	 * @Description 根据userId集合查询用户注册信息
+	 * @Date 2020/4/7 18:21
+	 **/
+	@Override
+	public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
+		List<UserResiInfoResultDTO> list=new ArrayList<>();
+		if(null==userResiInfoListFormDTO.getUserIdList()){
+			return new Result<List<UserResiInfoResultDTO>>().ok(list);
+		}
+		list= baseDao.selectListUserResiInfoDTO(userResiInfoListFormDTO.getUserIdList());
+		return new Result<List<UserResiInfoResultDTO>>().ok(list);
+	}
+
 	/**
 	 * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据
 	 *

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

@@ -151,7 +151,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
         if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-            log.warn(EpmetErrorCode.UPDATE_EXCEPTION.getName());
+            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
         }
     }
 
@@ -164,7 +164,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedBy(verificationCodeFormDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
         if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-            log.warn(EpmetErrorCode.UPDATE_EXCEPTION.getName());
+            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
         }
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -40,7 +40,7 @@
 
     <!-- 查询用户注册信息   -->
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
-            resultType="com.epmet.dto.UserResiInfoDTO">
+            resultType="com.epmet.dto.result.UserResiInfoResultDTO">
         SELECT
             uri.id,
             uc.USER_ID,
@@ -49,8 +49,15 @@
             uri.`NAME`,
             uri.STREET,
             uri.DISTRICT,
-            uri.BUILDING_ADDRESS,
+            uri.RESI_VISIT_ID,
-            uri.RESI_VISIT_ID
+            CONCAT_WS('-',uri.STREET,uri.SURNAME,uri.`NAME`) as show_name,
+            (
+            select uw.HEAD_IMG_URL from user_wechat uw
+            where uw.DEL_FLAG='0'
+            and uw.USER_ID=#{userId}
+            order by uw.CREATED_TIME
+            limit 1
+            )as head_photo
         FROM
             user_customer uc
             LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID )
@@ -70,4 +77,26 @@
         AND uri.reg_mobile = #{regMobile}
     </select>
 
+    <!-- 根据userId集合查询用户注册信息   -->
+    <select id="selectListUserResiInfoDTO" resultType="com.epmet.dto.result.UserResiInfoResultDTO">
+         SELECT
+            uri.id,
+            uri.USER_ID,
+            uri.REG_MOBILE,
+            uri.SURNAME,
+            uri.`NAME`,
+            uri.STREET,
+            uri.DISTRICT,
+            uri.BUILDING_ADDRESS,
+            CONCAT_WS('-',uri.STREET,uri.SURNAME,uri.`NAME`) as show_name,
+            uw.HEAD_IMG_URL as head_photo
+        FROM user_resi_info uri
+        left join  user_wechat uw on(uri.user_id=uw.USER_ID)
+        WHERE uri.DEL_FLAG = '0'
+        and uw.DEL_FLAG='0'
+        AND uri.USER_ID in
+        <foreach item="userId" collection="userIdList" separator="," open="(" close=")" index="">
+            #{userId}
+        </foreach>
+    </select>
 </mapper>