From f26af8a2f466dd06573f161d2ce0bdd32639b677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com> Date: Wed, 26 Jul 2017 13:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=EF=BC=8C=E5=AF=86=E7=A0=81=EF=BC=8Ctoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ifish/controller/Device.java | 2 +- src/main/java/com/ifish/controller/Login.java | 13 ++++ .../java/com/ifish/helper/UserHelper.java | 70 +++++++++++++++---- .../java/com/ifish/helper/UserHelperI.java | 9 +++ .../com/ifish/mapper/Tbl_User_MapperSql.java | 5 +- 5 files changed, 83 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/ifish/controller/Device.java b/src/main/java/com/ifish/controller/Device.java index 69da5a7..7028c28 100644 --- a/src/main/java/com/ifish/controller/Device.java +++ b/src/main/java/com/ifish/controller/Device.java @@ -33,7 +33,7 @@ public class Device { * @param macAddress * @return */ - @RequestMapping(value = "/bindDevice.do", method = RequestMethod.GET) + @RequestMapping(value = "/bindDevice.do", method = RequestMethod.POST) public Object bindDevice(Integer userId, String macAddress) { try { return deviceHelperI.bindDevice(userId, macAddress); diff --git a/src/main/java/com/ifish/controller/Login.java b/src/main/java/com/ifish/controller/Login.java index daafabc..2f0437f 100644 --- a/src/main/java/com/ifish/controller/Login.java +++ b/src/main/java/com/ifish/controller/Login.java @@ -111,4 +111,17 @@ public class Login { return userHelperI.updateUserImg(file, userId, path); } + /** + * 修改用户手机和密码 + * + * @param userId + * @param password + * @param phoneNumber + * @return + */ + @RequestMapping(value = "/updateUserPassword", method = RequestMethod.POST) + public Object updateUserPassword(Integer userId, String password, String phoneNumber, String token) { + return userHelperI.updateUserPassword(userId, password, phoneNumber, token); + } + } diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java index cf2cb0f..07d4dad 100644 --- a/src/main/java/com/ifish/helper/UserHelper.java +++ b/src/main/java/com/ifish/helper/UserHelper.java @@ -50,19 +50,19 @@ public class UserHelper implements UserHelperI { */ @Autowired private Tbl_User_Mapper tbl_User_Mapper; - + @Autowired private DeviceHelperI deviceHelperI; - + @Autowired private HardWareTypeHelperI hardWareTypeHelperI; - + @Autowired private RedisKeyHelperI redisKeyHelperI; - + @Autowired private SendMobile sendMobile; - + @Autowired private FastDFSClientI fastDFSClientI; @@ -149,7 +149,7 @@ public class UserHelper implements UserHelperI { dataMap.put("userSex", user.getUserSex()); dataMap.put("userImg", user.getUserImg()); dataMap.put("nickName", user.getNickName()); - + return IfishUtil.returnJson(ResultEnum.success.getKey(), dataMap); } @@ -353,7 +353,7 @@ public class UserHelper implements UserHelperI { return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); } } - + @Override public Object updateUser(Tbl_User user) { try { @@ -382,7 +382,7 @@ public class UserHelper implements UserHelperI { curUser.setUserSex(userSex); bln = true; } - + String registerId = user.getJiguangUserid(); if (StringUtils.isNotBlank(registerId)) { curUser.setJiguangUserid(registerId); @@ -431,7 +431,7 @@ public class UserHelper implements UserHelperI { return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); } } - + Tbl_User user = getUserById(userId); user.setUserImg(img); int i = tbl_User_Mapper.updateUser(user); @@ -446,6 +446,48 @@ public class UserHelper implements UserHelperI { } } + /** + * 修改用户手机号码和密码 + * + * @param userId + * @param password + * @param phoneNumber + * @return + */ + @Override + public Object updateUserPassword(Integer userId, String password, String phoneNumber, String token) { + try { + if (userId == null || userId == 0) { + return IfishUtil.toJson(ResultEnum.error401.getKey(), ""); + } + if (StringUtils.isBlank(password) && StringUtils.isBlank(phoneNumber) && StringUtils.isBlank(token)) { + return IfishUtil.toJson(ResultEnum.error401.getKey(), ""); + } + Tbl_User user = getUserById(userId); + if (user == null || user.getUserId() <= 0) { + return IfishUtil.toJson(ResultEnum.error401.getKey(), ""); + } + if (StringUtils.isNotBlank(password)) { + user.setUserPassword(password); + } + if (StringUtils.isNotBlank(phoneNumber)) { + user.setPhoneNumber(phoneNumber); + } + if (StringUtils.isNotBlank(token)) { + user.setToken(token); + } + int i = tbl_User_Mapper.updateUser(user); + if (i > 0) { + redisKeyHelperI.deleteRedisByTbl_User(user); + Map userMap = getUserMap(user); + return IfishUtil.returnJson(ResultEnum.success.getKey(), userMap); + } + + } catch (Exception e) { + } + return IfishUtil.toJson(ResultEnum.fail101.getKey(), ""); + } + /** * 根据手机号从缓存或数据库中取得用户对象 * @@ -620,7 +662,7 @@ public class UserHelper implements UserHelperI { dataMap.put("device", deviceMap.get("list")); dataMap.put("camera", deviceMap.get("list2")); return IfishUtil.returnJson(ResultEnum.success.getKey(), dataMap); - + } /** @@ -720,7 +762,7 @@ public class UserHelper implements UserHelperI { if (tmpUser.getUpdateTime() != null) { userMap.put("updateTime", IfishUtil.format(tmpUser.getUpdateTime())); } - + return userMap; } @@ -749,9 +791,9 @@ public class UserHelper implements UserHelperI { //封装设备返回信息 list.add(getDeviceInfo(device, deviceUser)); } - + } - + Map map = new HashMap(); map.put("list", list); map.put("list2", list2); @@ -867,5 +909,5 @@ public class UserHelper implements UserHelperI { return IfishUtil.returnJson(ResultEnum.fail101.getKey(), ""); } } - + } diff --git a/src/main/java/com/ifish/helper/UserHelperI.java b/src/main/java/com/ifish/helper/UserHelperI.java index d59fbeb..1a11f65 100644 --- a/src/main/java/com/ifish/helper/UserHelperI.java +++ b/src/main/java/com/ifish/helper/UserHelperI.java @@ -108,4 +108,13 @@ public interface UserHelperI { */ public Object updateUserImg(MultipartFile file, Integer userId, String path); + /** + * 修改用户手机号码和密码 + * + * @param userId + * @param password + * @param phoneNumber + * @return + */ + public Object updateUserPassword(Integer userId, String password, String phoneNumber, String token); } diff --git a/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java b/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java index a52af0c..8b619cc 100644 --- a/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java +++ b/src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java @@ -72,7 +72,10 @@ public class Tbl_User_MapperSql { sb.append("latitude = #{user.latitude}, "); } if (user.getLongitude() != null && user.getLongitude() > 0) { - sb.append("longitude = #{iser.longitude}, "); + sb.append("longitude = #{user.longitude}, "); + } + if (StringUtils.isNotBlank(user.getToken())) { + sb.append("token = #{user.token}, "); } sb.append("update_time = NOW() "); sb.append(" WHERE user_id = #{user.userId}");