运营端查询注册客户信息接口

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;
     }
 

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：已授权

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.已删除
      */

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;
+
+}

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;
+
+}

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<CustomerAgencyResultDTO> agencyList;
+
+}

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<MyInfoResultDTO>().ok(paCustomerService.myInfo(formDTO));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description  查询公众号注册的客户信息列表
+     **/
+    @PostMapping("registerinfo")
+    public Result<PageData> registerInfo(@LoginUser TokenDto tokenDTO, @RequestBody RegisterInfoFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<PageData>().ok(paCustomerService.registerInfo(formDTO));
+    }
+
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java

@@ -41,4 +41,12 @@ public interface CustomerMpDao extends BaseDao<CustomerMpEntity> {
      * @Description 查询客户小程序授权结果信息
      **/
     List<CustomerMpDTO> selectByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description 查询所有客户小程序的授权信息
+     **/
+    List<CustomerMpDTO> selectAll();
 }

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<PaCustomerEntity> {
      * @Description 公众号-根据userId查询用户对应的客户信息
      **/
     List<PaCustomerDTO> selectCustomerByUserId(@Param("userId") String userId);
+
+    /**
+     * @param
+     * @return
+     * @Author sun
+     * @Description  查询公众号注册的客户信息列表
+     **/
+    List<CustomerAgencyResultDTO> registerInfo();
 }

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：已授权

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;
+
 }

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;

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;
 

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<PaCustomerEntity> {
      **/
     MyInfoResultDTO myInfo(MyInfoFormDTO formDTO);
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description  查询公众号注册的客户信息列表
+     **/
+    PageData registerInfo(RegisterInfoFormDTO formDTO);
 }

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<PaCustomerDao, PaCust
     public CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO) {
         //1.客户表初始化数据
         PaCustomerEntity entity = new PaCustomerEntity();
+        entity.setIsInitialize(NumConstant.ZERO);
         entity.setCustomerName(formDTO.getAgencyName());
         baseDao.insert(entity);
 
@@ -322,5 +327,39 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         return resultDTO;
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description  查询公众号注册的客户信息列表
+     **/
+    @Override
+    public PageData registerInfo(RegisterInfoFormDTO formDTO) {
+        //分页参数
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        //1.查询客户组织信息
+        List<CustomerAgencyResultDTO> list = baseDao.registerInfo();
+        //2.查询客户小程序授权信息
+        List<CustomerMpDTO> 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<CustomerAgencyResultDTO> pageInfo = new PageInfo<>();
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml

@@ -19,4 +19,19 @@
             client ASC
     </select>
 
+    <select id="selectAll" resultType="com.epmet.dto.CustomerMpDTO">
+        SELECT
+            id,
+            customer_id,
+            client,
+            app_id,
+            authorization_flag
+        FROM
+            customer_mp
+        WHERE
+            del_flag = '0'
+        ORDER BY
+            customer_id ASC, client ASC
+    </select>
+
 </mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml

@@ -6,7 +6,8 @@
     <select id="selectCustomerByUserId" resultType="com.epmet.dto.PaCustomerDTO">
         SELECT
             pc.id,
-            pc.customer_name
+            pc.customer_name,
+            pc.is_initialize
         FROM
             pa_customer pc
         INNER JOIN pa_customer_user_agency pcua ON pc.id = pcua.customer_id
@@ -16,4 +17,28 @@
         AND pcua.user_id = #{userId}
     </select>
 
+    <select id="registerInfo" resultType="com.epmet.dto.result.CustomerAgencyResultDTO">
+        SELECT
+            pc.id AS "customerId",
+            pca.id AS "agencyId",
+            pca.agency_name AS "agencyName",
+            pca.`level` AS "level",
+            pca.province AS "province",
+            pca.city AS "city",
+            pca.district AS "district",
+            pca.partybranchnum AS "partybranchnum",
+            pc.is_initialize AS "initState",
+	        pa.phone AS "phone"
+        FROM
+            pa_customer_agency pca
+        INNER JOIN pa_customer pc ON pca.customer_id = pc.id
+        LEFT JOIN pa_customer_user_agency pcua ON pcua.agency_id = pca.id AND pcua.del_flag = '0'
+        LEFT JOIN pa_user pa ON pcua.user_id = pa.id AND pa.del_flag = '0'
+        WHERE
+            pca.del_flag = '0'
+        AND pc.del_flag = '0'
+        ORDER BY
+            pca.CREATED_TIME DESC
+    </select>
+
 </mapper>