diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java index 2d067fd589..c8c1288c12 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java @@ -2,43 +2,20 @@ package com.epmet.dto.form; import lombok.Data; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** * @Author sun - * @Description 运营端-根据授权状态和初始化状态获取客户列表(不分页)-接口入参 + * @Description 运营端-根据初始化状态获取公众号注册的客户列表-接口入参 */ @Data public class RegisterByAuthFormDTO implements Serializable { private static final long serialVersionUID = -6547893374373422628L; - public interface AddUserInternalGroup { - } - - /** - * 居民端是否授权(0:未授权,1:已授权) - * */ - @NotNull(message = "居民端是否授权不能为空", groups = { AddUserInternalGroup.class }) - private Integer resiAuth; - - /** - * 工作端是否授权(0:未授权,1:已授权) - * */ - @NotNull(message = "工作端是否授权不能为空", groups = { AddUserInternalGroup.class }) - private Integer workAuth; - /** * 初始化状态(0:已初始化、1:未初始化) * */ - @NotNull(message = "初始化状态不能为空", groups = { AddUserInternalGroup.class }) private Integer initState; - /** - * 所属端 resi:居民端 work:工作端 - */ - private String client; - } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index 8ed2ff7fd9..144b38aace 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -121,11 +121,11 @@ public class PaCustomerController { * @param formDTO * @return * @Author sun - * @Description 根据授权状态和初始化状态获取客户列表(不分页) + * @Description 根据初始化状态获取公众号注册的客户列表 **/ @PostMapping(value = "registerbyauth") public Result> registerByAuth(@LoginUser TokenDto tokenDTO, @RequestBody RegisterByAuthFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, RegisterByAuthFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO); return new Result>().ok( paCustomerService.registerByAuth(formDTO)); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java index a632d9b3eb..f22a55b563 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java @@ -65,7 +65,7 @@ public interface PaCustomerDao extends BaseDao { * @param formDTO * @return * @Author sun - * @Description 根据所属端授权状态、初始化状态查询客户列表数据 + * @Description 根据初始化状态获取公众号注册的客户列表 **/ List selectCustomerList(RegisterByAuthFormDTO formDTO); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java index addf9d6d53..a48b2b7d88 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java @@ -158,7 +158,7 @@ public interface PaCustomerService extends BaseService { * @param formDTO * @return * @Author sun - * @Description 根据授权状态和初始化状态获取客户列表(不分页) + * @Description 根据初始化状态获取公众号注册的客户列表 **/ List registerByAuth(RegisterByAuthFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 62fdde3a8c..3842ee0e7a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -488,29 +488,12 @@ public class PaCustomerServiceImpl extends BaseServiceImpl registerByAuth(RegisterByAuthFormDTO formDTO) { - List resultList = new ArrayList<>(); - //1.根据是否初始化和居民端授权状态查询客户列表信息 - formDTO.setClient(PaConstant.CLIENT_RESI); - List list1 = baseDao.selectCustomerList(formDTO); - - //2.根据是否初始化和工作端授权状态查询客户列表信息 - formDTO.setClient(PaConstant.CLIENT_WORK); - List list2 = baseDao.selectCustomerList(formDTO); - - //3.取交集数据 - list1.forEach(dto->{ - list2.forEach(cu->{ - if(dto.getCustomerId().equals(cu.getCustomerId())){ - resultList.add(dto); - } - }); - }); - return resultList; + return baseDao.selectCustomerList(formDTO); } } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml index 1d37df5b4d..8938e590ee 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml @@ -58,22 +58,14 @@