diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java index 9c78dcb..d394745 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java @@ -1,9 +1,82 @@ package com.lyms.yimiao.web.controller.v1; +import com.lymsh.mommybaby.basecommon.base.BaseController; +import com.lymsh.mommybaby.basecommon.base.TokenRequired; +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.enumdata.YnEnum; +import com.lymsh.yimiao.main.data.model.YmFeedbacks; +import com.lymsh.yimiao.main.data.model.YmUsers; +import com.lymsh.yimiao.main.data.service.YmFeedbacksService; +import com.lymsh.yimiao.main.data.service.YmUsersService; +import com.lymsh.yimiao.main.data.util.JsonUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.util.StringUtils; +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.Date; +import java.util.HashMap; +import java.util.Map; + /** - * 反馈 + * 反馈接口 * * Created by Administrator on 2016/4/29 0029. */ -public class FeedbackController { +@Controller +@RequestMapping("/v1") +public class FeedbackController extends BaseController{ + + @Autowired + private YmUsersService usersService; + @Autowired + private YmFeedbacksService feedBacksService; + + /** + * 提交意见反馈 + * + * @return + */ + @RequestMapping(value = "/feedbacks", method = RequestMethod.POST) + @TokenRequired + public void submitFeedBack(@RequestParam("content") String content, + HttpServletResponse httpServletResponse) { + + if (StringUtils.isEmpty(content)) { + ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse); + return; + } + + MommyBobyContext mommyBobyContext = ContextHolder.getContext(); + Integer userId = mommyBobyContext.getUserId(); + if (null != userId) { + + YmFeedbacks feedBacks = new YmFeedbacks(); + feedBacks.setYn(YnEnum.yes.getId()); + feedBacks.setCreated(new Date()); + feedBacks.setType(1);//默认是反馈 + feedBacks.setContent(content); + feedBacks.setPublishId(userId); + + YmUsers users = usersService.getYmUsers(userId); + if (null != users) { + feedBacks.setPublishName(users.getNickname()); + } + feedBacksService.addYmFeedbacks(feedBacks); + ResultUtils.buildSuccessResultAndWrite(httpServletResponse); + } else { + Map result = new HashMap<>(); + result.put("errorcode", ConstantInterface.SYSTEM_ERROR); + result.put("errormsg", "userId为空."); + writeJson(httpServletResponse, JsonUtil.obj2JsonString(result)); + } + } + + } diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java index c66e541..e3e9f9f 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/NotificationsController.java @@ -1,10 +1,26 @@ package com.lyms.yimiao.web.controller.v1; +import com.lymsh.mommybaby.basecommon.base.BaseController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + /** * - * 消息 + * 消息接口 * * Created by Administrator on 2016/4/29 0029. */ -public class NotificationsController { +@Controller +@RequestMapping("/v1") +public class NotificationsController extends BaseController{ + + //获取消息(1.系统消息2.接种消息) + + + //定时发送给当前登录用户接种通知 + /* + 查询当前登陆用户在当前时间距离下次接种时间3天和1天的时候,发送一条推送消息 + */ + + } 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 16c3027..f96e96c 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 @@ -3,8 +3,9 @@ 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.MedAreaService; import com.lymsh.yimiao.main.data.service.MedOrganizationService; +import com.lymsh.yimiao.main.data.util.JsonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,7 +17,7 @@ import java.util.HashMap; import java.util.Map; /** - * 机构 + * 机构信息 * * Created by Administrator on 2016/4/29 0029. */ @@ -27,7 +28,7 @@ public class OrganizationsController extends BaseController{ @Autowired private MedOrganizationService medOrganizationService; @Autowired - private MedAearService medAearService; + private MedAreaService medAreaService; @RequestMapping(value = "/organizations", method = RequestMethod.GET) @@ -36,21 +37,56 @@ public class OrganizationsController extends BaseController{ MedOrganization medOrganization = medOrganizationService.getMedOrganization(id); if (medOrganization==null){ - ResultUtils.buildParameterErrorResultAndWrite(response,"单位ID为空"); + 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()); + if (medOrganization.getoProvinceNo()!=null){ + map.put("province",medAreaService.getMedArea(medOrganization.getoProvinceNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoProvinceNo()).getAName()); + }else { + map.put("province",null); + } //市 + if (medOrganization.getoCityNo()!=null){ + map.put("city",medAreaService.getMedArea(medOrganization.getoCityNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoCityNo()).getAName()); + }else { + map.put("city",null); + } //区 + if (medOrganization.getoCityNo()!=null){ + map.put("city",medAreaService.getMedArea(medOrganization.getoCityNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoCityNo()).getAName()); + }else { + map.put("city",null); + } //县 - //街道 + if (medOrganization.getoCountyNo()!=null){ + map.put("county",medAreaService.getMedArea(medOrganization.getoCountyNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoCountyNo()).getAName()); + }else { + map.put("county",null); + } + //乡镇 + if (medOrganization.getoTownshipNo()!=null){ + map.put("township",medAreaService.getMedArea(medOrganization.getoTownshipNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoTownshipNo()).getAName()); + }else { + map.put("township",null); + } //村 + if (medOrganization.getoVillageNo()!=null){ + map.put("village",medAreaService.getMedArea(medOrganization.getoVillageNo()) == null ? null : medAreaService.getMedArea(medOrganization.getoVillageNo()).getAName()); + }else { + map.put("village",null); + } + //街道 + if (medOrganization.getoAddress()!=null){ + map.put("address",medAreaService.getMedArea(medOrganization.getoAddress()) == null ? null : medAreaService.getMedArea(medOrganization.getoAddress()).getAName()); + }else { + map.put("address",null); + } - + writeJson(response, JsonUtil.obj2JsonString(map)); } 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 5f959fd..64a2c09 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 @@ -1,7 +1,11 @@ package com.lyms.yimiao.web.controller.v1; import com.lymsh.mommybaby.basecommon.base.BaseController; +import com.lymsh.mommybaby.basecommon.base.TokenRequired; +import com.lymsh.mommybaby.basecommon.context.MommyBobyContext; +import com.lymsh.mommybaby.basecommon.util.ContextHolder; import com.lymsh.mommybaby.basecommon.util.JsonUtil; +import com.lymsh.mommybaby.basecommon.util.QiniuUtil; import com.lymsh.mommybaby.basecommon.util.ResultUtils; import com.lymsh.yimiao.main.data.enumdata.YnEnum; import com.lymsh.yimiao.main.data.model.YmUsers; @@ -9,6 +13,7 @@ import com.lymsh.yimiao.main.data.model.YmUsersQuery; import com.lymsh.yimiao.main.data.service.YmUsersService; import com.lymsh.yimiao.main.data.util.LoginContext; import com.lymsh.yimiao.main.data.util.LoginUtil; +import com.lymsh.yimiao.main.data.util.PhoneUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; @@ -39,7 +44,7 @@ public class UserController extends BaseController { @Value("#{configProperties['yimiao.typeId']}") private String typeId; @Autowired - private YmUsersService userService; + private YmUsersService usersService; /** * 发送验证码 @@ -79,7 +84,7 @@ public class UserController extends BaseController { YmUsersQuery query = new YmUsersQuery(); query.setPhone(phone); query.setYn(YnEnum.yes.getId()); - List usersList = userService.queryYmUsers(query); + List usersList = usersService.queryYmUsers(query); if (usersList.size()==0){ YmUsers users = new YmUsers(); users.setPhone(phone); @@ -87,13 +92,13 @@ public class UserController extends BaseController { users.setCreated(new Date()); users.setLoginCenterId(result.getId()); users.setLastLoginTime(new Date()); - userService.addYmUsers(users); + usersService.addYmUsers(users); map.put("token", result.getToken()); map.put("id", users.getId()); }else { YmUsers users = usersList.get(0); users.setLastLoginTime(new Date()); - userService.updateYmUsers(users); + usersService.updateYmUsers(users); map.put("token", result.getToken()); map.put("id", users.getId()); } @@ -120,7 +125,7 @@ public class UserController extends BaseController { YmUsersQuery query = new YmUsersQuery(); query.setPhone(phone); query.setYn(YnEnum.yes.getId()); - List usersList = userService.queryYmUsers(query); + List usersList = usersService.queryYmUsers(query); if (usersList.size()==0){ YmUsers user = new YmUsers(); user.setId(result.getId()); @@ -128,11 +133,69 @@ public class UserController extends BaseController { user.setCreated(new Date()); user.setModified(new Date()); user.setPhone(phone); - userService.addYmUsers(user); + usersService.addYmUsers(user); } } writeJson(response, JsonUtil.obj2JsonString(map)); } + /** + * 获取当前用户信息 + * @param response + */ + @RequestMapping(value = "/userInfo", method = RequestMethod.GET) + @TokenRequired + public void getUserInfo(HttpServletResponse response){ + //取到当前登陆用户的id + YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId()); + Map map = new HashMap<>(); + //如果没有昵称,返回手机 + map.put("nickname",users.getNickname()!=null ? users.getNickname() : users.getPhone()); + //如果没有头像,返回默认头像 + map.put("avatar", QiniuUtil.buildImg(users.getAvatar()!=null ? users.getAvatar() : "默认头像")); + + writeJson(response, JsonUtil.obj2JsonString(map)); + } + + /** + * 修改绑定手机号接口 + * @param response + * @param phone + */ + @RequestMapping(value = "/updatePhone", method = RequestMethod.PUT) + @TokenRequired + public void updateUserPhone(HttpServletResponse response, + @RequestParam("phone") String phone) { + //取到当前登陆用户的id + YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId()); + if (PhoneUtil.isMobileNO(phone)){ + users.setPhone(phone); + users.setModified(new Date()); + usersService.updateYmUsers(users); + ResultUtils.buildSuccessResultAndWrite(response); + }else { + ResultUtils.buildParameterErrorResultAndWrite(response,"手机号输入错误"); + } + } + + /** + * 修改当前登录用户头像和昵称 + * @param response + * @param avatar + * @param nickname + */ + @RequestMapping(value = "/updateUserInfo", method = RequestMethod.PUT) + @TokenRequired + public void updateUser(HttpServletResponse response, + @RequestParam(value = "avatar",required = false) String avatar, + @RequestParam(value = "nickname",required = false)String nickname) { + //取到当前登陆用户的id + YmUsers users = usersService.getYmUsers(ContextHolder.getContext().getUserId()); + users.setNickname(nickname); + users.setAvatar(avatar); + users.setModified(new Date()); + usersService.updateYmUsers(users); + ResultUtils.buildSuccessResultAndWrite(response); + } }