From b453615f070b1c8d28aff83e58052fbcf2d02add Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 17 Jul 2020 22:06:05 +0800 Subject: [PATCH] update --- .../com/lyms/platform/common/utils/DateUtil.java | 17 ++++++++- .../web/controller/BabyCheckController.java | 12 ++++++- .../operate/web/facade/BabyCheckFacade.java | 42 ++++++++++++++++------ 3 files changed, 58 insertions(+), 13 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 9f2963a..9cfd83e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1551,7 +1551,22 @@ public class DateUtil { calendar.set(Calendar.SECOND, 59); return calendar.getTime(); } - + /** + * + * 获取当前时间起始时间 + * @param + * @Author: 武涛涛 + * @Date: 2020/7/17 21:24 + */ + public static Date getFirstSecond() { + Calendar instance = Calendar.getInstance(); + instance.setTime(new Date()); + instance.add(Calendar.HOUR_OF_DAY, 0); + instance.add(Calendar.MINUTE, 0); + instance.add(Calendar.SECOND, 0); + instance.add(Calendar.MILLISECOND, 0); + return instance.getTime(); + } /** * 当前的开始时间 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index cb7c3de..5bc7528 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -383,7 +383,17 @@ public class BabyCheckController extends BaseController { public BaseResponse babyMeasureInfoList(@RequestBody BaseQuery param) { return babyCheckFacade.babyMeasureInfoList(param); } - + /** + * 儿保小程序 - 膳食信息列表 + * + * @param param + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/wx/babyChooseInfo/list") + @ResponseBody + public BaseResponse babyChooseInfoList(@RequestBody BaseQuery param) { + return babyCheckFacade.babyChooseInfoList(param); + } /** * 获取在儿保小程序中当天填入的最新测量信息 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 378b5bb..010c2d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -2929,7 +2929,9 @@ public class BabyCheckFacade extends BaseServiceImpl { public BaseResponse babyChooseInfoSaveOrUpdate(WxBabyChooseRequest param) { param.setType("2"); String pid = param.getPid(); - WxChooseInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("2")), WxChooseInfoModel.class); + Date firstSecond = DateUtil.getDayFirstSecond(new Date()); + Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); + WxChooseInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("2").and("createTime").gte(firstSecond).lte(dayLastSecond)), WxChooseInfoModel.class); if (model == null) { List babyInfos = param.getDiets(); Map map = babyInfos.get(0); @@ -2973,6 +2975,31 @@ public class BabyCheckFacade extends BaseServiceImpl { baseResponse.setPageInfo(param.getPageInfo()); return baseResponse; } + /** + * 儿保小程序 - 膳食信息列表 + * + * @param param + * @Author: 武涛涛 + * @Date: 2020/7/17 21:57 + */ + public BaseResponse babyChooseInfoList(BaseQuery param) { + MongoCondition condition = MongoCondition.newInstance("type", "2", MongoOper.IS); + condition = condition.and("pid", param.getKeyword(), MongoOper.IS); + MongoQuery mongoQuery = condition.toMongoQuery(); + // 分页数量 + long count = mongoTemplate.count(mongoQuery.convertToMongoQuery(), WxChooseInfoModel.class); + param.mysqlBuild((int) count); + mongoQuery.start(param.getOffset()).end(param.getLimit()); + + List infoModels = mongoTemplate.find(mongoQuery.convertToMongoQuery(), WxChooseInfoModel.class); + if (CollectionUtils.isEmpty(infoModels)) { + infoModels = new ArrayList(); + } + BaseListResponse baseResponse = new BaseListResponse(); + baseResponse.setData(infoModels); + baseResponse.setPageInfo(param.getPageInfo()); + return baseResponse; + } /** * 获取在儿保小程序中当天填入的最新测量信息 @@ -3008,19 +3035,12 @@ public class BabyCheckFacade extends BaseServiceImpl { * @return */ public BaseResponse babyChooseInfoDetail(BaseQuery param) { - List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(param.getKeyword()).and("type").is("2")), WxChooseInfoModel.class); + Date firstSecond = DateUtil.getDayFirstSecond(new Date()); + Date dayLastSecond = DateUtil.getDayLastSecond(new Date()); + List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(param.getKeyword()).and("type").is("2").and("createTime").gte(firstSecond).lte(dayLastSecond)), WxChooseInfoModel.class); BaseResponse baseResponse = new BaseResponse(); if (CollectionUtils.isNotEmpty(models)) { for (WxChooseInfoModel model : models) { - if(model.getCreateTime()==null){ - break; - } - Date date = new Date(model.getCreateTime().getTime() + 8 * 60 * 60 * 1000); - String dbCreateDime = DateUtil.getyyyy_MM_dd(date); - String currentDate = DateUtil.getyyyy_MM_dd(new Date()); - if (!dbCreateDime.equals(currentDate)) { - break; - } baseResponse.setObject(models); } } -- 1.8.3.1