From 6363147de4b80492b5a408c14c1f8ae53d16d742 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 15 Jul 2020 12:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PublicUserLoginServiceImpl.java | 6 +- .../java/com/epmet/dto/CustomerMpDTO.java | 2 +- .../java/com/epmet/dto/PaCustomerDTO.java | 5 ++ .../epmet/dto/form/RegisterInfoFormDTO.java | 32 +++++++++ .../dto/result/CustomerAgencyResultDTO.java | 65 +++++++++++++++++++ .../dto/result/RegisterInfoResultDTO.java | 26 ++++++++ .../controller/PaCustomerController.java | 14 ++++ .../java/com/epmet/dao/CustomerMpDao.java | 8 +++ .../java/com/epmet/dao/PaCustomerDao.java | 9 +++ .../com/epmet/entity/CustomerMpEntity.java | 2 +- .../com/epmet/entity/PaCustomerEntity.java | 5 ++ .../java/com/epmet/excel/CustomerMpExcel.java | 2 +- .../java/com/epmet/excel/PaCustomerExcel.java | 3 + .../com/epmet/service/PaCustomerService.java | 8 +++ .../service/impl/PaCustomerServiceImpl.java | 39 +++++++++++ .../main/resources/mapper/CustomerMpDao.xml | 15 +++++ .../main/resources/mapper/PaCustomerDao.xml | 27 +++++++- 17 files changed, 261 insertions(+), 7 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterInfoResultDTO.java diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 20b8ffba8e..972d9cc831 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -97,10 +97,10 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { logger.error("wxMpUser is null"); throw new RenException("解析微信用户信息失败 wxMpUser is null"); } - if(StringUtils.isBlank(wxMpUser.getUnionId())){ + /*if(StringUtils.isBlank(wxMpUser.getUnionId())){ logger.error("wxMpUser.getUnionId() is null"); -// throw new RenException("解析微信用户信息失败"); - } + // throw new RenException("解析微信用户信息失败"); + }*/ return wxMpUser; } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java index 014fbe6678..3a106817f7 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CustomerMpDTO.java @@ -51,7 +51,7 @@ public class CustomerMpDTO implements Serializable { /** * 小程序的appId */ - private Integer appId; + private String appId; /** * 是否已经授权 0：未授权，1：已授权 diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java index 2fed14154e..dd175f0747 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java @@ -43,6 +43,11 @@ public class PaCustomerDTO implements Serializable { */ private String customerName; + /** + * 是否已经完成客户信息初始化 0：未初始化，1：已初始化 + */ + private Integer isInitialize; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java new file mode 100644 index 0000000000..7b20804835 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/RegisterInfoFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author sun + * @Description 公众号-查询公众号注册的客户列表-接口入参 + */ +@Data +public class RegisterInfoFormDTO implements Serializable { + + private static final long serialVersionUID = -6547893374373422628L; + + public interface AddUserInternalGroup { + } + + /** + * 当前页 + * */ + @Min(value = 1) + private Integer pageNo = 1; + + /** + * 每页显示数量 + * */ + private Integer pageSize = 20; + +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java new file mode 100644 index 0000000000..6b361e8c4f --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author sun + * @Description 公众号-查询公众号注册的客户列表-接口返参 + */ +@Data +public class CustomerAgencyResultDTO implements Serializable { + + private static final long serialVersionUID = 3253989119352850315L; + + /** + * 客户Id + */ + private String customerId = ""; + /** + * 组织Id + */ + private String agencyId = ""; + /** + * 组织名称 + */ + private String agencyName = ""; + /** + * 组织级别 + */ + private String level = ""; + /** + * 省 + */ + private String province = ""; + /** + * 市 + */ + private String city = ""; + /** + * 区 + */ + private String district = ""; + /** + * 党支部数量 + */ + private Integer partybranchnum; + /** + * 居民端授权状态(0：未授权，1：已授权) + */ + private Integer resiAuth; + /** + * 政府端授权状态(0：未授权，1：已授权) + */ + private Integer workAuth; + /** + * 政府端授权状态(0：未授权，1：已授权) + */ + private Integer initState; + /** + * 注册人手机号 + */ + private String phone; + +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterInfoResultDTO.java new file mode 100644 index 0000000000..64c1f03e5e --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/RegisterInfoResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author sun + * @Description 公众号-查询公众号注册的客户列表-接口返参 + */ +@Data +public class RegisterInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 3253989119352850315L; + + /** + * 总记录数 + */ + private Integer total; + /** + * 客户组织列表 + */ + private List agencyList; + +} 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 0b32a836a7..862d9fa3f1 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 @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -8,6 +9,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.form.CreateAgencyFormDTO; import com.epmet.dto.form.MyInfoFormDTO; 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.MyInfoResultDTO; @@ -89,5 +91,17 @@ public class PaCustomerController { return new Result().ok(paCustomerService.myInfo(formDTO)); } + /** + * @param formDTO + * @return + * @Author sun + * @Description 查询公众号注册的客户信息列表 + **/ + @PostMapping("registerinfo") + public Result registerInfo(@LoginUser TokenDto tokenDTO, @RequestBody RegisterInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(paCustomerService.registerInfo(formDTO)); + } + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java index e868d6c4d5..7b3db18170 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java @@ -41,4 +41,12 @@ public interface CustomerMpDao extends BaseDao { * @Description 查询客户小程序授权结果信息 **/ List selectByCustomerId(@Param("customerId") String customerId); + + /** + * @param + * @return + * @Author sun + * @Description 查询所有客户小程序的授权信息 + **/ + List selectAll(); } \ No newline at end of file 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 ac4f9cd20f..de4111e6c6 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,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.PaCustomerDTO; +import com.epmet.dto.result.CustomerAgencyResultDTO; import com.epmet.entity.PaCustomerEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -41,4 +42,12 @@ public interface PaCustomerDao extends BaseDao { * @Description 公众号-根据userId查询用户对应的客户信息 **/ List selectCustomerByUserId(@Param("userId") String userId); + + /** + * @param + * @return + * @Author sun + * @Description 查询公众号注册的客户信息列表 + **/ + List registerInfo(); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java index 30ba4b4b15..dcd1dbe613 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CustomerMpEntity.java @@ -51,7 +51,7 @@ public class CustomerMpEntity extends BaseEpmetEntity { /** * 小程序的appId */ - private Integer appId; + private String appId; /** * 是否已经授权 0：未授权，1：已授权 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java index 09c41932ca..9c32baf589 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java @@ -43,4 +43,9 @@ public class PaCustomerEntity extends BaseEpmetEntity { */ private String customerName; + /** + * 是否已经完成客户信息初始化 0：未初始化，1：已初始化 + */ + private Integer isInitialize; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/CustomerMpExcel.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/CustomerMpExcel.java index 5c9549a265..cdfd902755 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/CustomerMpExcel.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/CustomerMpExcel.java @@ -41,7 +41,7 @@ public class CustomerMpExcel { private String client; @Excel(name = "小程序的appId") - private Integer appId; + private String appId; @Excel(name = "是否已经授权：0.未授权 1.已授权") private Integer authorizationFlag; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/PaCustomerExcel.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/PaCustomerExcel.java index b30999fe95..eadef64de2 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/PaCustomerExcel.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/excel/PaCustomerExcel.java @@ -37,6 +37,9 @@ public class PaCustomerExcel { @Excel(name = "客户名称，默认是根组织名称") private String customerName; + @Excel(name = "是否已经完成客户信息初始化：0.未初始化 1.已初始化") + private Integer isInitialize; + @Excel(name = "删除标识：0.未删除 1.已删除") private Integer delFlag; 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 765f4fd94d..bb8d3f2325 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 @@ -24,6 +24,7 @@ import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.CreateAgencyFormDTO; import com.epmet.dto.form.MyInfoFormDTO; 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.MyInfoResultDTO; @@ -131,4 +132,11 @@ public interface PaCustomerService extends BaseService { **/ MyInfoResultDTO myInfo(MyInfoFormDTO formDTO); + /** + * @param formDTO + * @return + * @Author sun + * @Description 查询公众号注册的客户信息列表 + **/ + PageData registerInfo(RegisterInfoFormDTO 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 3dd016aaf8..7793bab04a 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 @@ -37,8 +37,10 @@ import com.epmet.dto.*; import com.epmet.dto.form.CreateAgencyFormDTO; import com.epmet.dto.form.MyInfoFormDTO; 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.CustomerAgencyResultDTO; import com.epmet.dto.result.MyInfoResultDTO; import com.epmet.entity.*; import com.epmet.redis.PaCustomerRedis; @@ -46,6 +48,8 @@ import com.epmet.service.CustomerMpService; import com.epmet.service.PaCustomerAgencyService; import com.epmet.service.PaCustomerService; import com.epmet.service.PaCustomerUserAgencyService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -231,6 +235,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl list = baseDao.registerInfo(); + //2.查询客户小程序授权信息 + List mpList = customerMpDao.selectAll(); + //3.封装数据 + list.forEach(l -> { + mpList.forEach(mp -> { + if (l.getCustomerId().equals(mp.getCustomerId())) { + //居民端小程序授权情况 + if (PaConstant.CLIENT_RESI.equals(mp.getClient())) { + l.setResiAuth(mp.getAuthorizationFlag()); + } + //政府端小程序授权情况 + if (PaConstant.CLIENT_WORK.equals(mp.getClient())) { + l.setWorkAuth(mp.getAuthorizationFlag()); + } + } + }); + }); + PageInfo pageInfo = new PageInfo<>(); + return new PageData<>(list, pageInfo.getTotal()); + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml index 14d322bee1..97a62f99f1 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml @@ -19,4 +19,19 @@ client ASC + + \ 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 fcd4d09bbf..609937e09f 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 @@ -6,7 +6,8 @@ + + \ No newline at end of file