Merge branch 'dev_thirdplatform' into dev

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

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<List<RegisterByAuthResultDTO>> registerByAuth(@LoginUser TokenDto tokenDTO, @RequestBody RegisterByAuthFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, RegisterByAuthFormDTO.AddUserInternalGroup.class);
+        ValidatorUtils.validateEntity(formDTO);
         return new Result<List<RegisterByAuthResultDTO>>().ok( paCustomerService.registerByAuth(formDTO));
     }
 

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

@@ -65,7 +65,7 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 根据所属端授权状态、初始化状态查询客户列表数据
+     * @Description 根据初始化状态获取公众号注册的客户列表
      **/
     List<RegisterByAuthResultDTO> selectCustomerList(RegisterByAuthFormDTO formDTO);
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java

@@ -158,7 +158,7 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 根据授权状态和初始化状态获取客户列表（不分页）
+     * @Description 根据初始化状态获取公众号注册的客户列表
      **/
     List<RegisterByAuthResultDTO> registerByAuth(RegisterByAuthFormDTO formDTO);
 }

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<PaCustomerDao, PaCust
      * @param formDTO
      * @return
      * @Author sun
-     * @Description 根据授权状态和初始化状态获取客户列表（不分页）
+     * @Description 根据初始化状态获取公众号注册的客户列表
      **/
     @Override
     public List<RegisterByAuthResultDTO> registerByAuth(RegisterByAuthFormDTO formDTO) {
-        List<RegisterByAuthResultDTO> resultList = new ArrayList<>();
-        //1.根据是否初始化和居民端授权状态查询客户列表信息
-        formDTO.setClient(PaConstant.CLIENT_RESI);
-        List<RegisterByAuthResultDTO> list1 = baseDao.selectCustomerList(formDTO);
 
-        //2.根据是否初始化和工作端授权状态查询客户列表信息
+        return baseDao.selectCustomerList(formDTO);
-        formDTO.setClient(PaConstant.CLIENT_WORK);
-        List<RegisterByAuthResultDTO> list2 = baseDao.selectCustomerList(formDTO);
-
-        //3.取交集数据
-        list1.forEach(dto->{
-            list2.forEach(cu->{
-                if(dto.getCustomerId().equals(cu.getCustomerId())){
-                    resultList.add(dto);
-                }
-            });
-        });
-
-        return resultList;
     }
 
 }

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

@@ -58,22 +58,14 @@
 
     <select id="selectCustomerList" resultType="com.epmet.dto.result.RegisterByAuthResultDTO">
         SELECT
-            pc.id AS "customerId",
+            id AS "customerId",
-            pc.customer_name AS "customerName"
+            customer_name AS "customerName"
         FROM
-            pa_customer pc
+            pa_customer
-        INNER JOIN customer_mp cm ON pc.id = cm.customer_id
         WHERE
-            pc.del_flag = '0'
+            del_flag = '0'
-        AND cm.del_flag = '0'
+        <if test='null != initState and "" != initState'>
-        AND pc.is_initialize = #{initState}
+            AND is_initialize = #{initState}
-        <if test='null != client and "" != client and "resi" == client'>
-            AND cm.client = #{client}
-            AND cm.AUTHORIZATION_FLAG = #{resiAuth}
-        </if>
-        <if test='null != client and "" != client and "work" == client'>
-            AND cm.client = #{client}
-            AND cm.AUTHORIZATION_FLAG = #{workAuth}
         </if>
     </select>