diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java index c526738b7..3bff8c6e0 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java +++ b/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 implements PartyAuthenticationFailedService { - @Autowired - private PartyAuthenticationFailedRedis partyAuthenticationFailedRedis; - @Override public PageData page(Map params) { - //党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格 - String realName = params.get("realName").toString(); - String mobile = params.get("mobile").toString(); - 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()); + + String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"}; + if (AppUserUtils.isDefaultQuery(params, paramKeys)) { + List userDtoList = Lists.newArrayList(); + return new PageData<>(userDtoList, NumConstant.ZERO); } + + // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格 + paramKeys = new String[]{"realName", "identityNo", "mobile"}; + params = AppUserUtils.trimParamValue(params, paramKeys); + IPage page = this.getPage(params); List list = baseDao.selectListDto(params); return new PageData<>(list, page.getTotal()); @@ -71,19 +65,9 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl list(Map params) { - //党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格 - String realName = params.get("realName").toString(); - String mobile = params.get("mobile").toString(); - 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()); - } + // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格 + String[] paramKeys = new String[]{"realName", "identityNo", "mobile"}; + params = AppUserUtils.trimParamValue(params, paramKeys); List list = baseDao.selectListDto(params); return list; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index f3d5855c2..a1f532dfc 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/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> pageDIY(Map params) { - String[] paramKeys = new String[]{"realName", "mobile", "streetId", "communityId", "gridId", "identityNo", "registFlag", "postId", "startTime", "endTime"}; - if (AppUserUtils.isDefaultQuery(params, paramKeys)) { - List list = Lists.newArrayList(); - return new Result().ok(new PageData<>(list, NumConstant.ZERO)); - } - - params = preparePageParams(params); - IPage page = getPage(params); - List list = baseDao.pageDIY(params); - return new Result().ok(new PageData<>(list, page.getTotal())); + return new Result().ok(pagePartyMember(params, YesOrNoEnum.YES.value())); } @Override public Result> hasAuthenticationPartyPage(Map 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 + * @author work@yujt.net.cn + * @date 2020/2/24 16:41 + */ + private PageData pagePartyMember(Map params, String allPartyMemberFlag) { + + List list = Lists.newArrayList(); + // 是否是进入页面时的默认查询 + if (!isDefaultQuery(params)) { + return new PageData<>(list, NumConstant.ZERO); + } + + params = trimParamValue(params); IPage page = getPage(params); - List list = baseDao.hasAuthenticationPartyPage(params); - return new Result>().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 preparePageParams(Map 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"))); - return params; + /** + * 判断是否是进入页面时的默认查询 + * + * @param params 查询参数 + * @return boolean + * @author work@yujt.net.cn + * @date 2020/2/24 16:42 + */ + private boolean isDefaultQuery(Map 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)) { - return str.trim(); - } - return str; + /** + * 将必要的查询参数进行trim + * + * @param params 查询参数 + * @return java.util.Map + * @author work@yujt.net.cn + * @date 2020/2/24 16:43 + */ + private Map trimParamValue(Map params) { + String[] paramKeys = new String[]{"realName", "mobile", "identityNo"}; + return AppUserUtils.trimParamValue(params, paramKeys); } @Override diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index c62a43422..dd481639b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/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 implem @Autowired private UserInvitationRecordService userInvitationRecordService; - @Autowired - private UserDetailRedis userDetailRedis; + @Autowired private AdminFeignClient adminFeignClient; @Autowired @@ -109,15 +106,10 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public PageData page(Map params) { - String state = MapUtil.getStr(params, "state"); - String partyFlag = MapUtil.getStr(params, "partyFlag"); - // 上边两个值都为0，表示查询未认证居民列表 - if (YesOrNoEnum.NO.value().equals(state) && YesOrNoEnum.NO.value().equals(partyFlag)) { - String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"}; - if (AppUserUtils.isDefaultQuery(params, paramKeys)) { - List userDtoList = Lists.newArrayList(); - 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 userDtoList = Lists.newArrayList(); + return new PageData<>(userDtoList, NumConstant.ZERO); } this.verifyParams(params); // 查询当前用户所具有的的数据权限 @@ -133,23 +125,11 @@ public class UserServiceImpl extends BaseServiceImpl implem } private Map verifyParams(Map params) { - String param = (String) params.get("realName"); - if (StringUtils.isNotBlank(param)) { - params.put("realName", param.trim()); - } - 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; + + String[] paramKeys = new String[]{"realName", "identityNo", "nickname", FieldConstant.MOBILE_HUMP}; + + return AppUserUtils.trimParamValue(params, paramKeys); + } @Override @@ -157,7 +137,8 @@ public class UserServiceImpl extends BaseServiceImpl 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; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java index eea7c686c..eb892fb90 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java +++ b/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 + * @author work@yujt.net.cn + * @date 2020/2/24 16:39 + */ + public static Map trimParamValue(Map 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; + } }