From f0d40d3e13f567a293da09a40329dc021b1d3b67 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Sat, 30 Apr 2016 18:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BF=E8=8B=97=E5=84=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/service/impl/MedGuardianServiceImpl.java | 2 +- .../main/data/service/impl/MedKidsServiceImpl.java | 2 +- .../yimiao/web/controller/v1/KidsController.java | 180 ++++++++++++++++----- .../web/controller/v1/OrganizationsController.java | 50 +++++- .../yimiao/web/controller/v1/UserController.java | 14 +- 5 files changed, 202 insertions(+), 46 deletions(-) diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedGuardianServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedGuardianServiceImpl.java index d989142..17c5269 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedGuardianServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedGuardianServiceImpl.java @@ -23,7 +23,7 @@ public void updateMedGuardian(MedGuardian obj){medGuardianMapper.updateMedGuardi @Override public void deleteMedGuardian (Integer id){medGuardianMapper.deleteMedGuardian(id);} @Override -public MedGuardian getMedGuardian (Integer id){return medGuardianMapper.getMedGuardian(id);} +public MedGuardian getMedGuardian (String id){return medGuardianMapper.getMedGuardian(id);} @Override public int queryMedGuardianCount (MedGuardianQuery query){return medGuardianMapper.queryMedGuardianCount(query);} @Override diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java index f9ed4b6..09680b7 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedKidsServiceImpl.java @@ -23,7 +23,7 @@ public void updateMedKids(MedKids obj){medKidsMapper.updateMedKids(obj);} @Override public void deleteMedKids (Integer id){medKidsMapper.deleteMedKids(id);} @Override -public MedKids getMedKids (Integer id){return medKidsMapper.getMedKids(id);} +public MedKids getMedKids (String id){return medKidsMapper.getMedKids(id);} @Override public int queryMedKidsCount (MedKidsQuery query){return medKidsMapper.queryMedKidsCount(query);} @Override 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 ccf97d5..74d6268 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 @@ -4,14 +4,14 @@ import com.lymsh.mommybaby.basecommon.base.BaseController; import com.lymsh.mommybaby.basecommon.base.TokenRequired; import com.lymsh.mommybaby.basecommon.cache.redis.RedisUtils; import com.lymsh.mommybaby.basecommon.constant.ConstantInterface; +import com.lymsh.mommybaby.basecommon.context.MommyBobyContext; +import com.lymsh.mommybaby.basecommon.util.ContextHolder; import com.lymsh.mommybaby.basecommon.util.ResultUtils; -import com.lymsh.yimiao.main.data.model.MedKids; -import com.lymsh.yimiao.main.data.model.MedKidsQuery; -import com.lymsh.yimiao.main.data.service.MedKidsService; +import com.lymsh.yimiao.main.data.enumdata.YnEnum; +import com.lymsh.yimiao.main.data.model.*; +import com.lymsh.yimiao.main.data.service.*; import com.lymsh.yimiao.main.data.util.JsonUtil; -import com.lymsh.yimiao.main.data.util.LoginUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; @@ -39,34 +39,45 @@ public class KidsController extends BaseController{ @Autowired private MedKidsService medKidsService; - - /** - * 发送验证码 - * @param response - * @param phone 手机号 - */ - @RequestMapping(value = "/sendCode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") - @TokenRequired - public void sendVercode(HttpServletResponse response,@RequestParam("phone") String phone) { - - if (StringUtils.isNotBlank(phone)){ - //对手机号是否存在做校验 - MedKidsQuery query = new MedKidsQuery(); - query.setPhone(phone); - List medKidsList = medKidsService.queryMedKids(query); - if (medKidsList.size()==0){ - ResultUtils.buildParameterErrorResultAndWrite(response,"您预留的手机号不存在,请重新输入"); - return; - } - - Boolean result = LoginUtil.sendVerCode(phone, typeId, token); - if (result){ - ResultUtils.buildSuccessResultAndWrite(response); - }else { - ResultUtils.buildParameterErrorResultAndWrite(response,"发送失败"); - } - } - } + @Autowired + private YmUsersService usersService; + @Autowired + private YmUserKidMapsService ymUserKidMapsService; + @Autowired + private MedInoculateorderService medInoculateorderService; + @Autowired + private MedVaccineinfoService medVaccineinfoService; + @Autowired + private MedOrganizationService medOrganizationService; + + +// /** +// * 发送验证码 +// * @param response +// * @param phone 手机号 +// */ +// @RequestMapping(value = "/sendCode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") +// @TokenRequired +// public void sendVercode(HttpServletResponse response,@RequestParam("phone") String phone) { +// +// if (StringUtils.isNotBlank(phone)){ +// //对手机号是否存在做校验 +// MedKidsQuery query = new MedKidsQuery(); +// query.setPhone(phone); +// List medKidsList = medKidsService.queryMedKids(query); +// if (medKidsList.size()==0){ +// ResultUtils.buildParameterErrorResultAndWrite(response,"您预留的手机号不存在,请重新输入"); +// return; +// } +// +// Boolean result = LoginUtil.sendVerCode(phone, typeId, token); +// if (result){ +// ResultUtils.buildSuccessResultAndWrite(response); +// }else { +// ResultUtils.buildParameterErrorResultAndWrite(response,"发送失败"); +// } +// } +// } /** * 校验验证码 @@ -112,9 +123,9 @@ public class KidsController extends BaseController{ * @param barCode * @param phone */ - @RequestMapping(value = "/queryKids", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") + @RequestMapping(value = "/queryKidsId", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") @TokenRequired - public void getKids(HttpServletResponse response, + public void getKidsId(HttpServletResponse response, @RequestParam("birthday") String birthday, @RequestParam(value = "barCode",required = false) String barCode, @RequestParam(value = "phone",required = false) String phone) { @@ -123,11 +134,14 @@ public class KidsController extends BaseController{ medKidsQuery.setBirthday(birthday); medKidsQuery.setBarCode(barCode); medKidsQuery.setPhone(phone); + //medKidsQuery.setSort("");//时间排序 + medKidsQuery.setIsDelete("1"); List medKidsList = medKidsService.queryMedKids(medKidsQuery); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(medKidsList)){ + //TODO 查出来的数据,可能会多条一样的和不一样的,有多条一样的情况下,取最新的一条,不一样的正常返回 for (MedKids data :medKidsList){ Map map = new HashMap<>(); map.put("id",data.getId()); @@ -138,12 +152,102 @@ public class KidsController extends BaseController{ ResultUtils.buildSuccessResultAndWrite(response,list); } - //获取宝宝信息 - @RequestMapping(value = "/queryKids", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") + //添加宝宝接口(当前登陆用户与小孩子进行关联) + @RequestMapping(value = "/relateKids", method = RequestMethod.POST) @TokenRequired - public void getKids(HttpServletResponse response){ + public void UserRelateKids(HttpServletResponse response, + @RequestParam("id")String id){ + + //取到当前登陆用户的id + MommyBobyContext mommyBobyContext= ContextHolder.getContext(); + YmUsers users = usersService.getYmUsers(mommyBobyContext.getUserId()); + //把查询到的宝宝id与登陆用户关联 + YmUserKidMapsQuery query = new YmUserKidMapsQuery(); + query.setUserId(users.getId()); + query.setKidId(id); + query.setYn(YnEnum.yes.getId()); + int count = ymUserKidMapsService.queryYmUserKidMapsCount(query); + if (count!=0){ + ResultUtils.buildParameterErrorResultAndWrite(response,"这个宝宝已经和用户关联"); + return; + } + YmUserKidMaps userKidMaps = new YmUserKidMaps(); + userKidMaps.setUserId(users.getId()); + userKidMaps.setKidId(id); + userKidMaps.setCreated(new Date()); + userKidMaps.setYn(YnEnum.yes.getId()); + ymUserKidMapsService.addYmUserKidMaps(userKidMaps); + ResultUtils.buildSuccessResultAndWrite(response); + } + /** + * 获取宝宝信息 + * + * @param response + * @param id 宝宝id + */ + @RequestMapping(value = "/kids", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") + @TokenRequired + public void getKids(HttpServletResponse response, + @RequestParam("id")String id) { + if (id == null) { + ResultUtils.buildIdIsNull(response); + return; + } + MedKids kids = medKidsService.getMedKids(id); + if (kids == null) { + ResultUtils.buildParameterErrorResultAndWrite(response, "宝宝信息不存在"); + return; + } + Map map = new HashMap<>(); + map.put("id", kids.getId()); + map.put("name", kids.getName()); + //TODO 这里需要把这个字符串转换成时间戳 + map.put("birthday", kids.getBirthday()); + + MedInoculateorderQuery inoculateorderQuery = new MedInoculateorderQuery(); + inoculateorderQuery.setIoKidId(id); + //时间倒序 + inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc"); + List inoculateorderList = medInoculateorderService.queryMedInoculateorder(inoculateorderQuery); + if (CollectionUtils.isNotEmpty(inoculateorderList)) { + //取出离现在日期最近的一个预约接种 + MedInoculateorder medInoculateorder = inoculateorderList.get(0); + //下次接种时间 + map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime()); + //下次接种疫苗 + map.put("vaccineId", medInoculateorder.getIoVaccineId()); + MedVaccineinfo medVaccineinfo = medVaccineinfoService.getMedVaccineinfo(medInoculateorder.getIoVaccineId()); + map.put("vaccineName", medVaccineinfo == null ? "" : medVaccineinfo.getViName()); + //接种地点 + map.put("organizationId", medInoculateorder.getIoOrganizationId()); + MedOrganization medOrganization = medOrganizationService.getMedOrganization(medInoculateorder.getIoOrganizationId()); + map.put("organizationName", medOrganization == null ? "" : medOrganization.getoName()); + }else { + map.put("ioInoculateTime", null); + map.put("vaccineId", null); + map.put("vaccineName", null); + map.put("organizationId", null); + map.put("organizationName", null); + } + writeJson(response, JsonUtil.obj2JsonString(map)); } + /** + * 根据月龄获取宝宝该月龄预约接种的疫苗(分为免费疫苗和收费疫苗两个模块) + * + * @param response + * @param mouthAge 月龄 + */ + @RequestMapping(value = "/kidsVaccines", method = RequestMethod.GET) + @TokenRequired + public void getKidVaccines(HttpServletResponse response, + @RequestParam("mouthAge")String mouthAge) { + + } + + + + } diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/OrganizationsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/OrganizationsController.java index 085c0b8..16c3027 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/OrganizationsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/OrganizationsController.java @@ -1,9 +1,57 @@ package com.lyms.yimiao.web.controller.v1; +import com.lymsh.mommybaby.basecommon.base.BaseController; +import com.lymsh.mommybaby.basecommon.util.ResultUtils; +import com.lymsh.yimiao.main.data.model.MedOrganization; +import com.lymsh.yimiao.main.data.service.MedAearService; +import com.lymsh.yimiao.main.data.service.MedOrganizationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; + /** * 机构 * * Created by Administrator on 2016/4/29 0029. */ -public class OrganizationsController { +@Controller +@RequestMapping("/v1") +public class OrganizationsController extends BaseController{ + + @Autowired + private MedOrganizationService medOrganizationService; + @Autowired + private MedAearService medAearService; + + + @RequestMapping(value = "/organizations", method = RequestMethod.GET) + public void getOrganizations(HttpServletResponse response, + @RequestParam("id") String id){ + + MedOrganization medOrganization = medOrganizationService.getMedOrganization(id); + if (medOrganization==null){ + ResultUtils.buildParameterErrorResultAndWrite(response,"单位ID为空"); + return; + } + Map map = new HashMap<>(); + map.put("name",medOrganization.getoName()); + map.put("contactWay",medOrganization.getoContactWay()); + //省 + map.put("ProvinceName",medAearService.getMedAear(medOrganization.getoProvinceNo()) == null ? null : medAearService.getMedAear(medOrganization.getoProvinceNo()).getAName()); + //市 + //区 + //县 + //街道 + //村 + + + + } + } 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 9833ce7..5f959fd 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 @@ -69,12 +69,13 @@ public class UserController extends BaseController { @RequestParam("code") String code) { LoginContext result = LoginUtil.login(phone, code, typeId, token); - Map map = new HashMap<>(); - map.put("errorcode", result.getErrorcode()); - map.put("errormsg", result.getErrormsg()); //登陆的同时,在数据库创建账号,对手机号唯一性判断 if (result.getToken()!=null){ + Map map = new HashMap<>(); + map.put("errorcode", result.getErrorcode()); + map.put("errormsg", result.getErrormsg()); + YmUsersQuery query = new YmUsersQuery(); query.setPhone(phone); query.setYn(YnEnum.yes.getId()); @@ -93,9 +94,13 @@ public class UserController extends BaseController { YmUsers users = usersList.get(0); users.setLastLoginTime(new Date()); userService.updateYmUsers(users); + map.put("token", result.getToken()); + map.put("id", users.getId()); } + writeJson(response, JsonUtil.obj2JsonString(map)); + }else { + ResultUtils.buildParameterErrorResultAndWrite(response,"登陆失败,异常"); } - writeJson(response, JsonUtil.obj2JsonString(map)); } /** @@ -123,7 +128,6 @@ public class UserController extends BaseController { user.setCreated(new Date()); user.setModified(new Date()); user.setPhone(phone); - //user.setLoginCenterId(a) userService.addYmUsers(user); } } -- 1.8.3.1