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..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,9 +35,11 @@ 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); - return new Result>().ok(badgeService.getBadgeList(tokenDto,badgeListFormDTO)); + // 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())); } /** @@ -49,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 b8e04ded39..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,8 +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 +21,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 个人中心-获取徽章可操作列表(点亮,取消,认证) @@ -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 0c1a3239a4..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,8 +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; import lombok.extern.slf4j.Slf4j; @@ -41,10 +39,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("获取徽章点亮列表失败......"); @@ -63,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("获取徽章列表失败......");