diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index 15e1980651..0f2876f74f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java @@ -5,8 +5,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CustomerUserFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; +import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; -import com.epmet.dto.result.CustomerUserResultDTO; import com.epmet.dto.result.PointAdjustmentResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.PointAdjustmentLogService; @@ -39,7 +39,7 @@ public class AdjustmentController { * @date 2020.07.27 10:57 **/ @PostMapping("userlist") - public Result> userList(@RequestBody CustomerUserFormDTO param){ + public Result> userList(@RequestBody CustomerUserFormDTO param){ ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class); return epmetUserOpenFeignClient.customerUserList(param); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java similarity index 71% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java index 52885077d0..95cba037ef 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java @@ -6,13 +6,12 @@ import java.io.Serializable; /** * @Description - * @ClassName CustomerUserResultDTO + * @ClassName CustomerUser4PointResultDTO * @Auth wangc - * @Date 2020-07-25 15:45 + * @Date 2020-07-28 09:47 */ @Data -public class CustomerUserResultDTO implements Serializable { - private static final long serialVersionUID = 388843991776771308L; +public class CustomerUser4PointResultDTO implements Serializable { /** * 用户头像 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index c765ec0a28..70116e6e91 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -199,7 +199,7 @@ public interface EpmetUserOpenFeignClient { * @date 2020.07.25 16:15 **/ @PostMapping("/epmetuser/gridlatest/customeruserlist") - Result> customerUserList(@RequestBody CustomerUserFormDTO param); + Result> customerUserList(@RequestBody CustomerUserFormDTO param); /** * @Description 查询用户详情信息 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 39c71e8e9f..6ba2d156fd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -135,7 +135,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien * @date 2020.07.25 16:15 **/ @Override - public Result> customerUserList(CustomerUserFormDTO param) { + public Result> customerUserList(CustomerUserFormDTO param) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerUserList", param); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index 8f0922d2b1..342300ea58 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java @@ -27,7 +27,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.GridLatestDTO; import com.epmet.dto.form.CustomerUserFormDTO; -import com.epmet.dto.result.CustomerUserResultDTO; +import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.excel.GridLatestExcel; import com.epmet.service.GridLatestService; @@ -126,8 +126,8 @@ public class GridLatestController { * @date 2020.07.25 16:15 **/ @PostMapping("customeruserlist") - public Result> customerUserList(@RequestBody CustomerUserFormDTO param){ - return new Result>().ok(gridLatestService.getCustomerUsers(param)); + public Result> customerUserList(@RequestBody CustomerUserFormDTO param){ + return new Result>().ok(gridLatestService.getCustomerUsers(param)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java index b0a2490bda..ef513d0ac7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java @@ -6,7 +6,7 @@ import com.epmet.dto.UserHeadPhotoDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.result.CertifiedResultDTO; -import com.epmet.dto.result.CustomerUserResultDTO; +import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.entity.UserWechatEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -73,6 +73,6 @@ public interface UserWechatDao extends BaseDao{ * @author wangc * @date 2020.07.27 00:58 **/ - List selectResiAndStrangerInfo(@Param("userIds") List userIds,@Param("realName")String realName); + List selectResiAndStrangerInfo(@Param("userIds") List userIds, @Param("realName")String realName); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java index 595f5a503f..4298d1ef68 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java @@ -24,7 +24,7 @@ import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.GridLatestDTO; import com.epmet.dto.form.CustomerUserFormDTO; import com.epmet.dto.form.VisitedFormDTO; -import com.epmet.dto.result.CustomerUserResultDTO; +import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.entity.GridLatestEntity; @@ -129,6 +129,6 @@ public interface GridLatestService extends BaseService { * @author wangc * @date 2020.07.25 16:15 **/ - List getCustomerUsers(CustomerUserFormDTO customerUserFormDTO); + List getCustomerUsers(CustomerUserFormDTO customerUserFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index a8938ea276..a3b1a97331 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -31,7 +31,7 @@ import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.GridLatestDTO; import com.epmet.dto.form.CustomerUserFormDTO; import com.epmet.dto.form.VisitedFormDTO; -import com.epmet.dto.result.CustomerUserResultDTO; +import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.GridLatestEntity; @@ -182,9 +182,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) { + public List getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) { List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); - List allData = new LinkedList<>(); + List allData = new LinkedList<>(); if(null == userIds || userIds.isEmpty()){ return allData; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index 9d3167ed1b..d3edc68319 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -91,7 +91,7 @@ - SELECT wechat.USER_ID, wechat.NICKNAME AS userNickname,