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

增加排序

Browse Source
This commit is contained in:
TS-QD1 2023-11-24 14:36:18 +08:00
parent 40ff4307b1
commit b245868de2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml
View File

@ -195,6 +195,8 @@
AND AND
area_parent_id = #{areaParentId} area_parent_id = #{areaParentId}
</if> </if>
ORDER BY
area_city_code ASC
</select> </select>
<!-- 字典列表 --> <!-- 字典列表 -->
@ -255,6 +257,8 @@
#{areaCodes[${index}]} #{areaCodes[${index}]}
</foreach> </foreach>
</if> </if>
ORDER BY
area_city_code ASC
</select> </select>
<!-- 字典列表 --> <!-- 字典列表 -->
@ -284,6 +288,8 @@
LIMIT LIMIT
#{limitStart}, 1 #{limitStart}, 1
) )
ORDER BY
area_city_code ASC
LIMIT #{limitRow} LIMIT #{limitRow}
</select> </select>

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

@ -12,6 +12,7 @@ import ink.wgink.util.string.WStringUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
@ -55,7 +56,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr
@Override @Override
public List<AreaDTO> listByParentId(String areaParentId) { public List<AreaDTO> listByParentId(String areaParentId) {
return mongoTemplate.find(Query.query(Criteria.where("areaParentId").is(areaParentId)), AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue()); return mongoTemplate.find(Query.query(Criteria.where("areaParentId").is(areaParentId)).with(Sort.by(Sort.Order.asc("areaCityCode"))), AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue());
} }
@Override @Override
@ -74,7 +75,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr
query.addCriteria(Criteria.where("areaName").regex(pattern)); query.addCriteria(Criteria.where("areaName").regex(pattern));
} }
long total = mongoTemplate.count(query, MongoDictionaryCollectionEnum.AREA.getValue()); long total = mongoTemplate.count(query, MongoDictionaryCollectionEnum.AREA.getValue());
query.with(Pageable.ofSize(page.getRows()).withPage(page.getPage() - 1)); query.with(Pageable.ofSize(page.getRows()).withPage(page.getPage() - 1)).with(Sort.by(Sort.Order.asc("areaCityCode")));
List<AreaDTO> dataDTOs = mongoTemplate.find(query, AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue()); List<AreaDTO> dataDTOs = mongoTemplate.find(query, AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue());
return new SuccessResultList<>(dataDTOs, page.getPage(), total); return new SuccessResultList<>(dataDTOs, page.getPage(), total);
} }
@ -88,7 +89,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr
zTreeDTO.setId(areaDTO.getAreaId()); zTreeDTO.setId(areaDTO.getAreaId());
zTreeDTO.setpId(areaDTO.getAreaParentId()); zTreeDTO.setpId(areaDTO.getAreaParentId());
zTreeDTO.setName(areaDTO.getAreaName()); zTreeDTO.setName(areaDTO.getAreaName());
long subCount = mongoTemplate.count(Query.query(Criteria.where("areaParentId").is(areaDTO.getAreaId())), MongoDictionaryCollectionEnum.AREA.getValue()); long subCount = mongoTemplate.count(Query.query(Criteria.where("areaParentId").is(areaDTO.getAreaId())).with(Sort.by(Sort.Order.asc("areaCityCode"))), MongoDictionaryCollectionEnum.AREA.getValue());
setZTreeInfo(zTreeDTO, subCount); setZTreeInfo(zTreeDTO, subCount);
zTreeDTOs.add(zTreeDTO); zTreeDTOs.add(zTreeDTO);
} }
@ -98,7 +99,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr
@Override @Override
public List<AreaDTO> listByCode(String areaCode) { public List<AreaDTO> listByCode(String areaCode) {
Pattern pattern = Pattern.compile("^" + areaCode + ".*$", Pattern.CASE_INSENSITIVE); Pattern pattern = Pattern.compile("^" + areaCode + ".*$", Pattern.CASE_INSENSITIVE);
return mongoTemplate.find(Query.query(Criteria.where("areaCode").regex(pattern)), AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue()); return mongoTemplate.find(Query.query(Criteria.where("areaCode").regex(pattern)).with(Sort.by(Sort.Order.asc("areaCityCode"))), AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue());
} }
@Override @Override
@ -106,7 +107,7 @@ public class MongoAreaServiceImpl extends DefaultBaseService implements IMongoAr
String baseAreaCode = WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3); 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)).with(Sort.by(Sort.Order.asc("areaCityCode")));
return mongoTemplate.find(query, AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue()); return mongoTemplate.find(query, AreaDTO.class, MongoDictionaryCollectionEnum.AREA.getValue());
} }