jiangjiazhi / yimiao

Download as
Browse Code »

Commit de17a27a4dae47e3e644255e289fcfddb37a18f8

Authored by landong2015
1 parent fd2547e1fd
Exists in master

提交代码

Showing 3 changed files with 21 additions and 1 deletions

webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java View file @ de17a27
... ... @@ -147,10 +147,15 @@
147 147 @RequestMapping(value = "/queryKidsId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
148 148 @TokenRequired
149 149 public void getKidsId(HttpServletResponse response,
  150 + HttpServletRequest request,
150 151 @RequestParam("birthday") String birthday,
151 152 @RequestParam(value = "barCode", required = false) String barCode,
152 153 @RequestParam(value = "phone", required = false) String phone) {
153 154  
  155 + LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
  156 + //取到当前登陆用户的id
  157 + YmUsers users = usersService.getYmUsers(loginContext.getId());
  158 +
154 159 MedKidsQuery medKidsQuery = new MedKidsQuery();
155 160 medKidsQuery.setBirthday(birthday);
156 161 medKidsQuery.setBarCode(barCode);
... ... @@ -164,7 +169,19 @@
164 169 if (CollectionUtils.isNotEmpty(medKidsList)) {
165 170  
166 171 for (MedKids medKids : medKidsList) {
167   - Map<String, String> map = new HashMap<>();
  172 +
  173 + Map<String, Object> map = new HashMap<>();
  174 +
  175 + YmUserKidMapsQuery query = new YmUserKidMapsQuery();
  176 + query.setYn(YnEnum.yes.getId());
  177 + query.setKidId(medKids.getId());
  178 + query.setUserId(users.getId());
  179 + int count = ymUserKidMapsService.queryYmUserKidMapsCount(query);
  180 + if (count > 0){
  181 + map.put("relate",true);
  182 + }else if (count == 0){
  183 + map.put("relate",false);
  184 + }
168 185 if (StringUtils.isNotEmpty(medKids.getName())) {
169 186 map.put("id", medKids.getId());
170 187 map.put("name", medKids.getName());
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java View file @ de17a27
... ... @@ -258,6 +258,7 @@
258 258 map.put("id",data.getKidId());
259 259 MedKids medKids = medKidsService.getMedKids(data.getKidId());
260 260 map.put("name",medKids.getName());
  261 + map.put("sex",medKids.getSex());
261 262 list.add(map);
262 263 }
263 264 }
webApi/src/main/resources/config_state.properties View file @ de17a27
... ... @@ -35,6 +35,8 @@
35 35 mailServerPassword=yt12304
36 36 ams.login.msg=��֤��{0}�������ڵ�¼AMS�����DZ��˲���������й¶��
37 37  
  38 +
38 39 redis.servers=1dee160a571a490e.m.cnhza.kvstore.aliyuncs.com:6379:Lyms123456
  40 +#redis.servers=192.168.1.43:6379:Lyms@2016
39 41 token.prefix=ams