From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java
index 5ba5108..bc6a87d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamController.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.cal.team.vo.MesCalTeamImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamSaveReqVO;
@@ -13,6 +15,7 @@
import cn.iocoder.yudao.module.mes.service.cal.team.MesCalTeamService;
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:cal-team:query')")
public CommonResult<MesCalTeamRespVO> getTeam(@RequestParam("id") Long id) {
MesCalTeamDO team = teamService.getTeam(id);
return success(BeanUtils.toBean(team, MesCalTeamRespVO.class));
@@ -71,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐝粍鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:cal-team:query')")
public CommonResult<PageResult<MesCalTeamRespVO>> getTeamPage(@Valid MesCalTeamPageReqVO pageReqVO) {
PageResult<MesCalTeamDO> pageResult = teamService.getTeamPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesCalTeamRespVO.class));
@@ -79,7 +82,6 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱鐝粍鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:cal-team:query')")
public CommonResult<List<MesCalTeamRespVO>> getTeamList() {
List<MesCalTeamDO> list = teamService.getTeamList();
return success(BeanUtils.toBean(list, MesCalTeamRespVO.class));
@@ -98,4 +100,30 @@
BeanUtils.toBean(list, MesCalTeamRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐝粍瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesCalTeamImportExcelVO> list = Collections.singletonList(
+ MesCalTeamImportExcelVO.builder().code("TEAM-A").name("绀轰緥鐝粍")
+ .calendarType(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鐝粍瀵煎叆妯℃澘.xls", "鐝粍鍒楄〃", MesCalTeamImportExcelVO.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:cal-team:import')")
+ public CommonResult<MesCalTeamImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesCalTeamImportExcelVO> list = ExcelUtils.read(file, MesCalTeamImportExcelVO.class);
+ return success(teamService.importTeamList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3