liquanyu / regional-platform

Download as
Browse Code »

Commit e766acb2d84f56b24558a7d17b9cfe44b70c9eb4

Authored by dongqin
1 parent 107d8bfb54
Exists in master and in 1 other branch dev

儿保小程序字段添加，调用区域接口

Showing 2 changed files with 62 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ e766acb
... ... @@ -284,7 +284,7 @@
284 284 * @param param
285 285 * @return
286 286 */
287   - @RequestMapping("/wx/babyMeasureInfo/saveOrUpdate")
  287 + @RequestMapping(method = RequestMethod.POST, value = "/wx/babyMeasureInfo/saveOrUpdate")
288 288 @ResponseBody
289 289 public BaseResponse babyMeasureInfoSaveOrUpdate(@RequestBody WxBabyMeasureRequest param){
290 290 return babyCheckFacade.babyMeasureInfoSaveOrUpdate(param);
291 291  
... ... @@ -296,10 +296,23 @@
296 296 * @param param
297 297 * @return
298 298 */
299   - @RequestMapping("/wx/babyMeasureInfo/list")
  299 + @RequestMapping(method = RequestMethod.POST, value = "/wx/babyMeasureInfo/list")
300 300 @ResponseBody
301 301 public BaseResponse babyMeasureInfoList(@RequestBody BaseQuery param){
302 302 return babyCheckFacade.babyMeasureInfoList(param);
  303 + }
  304 +
  305 + /**
  306 + * 获取在儿保小程序中当天填入的最新测量信息
  307 + *
  308 + * @param param
  309 + * @return
  310 + */
  311 + @RequestMapping(method = RequestMethod.POST, value = "/babyMeasureInfo/detail")
  312 + @TokenRequired
  313 + @ResponseBody
  314 + public BaseResponse babyMeasureInfoDetail(@RequestBody BaseQuery param){
  315 + return babyCheckFacade.babyMeasureInfoDetail(param);
303 316 }
304 317  
305 318  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ e766acb
... ... @@ -6,7 +6,9 @@
6 6 import com.lyms.platform.common.dao.BaseQuery;
7 7 import com.lyms.platform.common.dao.operator.MongoCondition;
8 8 import com.lyms.platform.common.dao.operator.MongoOper;
  9 +import com.lyms.platform.common.dao.operator.MongoQuery;
9 10 import com.lyms.platform.common.enums.*;
  11 +import com.lyms.platform.common.result.BaseListResponse;
10 12 import com.lyms.platform.common.result.BaseObjectResponse;
11 13 import com.lyms.platform.common.result.BaseResponse;
12 14 import com.lyms.platform.common.utils.*;
... ... @@ -2393,7 +2395,7 @@
2393 2395 public BaseResponse babyMeasureInfoSaveOrUpdate(WxBabyMeasureRequest param) {
2394 2396 param.setType("2");
2395 2397 String pid = param.getPid();
2396   - WxMeasureInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid)), WxMeasureInfoModel.class);
  2398 + WxMeasureInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("2")), WxMeasureInfoModel.class);
2397 2399 if (model == null){
2398 2400 List<Map> babyInfos = param.getBabyInfos();
2399 2401 Map map = babyInfos.get(0);
2400 2402  
... ... @@ -2421,9 +2423,11 @@
2421 2423 }
2422 2424 }
2423 2425 if (!exist){
2424   - dbBabyInfos.add(param.getBabyInfos().get(0));
  2426 + Map map = param.getBabyInfos().get(0);
  2427 + map.put("createTime", DateUtil.getyyyy_MM_dd(new Date()));
  2428 + dbBabyInfos.add(map);
2425 2429 }
2426   - mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(model.getId())), MongoConvertHelper
  2430 + mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(model.getId()).and("type").is("2")), MongoConvertHelper
2427 2431 .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)), WxMeasureInfoModel.class);
2428 2432 return new BaseResponse();
2429 2433 }
2430 2434  
... ... @@ -2437,12 +2441,47 @@
2437 2441 public BaseResponse babyMeasureInfoList(BaseQuery param) {
2438 2442 MongoCondition condition = MongoCondition.newInstance("type", "2", MongoOper.IS);
2439 2443 condition = condition.and("pid", param.getKeyword(), MongoOper.IS);
2440   - if (org.apache.commons.lang.StringUtils.isNotEmpty(param.getNeed())) {
2441   - long count = mongoTemplate.count(Query.query(Criteria.where("type").is("2").and("ped").is(param.getKeyword())), WxMeasureInfoModel.class);
2442   - param.mysqlBuild((int) count);
2443   - //condition.start(babyQuery.getOffset()).end(babyQuery.getLimit());
  2444 + MongoQuery mongoQuery = condition.toMongoQuery();
  2445 + // 分页数量
  2446 + long count = mongoTemplate.count(mongoQuery.convertToMongoQuery(), WxMeasureInfoModel.class);
  2447 + param.mysqlBuild((int) count);
  2448 + mongoQuery.start(param.getOffset()).end(param.getLimit());
  2449 +
  2450 + List<WxMeasureInfoModel> infoModels = mongoTemplate.find(mongoQuery.convertToMongoQuery(), WxMeasureInfoModel.class);
  2451 + if (CollectionUtils.isEmpty(infoModels)){
  2452 + infoModels = new ArrayList<WxMeasureInfoModel>();
2444 2453 }
2445   - return null;
  2454 + BaseListResponse baseResponse = new BaseListResponse();
  2455 + baseResponse.setData(infoModels);
  2456 + baseResponse.setPageInfo(param.getPageInfo());
  2457 + return baseResponse;
  2458 + }
  2459 +
  2460 + /**
  2461 + * 获取在儿保小程序中当天填入的最新测量信息
  2462 + *
  2463 + * @param param
  2464 + * @return
  2465 + */
  2466 + public BaseResponse babyMeasureInfoDetail(BaseQuery param) {
  2467 + List<WxMeasureInfoModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(param.getKeyword()).and("type").is("2")), WxMeasureInfoModel.class);
  2468 + BaseResponse baseResponse = new BaseResponse();
  2469 + if (CollectionUtils.isNotEmpty(models)){
  2470 + for (WxMeasureInfoModel model: models){
  2471 + List<Map> babyInfos = model.getBabyInfos();
  2472 + if (CollectionUtils.isNotEmpty(babyInfos)){
  2473 + for (Map map : babyInfos){
  2474 + String currentDate = DateUtil.getyyyy_MM_dd(new Date());
  2475 + String dbCreateDime = map.get("createTime").toString();
  2476 + if (dbCreateDime.equals(currentDate)){
  2477 + baseResponse.setObject(map);
  2478 + break;
  2479 + }
  2480 + }
  2481 + }
  2482 + }
  2483 + }
  2484 + return baseResponse;
2446 2485 }
2447 2486 }