diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java index 9e2b97f..7189277 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java @@ -7,6 +7,7 @@ import com.lyms.platform.pojo.PersonModel; import com.lyms.platform.query.PersonModelQuery; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.List; @@ -34,7 +35,18 @@ public class PersonService { personModelQuery.mysqlBuild(personDao.queryCount(query)); query.start(personModelQuery.getOffset()).end(personModelQuery.getLimit()); } + return personDao.queryPersons(query); + } + + + public List queryPersons(PersonModelQuery personModelQuery,Sort.Direction direction,String field) { + + MongoQuery query = personModelQuery.convertToQuery(); + if (StringUtils.isNotEmpty(personModelQuery.getNeed())) { + personModelQuery.mysqlBuild(personDao.queryCount(query)); + query.start(personModelQuery.getOffset()).end(personModelQuery.getLimit()); + } - return personDao.queryPersons(personModelQuery.convertToQuery()); + return personDao.queryPersons(query.addOrder(direction, field)); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index b3c8f38..21e8a88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1907,22 +1907,25 @@ public class TestController extends BaseController { @Override public void run() { int limt = 1000; - int page = 0; + int page = 1; PersonModelQuery personModelQuery = new PersonModelQuery(); personModelQuery.setYn(YnEnums.YES.getId()); personModelQuery.setTypes(new Integer[]{1, 3}); //孕妇或者产妇基本信息 personModelQuery.setNeed("true"); + personModelQuery.setLimit(limt); if (StringUtils.isNotEmpty(id)) { personModelQuery.setId(id); } while (true) { + System.out.println("page======"+page); personModelQuery.setPage(page); - personModelQuery.setLimit(limt); - List personModels = personService.queryPersons(personModelQuery); + + List personModels = personService.queryPersons(personModelQuery,Sort.Direction.DESC, "created"); if (CollectionUtils.isNotEmpty(personModels)) { + System.out.println("sss"); int batchSize = 200; int end = 0; for (int i = 0; i < personModels.size(); i += batchSize) {