diff --git a/src/main/java/com/example/demo/controller/PermissionController.java b/src/main/java/com/example/demo/controller/PermissionController.java index 0c3d3c3..94f1d9a 100644 --- a/src/main/java/com/example/demo/controller/PermissionController.java +++ b/src/main/java/com/example/demo/controller/PermissionController.java @@ -2,6 +2,7 @@ package com.example.demo.controller; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; +import com.example.demo.domain.vo.AdminVo; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Permission; import com.example.demo.domain.vo.Result; @@ -53,9 +54,9 @@ public class PermissionController { } //编辑用户 @PostMapping("/updateAdmin") - public Result updateAdmin(@RequestBody Admin admin) throws Exception { + public Result updateAdmin(@RequestBody AdminVo adminVo) throws Exception { try { - return Result.success(permissionService.updateAdmin(admin)); + return Result.success(permissionService.updateAdmin(adminVo)); } catch (Exception e) { log.error(Arrays.toString(e.getStackTrace())); diff --git a/src/main/java/com/example/demo/mapper/PermissionMapper.java b/src/main/java/com/example/demo/mapper/PermissionMapper.java index 7660751..2407e0d 100644 --- a/src/main/java/com/example/demo/mapper/PermissionMapper.java +++ b/src/main/java/com/example/demo/mapper/PermissionMapper.java @@ -3,6 +3,7 @@ package com.example.demo.mapper; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; +import com.example.demo.domain.vo.AdminVo; import com.example.demo.domain.vo.Permission; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/example/demo/service/AdminService.java b/src/main/java/com/example/demo/service/AdminService.java index 106b9a3..c1dbf4a 100644 --- a/src/main/java/com/example/demo/service/AdminService.java +++ b/src/main/java/com/example/demo/service/AdminService.java @@ -19,5 +19,5 @@ public interface AdminService { Result updatePassword(Password password); - Result resetPassword(Password password); + Integer resetPassword(Password password); } diff --git a/src/main/java/com/example/demo/service/PermissionService.java b/src/main/java/com/example/demo/service/PermissionService.java index e306b28..347bb0c 100644 --- a/src/main/java/com/example/demo/service/PermissionService.java +++ b/src/main/java/com/example/demo/service/PermissionService.java @@ -3,7 +3,9 @@ package com.example.demo.service; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; +import com.example.demo.domain.vo.AdminVo; import com.example.demo.domain.vo.Permission; +import com.example.demo.domain.vo.Result; import com.github.pagehelper.PageInfo; import java.util.List; @@ -26,5 +28,5 @@ public interface PermissionService { Integer updateAdminRole(AdminRole adminRole); Integer upadatePermission(Admin admin) throws Exception; - Object updateAdmin(Admin admin)throws Exception; + Result updateAdmin(AdminVo adminVo)throws Exception; } diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java index a880423..78cab48 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java @@ -141,20 +141,20 @@ public class AdminServiceImpl implements AdminService { @Override - public Result resetPassword(Password password) { + public Integer resetPassword(Password password) { String newPassword = password.getNewPassword(); if(newPassword == null ||password.getAccount() == null) { - return Result.error("输入不能为空"); + return 0; } // 检查新密码是否符合复杂度要求 if (!PASSWORD_PATTERN.matcher(newPassword).matches()) { - return Result.error("新密码必须为8-16位数字、字母或符号组成，且至少包含其中两种"); + return 0; } if(adminMapper.getAdmin(password.getAccount())==null) { - return Result.error("用户不存在"); + return 0; } try { // 获取认证后的用户信息 @@ -169,10 +169,10 @@ public class AdminServiceImpl implements AdminService { admin.setUpdateTime(new Date()); // 更新修改时间 adminMapper.updatePassword(admin); - return Result.success("密码重置成功"); + return 1; } catch (Exception e) { - return Result.error("密码重置失败"); + return 0; } } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java index f026057..ea43441 100644 --- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java @@ -3,9 +3,13 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; +import com.example.demo.domain.vo.AdminVo; +import com.example.demo.domain.vo.Password; import com.example.demo.domain.vo.Permission; +import com.example.demo.domain.vo.Result; import com.example.demo.mapper.AdminMapper; import com.example.demo.mapper.PermissionMapper; +import com.example.demo.service.AdminService; import com.example.demo.service.PermissionService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -32,6 +36,9 @@ public class PermissionServiceImpl implements PermissionService { private PermissionMapper permissionMapper; @Autowired private AdminMapper adminMapper; + @Autowired + private AdminService adminService; + @Override public List getposition(String token) { return permissionMapper.getposition(token); @@ -116,31 +123,42 @@ public class PermissionServiceImpl implements PermissionService { } @Override - public Object updateAdmin(Admin admin)throws Exception { + public Result updateAdmin(AdminVo adminVo)throws Exception { - if(ObjectUtils.isEmpty(admin.getAccount())){ + if(ObjectUtils.isEmpty(adminVo.getAccount())){ throw new Exception("账号为空！"); } - if(ObjectUtils.isEmpty( admin.getMarket())){ + if(ObjectUtils.isEmpty(adminVo.getAdminName())){ + throw new Exception("用户名为空！"); + } + if(ObjectUtils.isEmpty(adminVo.getMarket())){ throw new Exception("地区为空！"); } - if(ObjectUtils.isEmpty( admin.getPostiton())){ + if(ObjectUtils.isEmpty(adminVo.getPostiton())){ throw new Exception("职位为空！"); } - - if(ObjectUtils.isEmpty( admin.getAdminName())){ - throw new Exception("用户名为空！"); - } - if(ObjectUtils.isEmpty( admin.getMachineId())){ + if(ObjectUtils.isEmpty(adminVo.getMachineId())){ throw new Exception("机器编号为空！"); } - if (admin.getMachineId().contains(",")) { + if (adminVo.getMachineId().contains(",")) { throw new Exception("机器编号格式错误"); } else { - - - return permissionMapper.updateAdmin(admin); + Admin admin = new Admin(); + admin.setAccount(adminVo.getAccount()); + admin.setAdminName(adminVo.getAdminName()); + admin.setMarket(adminVo.getMarket()); + admin.setPostiton(adminVo.getPostiton()); + admin.setMachineId(adminVo.getMachineId()+","+adminVo.getMachineIds()); + admin.setRemark(adminVo.getRemark()); + permissionMapper.updateAdmin(admin); + Password password = new Password(); + password.setAccount(adminVo.getAccount()); + password.setNewPassword(adminVo.getPassword()); + if(adminService.resetPassword(password)==0){ + return Result.error("密码更改失败"); + }; + return Result.success("成功"); } } diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index e2663b7..63fdc1d 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -27,6 +27,7 @@ where admin_id= #{id} + update admin @@ -42,12 +43,11 @@ remark= #{remark}, - market= #{market} - where account= #{account} + delete from admin where id=#{id}