From 5114fe8f9b2ad626171ef3aef79673fc5336ee81 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Jul 2020 12:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/RegisterByAuthFormDTO.java | 44 +++++++++++++++++++ .../dto/result/RegisterByAuthResultDTO.java | 26 +++++++++++ .../controller/PaCustomerController.java | 18 ++++++-- .../java/com/epmet/dao/PaCustomerDao.java | 11 +++++ .../com/epmet/service/PaCustomerService.java | 14 ++++-- .../service/impl/PaCustomerServiceImpl.java | 30 +++++++++++++ .../main/resources/mapper/PaCustomerDao.xml | 21 +++++++++ .../service/impl/CustomerServiceImpl.java | 3 -- 8 files changed, 156 insertions(+), 11 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterByAuthResultDTO.java 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 new file mode 100644 index 0000000000..2d067fd589 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterByAuthFormDTO.java @@ -0,0 +1,44 @@ +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 运营端-根据授权状态和初始化状态获取客户列表（不分页）-接口入参 + */ +@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-client/src/main/java/com/epmet/dto/result/RegisterByAuthResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterByAuthResultDTO.java new file mode 100644 index 0000000000..3c4c3c1eb8 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterByAuthResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author sun + * @Description 运营端-根据授权状态和初始化状态获取客户列表（不分页）-接口返参 + */ +@Data +public class RegisterByAuthResultDTO implements Serializable { + + private static final long serialVersionUID = 4642988014737245076L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 客户名称 + */ + private String customerName; + +} 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 16084e2d99..519a1a4cc4 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 @@ -7,12 +7,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.form.CreateAgencyFormDTO; +import com.epmet.dto.form.RegisterByAuthFormDTO; import com.epmet.dto.form.RegisterFormDTO; import com.epmet.dto.form.RegisterInfoFormDTO; -import com.epmet.dto.result.AgencyLevelListResultDTO; -import com.epmet.dto.result.CreateAgencyResultDTO; -import com.epmet.dto.result.InitCustomerResultDTO; -import com.epmet.dto.result.MyInfoResultDTO; +import com.epmet.dto.result.*; import com.epmet.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -122,4 +120,16 @@ public class PaCustomerController { return new Result(); } + /** + * @param formDTO + * @return + * @Author sun + * @Description 根据授权状态和初始化状态获取客户列表（不分页） + **/ + @PostMapping(value = "registerbyauth") + public Result> registerByAuth(@LoginUser TokenDto tokenDTO, @RequestBody RegisterByAuthFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, RegisterByAuthFormDTO.AddUserInternalGroup.class); + 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 d0b00c2357..a632d9b3eb 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 @@ -19,7 +19,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PaCustomerDTO; +import com.epmet.dto.form.RegisterByAuthFormDTO; import com.epmet.dto.result.CustomerAgencyResultDTO; +import com.epmet.dto.result.RegisterByAuthResultDTO; import com.epmet.entity.PaCustomerEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -58,4 +60,13 @@ public interface PaCustomerDao extends BaseDao { * @Description 修改客户数据状态为已完成初始化 **/ int updateCustomerById(PaCustomerDTO dto); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 根据所属端授权状态、初始化状态查询客户列表数据 + **/ + List selectCustomerList(RegisterByAuthFormDTO formDTO); + } \ No newline at end of file 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 8e45d47fa3..87bd164d01 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 @@ -22,12 +22,10 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.CreateAgencyFormDTO; +import com.epmet.dto.form.RegisterByAuthFormDTO; import com.epmet.dto.form.RegisterFormDTO; import com.epmet.dto.form.RegisterInfoFormDTO; -import com.epmet.dto.result.AgencyLevelListResultDTO; -import com.epmet.dto.result.CreateAgencyResultDTO; -import com.epmet.dto.result.InitCustomerResultDTO; -import com.epmet.dto.result.MyInfoResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.PaCustomerEntity; import java.util.List; @@ -155,4 +153,12 @@ public interface PaCustomerService extends BaseService { * @Description 修改客户数据状态为已完成初始化 **/ void updateCustomer(String customerId); + + /** + * @param formDTO + * @return + * @Author sun + * @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 20866695f2..63290cfb9f 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 @@ -35,6 +35,7 @@ import com.epmet.constant.PaConstant; import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.CreateAgencyFormDTO; +import com.epmet.dto.form.RegisterByAuthFormDTO; import com.epmet.dto.form.RegisterFormDTO; import com.epmet.dto.form.RegisterInfoFormDTO; import com.epmet.dto.result.*; @@ -432,4 +433,33 @@ 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; + } + } \ 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 074145416f..1d37df5b4d 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 @@ -56,6 +56,27 @@ pca.CREATED_TIME DESC + + UPDATE pa_customer SET is_initialize = #{isInitialize} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index fbfa1de278..2dc57cd47f 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -440,9 +440,6 @@ public class CustomerServiceImpl extends BaseServiceImpl