dto名称重复，修改

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java

@@ -5,8 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
-import com.epmet.dto.result.CustomerUserResultDTO;
 import com.epmet.dto.result.PointAdjustmentResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.PointAdjustmentLogService;
@@ -39,7 +39,7 @@ public class AdjustmentController {
      * @date 2020.07.27 10:57
      **/
     @PostMapping("userlist")
-    public Result<List<CustomerUserResultDTO>> userList(@RequestBody CustomerUserFormDTO param){
+    public Result<List<CustomerUser4PointResultDTO>> userList(@RequestBody CustomerUserFormDTO param){
         ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class);
         return epmetUserOpenFeignClient.customerUserList(param);
     }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUserResultDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java

@@ -6,13 +6,12 @@ import java.io.Serializable;
 
 /**
  * @Description
- * @ClassName CustomerUserResultDTO
+ * @ClassName CustomerUser4PointResultDTO
  * @Auth wangc
- * @Date 2020-07-25 15:45
+ * @Date 2020-07-28 09:47
  */
 @Data
-public class CustomerUserResultDTO implements Serializable {
+public class CustomerUser4PointResultDTO implements Serializable {
-    private static final long serialVersionUID = 388843991776771308L;
 
     /**
      * 用户头像

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -199,7 +199,7 @@ public interface EpmetUserOpenFeignClient {
      * @date 2020.07.25 16:15
      **/
     @PostMapping("/epmetuser/gridlatest/customeruserlist")
-    Result<List<CustomerUserResultDTO>> customerUserList(@RequestBody CustomerUserFormDTO param);
+    Result<List<CustomerUser4PointResultDTO>> customerUserList(@RequestBody CustomerUserFormDTO param);
 
     /**
      * @Description 查询用户详情信息

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -135,7 +135,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
      * @date 2020.07.25 16:15
      **/
     @Override
-    public Result<List<CustomerUserResultDTO>> customerUserList(CustomerUserFormDTO param) {
+    public Result<List<CustomerUser4PointResultDTO>> customerUserList(CustomerUserFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerUserList", param);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -27,7 +27,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.CustomerUserFormDTO;
-import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.excel.GridLatestExcel;
 import com.epmet.service.GridLatestService;
@@ -126,8 +126,8 @@ public class GridLatestController {
      * @date 2020.07.25 16:15
      **/
     @PostMapping("customeruserlist")
-    public Result<List<CustomerUserResultDTO>> customerUserList(@RequestBody CustomerUserFormDTO param){
+    public Result<List<CustomerUser4PointResultDTO>> customerUserList(@RequestBody CustomerUserFormDTO param){
-        return new  Result<List<CustomerUserResultDTO>>().ok(gridLatestService.getCustomerUsers(param));
+        return new  Result<List<CustomerUser4PointResultDTO>>().ok(gridLatestService.getCustomerUsers(param));
     }
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java

@@ -6,7 +6,7 @@ import com.epmet.dto.UserHeadPhotoDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.WxLoginUserInfoFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
-import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.entity.UserWechatEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -73,6 +73,6 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
      * @author wangc
      * @date 2020.07.27 00:58
     **/
-    List<CustomerUserResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds,@Param("realName")String realName);
+    List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds, @Param("realName")String realName);
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java

@@ -24,7 +24,7 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
-import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 
@@ -129,6 +129,6 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * @author wangc
      * @date 2020.07.25 16:15
     **/
-    List<CustomerUserResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO);
+    List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO);
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -31,7 +31,7 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
-import com.epmet.dto.result.CustomerUserResultDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
@@ -182,9 +182,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      * @date 2020.07.25 16:15
      **/
     @Override
-    public List<CustomerUserResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
+    public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
         List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
-        List<CustomerUserResultDTO> allData = new LinkedList<>();
+        List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
         if(null == userIds || userIds.isEmpty()){
             return allData;
         }

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -91,7 +91,7 @@
     </select>
 
     <!-- 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称 -->
-    <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUserResultDTO">
+    <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
         SELECT
             wechat.USER_ID,
             wechat.NICKNAME AS userNickname,