diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java index b33ab989..332d619f 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java @@ -1,37 +1,30 @@ package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementRespVO; import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; -import jakarta.validation.Valid; -import jakarta.validation.Valid; -import jakarta.servlet.http.HttpServletResponse; -import java.util.List; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; - -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; - import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagementService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 人员管理") @RestController @@ -44,14 +37,19 @@ public class PersonnelManagementController { @PostMapping("/create") @Operation(summary = "创建人员管理") - public CommonResult createPersonnelManagement(@Valid @RequestBody PersonnelManagementSaveReqVO createReqVO) { return success(personnelManagementService.createPersonnelManagement(createReqVO)); } + @PutMapping("/reset") + @Operation(summary = "密码重置") + public CommonResult reset(@Valid @RequestBody PersonnelManagementSaveReqVO updateReqVO) { + personnelManagementService.reset(updateReqVO); + return success(true); + } + @PutMapping("/update") @Operation(summary = "更新人员管理") - public CommonResult updatePersonnelManagement(@Valid @RequestBody PersonnelManagementSaveReqVO updateReqVO) { personnelManagementService.updatePersonnelManagement(updateReqVO); return success(true); @@ -60,7 +58,6 @@ public class PersonnelManagementController { @DeleteMapping("/delete") @Operation(summary = "删除人员管理") @Parameter(name = "id", description = "编号", required = true) - public CommonResult deletePersonnelManagement(@RequestParam("id") String id) { personnelManagementService.deletePersonnelManagement(id); return success(true); @@ -69,7 +66,6 @@ public class PersonnelManagementController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除人员管理") - public CommonResult deletePersonnelManagementList(@RequestParam("ids") List ids) { personnelManagementService.deletePersonnelManagementListByIds(ids); return success(true); @@ -78,7 +74,6 @@ public class PersonnelManagementController { @GetMapping("/get") @Operation(summary = "获得人员管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - public CommonResult getPersonnelManagement(@RequestParam("id") String id) { PersonnelManagementDO personnelManagement = personnelManagementService.getPersonnelManagement(id); return success(BeanUtils.toBean(personnelManagement, PersonnelManagementRespVO.class)); @@ -86,7 +81,6 @@ public class PersonnelManagementController { @GetMapping("/page") @Operation(summary = "获得人员管理分页") - public CommonResult> getPersonnelManagementPage(@Valid PersonnelManagementPageReqVO pageReqVO) { PageResult pageResult = personnelManagementService.getPersonnelManagementPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PersonnelManagementRespVO.class)); @@ -94,15 +88,14 @@ public class PersonnelManagementController { @GetMapping("/export-excel") @Operation(summary = "导出人员管理 Excel") - @ApiAccessLog(operateType = EXPORT) public void exportPersonnelManagementExcel(@Valid PersonnelManagementPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = personnelManagementService.getPersonnelManagementPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "人员管理.xls", "数据", PersonnelManagementRespVO.class, - BeanUtils.toBean(list, PersonnelManagementRespVO.class)); + BeanUtils.toBean(list, PersonnelManagementRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java index 5db92c6f..69078027 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java @@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserDO; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface SystemUserMapper extends BaseMapperX { + SystemUserDO selectByPhone(String phone); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java index 55bbc68f..99ce9dfd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementService.java @@ -61,4 +61,6 @@ public interface PersonnelManagementService { PageResult getPersonnelManagementPage(PersonnelManagementPageReqVO pageReqVO); int personnelCount(Long tenantId); + + void reset(@Valid PersonnelManagementSaveReqVO updateReqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java index 2dacab1f..8c07484a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/personnelmanagement/PersonnelManagementServiceImpl.java @@ -126,6 +126,15 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic return personnelManagementMapper.personnelCount(tenantId); } + @Override + public void reset(PersonnelManagementSaveReqVO updateReqVO) { + PersonnelManagementDO managementDO = personnelManagementMapper.selectById(updateReqVO.getId()); + SystemUserDO userDO = userMapper.selectByPhone(managementDO.getPhone()); + String substring = userDO.getMobile().substring(userDO.getMobile().length() - 6); + userDO.setPassword(encodePassword(substring)); // 加密密码 + userMapper.updateById(userDO); + } + /** * 处理图片集合转换 * 优先使用图片集合,如果图片集合为空则使用字符串 diff --git a/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml b/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml index 6aceb4ca..5e2597c7 100644 --- a/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml @@ -9,4 +9,10 @@ 文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ --> + \ No newline at end of file