From 2e20e85173b764e43a6e4022072bc8fb0cc61330 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 30 十二月 2024 19:45:35 +0800
Subject: [PATCH] 1、李赛克生成trf文件模板初始化
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageController.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageController.java
index b7e63b4..42d7fe8 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageController.java
@@ -2,7 +2,7 @@
import com.mes.hollow.entity.dto.HollowBigStorageAndDetailsDTO;
-import com.mes.hollow.entity.request.HollowTaskRequest;
+import com.mes.hollow.entity.dto.LisecHollowDetails;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import com.mes.hollow.service.HollowBigStorageCageService;
import com.mes.utils.Blank;
@@ -15,12 +15,14 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.core.io.FileSystemResource;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.StringWriter;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,8 +46,8 @@
return Result.build(200, "鏌ヨ鎴愬姛", hollowBigStorageCageService.queryHollowBigStorageCageDetail(query));
}
- @GetMapping("/generate")
- public ResponseEntity<FileSystemResource> generate() throws IOException, TemplateException {
+ @PostMapping("/generate")
+ public ResponseEntity<FileSystemResource> generate(@RequestBody LisecHollowDetails details) throws IOException, TemplateException {
// 鍒涘缓鍜岄厤缃瓼reemarker閰嶇疆瀹炰緥
Configuration cfg = new Configuration(new Version("2.3.29"));
cfg.setClassForTemplateLoading(HollowBigStorageCageController.class, "/templates/");
@@ -55,15 +57,8 @@
// 鍒涘缓鏁版嵁妯″瀷
Map<String, Object> root = new HashMap<>();
root.put("blank", blank);
- HollowTaskRequest request = new HollowTaskRequest();
- request.setCell(1);
- request.setFlowCardId("1111");
- List<HollowTaskRequest> list = new ArrayList<>();
- list.add(request);
- list.add(request);
- list.add(request);
- root.put("request", request);
- root.put("list1", list);
+
+ root.put("details", details);
// 鑾峰彇妯℃澘
Template temp = cfg.getTemplate("hollowGlass.ftl");
--
Gitblit v1.8.0