居民相关和党员相关所有网页列表，默认分页查询返回空集合。

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java

@@ -17,19 +17,18 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao;
 import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
 import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
-import com.elink.esua.epdc.redis.PartyAuthenticationFailedRedis;
 import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
+import com.elink.esua.epdc.util.AppUserUtils;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,24 +45,19 @@ import java.util.Map;
 @Service
 public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyAuthenticationFailedDao, PartyAuthenticationFailedEntity> implements PartyAuthenticationFailedService {
 
-    @Autowired
-    private PartyAuthenticationFailedRedis partyAuthenticationFailedRedis;
-
     @Override
     public PageData<PartyAuthenticationFailedDTO> page(Map<String, Object> params) {
-        //党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
+
-        String realName = params.get("realName").toString();
+        String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"};
-        String mobile = params.get("mobile").toString();
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
-        String identityNo = params.get("identityNo").toString();
+            List<PartyAuthenticationFailedDTO> userDtoList = Lists.newArrayList();
-        if (StringUtils.isNotBlank(realName)) {
+            return new PageData<>(userDtoList, NumConstant.ZERO);
-            params.put("realName", realName.trim());
-        }
-        if (StringUtils.isNotBlank(mobile)) {
-            params.put("mobile", mobile.trim());
-        }
-        if (StringUtils.isNotBlank(identityNo)) {
-            params.put("identityNo", identityNo.trim());
         }
+
+        // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
+        paramKeys = new String[]{"realName", "identityNo", "mobile"};
+        params = AppUserUtils.trimParamValue(params, paramKeys);
+
         IPage<PartyAuthenticationFailedEntity> page = this.getPage(params);
         List<PartyAuthenticationFailedDTO> list = baseDao.selectListDto(params);
         return new PageData<>(list, page.getTotal());
@@ -71,19 +65,9 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
 
     @Override
     public List<PartyAuthenticationFailedDTO> list(Map<String, Object> params) {
-        //党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
+        // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
-        String realName = params.get("realName").toString();
+        String[] paramKeys = new String[]{"realName", "identityNo", "mobile"};
-        String mobile = params.get("mobile").toString();
+        params = AppUserUtils.trimParamValue(params, paramKeys);
-        String identityNo = params.get("identityNo").toString();
-        if (StringUtils.isNotBlank(realName)) {
-            params.put("realName", realName.trim());
-        }
-        if (StringUtils.isNotBlank(mobile)) {
-            params.put("mobile", mobile.trim());
-        }
-        if (StringUtils.isNotBlank(identityNo)) {
-            params.put("identityNo", identityNo.trim());
-        }
         List<PartyAuthenticationFailedDTO> list = baseDao.selectListDto(params);
 
         return list;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -81,38 +82,67 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     @Override
     public Result<PageData<PartyMembersDTO>> pageDIY(Map<String, Object> params) {
-        String[] paramKeys = new String[]{"realName", "mobile", "streetId", "communityId", "gridId", "identityNo", "registFlag", "postId", "startTime", "endTime"};
+        return new Result().ok(pagePartyMember(params, YesOrNoEnum.YES.value()));
-        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
-            List<PartyMembersDTO> list = Lists.newArrayList();
-            return new Result().ok(new PageData<>(list, NumConstant.ZERO));
-        }
-
-        params = preparePageParams(params);
-        IPage<PartyMembersDTO> page = getPage(params);
-        List<PartyMembersDTO> list = baseDao.pageDIY(params);
-        return new Result().ok(new PageData<>(list, page.getTotal()));
     }
 
     @Override
     public Result<PageData<PartyMembersDTO>> hasAuthenticationPartyPage(Map<String, Object> params) {
-        params = preparePageParams(params);
+        return new Result().ok(pagePartyMember(params, YesOrNoEnum.NO.value()));
+    }
+
+    /**
+     * 党员库和已认证党员列表
+     *
+     * @param params             分页参数
+     * @param allPartyMemberFlag 是否是党员库查询
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.PartyMembersDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/2/24 16:41
+     */
+    private PageData<PartyMembersDTO> pagePartyMember(Map<String, Object> params, String allPartyMemberFlag) {
+
+        List<PartyMembersDTO> list = Lists.newArrayList();
+        // 是否是进入页面时的默认查询
+        if (!isDefaultQuery(params)) {
+            return new PageData<>(list, NumConstant.ZERO);
+        }
+
+        params = trimParamValue(params);
         IPage<PartyMembersDTO> page = getPage(params);
-        List<PartyMembersDTO> list = baseDao.hasAuthenticationPartyPage(params);
+        // 党员库
-        return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(list, page.getTotal()));
+        if (YesOrNoEnum.YES.value().equals(allPartyMemberFlag)) {
+            list = baseDao.pageDIY(params);
+        } else {
+            // 已认证党员
+            list = baseDao.hasAuthenticationPartyPage(params);
+        }
+        return new PageData<>(list, page.getTotal());
     }
 
-    private Map<String, Object> preparePageParams(Map<String, Object> params) {
+    /**
-        params.put("realName", trimStr(MapUtil.getStr(params, "realName")));
+     * 判断是否是进入页面时的默认查询
-        params.put("mobile", trimStr(MapUtil.getStr(params, "mobile")));
+     *
-        params.put("identityNo", trimStr(MapUtil.getStr(params, "identityNo")));
+     * @param params 查询参数
-        return params;
+     * @return boolean
+     * @author work@yujt.net.cn
+     * @date 2020/2/24 16:42
+     */
+    private boolean isDefaultQuery(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"realName", "mobile", "streetId", "communityId", "gridId", "identityNo", "registFlag", "postId", "startTime", "endTime"};
+        return AppUserUtils.isDefaultQuery(params, paramKeys);
     }
 
-    private String trimStr(String str) {
+    /**
-        if (StringUtils.isNotBlank(str)) {
+     * 将必要的查询参数进行trim
-            return str.trim();
+     *
-        }
+     * @param params 查询参数
-        return str;
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @author work@yujt.net.cn
+     * @date 2020/2/24 16:43
+     */
+    private Map<String, Object> trimParamValue(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"realName", "mobile", "identityNo"};
+        return AppUserUtils.trimParamValue(params, paramKeys);
     }
 
     @Override

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -20,7 +20,6 @@ package com.elink.esua.epdc.service.impl;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -32,7 +31,6 @@ import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
@@ -100,8 +98,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Autowired
     private UserInvitationRecordService userInvitationRecordService;
-    @Autowired
+
-    private UserDetailRedis userDetailRedis;
     @Autowired
     private AdminFeignClient adminFeignClient;
     @Autowired
@@ -109,15 +106,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
-        String state = MapUtil.getStr(params, "state");
+        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
-        String partyFlag = MapUtil.getStr(params, "partyFlag");
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
-        // 上边两个值都为0，表示查询未认证居民列表
+            List<UserDTO> userDtoList = Lists.newArrayList();
-        if (YesOrNoEnum.NO.value().equals(state) && YesOrNoEnum.NO.value().equals(partyFlag)) {
+            return new PageData<>(userDtoList, NumConstant.ZERO);
-            String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
-            if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
-                List<UserDTO> userDtoList = Lists.newArrayList();
-                return new PageData<>(userDtoList, NumConstant.ZERO);
-            }
         }
         this.verifyParams(params);
         // 查询当前用户所具有的的数据权限
@@ -133,23 +125,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     private Map<String, Object> verifyParams(Map<String, Object> params) {
-        String param = (String) params.get("realName");
+
-        if (StringUtils.isNotBlank(param)) {
+        String[] paramKeys = new String[]{"realName", "identityNo", "nickname", FieldConstant.MOBILE_HUMP};
-            params.put("realName", param.trim());
+
-        }
+        return AppUserUtils.trimParamValue(params, paramKeys);
-        param = (String) params.get("nickname");
+
-        if (StringUtils.isNotBlank(param)) {
-            params.put("nickname", param.trim());
-        }
-        param = (String) params.get(FieldConstant.MOBILE_HUMP);
-        if (StringUtils.isNotBlank(param)) {
-            params.put(FieldConstant.MOBILE_HUMP, param.trim());
-        }
-        param = (String) params.get("identityNo");
-        if (StringUtils.isNotBlank(param)) {
-            params.put("identityNo", param.trim());
-        }
-        return params;
     }
 
     @Override
@@ -157,7 +137,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserEntity entity = baseDao.selectById(id);
         UserDTO resultDTO = ConvertUtils.sourceToTarget(entity, UserDTO.class);
         resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, null));
-        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ZERO_STR));//0 未通过1通过
+        //0 未通过1通过
+        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ZERO_STR));
         resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ONE_STR));
         return resultDTO;
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java

@@ -28,10 +28,36 @@ public class AppUserUtils {
             return true;
         }
         for (String paramKey : paramKeys) {
+            if (StringUtils.isBlank(paramKey)) {
+                continue;
+            }
             if (StringUtils.isNotBlank(MapUtil.getStr(params, paramKey))) {
                 return false;
             }
         }
         return true;
     }
+
+    /**
+     * 对查询条件进行trim操作
+     *
+     * @param params    查询条件
+     * @param paramKeys 需要trim的键
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @author work@yujt.net.cn
+     * @date 2020/2/24 16:39
+     */
+    public static Map<String, Object> trimParamValue(Map<String, Object> params, String[] paramKeys) {
+        if (ArrayUtil.isNotEmpty(paramKeys)) {
+            for (String paramKey : paramKeys) {
+                if (StringUtils.isNotBlank(paramKey)) {
+                    String paramValue = MapUtil.getStr(params, paramKey);
+                    if (StringUtils.isNotBlank(paramValue)) {
+                        params.put(paramKey, paramValue.trim());
+                    }
+                }
+            }
+        }
+        return params;
+    }
 }