jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b453615f070b1c8d28aff83e58052fbcf2d02add

Authored by wtt
1 parent 829ccedb6a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 58 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ b453615
... ... @@ -1551,7 +1551,22 @@
1551 1551 calendar.set(Calendar.SECOND, 59);
1552 1552 return calendar.getTime();
1553 1553 }
1554   -
  1554 + /**
  1555 + *
  1556 + * 获取当前时间起始时间
  1557 + * @param
  1558 + * @Author: 武涛涛
  1559 + * @Date: 2020/7/17 21:24
  1560 + */
  1561 + public static Date getFirstSecond() {
  1562 + Calendar instance = Calendar.getInstance();
  1563 + instance.setTime(new Date());
  1564 + instance.add(Calendar.HOUR_OF_DAY, 0);
  1565 + instance.add(Calendar.MINUTE, 0);
  1566 + instance.add(Calendar.SECOND, 0);
  1567 + instance.add(Calendar.MILLISECOND, 0);
  1568 + return instance.getTime();
  1569 + }
1555 1570 /**
1556 1571 * 当前的开始时间
1557 1572 *
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ b453615
... ... @@ -383,7 +383,17 @@
383 383 public BaseResponse babyMeasureInfoList(@RequestBody BaseQuery param) {
384 384 return babyCheckFacade.babyMeasureInfoList(param);
385 385 }
386   -
  386 + /**
  387 + * 儿保小程序 - 膳食信息列表
  388 + *
  389 + * @param param
  390 + * @return
  391 + */
  392 + @RequestMapping(method = RequestMethod.POST, value = "/wx/babyChooseInfo/list")
  393 + @ResponseBody
  394 + public BaseResponse babyChooseInfoList(@RequestBody BaseQuery param) {
  395 + return babyCheckFacade.babyChooseInfoList(param);
  396 + }
387 397 /**
388 398 * 获取在儿保小程序中当天填入的最新测量信息
389 399 *
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ b453615
... ... @@ -2929,7 +2929,9 @@
2929 2929 public BaseResponse babyChooseInfoSaveOrUpdate(WxBabyChooseRequest param) {
2930 2930 param.setType("2");
2931 2931 String pid = param.getPid();
2932   - WxChooseInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("2")), WxChooseInfoModel.class);
  2932 + Date firstSecond = DateUtil.getDayFirstSecond(new Date());
  2933 + Date dayLastSecond = DateUtil.getDayLastSecond(new Date());
  2934 + WxChooseInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("2").and("createTime").gte(firstSecond).lte(dayLastSecond)), WxChooseInfoModel.class);
2933 2935 if (model == null) {
2934 2936 List<Map> babyInfos = param.getDiets();
2935 2937 Map map = babyInfos.get(0);
2936 2938  
... ... @@ -2973,7 +2975,32 @@
2973 2975 baseResponse.setPageInfo(param.getPageInfo());
2974 2976 return baseResponse;
2975 2977 }
  2978 + /**
  2979 + * 儿保小程序 - 膳食信息列表
  2980 + *
  2981 + * @param param
  2982 + * @Author: 武涛涛
  2983 + * @Date: 2020/7/17 21:57
  2984 + */
  2985 + public BaseResponse babyChooseInfoList(BaseQuery param) {
  2986 + MongoCondition condition = MongoCondition.newInstance("type", "2", MongoOper.IS);
  2987 + condition = condition.and("pid", param.getKeyword(), MongoOper.IS);
  2988 + MongoQuery mongoQuery = condition.toMongoQuery();
  2989 + // 分页数量
  2990 + long count = mongoTemplate.count(mongoQuery.convertToMongoQuery(), WxChooseInfoModel.class);
  2991 + param.mysqlBuild((int) count);
  2992 + mongoQuery.start(param.getOffset()).end(param.getLimit());
2976 2993  
  2994 + List<WxChooseInfoModel> infoModels = mongoTemplate.find(mongoQuery.convertToMongoQuery(), WxChooseInfoModel.class);
  2995 + if (CollectionUtils.isEmpty(infoModels)) {
  2996 + infoModels = new ArrayList<WxChooseInfoModel>();
  2997 + }
  2998 + BaseListResponse baseResponse = new BaseListResponse();
  2999 + baseResponse.setData(infoModels);
  3000 + baseResponse.setPageInfo(param.getPageInfo());
  3001 + return baseResponse;
  3002 + }
  3003 +
2977 3004 /**
2978 3005 * 获取在儿保小程序中当天填入的最新测量信息
2979 3006 *
2980 3007  
... ... @@ -3008,19 +3035,12 @@
3008 3035 * @return
3009 3036 */
3010 3037 public BaseResponse babyChooseInfoDetail(BaseQuery param) {
3011   - List<WxChooseInfoModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(param.getKeyword()).and("type").is("2")), WxChooseInfoModel.class);
  3038 + Date firstSecond = DateUtil.getDayFirstSecond(new Date());
  3039 + Date dayLastSecond = DateUtil.getDayLastSecond(new Date());
  3040 + List<WxChooseInfoModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(param.getKeyword()).and("type").is("2").and("createTime").gte(firstSecond).lte(dayLastSecond)), WxChooseInfoModel.class);
3012 3041 BaseResponse baseResponse = new BaseResponse();
3013 3042 if (CollectionUtils.isNotEmpty(models)) {
3014 3043 for (WxChooseInfoModel model : models) {
3015   - if(model.getCreateTime()==null){
3016   - break;
3017   - }
3018   - Date date = new Date(model.getCreateTime().getTime() + 8 * 60 * 60 * 1000);
3019   - String dbCreateDime = DateUtil.getyyyy_MM_dd(date);
3020   - String currentDate = DateUtil.getyyyy_MM_dd(new Date());
3021   - if (!dbCreateDime.equals(currentDate)) {
3022   - break;
3023   - }
3024 3044 baseResponse.setObject(models);
3025 3045 }
3026 3046 }