From 5e700684c3dc0eb2f23a994437ce0ec35ff1c7c2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 10 Jan 2023 18:06:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=AA=E4=BA=BA=E5=BE=BD=E7=AB=A0=E7=82=B9?= =?UTF-8?q?=E4=BA=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E4=BC=A0token=E4=B9=9F=E5=8F=AF=E4=BB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/person/controller/BadgeController.java | 3 ++- .../com/epmet/modules/person/service/BadgeService.java | 4 ++-- .../modules/person/service/impl/BadgeServiceImpl.java | 7 +++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java index 5b455c43a4..ab93495730 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java @@ -39,7 +39,8 @@ public class BadgeController { @PostMapping("list") public Result> getBadgeList(@LoginUser TokenDto tokenDto,@RequestBody BadgeListFormDTO badgeListFormDTO){ ValidatorUtils.validateEntity(badgeListFormDTO, BadgeListFormDTO.BadgeList.class); - return new Result>().ok(badgeService.getBadgeList(tokenDto,badgeListFormDTO)); + // return new Result>().ok(badgeService.getBadgeList(tokenDto,badgeListFormDTO)); + return new Result>().ok(badgeService.getBadgeList(tokenDto.getCustomerId(),tokenDto.getUserId())); } /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java index b8e04ded39..ce8ff55ea9 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java @@ -4,7 +4,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CertificationAddFormDTO; import com.epmet.dto.form.OpenedOrClosedFormDTO; -import com.epmet.resi.mine.dto.from.BadgeListFormDTO; import com.epmet.resi.mine.dto.from.OperListFormDTO; import com.epmet.resi.mine.dto.result.BadgeListResultDTO; import com.epmet.resi.mine.dto.result.OperListResultDTO; @@ -23,7 +22,8 @@ public interface BadgeService { * @author zxc * @date 2020/11/3 4:11 下午 */ - List getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO); + // List getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO); + List getBadgeList(String customerId,String userId); /** * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证） diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java index 0c1a3239a4..af37c2dae7 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java @@ -12,7 +12,6 @@ import com.epmet.dto.result.UserBadgeListResultDTO; import com.epmet.dto.result.UserOperListResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.person.service.BadgeService; -import com.epmet.resi.mine.dto.from.BadgeListFormDTO; import com.epmet.resi.mine.dto.from.OperListFormDTO; import com.epmet.resi.mine.dto.result.BadgeListResultDTO; import com.epmet.resi.mine.dto.result.OperListResultDTO; @@ -41,10 +40,10 @@ public class BadgeServiceImpl implements BadgeService { * @date 2020/11/3 4:11 下午 */ @Override - public List getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO) { + public List getBadgeList(String customerId,String userId) { UserBadgeListFormDTO form = new UserBadgeListFormDTO(); - form.setCustomerId(badgeListFormDTO.getCustomerId()); - form.setUserId(tokenDto.getUserId()); + form.setCustomerId(customerId); + form.setUserId(userId); Result> listResult = epmetUserOpenFeignClient.selectBadgeList(form); if (!listResult.success()){ throw new RenException("获取徽章点亮列表失败......"); From faa6249276914af52b5e4f81812bf697e765d4bf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 10 Jan 2023 18:48:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?/resi/mine/badge/operlist=E4=BB=8Etoken?= =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96customerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../person/controller/BadgeController.java | 15 ++++++++------- .../modules/person/service/BadgeService.java | 4 ++-- .../person/service/impl/BadgeServiceImpl.java | 7 +++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java index ab93495730..e11c3cd8a6 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/BadgeController.java @@ -7,8 +7,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CertificationAddFormDTO; import com.epmet.dto.form.OpenedOrClosedFormDTO; import com.epmet.modules.person.service.BadgeService; -import com.epmet.resi.mine.dto.from.BadgeListFormDTO; -import com.epmet.resi.mine.dto.from.OperListFormDTO; import com.epmet.resi.mine.dto.result.BadgeListResultDTO; import com.epmet.resi.mine.dto.result.OperListResultDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -37,8 +35,9 @@ public class BadgeController { * @date 2020/11/3 4:11 下午 */ @PostMapping("list") - public Result> getBadgeList(@LoginUser TokenDto tokenDto,@RequestBody BadgeListFormDTO badgeListFormDTO){ - ValidatorUtils.validateEntity(badgeListFormDTO, BadgeListFormDTO.BadgeList.class); + // public Result> getBadgeList(@LoginUser TokenDto tokenDto,@RequestBody BadgeListFormDTO badgeListFormDTO){ + public Result> getBadgeList(@LoginUser TokenDto tokenDto){ + // ValidatorUtils.validateEntity(badgeListFormDTO, BadgeListFormDTO.BadgeList.class); // return new Result>().ok(badgeService.getBadgeList(tokenDto,badgeListFormDTO)); return new Result>().ok(badgeService.getBadgeList(tokenDto.getCustomerId(),tokenDto.getUserId())); } @@ -50,9 +49,11 @@ public class BadgeController { * @date 2020/11/3 4:28 下午 */ @PostMapping("operlist") - public Result> getOperList(@LoginUser TokenDto tokenDto,@RequestBody OperListFormDTO operListFormDTO){ - ValidatorUtils.validateEntity(operListFormDTO, OperListFormDTO.OperList.class); - return new Result>().ok(badgeService.getOperList(tokenDto,operListFormDTO)); + // public Result> getOperList(@LoginUser TokenDto tokenDto,@RequestBody OperListFormDTO operListFormDTO){ + public Result> getOperList(@LoginUser TokenDto tokenDto){ + // ValidatorUtils.validateEntity(operListFormDTO, OperListFormDTO.OperList.class); + // return new Result>().ok(badgeService.getOperList(tokenDto,operListFormDTO)); + return new Result>().ok(badgeService.getOperList(tokenDto.getCustomerId(),tokenDto.getUserId())); } /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java index ce8ff55ea9..7703b41e50 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/BadgeService.java @@ -4,7 +4,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CertificationAddFormDTO; import com.epmet.dto.form.OpenedOrClosedFormDTO; -import com.epmet.resi.mine.dto.from.OperListFormDTO; import com.epmet.resi.mine.dto.result.BadgeListResultDTO; import com.epmet.resi.mine.dto.result.OperListResultDTO; @@ -31,7 +30,8 @@ public interface BadgeService { * @author zxc * @date 2020/11/3 4:28 下午 */ - List getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO); + // List getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO); + List getOperList(String customerId,String userId); /** * @Description 个人中心-提交徽章认证 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java index af37c2dae7..40433eae67 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/BadgeServiceImpl.java @@ -12,7 +12,6 @@ import com.epmet.dto.result.UserBadgeListResultDTO; import com.epmet.dto.result.UserOperListResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.person.service.BadgeService; -import com.epmet.resi.mine.dto.from.OperListFormDTO; import com.epmet.resi.mine.dto.result.BadgeListResultDTO; import com.epmet.resi.mine.dto.result.OperListResultDTO; import lombok.extern.slf4j.Slf4j; @@ -62,10 +61,10 @@ public class BadgeServiceImpl implements BadgeService { * @date 2020/11/3 4:28 下午 */ @Override - public List getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO) { + public List getOperList(String customerId,String userId) { UserOperListFormDTO userOperListFormDTO = new UserOperListFormDTO(); - userOperListFormDTO.setCustomerId(operListFormDTO.getCustomerId()); - userOperListFormDTO.setUserId(tokenDto.getUserId()); + userOperListFormDTO.setCustomerId(customerId); + userOperListFormDTO.setUserId(userId); Result> listResult = epmetUserOpenFeignClient.selectOperList(userOperListFormDTO); if (!listResult.success()){ throw new RenException("获取徽章列表失败......");