From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植（与新高原有 em 模块重复）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.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/md/workstation/MesMdWorkshopController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
index 04e3cb0..614d663 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
@@ -9,6 +9,8 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.md.workstation.vo.workshop.MesMdWorkshopImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.workshop.MesMdWorkshopSaveReqVO;
@@ -18,6 +20,7 @@
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
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;
@@ -25,6 +28,7 @@
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;
@@ -74,7 +78,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱杞﹂棿")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')")
public CommonResult<MesMdWorkshopRespVO> getWorkshop(@RequestParam("id") Long id) {
MesMdWorkshopDO workshop = workshopService.getWorkshop(id);
if (workshop == null) {
@@ -86,7 +89,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱杞﹂棿鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')")
public CommonResult<PageResult<MesMdWorkshopRespVO>> getWorkshopPage(@Valid MesMdWorkshopPageReqVO pageReqVO) {
PageResult<MesMdWorkshopDO> pageResult = workshopService.getWorkshopPage(pageReqVO);
return success(new PageResult<>(buildWorkshopRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -123,6 +125,34 @@
ExcelUtils.write(response, "杞﹂棿.xls", "鏁版嵁", MesMdWorkshopRespVO.class, voList);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱杞﹂棿瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesMdWorkshopImportExcelVO> list = Collections.singletonList(
+ MesMdWorkshopImportExcelVO.builder().code("WS-001").name("绀轰緥杞﹂棿")
+ .area(new java.math.BigDecimal("1000.00"))
+ .chargeUserId(1L)
+ .status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "杞﹂棿瀵煎叆妯℃澘.xls", "杞﹂棿鍒楄〃", MesMdWorkshopImportExcelVO.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:md-workshop:import')")
+ public CommonResult<MesMdWorkshopImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesMdWorkshopImportExcelVO> list = ExcelUtils.read(file, MesMdWorkshopImportExcelVO.class);
+ return success(workshopService.importWorkshopList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesMdWorkshopRespVO> buildWorkshopRespVOList(List<MesMdWorkshopDO> list) {
--
Gitblit v1.9.3