Merge remote-tracking branch 'origin/房屋tree_yzm'

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

@@ -43,7 +43,7 @@ public class GridController {
      * @return
      */
     @PostMapping("griddetail")
-    public Result<GridDetailResultDTO> gridDetail(@LoginUser TokenDto tokenDto,@RequestBody CustomerGridFormDTO customerGridFormDTO){
+    public Result<GridDetailResultDTO> gridDetail(@RequestBody CustomerGridFormDTO customerGridFormDTO){
         Result<GridDetailResultDTO> griddetail = customerGridService.griddetail(customerGridFormDTO);
         return griddetail;
     }

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

@@ -238,6 +238,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     public Result<GridDetailResultDTO> griddetail(CustomerGridFormDTO customerGridFormDTO) {
         GridDetailResultDTO griddetail = baseDao.griddetail(customerGridFormDTO);
+        if(null==griddetail){
+            return new Result<>();
+        }
         List<UserIdAndPidDTO> customerStaffGridDTOS = baseDao.selectUserIdByGridId(customerGridFormDTO);
         //获取人员具体信息(头像、名字...)
         Result<List<StaffGridListDTO>> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS);

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -537,8 +537,10 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				}
 			}
 		});
-		//2.1:批量更新发布范围表数据
-		articlePublishRangeService.updateBatchById(offLineList);
+		if(!CollectionUtils.isEmpty(offLineList)){
+			//2.1:批量更新发布范围表数据
+			articlePublishRangeService.updateBatchById(offLineList);
+		}
 
 		//3:根据是否全部下线更新文章主表数据
 		ArticleEntity entity = new ArticleEntity();
@@ -1740,47 +1742,47 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		PublishedListResultDTO resultDTO = new PublishedListResultDTO();
 		//1.查询文章主表信息
 		List<PublishedListResultDTO> list = baseDao.selectAllArticle(formDTO);
-
-		if (!CollectionUtils.isEmpty(list)) {
-			resultDTO = list.get(NumConstant.ZERO);
-			resultDTO.setTagNameList(StringUtils.isNotBlank(resultDTO.getTags())?Arrays.asList(resultDTO.getTags().split("[|]")):new ArrayList<>());
-			resultDTO.setIsMePublished(resultDTO.getCreatedBy().equals(formDTO.getStaffId())?true:false);
-			//查询文章涉及的发布范围网络Id列表
-			LambdaQueryWrapper<ArticlePublishRangeEntity> tWrapper = new LambdaQueryWrapper<>();
-			tWrapper.eq(ArticlePublishRangeEntity::getArticleId, formDTO.getArticleId());
-			tWrapper.eq(ArticlePublishRangeEntity::getDelFlag, NumConstant.ZERO_STR);
-			//【文章下线的查所有发布范围，文章没下线的只查还没下线的发布范围】
-			if("offline".equals(resultDTO.getStatusFlag())){
-				tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "offline");
-			}else {
-				tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "published");
-			}
-			List<ArticlePublishRangeEntity> entityList = articlePublishRangeDao.selectList(tWrapper);
-			if (!CollectionUtils.isEmpty(entityList)) {
-				List<String> contentList = entityList.stream().map(ArticlePublishRangeEntity::getGridId).collect(Collectors.toList());
-				resultDTO.setGridIdList(contentList);
-			}
-
-			//查询文章内容
-			LambdaQueryWrapper<ArticleContentEntity> tWrapper1 = new LambdaQueryWrapper<>();
-			tWrapper1.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
-			tWrapper1.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
-			tWrapper1.orderByDesc(ArticleContentEntity::getOrderNum);
-			List<ArticleContentEntity> contentEntityList = articleContentDao.selectList(tWrapper1);
-			if (!CollectionUtils.isEmpty(contentEntityList)) {
-				List<PublishedListResultDTO.Content> contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class);
-				resultDTO.setContentList(contentList);
-			}
-
-			//标签列表
-			LambdaQueryWrapper<ArticleTagsEntity> tWrapper2 = new LambdaQueryWrapper<>();
-			tWrapper2.eq(ArticleTagsEntity::getArticleId, formDTO.getArticleId());
-			tWrapper2.eq(ArticleTagsEntity::getDelFlag, NumConstant.ZERO_STR);
-			List<ArticleTagsEntity> tagsEntityList = articleTagsDao.selectList(tWrapper2);
-			if (!CollectionUtils.isEmpty(tagsEntityList)) {
-				List<String> contentList = tagsEntityList.stream().map(ArticleTagsEntity::getTagId).collect(Collectors.toList());
-				resultDTO.setTagIdList(contentList);
-			}
+		if(CollectionUtils.isEmpty(list)){
+			return null;
+		}
+		resultDTO = list.get(NumConstant.ZERO);
+		resultDTO.setTagNameList(StringUtils.isNotBlank(resultDTO.getTags())?Arrays.asList(resultDTO.getTags().split("[|]")):new ArrayList<>());
+		resultDTO.setIsMePublished(resultDTO.getCreatedBy().equals(formDTO.getStaffId())?true:false);
+		//查询文章涉及的发布范围网络Id列表
+		LambdaQueryWrapper<ArticlePublishRangeEntity> tWrapper = new LambdaQueryWrapper<>();
+		tWrapper.eq(ArticlePublishRangeEntity::getArticleId, formDTO.getArticleId());
+		tWrapper.eq(ArticlePublishRangeEntity::getDelFlag, NumConstant.ZERO_STR);
+		//【文章下线的查所有发布范围，文章没下线的只查还没下线的发布范围】
+		if("offline".equals(resultDTO.getStatusFlag())){
+			tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "offline");
+		}else {
+			tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "published");
+		}
+		List<ArticlePublishRangeEntity> entityList = articlePublishRangeDao.selectList(tWrapper);
+		if (!CollectionUtils.isEmpty(entityList)) {
+			List<String> contentList = entityList.stream().map(ArticlePublishRangeEntity::getGridId).collect(Collectors.toList());
+			resultDTO.setGridIdList(contentList);
+		}
+
+		//查询文章内容
+		LambdaQueryWrapper<ArticleContentEntity> tWrapper1 = new LambdaQueryWrapper<>();
+		tWrapper1.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
+		tWrapper1.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
+		tWrapper1.orderByDesc(ArticleContentEntity::getOrderNum);
+		List<ArticleContentEntity> contentEntityList = articleContentDao.selectList(tWrapper1);
+		if (!CollectionUtils.isEmpty(contentEntityList)) {
+			List<PublishedListResultDTO.Content> contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class);
+			resultDTO.setContentList(contentList);
+		}
+
+		//标签列表
+		LambdaQueryWrapper<ArticleTagsEntity> tWrapper2 = new LambdaQueryWrapper<>();
+		tWrapper2.eq(ArticleTagsEntity::getArticleId, formDTO.getArticleId());
+		tWrapper2.eq(ArticleTagsEntity::getDelFlag, NumConstant.ZERO_STR);
+		List<ArticleTagsEntity> tagsEntityList = articleTagsDao.selectList(tWrapper2);
+		if (!CollectionUtils.isEmpty(tagsEntityList)) {
+			List<String> contentList = tagsEntityList.stream().map(ArticleTagsEntity::getTagId).collect(Collectors.toList());
+			resultDTO.setTagIdList(contentList);
 		}
 
 		return resultDTO;

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java

@@ -1,6 +1,7 @@
 package com.epmet.modules.person.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -63,8 +64,10 @@ public class BadgeController {
      * @author zxc
      * @date 2020/11/4 11:16 上午
      */
+    @NoRepeatSubmit
     @PostMapping("certification/add")
     public Result certificationAdd(@LoginUser TokenDto tokenDto,@RequestBody CertificationAddFormDTO certificationAddFormDTO){
+        certificationAddFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(certificationAddFormDTO, CertificationAddFormDTO.CertificationAdd.class);
         return badgeService.certificationAdd(tokenDto,certificationAddFormDTO);
     }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java

@@ -85,7 +85,6 @@ public class BadgeServiceImpl implements BadgeService {
      */
     @Override
     public Result certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO) {
-        certificationAddFormDTO.setUserId(tokenDto.getUserId());
         Result result = epmetUserOpenFeignClient.authBadgeRecord(certificationAddFormDTO);
         return result;
     }

epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java

@@ -36,7 +36,7 @@ public interface BadgeConstant {
 
     String GET_BADGE_NAME_FAILURE = "获取徽章名称失败......";
 
-    String MESSAGE_CONTENT = "您有一条徽章认证消，,%s申请认证%s，请审核";
+    String MESSAGE_CONTENT = "您有一条徽章认证消息，,%s申请认证%s，请审核";
 
     String READ_FLAG = "unread";
 

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

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -255,7 +256,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         // 校验这个徽章此人有没有
         Integer recordCount = userBadgeCertificateRecordDao.selectIsExist(certificationAddFormDTO.getBadgeId(), certificationAddFormDTO.getUserId());
         if (recordCount>NumConstant.ZERO){
-            throw new RenException("不允许重复提交审核");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"不允许重复提交审核","已存在认证记录，不允许重复提交审核");
         }
         log.info(JSON.toJSONString(certificationAddFormDTO));
         AuthFieldFormDTO authFieldFormDTO = new AuthFieldFormDTO();