Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -13,8 +14,9 @@ import java.io.Serializable;
 @Data
 public class IssueDetailFormDTO implements Serializable {
     private static final long serialVersionUID = 4859779755214503489L;
-
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
-    @NotBlank(message = "议题id不能为空")
+    }
+    @NotBlank(message = "议题id不能为空",groups =AddUserShowGroup.class )
     private String issueId;
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -43,6 +43,7 @@ public class IssueController {
      */
     @PostMapping(value = "detail")
     public Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
+        ValidatorUtils.validateEntity(issueDetail,IssueDetailFormDTO.AddUserShowGroup.class);
         return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
     }
 

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml

@@ -29,7 +29,8 @@
             g.UPDATED_TIME AS "updatedTime",
             if(exists( select gr.id from guide_reader gr
             where gr.del_flag='0'
-            and gr.GUIDE_ID=g.id),1,0) AS readFlag
+            and gr.GUIDE_ID=g.id
+            and gr.USER_ID = #{userId}),1,0) AS readFlag
         FROM
             guide g
         INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.DEL_FLAG = 0 AND gc.CUSTOMER_ID = #{customerId}

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueDetailFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -13,8 +14,9 @@ import java.io.Serializable;
 @Data
 public class IssueDetailFormDTO implements Serializable {
     private static final long serialVersionUID = 4859779755214503489L;
-
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
-    @NotBlank(message = "议题id不能为空")
+    }
+    @NotBlank(message = "议题id不能为空",groups = AddUserShowGroup.class)
     private String issueId;
 
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@@ -36,7 +36,7 @@ public class IssueController {
     @PostMapping(value = "/detail")
 //    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueDetailResultDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IssueDetailFormDTO issueDetail){
-        ValidatorUtils.validateEntity(issueDetail);
+        ValidatorUtils.validateEntity(issueDetail,IssueDetailFormDTO.AddUserShowGroup.class);
         return new Result<IssueDetailResultDTO>().ok(issueService.detail(tokenDto,issueDetail));
     }
 

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

@@ -114,7 +114,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 			userResiInfoFormDTO.setCustomerId(fromDto.getCustomerId());
 			userResiInfoFormDTO.setUserId(fromDto.getUserId());
-			UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData();
+			Result<UserResiInfoResultDTO> res = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+			if (res.success() && null != res) {
+				UserResiInfoResultDTO userResiInfoResult = res.getData();
 				if (null != userResiInfoResult) {
 					PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult,
 							PartymemberInfoDTO.class);
@@ -122,9 +124,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 					partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
 					partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
 					partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
+					partyMemberInfo.setIdCard(userResiInfoResult.getIdNum());
 					result.setPartyMemberInfo(partyMemberInfo);
 				}
-
+			}
 		}
 		// 将访问行为存入热心居民申请行为记录表
 		String visitId = saveOrUpdateVisit(null, fromDto, PartyMemberConstant.OPERATE_INITIALIZE);

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

@@ -59,4 +59,8 @@ public class UserResiInfoResultDTO implements Serializable {
 
 	private String nickName;
 	private String realName;
+	/**
+	 * 身份证号
+	 */
+	private String idNum;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -183,7 +183,7 @@ public class UserBaseInfoRedis {
                     }
                 }
             }
-
+            set(baseInfo);
             return baseInfo;
 
         }
@@ -270,7 +270,7 @@ public class UserBaseInfoRedis {
                     }
                 }
             }
-
+            set(baseInfo);
             return baseInfo;
 
         }

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -163,7 +164,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         //检验是否已经回复过
         UserAdviceEntity userAdviceEntity = baseDao.selectById(dto.getAdviceId());
         if (StringUtils.isNotBlank(userAdviceEntity.getReplyContent()) || StringUtils.isNotBlank(userAdviceEntity.getReplyUserId())) {
-            throw new RenException("该建议已被回复，不能再次回复");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"该建议已被回复，不能再次回复","该建议已被回复，不能再次回复");
         }
         //审核图片
         auditPic(dto.getGovImgList());

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

@@ -575,14 +575,20 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setEpmetUserId(userEntity.getId());
             result.setRegFlag(false);
         } else {
-            //更新下user_Base_info信息
+            // 更新下user_Base_info信息
-            if(StringUtils.isNotBlank(formDTO.getNick())){
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getRealName())) {
                 baseInfo.setRealName(formDTO.getNick());
+            }
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getSurname())) {
                 baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick()));
+            }
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getName())) {
                 baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick()));
+            }
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getNickname())) {
                 baseInfo.setNickname(formDTO.getNick());
             }
-            if(StringUtils.isNotBlank(formDTO.getAvatarUrl())){
+            if (StringUtils.isNotBlank(formDTO.getAvatarUrl()) && StringUtils.isBlank(baseInfo.getHeadImgUrl())) {
                 baseInfo.setHeadImgUrl(formDTO.getAvatarUrl());
             }
             baseDao.updateById(baseInfo);

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

@@ -186,6 +186,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			resultDTO.setBuildingAddress(userBaseInfoResultDTO.getBuildingAddress());
 			resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
 			resultDTO.setShowName(StrConstant.EPMETY_STR);
+			resultDTO.setIdNum(userBaseInfoResultDTO.getIdNum());
 			if (StringUtils.isNotBlank(userBaseInfoResultDTO.getSurname())){
 				String gender;
 				if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {