重置密码

mec-biz/src/main/java/com/ym/mec/biz/service/EmployeeService.java

@@ -79,4 +79,6 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
     void simpleUpdate(Employee employee);
 
     PageInfo<SysUserDto> queryEmployeeBasicInfo(UserBasicQueryInfo queryInfo);
+
+    void resetPassword(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -581,4 +581,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void resetPassword(Integer userId) {
+        SysUser user = Optional.ofNullable(teacherDao.getUser(userId)).orElseThrow(() -> new BizException("用户不存在"));
+        //默认密码是gym+手机号后四位
+        StringBuffer gym = new StringBuffer("gym").append(user.getPhone().substring(7));
+        employeeDao.updatePassword(userId, new BCryptPasswordEncoder().encode(gym.toString()));
+    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -24,6 +24,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -81,22 +82,30 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "员工操作")
     @PostMapping("/employeeOperate")
     @PreAuthorize("@pcs.hasPermissions('employee/employeeOperate')")
-    public Object employeeOperate(Integer employeeId, EmployeeOperateEnum operate){
+    public HttpResponseResult employeeOperate(Integer employeeId, EmployeeOperateEnum operate){
         employeeService.employeeOperate(employeeId,operate);
         return succeed();
     }
 
+    @ApiOperation(value = "密码重置")
+    @PostMapping("/resetPassword")
+    @PreAuthorize("@pcs.hasPermissions('employee/resetPassword')")
+    public HttpResponseResult resetPassword(Integer userId){
+        employeeService.resetPassword(userId);
+        return succeed();
+    }
+
     @ApiOperation(value = "当前用户是否有课程组教务老师关联")
     @PostMapping("/hasCourseGroupRelation")
     @PreAuthorize("@pcs.hasPermissions('employee/hasCourseGroupRelation')")
-    public Object hasCourseGroupRelation(Integer employeeId){
+    public HttpResponseResult<HashMap<String, Integer>> hasCourseGroupRelation(Integer employeeId){
         return succeed(employeeService.hasCourseGroupRelation(employeeId));
     }
 
     @ApiOperation(value = "修改指定的教务老师关联")
     @PostMapping("/updateEducationTeacherId")
     @PreAuthorize("@pcs.hasPermissions('employee/updateEducationTeacherId')")
-    public Object updateEducationTeacherId(Integer currentUserId,Integer targetUserId){
+    public HttpResponseResult updateEducationTeacherId(Integer currentUserId,Integer targetUserId){
         employeeService.updateEducationTeacherId(currentUserId,targetUserId);
         return succeed();
     }
@@ -104,7 +113,7 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "新增员工")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('employee/add')")
-    public Object add(@RequestBody Employee employee) throws Exception {
+    public HttpResponseResult add(@RequestBody Employee employee) throws Exception {
         employeeService.add(employee);
         return succeed();
     }
@@ -122,14 +131,14 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "修改员工")
     @PostMapping("/simpleUpdate")
     @PreAuthorize("@pcs.hasPermissions('employee/simpleUpdate')")
-    public Object simpleUpdate(@RequestBody Employee employee) {
+    public HttpResponseResult simpleUpdate(@RequestBody Employee employee) {
         employeeService.simpleUpdate(employee);
         return succeed();
     }
 
     @ApiOperation(value = "修改用户")
     @PostMapping("/updateUser")
-    public Object update(SysUser sysUser) {
+    public HttpResponseResult update(SysUser sysUser) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user != null) {
             Date date = new Date();
@@ -144,13 +153,13 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "获取所有员工")
     @GetMapping("/findAll")
     @PreAuthorize("@pcs.hasPermissions('employee/findAll')")
-    public Object findAll() {
+    public HttpResponseResult<List<Employee>> findAll() {
         return succeed(employeeService.findAll(null));
     }
 
     @ApiOperation(value = "获取用户信息")
     @GetMapping("/queryUserInfo")
-    public Object apiQueryUserInfo() {
+    public HttpResponseResult apiQueryUserInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser != null && sysUser.getId() != null){
             Employee employee = employeeService.get(sysUser.getId());