From a7df08871ca4bd6179a2c80aa4aed87cc6409726 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 14:31:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../java/com/epmet/dto/form/ReplyFormDTO.java | 34 ++++++++++ .../controller/ResiEventReplyController.java | 17 +++++ .../epmet/service/ResiEventReplyService.java | 11 +++- .../impl/ResiEventReplyServiceImpl.java | 64 +++++++++++++++++++ 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 015095cc83..ead3a480f5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -97,6 +97,7 @@ public enum EpmetErrorCode { VOTE_ISSUE_PLEASE(8602,"请先选择支持或反对，再发表您的想法"), RESI_EVENT_READ(8603,"当前事件正在处理中,不能撤回"), RESI_EVENT_NOT_MY_REPORTED(8604,"当前事件不是您发布的，无权操作"), + CAN_NOT_REPLY_RESI_EVENT(8605,"办结、立项处理后不可回复"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java new file mode 100644 index 0000000000..a6729ff46f --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 回复通用入参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/4 14:16 + */ +@Data +public class ReplyFormDTO implements Serializable { + private static final long serialVersionUID = 1653042839040178697L; + public interface AddUserInternalGroup { + } + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + @NotBlank(message = "事件id不能为空",groups = AddUserInternalGroup.class) + private String resiEventId; + @Length(min = 1, max = 200, message = "请填写回复内容,最多输入200字", groups = AddUserShowGroup.class) + private String content; + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java index dec9a9a80f..f7c57b14c5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.service.ResiEventReplyService; @@ -59,4 +60,20 @@ public class ResiEventReplyController { return new Result>().ok(resiEventReplyService.replyList(formDTO)); } + /** + * 报事-工作人员回复 + * + * @param tokenDto + * @param replyFormDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/8/4 14:19 + */ + @PostMapping("govReply") + public Result govReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO replyFormDTO){ + replyFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(replyFormDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); + resiEventReplyService.govReply(replyFormDTO); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java index 5065a9eb79..4311de0805 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventReplyService.java @@ -18,10 +18,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -41,4 +41,13 @@ public interface ResiEventReplyService extends BaseService */ List replyList(ReplyListFormDTO formDTO); + /** + * 报事-工作人员回复 + * + * @param replyFormDTO + * @return void + * @author yinzuomei + * @date 2021/8/4 14:20 + */ + void govReply(ReplyFormDTO replyFormDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java index 98767e41c8..2a284ad914 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -18,13 +18,28 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.EventConstant; +import com.epmet.constant.ResiEventAction; +import com.epmet.dao.ResiEventDao; +import com.epmet.dao.ResiEventOperationLogDao; import com.epmet.dao.ResiEventReplyDao; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.dto.form.ReplyFormDTO; import com.epmet.dto.form.ReplyListFormDTO; import com.epmet.dto.result.ReplyListResultDTO; +import com.epmet.entity.ResiEventEntity; +import com.epmet.entity.ResiEventOperationLogEntity; import com.epmet.entity.ResiEventReplyEntity; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventReplyService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -35,6 +50,12 @@ import java.util.List; */ @Service public class ResiEventReplyServiceImpl extends BaseServiceImpl implements ResiEventReplyService { + @Autowired + private ResiEventDao resiEventDao; + @Autowired + private ResiEventOperationLogDao resiEventOperationLogDao; + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; /** * @Description 报事详情-回复列表-两端通用 @@ -52,4 +73,47 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId()); + if (!staffResult.success() && null == staffResult.getData()) { + throw new RenException("查询当前工作人员信息异常"); + } + // 插入回复表 + ResiEventReplyEntity resiEventReplyEntity=new ResiEventReplyEntity(); + resiEventReplyEntity.setCustomerId(eventEntity.getCustomerId()); + resiEventReplyEntity.setResiEventId(replyFormDTO.getResiEventId()); + resiEventReplyEntity.setFromUserId(replyFormDTO.getUserId()); + resiEventReplyEntity.setContent(replyFormDTO.getContent()); + resiEventReplyEntity.setUserShowName(staffResult.getData().getOrganizationName()); + resiEventReplyEntity.setCreatedTime(new Date()); + baseDao.insert(resiEventReplyEntity); + // 记录操作日志 + //2、插入log日志 + ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity(); + reCallLog.setCustomerId(eventEntity.getCustomerId()); + reCallLog.setResiEventId(eventEntity.getId()); + reCallLog.setUserId(replyFormDTO.getUserId()); + reCallLog.setUserIdentity(EventConstant.STAFF); + reCallLog.setActionCode(ResiEventAction.REPLY.getCode()); + reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc()); + reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime()); + resiEventOperationLogDao.insert(reCallLog); + } } \ No newline at end of file From 634d05f5b6ac8f91b0b9ada4b6ac1cd951b87889 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 14:35:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BF=98=E4=BA=86=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A6=81=E8=B5=B0=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResiEventReplyServiceImpl.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java index 2a284ad914..2bfa788811 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -20,7 +20,11 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.scan.param.TextScanParamDTO; +import com.epmet.commons.tools.scan.param.TextTaskDTO; +import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.ResiEventDao; @@ -35,12 +39,15 @@ import com.epmet.entity.ResiEventOperationLogEntity; import com.epmet.entity.ResiEventReplyEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventReplyService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; +import java.util.UUID; /** * 事件回复表 @@ -56,6 +63,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl staffResult = govOrgOpenFeignClient.getAgencyByStaff(replyFormDTO.getUserId()); if (!staffResult.success() && null == staffResult.getData()) { @@ -116,4 +129,22 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg()); + } + } + } + } } \ No newline at end of file From 56f9e23c7a677eefb1516e4c02c6ae56ecd6824f Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 4 Aug 2021 14:45:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?-=E5=B0=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84gridId=E6=94=B9=E4=B8=BAcustomerId=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?userShowName=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/ResiEventNpcListFormDTO.java | 2 +- .../dto/result/ResiEventNpcResultDTO.java | 8 +++ .../epmet/controller/ResiEventController.java | 8 +-- .../com/epmet/service/ResiEventService.java | 2 +- .../service/impl/ResiEventServiceImpl.java | 55 +++++++++++++++---- .../dto/form/ListUserByBadgeFormDTO.java | 5 +- .../com/epmet/controller/BadgeController.java | 4 +- .../src/main/java/com/epmet/dao/BadgeDao.java | 2 +- .../java/com/epmet/service/BadgeService.java | 2 +- .../epmet/service/impl/BadgeServiceImpl.java | 4 +- .../src/main/resources/mapper/BadgeDao.xml | 2 +- 11 files changed, 67 insertions(+), 27 deletions(-) diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java index 97b856a8e6..8f5921ea8d 100644 --- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/ResiEventNpcListFormDTO.java @@ -9,5 +9,5 @@ import lombok.Data; */ @Data public class ResiEventNpcListFormDTO { - private String gridId; + private String customerId; } diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java index 4208f28751..f7ea5861d3 100644 --- a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ResiEventNpcResultDTO.java @@ -20,8 +20,16 @@ public class ResiEventNpcResultDTO { private String gridId; + /** + * 展示名 + */ private String displayName; + /** + * 真实姓名 + */ + private String userShowName; + private String headImgUrl; private String agencyId; diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java index b594e42921..57d06b8a0b 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -32,15 +32,15 @@ public class ResiEventController { /** * @return - * @Description 查询人大代表列表 + * @Description 查询人大代表列表(客户下的) * @author wxz * @date 2021.08.03 09:17 */ - @PostMapping("/npc-list-ingrid") + @PostMapping("/npc-list") public Result>> listNpc(@RequestBody ResiEventNpcListFormDTO input) { ValidatorUtils.validateEntity(input); - String gridId = input.getGridId(); - List npcs = resiEventService.listNpcByGrid(gridId); + String customerId = input.getCustomerId(); + List npcs = resiEventService.listNpcByGrid(customerId); HashMap> wrapper = new HashMap<>(); wrapper.put("reportTargets", npcs); diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java index b23d04a476..85432f2a18 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -18,7 +18,7 @@ public interface ResiEventService { * @author wxz * @date 2021.08.03 09:29 */ - List listNpcByGrid(String gridId); + List listNpcByGrid(String customerId); /** * @Description 查询上报目标列表 diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 713d821588..b81eb0f47e 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -36,32 +36,65 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override - public List listNpcByGrid(String gridId) { + public List listNpcByGrid(String customerId) { // 查询网格所属的组织信息 - Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(gridId); - GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); - String parentAgencyId = gridInfoData.getParentAgencyId(); - String pids = gridInfoData.getPids(); + //Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId); + //GridInfoResultDTO gridInfoData = getResultDataOrThrowsException(gridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + //String parentAgencyId = gridInfoData.getParentAgencyId(); + //String pids = gridInfoData.getPids(); //查询人大代表列表 - ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(gridId, BadgeConstant.BADGE_KEY_NPC); + ListUserByBadgeFormDTO npcForm = new ListUserByBadgeFormDTO(customerId, BadgeConstant.BADGE_KEY_NPC); Result> npcResult = epmetUserOpenFeignClient.listUsersByBadge(npcForm); List npcData = getResultDataOrThrowsException(npcResult, ServiceConstant.EPMET_USER_SERVER, null, null); - List npcResultList = npcData.stream() - .map(npc -> new ResiEventNpcResultDTO(npc.getUserId(), gridId, "人大代表-".concat(npc.getRealName()), npc.getHeadImgUrl(), parentAgencyId, pids)) - .collect(Collectors.toList()); + //批量查询人大代表所在的网格信息 + List npcGridIds = npcData.stream().map(d -> d.getGridId()).collect(Collectors.toList()); + OrgInfoFormDTO form = new OrgInfoFormDTO(OrgInfoConstant.GRID, npcGridIds); + Result> npcGridInfoResult = govOrgOpenFeignClient.selectOrgInfo(form); + List npcGridInfos = getResultDataOrThrowsException(npcGridInfoResult, ServiceConstant.GOV_ORG_SERVER, null, null); + + Map npcGridInfoMap = convertNpcGridInfos2Map(npcGridInfos); + + List npcResultList = new ArrayList<>(); + npcData.stream().forEach(npc -> { + OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); + ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO( + npc.getUserId(), + npc.getGridId(), + "人大代表-".concat(npc.getRealName()), + npc.getRealName(), + npc.getHeadImgUrl(), + gridInfo != null ? gridInfo.getAgencyId() : null, + gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null); + npcResultList.add(resiEventNpcInfo); + } + ); return npcResultList; } /** - * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序 * @return + * @Description 将网格信息转化为map + * @author wxz + * @date 2021.08.04 14:25 + */ + private Map convertNpcGridInfos2Map(List npcGridInfos) { + HashMap result = new HashMap<>(); + npcGridInfos.stream().forEach(i -> { + result.put(i.getOrgId(), i); + }); + return result; + } + + /** + * @return + * @Description 此处会调用org上游接口批量获取父级组织信息，由于上游接口排序不可控，因此此处需要使用TreeSet做排序 * @author wxz * @date 2021.08.03 15:51 - */ + */ @Override public TreeSet listReportTargetLevels(String gridId) { TreeSet targetLevels = new TreeSet<>(); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java index 8d616bacf3..0587b7f163 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ListUserByBadgeFormDTO.java @@ -11,10 +11,9 @@ import javax.validation.constraints.NotBlank; @NoArgsConstructor public class ListUserByBadgeFormDTO { - @NotBlank(message = "网格ID不能为空") - private String gridId; + @NotBlank(message = "客户ID不能为空") + private String customerId; @NotBlank(message = "徽章key不能为空") private String badgeKey; - } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 192fc3c5d3..503da1bd31 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -199,10 +199,10 @@ public class BadgeController { public Result> listUsersByBadge(@RequestBody ListUserByBadgeFormDTO input) { ValidatorUtils.validateEntity(input); - String gridId = input.getGridId(); + String customerId = input.getCustomerId(); String badgeKey = input.getBadgeKey(); - List users = badgeService.listUsersByBadge(gridId, badgeKey); + List users = badgeService.listUsersByBadge(customerId, badgeKey); return new Result>().ok(users); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index 5c4aab8dcb..d2a10f7026 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -203,5 +203,5 @@ public interface BadgeDao extends BaseDao { * @author wxz * @date 2021.08.02 10:40 */ - List listUsersByBadge(@Param("gridId") String gridId, @Param("badgeKey") String badgeKey); + List listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index fad619e87b..fc06714fd9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -199,5 +199,5 @@ public interface BadgeService extends BaseService { * @author wxz * @date 2021.08.02 10:39 */ - List listUsersByBadge(String gridId, String badgeKey); + List listUsersByBadge(String customerId, String badgeKey); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 985dd00c46..4734770a3a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -481,7 +481,7 @@ public class BadgeServiceImpl extends BaseServiceImpl imp } @Override - public List listUsersByBadge(String gridId, String badgeKey) { - return baseDao.listUsersByBadge(gridId, badgeKey); + public List listUsersByBadge(String customerId, String badgeKey) { + return baseDao.listUsersByBadge(customerId, badgeKey); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 560867c932..09c84bde81 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -320,7 +320,7 @@ user_base_info.HEAD_IMG_URL from resi_user_badge inner join badge on (badge.BADGE_KEY = #{badgeKey} - and resi_user_badge.GRID_ID = #{gridId} + and resi_user_badge.CUSTOMER_ID=#{customerId} and resi_user_badge.CERTIFICATION_AUTID_STATUS = 'approved' and resi_user_badge.DEL_FLAG = 0 and resi_user_badge.BADGE_ID = badge.ID