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/dv/subject/MesDvSubjectController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
index c18d7f9..e47a673 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
@@ -26,6 +26,11 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import org.springframework.web.multipart.MultipartFile;
+import io.swagger.v3.oas.annotations.Parameters;
+import java.util.Collections;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 鐐规淇濆吇椤圭洰")
@RestController
@@ -63,7 +68,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
public CommonResult<MesDvSubjectRespVO> getSubject(@RequestParam("id") Long id) {
MesDvSubjectDO subject = subjectService.getSubject(id);
return success(BeanUtils.toBean(subject, MesDvSubjectRespVO.class));
@@ -71,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
public CommonResult<PageResult<MesDvSubjectRespVO>> getSubjectPage(@Valid MesDvSubjectPageReqVO pageReqVO) {
PageResult<MesDvSubjectDO> pageResult = subjectService.getSubjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesDvSubjectRespVO.class));
@@ -79,7 +82,6 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
- @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
public CommonResult<List<MesDvSubjectRespVO>> getSubjectSimpleList() {
List<MesDvSubjectDO> list = subjectService.getSubjectList();
return success(BeanUtils.toBean(list, MesDvSubjectRespVO.class));
@@ -98,4 +100,34 @@
BeanUtils.toBean(list, MesDvSubjectRespVO.class));
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐐规淇濆吇椤圭洰瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesDvSubjectImportExcelVO> list = Collections.singletonList(
+ MesDvSubjectImportExcelVO.builder()
+ .code("SUB-001").name("澶栬妫�鏌�").type(1)
+ .content("妫�鏌ュ澹虫槸鍚︽湁瑁傜汗").standard("澶栬瀹屽ソ")
+ .status(0).remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鐐规淇濆吇椤圭洰瀵煎叆妯℃澘.xls", "鐐规淇濆吇椤圭洰鍒楄〃", MesDvSubjectImportExcelVO.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:dv-subject:import')")
+ public CommonResult<MesDvSubjectImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesDvSubjectImportExcelVO> list = ExcelUtils.read(file, MesDvSubjectImportExcelVO.class);
+ return success(subjectService.importSubjectList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3