diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java deleted file mode 100644 index 312c9fa..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -public class Result { - - private Integer status; - private String message; - private T data; - - public Integer getStatus() { - return status; - } - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - private Result(Integer status,String message,T data){ - this.status=status; - this.message=message; - this.data=data; - } - private Result(Integer status,String message){ - this.status=status; - this.message=message; - } - private Result(String message){ - this.message=message; - } - - - public static Result buildR(Status status,String message,T data){ - return new Result(status.getCode(),message,data); - - } - - - public static Result buildR(Status status,String message,String type){ - return new Result(status.getCode(),message); - } - - public static Result buildR(Status status,T data){ - return new Result(status.getCode(),status.getMessage(),data); - } - - public static Result buildR(Status status){ - return new Result(status.getCode(),status.getMessage()); - } - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java deleted file mode 100644 index 312c9fa..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -public class Result { - - private Integer status; - private String message; - private T data; - - public Integer getStatus() { - return status; - } - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - private Result(Integer status,String message,T data){ - this.status=status; - this.message=message; - this.data=data; - } - private Result(Integer status,String message){ - this.status=status; - this.message=message; - } - private Result(String message){ - this.message=message; - } - - - public static Result buildR(Status status,String message,T data){ - return new Result(status.getCode(),message,data); - - } - - - public static Result buildR(Status status,String message,String type){ - return new Result(status.getCode(),message); - } - - public static Result buildR(Status status,T data){ - return new Result(status.getCode(),status.getMessage(),data); - } - - public static Result buildR(Status status){ - return new Result(status.getCode(),status.getMessage()); - } - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java index bdca50f..1d0c415 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java @@ -1,33 +1,17 @@ package com.casic.missiles.modular.system.utils; -public enum Status { - OK(200,"请求成功"), - FAIL(500,"请求失败"), - SYSTEM_ERROR(101,"系统异常"), - LOGIN_SUCCEEDED(200,"登录成功"), - EMPLOYEE_NOT_EXIST(2400,"员工号不存在"), - USER_ALREADY_REGISTERED(2500,"该账号已注册"), - USER_ALREADY_NOT_REGISTERED(2301,"您的账号未注册，请先注册"), - FAILED_CERTIFICATION(2300,"认证不通过"), - FAILED_PHONE(2302,"授权手机号不正确"), - EMPLOYEE_NAME_MISMATCH(2400,"员工号与姓名不匹配"); - private Integer code; - private String message; - Status(Integer code,String message){ - this.code=code; - this.message=message; - } - //只需要添加get方法就行 - public Integer getCode() { - return code; - } - public String getMessage() { - return message; - } +public interface Status { + String OK = "请求成功"; + String FAIL = "请求失败"; + String SYSTEM_ERROR = "系统异常"; + String LOGIN_SUCCEEDED = "登录成功"; + String EMPLOYEE_NOT_EXIS = "员工不存在"; + String USER_ALREADY_REGISTERED = "该账号已注册"; + String USER_ALREADY_NOT_REGISTERED = "您的账号未注册，请先注册"; + String FAILED_CERTIFICATION = "认证不通过"; + String FAILED_PHONE = "授权手机号不正确"; + String PHONE_GET_FAILED = "手机号获取失败"; + String EMPLOYEE_NAME_MISMATCH = "员工号与姓名不匹配"; - @Override - public String toString() { - return code+":"+message; - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java deleted file mode 100644 index 312c9fa..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -public class Result { - - private Integer status; - private String message; - private T data; - - public Integer getStatus() { - return status; - } - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - private Result(Integer status,String message,T data){ - this.status=status; - this.message=message; - this.data=data; - } - private Result(Integer status,String message){ - this.status=status; - this.message=message; - } - private Result(String message){ - this.message=message; - } - - - public static Result buildR(Status status,String message,T data){ - return new Result(status.getCode(),message,data); - - } - - - public static Result buildR(Status status,String message,String type){ - return new Result(status.getCode(),message); - } - - public static Result buildR(Status status,T data){ - return new Result(status.getCode(),status.getMessage(),data); - } - - public static Result buildR(Status status){ - return new Result(status.getCode(),status.getMessage()); - } - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java index bdca50f..1d0c415 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java @@ -1,33 +1,17 @@ package com.casic.missiles.modular.system.utils; -public enum Status { - OK(200,"请求成功"), - FAIL(500,"请求失败"), - SYSTEM_ERROR(101,"系统异常"), - LOGIN_SUCCEEDED(200,"登录成功"), - EMPLOYEE_NOT_EXIST(2400,"员工号不存在"), - USER_ALREADY_REGISTERED(2500,"该账号已注册"), - USER_ALREADY_NOT_REGISTERED(2301,"您的账号未注册，请先注册"), - FAILED_CERTIFICATION(2300,"认证不通过"), - FAILED_PHONE(2302,"授权手机号不正确"), - EMPLOYEE_NAME_MISMATCH(2400,"员工号与姓名不匹配"); - private Integer code; - private String message; - Status(Integer code,String message){ - this.code=code; - this.message=message; - } - //只需要添加get方法就行 - public Integer getCode() { - return code; - } - public String getMessage() { - return message; - } +public interface Status { + String OK = "请求成功"; + String FAIL = "请求失败"; + String SYSTEM_ERROR = "系统异常"; + String LOGIN_SUCCEEDED = "登录成功"; + String EMPLOYEE_NOT_EXIS = "员工不存在"; + String USER_ALREADY_REGISTERED = "该账号已注册"; + String USER_ALREADY_NOT_REGISTERED = "您的账号未注册，请先注册"; + String FAILED_CERTIFICATION = "认证不通过"; + String FAILED_PHONE = "授权手机号不正确"; + String PHONE_GET_FAILED = "手机号获取失败"; + String EMPLOYEE_NAME_MISMATCH = "员工号与姓名不匹配"; - @Override - public String toString() { - return code+":"+message; - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java index ebf9328..0a4b183 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java @@ -16,7 +16,7 @@ } public static String getId(){ - int i = RandomUtils.nextInt(1000000, 10000000); + int i = RandomUtils.nextInt(100000, 1000000); return new Date().getTime() + "" + i; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java deleted file mode 100644 index 312c9fa..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -public class Result { - - private Integer status; - private String message; - private T data; - - public Integer getStatus() { - return status; - } - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - private Result(Integer status,String message,T data){ - this.status=status; - this.message=message; - this.data=data; - } - private Result(Integer status,String message){ - this.status=status; - this.message=message; - } - private Result(String message){ - this.message=message; - } - - - public static Result buildR(Status status,String message,T data){ - return new Result(status.getCode(),message,data); - - } - - - public static Result buildR(Status status,String message,String type){ - return new Result(status.getCode(),message); - } - - public static Result buildR(Status status,T data){ - return new Result(status.getCode(),status.getMessage(),data); - } - - public static Result buildR(Status status){ - return new Result(status.getCode(),status.getMessage()); - } - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java index bdca50f..1d0c415 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java @@ -1,33 +1,17 @@ package com.casic.missiles.modular.system.utils; -public enum Status { - OK(200,"请求成功"), - FAIL(500,"请求失败"), - SYSTEM_ERROR(101,"系统异常"), - LOGIN_SUCCEEDED(200,"登录成功"), - EMPLOYEE_NOT_EXIST(2400,"员工号不存在"), - USER_ALREADY_REGISTERED(2500,"该账号已注册"), - USER_ALREADY_NOT_REGISTERED(2301,"您的账号未注册，请先注册"), - FAILED_CERTIFICATION(2300,"认证不通过"), - FAILED_PHONE(2302,"授权手机号不正确"), - EMPLOYEE_NAME_MISMATCH(2400,"员工号与姓名不匹配"); - private Integer code; - private String message; - Status(Integer code,String message){ - this.code=code; - this.message=message; - } - //只需要添加get方法就行 - public Integer getCode() { - return code; - } - public String getMessage() { - return message; - } +public interface Status { + String OK = "请求成功"; + String FAIL = "请求失败"; + String SYSTEM_ERROR = "系统异常"; + String LOGIN_SUCCEEDED = "登录成功"; + String EMPLOYEE_NOT_EXIS = "员工不存在"; + String USER_ALREADY_REGISTERED = "该账号已注册"; + String USER_ALREADY_NOT_REGISTERED = "您的账号未注册，请先注册"; + String FAILED_CERTIFICATION = "认证不通过"; + String FAILED_PHONE = "授权手机号不正确"; + String PHONE_GET_FAILED = "手机号获取失败"; + String EMPLOYEE_NAME_MISMATCH = "员工号与姓名不匹配"; - @Override - public String toString() { - return code+":"+message; - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java index ebf9328..0a4b183 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java @@ -16,7 +16,7 @@ } public static String getId(){ - int i = RandomUtils.nextInt(1000000, 10000000); + int i = RandomUtils.nextInt(100000, 1000000); return new Date().getTime() + "" + i; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java index 8e4ba75..ec2b22f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java @@ -52,8 +52,12 @@ String doPost = HttpClientUtil.doPostJson(url, json); JSONObject jsonObject = JSONObject.parseObject(doPost); Object phone_info = jsonObject.get("phone_info"); - JSONObject parse =JSONObject.parseObject(phone_info.toString()); - return parse.get("phoneNumber").toString(); + if(null != phone_info){ + JSONObject parse =JSONObject.parseObject(phone_info.toString()); + return parse.get("phoneNumber").toString(); + }else{ + return "GetFailed"; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java deleted file mode 100644 index 312c9fa..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -public class Result { - - private Integer status; - private String message; - private T data; - - public Integer getStatus() { - return status; - } - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - private Result(Integer status,String message,T data){ - this.status=status; - this.message=message; - this.data=data; - } - private Result(Integer status,String message){ - this.status=status; - this.message=message; - } - private Result(String message){ - this.message=message; - } - - - public static Result buildR(Status status,String message,T data){ - return new Result(status.getCode(),message,data); - - } - - - public static Result buildR(Status status,String message,String type){ - return new Result(status.getCode(),message); - } - - public static Result buildR(Status status,T data){ - return new Result(status.getCode(),status.getMessage(),data); - } - - public static Result buildR(Status status){ - return new Result(status.getCode(),status.getMessage()); - } - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java index bdca50f..1d0c415 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java @@ -1,33 +1,17 @@ package com.casic.missiles.modular.system.utils; -public enum Status { - OK(200,"请求成功"), - FAIL(500,"请求失败"), - SYSTEM_ERROR(101,"系统异常"), - LOGIN_SUCCEEDED(200,"登录成功"), - EMPLOYEE_NOT_EXIST(2400,"员工号不存在"), - USER_ALREADY_REGISTERED(2500,"该账号已注册"), - USER_ALREADY_NOT_REGISTERED(2301,"您的账号未注册，请先注册"), - FAILED_CERTIFICATION(2300,"认证不通过"), - FAILED_PHONE(2302,"授权手机号不正确"), - EMPLOYEE_NAME_MISMATCH(2400,"员工号与姓名不匹配"); - private Integer code; - private String message; - Status(Integer code,String message){ - this.code=code; - this.message=message; - } - //只需要添加get方法就行 - public Integer getCode() { - return code; - } - public String getMessage() { - return message; - } +public interface Status { + String OK = "请求成功"; + String FAIL = "请求失败"; + String SYSTEM_ERROR = "系统异常"; + String LOGIN_SUCCEEDED = "登录成功"; + String EMPLOYEE_NOT_EXIS = "员工不存在"; + String USER_ALREADY_REGISTERED = "该账号已注册"; + String USER_ALREADY_NOT_REGISTERED = "您的账号未注册，请先注册"; + String FAILED_CERTIFICATION = "认证不通过"; + String FAILED_PHONE = "授权手机号不正确"; + String PHONE_GET_FAILED = "手机号获取失败"; + String EMPLOYEE_NAME_MISMATCH = "员工号与姓名不匹配"; - @Override - public String toString() { - return code+":"+message; - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java index ebf9328..0a4b183 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java @@ -16,7 +16,7 @@ } public static String getId(){ - int i = RandomUtils.nextInt(1000000, 10000000); + int i = RandomUtils.nextInt(100000, 1000000); return new Date().getTime() + "" + i; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java index 8e4ba75..ec2b22f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java @@ -52,8 +52,12 @@ String doPost = HttpClientUtil.doPostJson(url, json); JSONObject jsonObject = JSONObject.parseObject(doPost); Object phone_info = jsonObject.get("phone_info"); - JSONObject parse =JSONObject.parseObject(phone_info.toString()); - return parse.get("phoneNumber").toString(); + if(null != phone_info){ + JSONObject parse =JSONObject.parseObject(phone_info.toString()); + return parse.get("phoneNumber").toString(); + }else{ + return "GetFailed"; + } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 0a975cf..083a82f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -19,7 +19,7 @@ enable: false #图片下载本地地址 file: - uploadPath: D:\tmp\ + uploadPath: D:\work\ commponentType: disk logging: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 4ef1109..b86568d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.controller; import com.alibaba.fastjson.JSONObject; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.UserDto; -import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.utils.*; import dm.jdbc.util.StringUtil; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; /** * @Description: 小程序用户 @@ -30,12 +29,12 @@ private UserActionService userActionService; /** - * 注册 + * 登录 */ @RequestMapping("userLogin") @ResponseBody - public Result userLogin(@RequestBody HashMap map){ - return userActionService.userLogin(map); + public Object userLogin(@RequestBody ParamsDto dto){ + return userActionService.userLogin(dto); } /** @@ -43,7 +42,7 @@ */ @RequestMapping("userRegister") @ResponseBody - public Result userRegister(@RequestBody UserDto userDto){ + public Object userRegister(@RequestBody UserDto userDto){ return userActionService.userRegister(userDto); } /** @@ -51,37 +50,25 @@ */ @RequestMapping("getUserType") @ResponseBody - public List getUserType(){ + public Object getUserType(){ return userActionService.getUserType(); } /** - * 校验用户 - */ - @RequestMapping("verifyUser") - @ResponseBody - public Result verifyUser(@RequestBody UserDto userDto){ - return userActionService.verifyUser(userDto); - } - /** - * 找回密码 - */ - @RequestMapping("retrievePassword") - @ResponseBody - public Result retrievePassword(String id,String oldPwd,String newPwd){ - return userActionService.retrievePassword(id,oldPwd,newPwd); - } - /** - * 用户信息 - */ - @RequestMapping("getUserInfo") - @ResponseBody - public Result getUserInfo(String userName){ - return userActionService.getUserInfo(userName); - } - /** * 修改照片 */ - + @RequestMapping("updateUserImg") + @ResponseBody + public Object updateUserImg(@RequestBody ParamsDto dto){ + return userActionService.updateUserImg(dto); + } + /** + * 获取用户权限 + */ + @RequestMapping("getUserJurisdiction") + @ResponseBody + public Object getUserJurisdiction(@RequestBody ParamsDto dto){ + return userActionService.getUserJurisdiction(dto); + } /** * 修改密码 */ @@ -98,12 +85,8 @@ if (StringUtil.isEmpty(code)) { return null; } - JSONObject jsonObject = WXUserUtils.getOpenId(code); - //JSONObject str = WXUserUtils.getAccessToken(); - //JSONObject phone = WXUserUtils.getPhone(code,str.get("access_token").toString()); - //System.out.println("token:"+str); - //System.out.println("phone:"+phone); - return Result.buildR(Status.OK,jsonObject); + String phone = WXUserUtils.getPhone(code); + return ResponseData.success(phone); } /** * 获取微信手机号 @@ -120,15 +103,15 @@ if (json.containsKey("phoneNumber")) { String phone = json.getString("phoneNumber"); if (StringUtils.isNoneBlank(phone)) { - return Result.buildR(Status.OK,json); + return ResponseData.success(json); } else { - return Result.buildR(Status.FAILED_PHONE); + return ResponseData.error(Status.FAILED_PHONE); } } else { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } catch (Exception e) { - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 5647343..d2c32af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -1,7 +1,6 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.modular.system.dto.StaffInfoDto; import com.casic.missiles.modular.system.dto.UserDto; import com.casic.missiles.modular.system.model.Dict; import org.apache.ibatis.annotations.Param; @@ -9,17 +8,17 @@ import java.util.List; public interface UserActionMapper extends BaseMapper { - List getList(); + List getList(@Param("id") String id); void userRegister(@Param("userDto") UserDto userDto); UserDto getUserInfo(@Param("userDto") UserDto userDto); - StaffInfoDto getStaffInfo(@Param("userDto") UserDto userDto); - - void retrievePassword(@Param("id")String id, @Param("salt")String salt, @Param("password")String password); - void setUserOpenId(@Param("userDto")UserDto user); void userEmpowerment(@Param("id")String id,@Param("userId")String userId,@Param("updateTime")String updateTime); + + void updateUserImg(@Param("fileId")String fileId, @Param("uid") String uid); + + List getUserJurisdiction(@Param("uid") String uid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java new file mode 100644 index 0000000..89fe7c9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/ParamsDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class ParamsDto { + private String id;//主键id + private String code;//微信登录code + private String phoneCode;//获取手机号code + + private String fileId;//文件id + private String uid;//用户id +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index ae06f38..a1608fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -2,23 +2,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.system.utils.Result; - -import java.util.HashMap; -import java.util.List; public interface UserActionService extends IService { - List getUserType(); + Object getUserType(); - Result userRegister(UserDto userDto); + Object userRegister(UserDto userDto); - Result retrievePassword(String id,String oldPwd,String newPwd); + Object userLogin(ParamsDto dto); - Result verifyUser(UserDto userDto); + Object updateUserImg(ParamsDto dto); - Result getUserInfo(String userName); - - Result userLogin(HashMap map); + Object getUserJurisdiction(ParamsDto dto); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java index fd5189d..e75760c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -11,6 +11,6 @@ */ @Slf4j @Service -public class StaffInfoServiceImpl extends ServiceImpl { +public class StaffInfoServiceImpl /*extends ServiceImpl*/ { } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 1e49b17..9d469ae 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -1,16 +1,18 @@ package com.casic.missiles.modular.system.service.impl; import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.core.shiro.ShiroKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.ParamsDto; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.UserActionService; -import com.casic.missiles.modular.system.utils.Result; import com.casic.missiles.modular.system.utils.Status; import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; +import dm.jdbc.util.StringUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,31 +25,49 @@ @Resource private UserActionMapper userActionDao; + @Value("${casic.file.uploadPath}") + private String filePath; + @Override - public Result userLogin(HashMap map) { + public Object userLogin(ParamsDto dto) { try { UserDto userDto = new UserDto(); - userDto.setAttr1(WXUserUtils.getPhone(map.get("phoneCode").toString())); + String phone = WXUserUtils.getPhone(dto.getPhoneCode()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null != user){ - JSONObject jsonObject = WXUserUtils.getOpenId(map.get("code").toString()); - user.setSyncId(jsonObject.get("openid").toString()); - userActionDao.setUserOpenId(user); - return Result.buildR(Status.LOGIN_SUCCEEDED,user); + if(StringUtil.isEmpty(user.getSyncId())){ + JSONObject jsonObject = WXUserUtils.getOpenId(dto.getCode()); + if(null != jsonObject.get("openid")){ + user.setSyncId(jsonObject.get("openid").toString()); + } + List list = userActionDao.getList(user.getSalt()); + user.setSalt(list.get(0).getName()); + userActionDao.setUserOpenId(user); + } + user.setAvatar(filePath+user.getAvatar()); + return ResponseData.success(user); }else{ - return Result.buildR(Status.USER_ALREADY_NOT_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_NOT_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result userRegister(UserDto userDto) { + public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - userDto.setAttr1(userDto.getPhone()); + String phone = WXUserUtils.getPhone(userDto.getPhone()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + } + userDto.setAttr1(phone); UserDto user = userActionDao.getUserInfo(userDto); if(null == user){ userDto.setAttr1(""); @@ -55,67 +75,49 @@ if(null != userInfo){ userActionDao.userRegister(userDto); userActionDao.userEmpowerment(UuidUtils.getId(),userInfo.getId(),sim.format(new Date())); - return Result.buildR(Status.OK); + return ResponseData.success(); }else { - return Result.buildR(Status.EMPLOYEE_NOT_EXIST); + return ResponseData.error(Status.EMPLOYEE_NOT_EXIS); } }else{ - return Result.buildR(Status.USER_ALREADY_REGISTERED); + return ResponseData.error(Status.USER_ALREADY_REGISTERED); } }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result retrievePassword(String id,String oldPwd,String newPwd) { + public Object updateUserImg(ParamsDto dto) { try { - String salt = ShiroKit.getRandomSalt(5); - String password = ShiroKit.md5(newPwd, salt); - userActionDao.retrievePassword(id,salt,password); - return Result.buildR(Status.OK); + userActionDao.updateUserImg(dto.getFileId(), dto.getUid()); + return ResponseData.success(); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result verifyUser(UserDto userDto) { + public Object getUserJurisdiction(ParamsDto dto) { try { - UserDto user = userActionDao.getUserInfo(userDto); - if(null != user){ - if(user.getPhone().equals(userDto.getPhone())){ - return Result.buildR(Status.OK,user.getId()); - }else{ - return Result.buildR(Status.FAILED_PHONE); - } - }else{ - return Result.buildR(Status.FAILED_CERTIFICATION); - } + List resList = userActionDao.getUserJurisdiction(dto.getUid()); + return ResponseData.success(resList); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } @Override - public Result getUserInfo(String userName) { + public Object getUserType() { try { - UserDto userDto = new UserDto(); - userDto.setAccount(userName); - UserDto user = userActionDao.getUserInfo(userDto); - return Result.buildR(Status.OK,user); + List list = userActionDao.getList(""); + return ResponseData.success(list); }catch (Exception e){ e.printStackTrace(); - return Result.buildR(Status.FAIL); + return ResponseData.error(Status.FAIL); } } - - - @Override - public List getUserType() { - return userActionDao.getList(); - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java deleted file mode 100644 index 312c9fa..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.missiles.modular.system.utils; - -public class Result { - - private Integer status; - private String message; - private T data; - - public Integer getStatus() { - return status; - } - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - private Result(Integer status,String message,T data){ - this.status=status; - this.message=message; - this.data=data; - } - private Result(Integer status,String message){ - this.status=status; - this.message=message; - } - private Result(String message){ - this.message=message; - } - - - public static Result buildR(Status status,String message,T data){ - return new Result(status.getCode(),message,data); - - } - - - public static Result buildR(Status status,String message,String type){ - return new Result(status.getCode(),message); - } - - public static Result buildR(Status status,T data){ - return new Result(status.getCode(),status.getMessage(),data); - } - - public static Result buildR(Status status){ - return new Result(status.getCode(),status.getMessage()); - } - -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java index bdca50f..1d0c415 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/Status.java @@ -1,33 +1,17 @@ package com.casic.missiles.modular.system.utils; -public enum Status { - OK(200,"请求成功"), - FAIL(500,"请求失败"), - SYSTEM_ERROR(101,"系统异常"), - LOGIN_SUCCEEDED(200,"登录成功"), - EMPLOYEE_NOT_EXIST(2400,"员工号不存在"), - USER_ALREADY_REGISTERED(2500,"该账号已注册"), - USER_ALREADY_NOT_REGISTERED(2301,"您的账号未注册，请先注册"), - FAILED_CERTIFICATION(2300,"认证不通过"), - FAILED_PHONE(2302,"授权手机号不正确"), - EMPLOYEE_NAME_MISMATCH(2400,"员工号与姓名不匹配"); - private Integer code; - private String message; - Status(Integer code,String message){ - this.code=code; - this.message=message; - } - //只需要添加get方法就行 - public Integer getCode() { - return code; - } - public String getMessage() { - return message; - } +public interface Status { + String OK = "请求成功"; + String FAIL = "请求失败"; + String SYSTEM_ERROR = "系统异常"; + String LOGIN_SUCCEEDED = "登录成功"; + String EMPLOYEE_NOT_EXIS = "员工不存在"; + String USER_ALREADY_REGISTERED = "该账号已注册"; + String USER_ALREADY_NOT_REGISTERED = "您的账号未注册，请先注册"; + String FAILED_CERTIFICATION = "认证不通过"; + String FAILED_PHONE = "授权手机号不正确"; + String PHONE_GET_FAILED = "手机号获取失败"; + String EMPLOYEE_NAME_MISMATCH = "员工号与姓名不匹配"; - @Override - public String toString() { - return code+":"+message; - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java index ebf9328..0a4b183 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/UuidUtils.java @@ -16,7 +16,7 @@ } public static String getId(){ - int i = RandomUtils.nextInt(1000000, 10000000); + int i = RandomUtils.nextInt(100000, 1000000); return new Date().getTime() + "" + i; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java index 8e4ba75..ec2b22f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/utils/WXUserUtils.java @@ -52,8 +52,12 @@ String doPost = HttpClientUtil.doPostJson(url, json); JSONObject jsonObject = JSONObject.parseObject(doPost); Object phone_info = jsonObject.get("phone_info"); - JSONObject parse =JSONObject.parseObject(phone_info.toString()); - return parse.get("phoneNumber").toString(); + if(null != phone_info){ + JSONObject parse =JSONObject.parseObject(phone_info.toString()); + return parse.get("phoneNumber").toString(); + }else{ + return "GetFailed"; + } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 0a975cf..083a82f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -19,7 +19,7 @@ enable: false #图片下载本地地址 file: - uploadPath: D:\tmp\ + uploadPath: D:\work\ commponentType: disk logging: diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index 26cc328..0cece09 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -11,16 +11,13 @@ - - - UPDATE sys_user SET `PASSWORD` = #{password}, `SALT` = #{salt} WHERE `ID` = #{id} - and t.ACCOUNT = #{userDto.account} @@ -33,46 +30,31 @@ - UPDATE sys_user SET `PHONE` = #{userDto.phone} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} + UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone} - + INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`) VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S')) - - INSERT INTO sys_user ( - `ID`, - `ACCOUNT`, - `PASSWORD`, - `SALT`, - `NAME`, - `BIRTHDAY`, - `SEX`, - `EMAIL`, - `PHONE`, - `DEPT_ID`, - `STATUS`, - `CREATE_TIME`, - `TENANT_ID` - ) - VALUES - ( - #{userDto.id}, - #{userDto.account}, - #{userDto.password}, - #{userDto.salt}, - #{userDto.name}, - null, - #{userDto.sex}, - #{userDto.email}, - #{userDto.phone}, - #{userDto.deptId}, - #{userDto.status}, - DATE_FORMAT(#{userDto.createTime},'%Y-%m-%d %H:%i:%S'), - #{userDto.tenantId} - ) - + + UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid} + + \ No newline at end of file