From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolTypeController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolTypeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolTypeController.java
index 50312be..8932594 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolTypeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolTypeController.java
@@ -6,6 +6,8 @@
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.mes.controller.admin.tm.tool.vo.type.MesTmToolTypeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.type.MesTmToolTypeImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.type.MesTmToolTypePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.type.MesTmToolTypeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.type.MesTmToolTypeSaveReqVO;
@@ -13,6 +15,7 @@
import cn.iocoder.yudao.module.mes.service.tm.tool.MesTmToolTypeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -20,8 +23,10 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -63,7 +68,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱宸ュ叿绫诲瀷")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:tm-tool-type:query')")
public CommonResult<MesTmToolTypeRespVO> getToolType(@RequestParam("id") Long id) {
MesTmToolTypeDO toolType = toolTypeService.getToolType(id);
return success(BeanUtils.toBean(toolType, MesTmToolTypeRespVO.class));
@@ -71,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱宸ュ叿绫诲瀷鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:tm-tool-type:query')")
public CommonResult<PageResult<MesTmToolTypeRespVO>> getToolTypePage(@Valid MesTmToolTypePageReqVO pageReqVO) {
PageResult<MesTmToolTypeDO> pageResult = toolTypeService.getToolTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesTmToolTypeRespVO.class));
@@ -97,4 +100,31 @@
BeanUtils.toBean(list, MesTmToolTypeRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱宸ュ叿绫诲瀷瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesTmToolTypeImportExcelVO> list = Collections.singletonList(
+ MesTmToolTypeImportExcelVO.builder()
+ .code("TT-001").name("绀轰緥宸ュ叿绫诲瀷").codeFlag(false)
+ .maintenType(1).maintenPeriod(30).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "宸ュ叿绫诲瀷瀵煎叆妯℃澘.xls", "宸ュ叿绫诲瀷鍒楄〃", MesTmToolTypeImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆宸ュ叿绫诲瀷")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:tm-tool-type:import')")
+ public CommonResult<MesTmToolTypeImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesTmToolTypeImportExcelVO> list = ExcelUtils.read(file, MesTmToolTypeImportExcelVO.class);
+ return success(toolTypeService.importToolTypeList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3