From cbc1f0f853494fd1e347fb416caebc884bf7bdcc Mon Sep 17 00:00:00 2001 From: chenbowen Date: Mon, 5 Jan 2026 19:44:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E7=BB=9F=E4=B8=80=E8=AE=A1=E9=87=8F?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/untInfo/UntInfoController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java index 3fca1775..c5610929 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/untInfo/UntInfoController.java @@ -43,14 +43,14 @@ public class UntInfoController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建计量单位") - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:create')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:create')") public CommonResult createUntInfo(@Valid @RequestBody UntInfoSaveReqVO createReqVO) { return success(untInfoService.createUntInfo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新计量单位") - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:update')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:update')") public CommonResult updateUntInfo(@Valid @RequestBody UntInfoSaveReqVO updateReqVO) { untInfoService.updateUntInfo(updateReqVO); return success(true); @@ -59,7 +59,7 @@ public class UntInfoController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除计量单位") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:delete')") public CommonResult deleteUntInfo(@RequestParam("id") Long id) { untInfoService.deleteUntInfo(id); return success(true); @@ -68,7 +68,7 @@ public class UntInfoController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除计量单位") - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:delete')") public CommonResult deleteUntInfoList(@RequestBody BatchDeleteReqVO req) { untInfoService.deleteUntInfoListByIds(req.getIds()); return success(true); @@ -77,7 +77,7 @@ public class UntInfoController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得计量单位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:query')") public CommonResult getUntInfo(@RequestParam("id") Long id) { UntInfoDO untInfo = untInfoService.getUntInfo(id); return success(BeanUtils.toBean(untInfo, UntInfoRespVO.class)); @@ -85,7 +85,7 @@ public class UntInfoController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得计量单位分页") - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:query')") public CommonResult> getUntInfoPage(@Valid UntInfoPageReqVO pageReqVO) { PageResult pageResult = untInfoService.getUntInfoPage(pageReqVO); return success(BeanUtils.toBean(pageResult, UntInfoRespVO.class)); @@ -93,7 +93,7 @@ public class UntInfoController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出计量单位 Excel") - @PreAuthorize("@ss.hasPermission('unitmanagement:unt-info:export')") + @PreAuthorize("@ss.hasPermission('unit-management:unt-info:export')") @ApiAccessLog(operateType = EXPORT) public void exportUntInfoExcel(@Valid UntInfoPageReqVO pageReqVO, HttpServletResponse response) throws IOException { From 73df6ca1a534968d3458775a511692195811846d Mon Sep 17 00:00:00 2001 From: ranke <213539@qq.com> Date: Wed, 7 Jan 2026 09:13:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=85=8B?= =?UTF-8?q?=E9=9A=86=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD.=20http://172.16.?= =?UTF-8?q?46.63:31560/index.php=3Fm=3Dtask&f=3Dview&taskID=3D684?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 +++++++++++ .../DepartmentMaterialController.java | 19 +++++++++++++++++ .../vo/DepartmentMaterialCloneReqVO.java | 21 +++++++++++++++++++ .../DepartmentMaterialService.java | 8 +++++++ .../DepartmentMaterialServiceImpl.java | 11 +++++++++- 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialCloneReqVO.java diff --git a/pom.xml b/pom.xml index a2e6ae70..8917ad68 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,10 @@ maven-compiler-plugin ${maven-compiler-plugin.version} + ${java.version} + ${java.version} + + ${java.version} org.springframework.boot @@ -229,6 +233,14 @@ 1.0.0 + + klw-dev + + dev + + klw + + diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/DepartmentMaterialController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/DepartmentMaterialController.java index 23b450d2..2fde036a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/DepartmentMaterialController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/DepartmentMaterialController.java @@ -1,5 +1,7 @@ package com.zt.plat.module.base.controller.admin.departmentmaterial; +import com.zt.plat.framework.common.util.object.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -103,4 +105,21 @@ public class DepartmentMaterialController { list); } + @PostMapping("/clone") + @Operation(summary = "克隆组织架构物料") + @Parameter(name = "ids", description = "要克隆的数据ID", required = true) + @Parameter(name = "deptId", description = "目标组织架构ID", required = true) + @PreAuthorize("@ss.hasPermission('base:department-material:clone')") + @Transactional + public CommonResult getDepartmentMaterial(@RequestBody DepartmentMaterialCloneReqVO req) { + List list = departmentMaterialService.getDepartmentMaterialByIds(req.getIds()); + for (DepartmentMaterialRespVO departmentMaterial : list) { + DepartmentMaterialSaveReqVO createReqVO = BeanUtils.toBean(departmentMaterial, DepartmentMaterialSaveReqVO.class); + createReqVO.setId( null); + createReqVO.setDeptId(req.getDeptId()); + departmentMaterialService.createDepartmentMaterial(createReqVO); + } + return success(true); + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialCloneReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialCloneReqVO.java new file mode 100644 index 00000000..a70d433b --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialCloneReqVO.java @@ -0,0 +1,21 @@ +package com.zt.plat.module.base.controller.admin.departmentmaterial.vo; + +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.util.List; + +/** + * 克隆组织架构物料 请求 + * 2026/1/6 17:55 + */ +@Data +public class DepartmentMaterialCloneReqVO { + + @NotEmpty(message = "批量克隆 ids 不能为空") + private List ids; + + @NotEmpty(message = "目标组织架构ID不能为空") + private Long deptId; + +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialService.java index 646348ce..b92936cc 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialService.java @@ -51,6 +51,14 @@ public interface DepartmentMaterialService { */ DepartmentMaterialRespVO getDepartmentMaterial(Long id); + /** + * 根据多个ID获得组织架构物料列表 + * + * @param ids 编号 list + * @return 组织架构物料列表 + */ + List getDepartmentMaterialByIds(List ids); + /** * 获得组织架构物料分页 * diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java index 4f60db95..058b5a21 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java @@ -106,7 +106,16 @@ public class DepartmentMaterialServiceImpl implements DepartmentMaterialService if (data == null) { return null; } - return CollUtil.getFirst(decorateDepartmentMaterials(Collections.singletonList(data))); + return CollUtil.getFirst(decorateDepartmentMaterials(Collections.singletonList(data))); + } + + @Override + public List getDepartmentMaterialByIds(List ids) { + List data = departmentMaterialMapper.selectByIds(ids); + if (org.apache.commons.collections4.CollectionUtils.isEmpty( data)) { + return null; + } + return decorateDepartmentMaterials(data); } @Override