Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地区字段截取修改约束方法

Browse Source
This commit is contained in:
wanggeng 2022-02-12 17:00:43 +08:00
parent eee23bdd1e
commit 5997e45639
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
View File

@ -76,14 +76,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) { public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(2); Map<String, Object> params = getHashMap(2);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
return list(params); return list(params);
} }
@Override @Override
public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) { public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(6); Map<String, Object> params = getHashMap(6);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("sort", "departmentAreaCode"); params.put("sort", "departmentAreaCode");
params.put("order", order); params.put("order", order);
return list(params); return list(params);
@ -92,7 +92,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) { public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(4); Map<String, Object> params = getHashMap(4);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("excludeDepartmentAreaCode", departmentAreaCode); params.put("excludeDepartmentAreaCode", departmentAreaCode);
return list(params); return list(params);
} }
@ -100,7 +100,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) { public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(8); Map<String, Object> params = getHashMap(8);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("excludeDepartmentAreaCode", departmentAreaCode); params.put("excludeDepartmentAreaCode", departmentAreaCode);
params.put("sort", "departmentAreaCode"); params.put("sort", "departmentAreaCode");
params.put("order", order); params.put("order", order);
@ -131,20 +131,20 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public SuccessResultList<List<DepartmentDTO>> listPageAllByAreaCode(String departmentAreaCode, ListPage page) { public SuccessResultList<List<DepartmentDTO>> listPageAllByAreaCode(String departmentAreaCode, ListPage page) {
page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
return listPage(page); return listPage(page);
} }
@Override @Override
public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) { public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) {
page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode);
return listPage(page); return listPage(page);
} }
@Override @Override
public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) { public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) {
page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode);
page.getParams().put("departmentType", departmentType); page.getParams().put("departmentType", departmentType);
return listPage(page); return listPage(page);
@ -305,7 +305,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public Integer countAllByAreaCode(String areaCode) { public Integer countAllByAreaCode(String areaCode) {
Map<String, Object> params = getHashMap(2); Map<String, Object> params = getHashMap(2);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
return count(params); return count(params);
} }
} }

4
module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java
View File

@ -120,14 +120,14 @@ public class AreaServiceImpl extends DefaultBaseService implements IAreaService
@Override @Override
public List<AreaDTO> listByCode(String areaCode) { public List<AreaDTO> listByCode(String areaCode) {
Map<String, Object> params = getHashMap(1); Map<String, Object> params = getHashMap(1);
params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
return areaDao.list(params); return areaDao.list(params);
} }
@Override @Override
public List<AreaDTO> listSubByCode(String areaCode) { public List<AreaDTO> listSubByCode(String areaCode) {
Map<String, Object> params = getHashMap(4); Map<String, Object> params = getHashMap(4);
params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); params.put("areaCode", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
params.put("excludeAreaCode", areaCode); params.put("excludeAreaCode", areaCode);
return areaDao.list(params); return areaDao.list(params);
} }

2
mongo-module-dictionary/src/main/java/ink/wgink/mongo/module/dictionary/service/impl/MongoAreaServiceImpl.java
View File

@ -103,7 +103,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr
@Override @Override
public List<AreaDTO> listSubByCode(String areaCode) { public List<AreaDTO> listSubByCode(String areaCode) {
String baseAreaCode = WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0'); String baseAreaCode = WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3);
Pattern pattern = Pattern.compile("^" + baseAreaCode + "((?!" + areaCode.replace(baseAreaCode, "") + ").)*$", Pattern.CASE_INSENSITIVE); Pattern pattern = Pattern.compile("^" + baseAreaCode + "((?!" + areaCode.replace(baseAreaCode, "") + ").)*$", Pattern.CASE_INSENSITIVE);
Query query = new Query(); Query query = new Query();
query.addCriteria(Criteria.where("areaCode").regex(pattern)); query.addCriteria(Criteria.where("areaCode").regex(pattern));

18
service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java
View File

@ -252,14 +252,14 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) { public List<DepartmentDTO> listAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(2); Map<String, Object> params = getHashMap(2);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
return list(params); return list(params);
} }
@Override @Override
public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) { public List<DepartmentDTO> listAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(6); Map<String, Object> params = getHashMap(6);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("sort", "departmentAreaCode"); params.put("sort", "departmentAreaCode");
params.put("order", order); params.put("order", order);
return list(params); return list(params);
@ -268,7 +268,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) { public List<DepartmentDTO> listSubAllByAreaCode(String departmentAreaCode) {
Map<String, Object> params = getHashMap(4); Map<String, Object> params = getHashMap(4);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("excludeDepartmentAreaCode", departmentAreaCode); params.put("excludeDepartmentAreaCode", departmentAreaCode);
return list(params); return list(params);
} }
@ -276,7 +276,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) { public List<DepartmentDTO> listSubAllByAreaCodeAndOrder(String departmentAreaCode, String order) {
Map<String, Object> params = getHashMap(8); Map<String, Object> params = getHashMap(8);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("excludeDepartmentAreaCode", departmentAreaCode); params.put("excludeDepartmentAreaCode", departmentAreaCode);
params.put("sort", "departmentAreaCode"); params.put("sort", "departmentAreaCode");
params.put("order", order); params.put("order", order);
@ -314,20 +314,20 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public SuccessResultList<List<DepartmentDTO>> listPageAllByAreaCode(String areaCode, ListPage page) { public SuccessResultList<List<DepartmentDTO>> listPageAllByAreaCode(String areaCode, ListPage page) {
page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
return listPage(page); return listPage(page);
} }
@Override @Override
public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) { public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCode(String departmentAreaCode, ListPage page) {
page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode);
return listPage(page); return listPage(page);
} }
@Override @Override
public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) { public SuccessResultList<List<DepartmentDTO>> listPageSubAllByAreaCodeAndType(String departmentAreaCode, Integer departmentType, ListPage page) {
page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); page.getParams().put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode); page.getParams().put("excludeDepartmentAreaCode", departmentAreaCode);
page.getParams().put("departmentType", departmentType); page.getParams().put("departmentType", departmentType);
return listPage(page); return listPage(page);
@ -386,7 +386,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
if (StringUtils.isBlank(departmentParentId) || StringUtils.equals(departmentParentId, "0")) { if (StringUtils.isBlank(departmentParentId) || StringUtils.equals(departmentParentId, "0")) {
params.put("departmentAreaCode", departmentAreaCode); params.put("departmentAreaCode", departmentAreaCode);
} else { } else {
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(departmentAreaCode, '0', 3));
params.put("departmentParentId", departmentParentId); params.put("departmentParentId", departmentParentId);
} }
params.put("departmentType", departmentType); params.put("departmentType", departmentType);
@ -531,7 +531,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
@Override @Override
public Integer countAllByAreaCode(String areaCode) { public Integer countAllByAreaCode(String areaCode) {
Map<String, Object> params = getHashMap(2); Map<String, Object> params = getHashMap(2);
params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); params.put("departmentAreaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
return count(params); return count(params);
} }