From de17a27a4dae47e3e644255e289fcfddb37a18f8 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Thu, 12 May 2016 16:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/yimiao/web/controller/v1/KidsController.java | 19 ++++++++++++++++++- .../lyms/yimiao/web/controller/v1/UserController.java | 1 + webApi/src/main/resources/config_state.properties | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java index d9ff390..a12bff8 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java @@ -147,10 +147,15 @@ public class KidsController extends BaseController { @RequestMapping(value = "/queryKidsId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") @TokenRequired public void getKidsId(HttpServletResponse response, + HttpServletRequest request, @RequestParam("birthday") String birthday, @RequestParam(value = "barCode", required = false) String barCode, @RequestParam(value = "phone", required = false) String phone) { + LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); + //取到当前登陆用户的id + YmUsers users = usersService.getYmUsers(loginContext.getId()); + MedKidsQuery medKidsQuery = new MedKidsQuery(); medKidsQuery.setBirthday(birthday); medKidsQuery.setBarCode(barCode); @@ -164,7 +169,19 @@ public class KidsController extends BaseController { if (CollectionUtils.isNotEmpty(medKidsList)) { for (MedKids medKids : medKidsList) { - Map map = new HashMap<>(); + + Map map = new HashMap<>(); + + YmUserKidMapsQuery query = new YmUserKidMapsQuery(); + query.setYn(YnEnum.yes.getId()); + query.setKidId(medKids.getId()); + query.setUserId(users.getId()); + int count = ymUserKidMapsService.queryYmUserKidMapsCount(query); + if (count > 0){ + map.put("relate",true); + }else if (count == 0){ + map.put("relate",false); + } if (StringUtils.isNotEmpty(medKids.getName())) { map.put("id", medKids.getId()); map.put("name", medKids.getName()); diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java index 21c4d49..1fd08a9 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java @@ -258,6 +258,7 @@ public class UserController extends BaseController { map.put("id",data.getKidId()); MedKids medKids = medKidsService.getMedKids(data.getKidId()); map.put("name",medKids.getName()); + map.put("sex",medKids.getSex()); list.add(map); } } diff --git a/webApi/src/main/resources/config_state.properties b/webApi/src/main/resources/config_state.properties index 310e6b8..712ba18 100644 --- a/webApi/src/main/resources/config_state.properties +++ b/webApi/src/main/resources/config_state.properties @@ -35,5 +35,7 @@ mailServerUsername=411441657@qq.com mailServerPassword=yt12304 ams.login.msg=��֤��{0}�������ڵ�¼AMS�����DZ��˲���������й¶�� + redis.servers=1dee160a571a490e.m.cnhza.kvstore.aliyuncs.com:6379:Lyms123456 +#redis.servers=192.168.1.43:6379:Lyms@2016 token.prefix=ams \ No newline at end of file -- 1.8.3.1