From 2364a3af0f5459850a2c377b036f5e9cf9558717 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Mon, 07 May 2018 15:28:45 +0800 Subject: [PATCH] 地图相关资源 --- src/main/java/com/moral/controller/MobileController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java index 5dd23cf..61740c2 100644 --- a/src/main/java/com/moral/controller/MobileController.java +++ b/src/main/java/com/moral/controller/MobileController.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.moral.common.util.Crypto; import com.moral.util.MessageUtils; import com.taobao.api.ApiException; import org.apache.commons.lang3.StringUtils; @@ -68,7 +69,7 @@ * @param newpassword the newpassword * @return the result bean */ - @GetMapping("upPassword") + @PostMapping("upPassword") public AppData<OperateUser> updatePassword(Integer uid, String password, String newpassword) { OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword); return new AppData<OperateUser>(operateUser); @@ -80,7 +81,7 @@ * @param device the device * @return the result bean */ - @GetMapping("reportDevice") + @PostMapping("reportDevice") public AppData<String> installDevice(Device device) { deviceService.saveOrUpdateDevice(device); return new AppData<String>(""); @@ -94,7 +95,7 @@ * @param pageSize the page size * @return the install devices by operate user */ - @GetMapping("myRelease") + @PostMapping("myRelease") public AppData<List<Device>> getInstallDevicesByOperateUser(@RequestParam(value="uid", required=true)Integer uid, @RequestParam(defaultValue="0")Integer pageIndex, @RequestParam(defaultValue="0")Integer pageSize) { List<Device> devices = deviceService.getInstallDevicesByOperateUser(uid, pageIndex, pageSize); @@ -107,7 +108,7 @@ * @param mac the mac * @return the device by mac */ - @GetMapping("getEquInfoByMac") + @PostMapping("getEquInfoByMac") public AppData<Device> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) { Device device = deviceService.getDeviceByMac(mac); return new AppData<Device>(device); @@ -119,7 +120,7 @@ * @param request the area name * @return the monitor points by area name */ - @GetMapping("getMpointsByAreaName") + @PostMapping("getMpointsByAreaName") public AppData<List<MonitorPoint>> getMonitorPointsByAreaName(HttpServletRequest request) { Map<String, Object> parameters = getParametersStartingWith(request, null); List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(parameters); @@ -132,7 +133,7 @@ * @param request the area name * @return the organizations by area name */ - @GetMapping("getOrgsByAreaName") + @PostMapping("getOrgsByAreaName") public AppData<List<Organization>> getOrganizationsByAreaName(HttpServletRequest request) { Map<String, Object> parameters = getParametersStartingWith(request, null); List<Organization> organizations = organizationService.getOrganizationsByAreaName(parameters); @@ -165,7 +166,7 @@ //��������������� int code = (int)((Math.random() * 9 + 1) * 100000); user.setCode(String.valueOf(code)); - operateUserService.updateOperateUserCode(user); + operateUserService.updateOperateUser(user); //��������������� try { @@ -187,4 +188,45 @@ } return new AppData<String>(""); } + + /** + * Send SMS + * + * @param mobile + * @return + */ + @PostMapping("password") + public AppData<String> password(String username, String password, String code){ + AppData apiData = new AppData(); + + if (StringUtils.isBlank(code)){ + apiData.setErrno(1); + apiData.setMessage("������������������������������������������"); + apiData.setData("{}"); + return apiData; + } + OperateUser user = operateUserService.getOperateUserByMobile(username); + if (user==null){ + apiData.setErrno(1); + apiData.setMessage("���������������������������"); + apiData.setData("{}"); + return apiData; + } + if (user.getCode().equals(code)){ + user.setPassword(Crypto.md5(password)); + int new_code = (int)((Math.random() * 9 + 1) * 100000); + user.setCode(String.valueOf(new_code)); + operateUserService.updateOperateUser(user); + + apiData.setErrno(0); + apiData.setMessage("������������������"); + apiData.setData("{}"); + return apiData; + } else { + apiData.setErrno(1); + apiData.setMessage("������������������������"); + apiData.setData("{}"); + return apiData; + } + } } -- Gitblit v1.8.0