From 959a3e15699e4547706b05f07dff190b503d2390 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 17 一月 2025 11:32:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/gateway/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowBigStorageCageController.java | 42 ---------------------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/pom.xml | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 4 +-
hangzhoumesParent/moduleService/howllowGlassModule/pom.xml | 2
17 files changed, 17 insertions(+), 59 deletions(-)
diff --git a/hangzhoumesParent/gateway/src/main/resources/application.yml b/hangzhoumesParent/gateway/src/main/resources/application.yml
index 6cecd95..c7444bf 100644
--- a/hangzhoumesParent/gateway/src/main/resources/application.yml
+++ b/hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -6,7 +6,7 @@
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ server-addr: 127.0.0.1:8849
gateway:
discovery:
locator:
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml
index 3e3475e..b15c527 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@
cloud:
nacos:
discovery:
- server-addr: 10.153.19.150:8848
+ server-addr: 10.153.19.150:8849
application:
name: cacheGlass
redis:
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index c5fda3f..63ac861 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 10011
spring:
profiles:
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml
index 35c0670..96efde8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@
cloud:
nacos:
discovery:
- server-addr: 10.153.19.150:8848
+ server-addr: 10.153.19.150:8849
redis:
database: 0
host: 10.153.19.150
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index e5dacb9..9d2c396 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8082
+ port: 10012
spring:
profiles:
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
index 19dedb8..7756b17 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8086
+ port: 10013
spring:
profiles:
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
index 1830e90..6c1594a 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@
cloud:
nacos:
discovery:
- server-addr: 10.153.19.150:8848
+ server-addr: 10.153.19.150:8849
redis:
database: 0
host: 10.153.19.150
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
index 861c786..cb287d3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8083
+ port: 10015
spring:
profiles:
active: prod
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
index 65a2261..233bdcc 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
@@ -27,7 +27,7 @@
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ server-addr: 127.0.0.1:8849
application:
name: temperingGlass
redis:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index c593002..55a2ffe 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8084
+ port: 10016
spring:
profiles:
active: prod
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml
index e73f2dc..560afec 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@
cloud:
nacos:
discovery:
- server-addr: 10.153.19.150:8848
+ server-addr: 10.153.19.150:8849
redis:
database: 0
host: 10.153.19.150
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index 5873f82..90ac9a6 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -1,9 +1,9 @@
server:
- port: 8085
+ port: 10017
spring:
profiles:
- active: cz
+ active: prod
application:
name: unLoadGlass
liquibase:
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/pom.xml b/hangzhoumesParent/moduleService/howllowGlassModule/pom.xml
index 87ee9eb..d6c101e 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/pom.xml
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>howllowGlass</artifactId>
+ <artifactId>hollowGlass</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
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 d19b30f..19edaaa 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,29 +2,18 @@
import com.mes.hollow.entity.dto.HollowBigStorageAndDetailsDTO;
-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;
import com.mes.utils.Result;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import freemarker.template.Version;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.ResponseEntity;
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.*;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* (HollowBigStorageCage)琛ㄦ帶鍒跺眰
@@ -43,37 +32,6 @@
@PostMapping("/queryHollowBigStorageCageDetail")
public Result<List<HollowBigStorageAndDetailsDTO>> queryHollowBigStorageCageDetail(@RequestBody HollowBigStorageDetailsQueryVO query) {
return Result.build(200, "鏌ヨ鎴愬姛", hollowBigStorageCageService.queryHollowBigStorageCageDetail(query));
- }
-
- @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/");
- // 鍒涘缓Calculator瀹炰緥
- Blank blank = new Blank();
-
- // 鍒涘缓鏁版嵁妯″瀷
- Map<String, Object> root = new HashMap<>();
- root.put("blank", blank);
-
- root.put("details", details);
-
- // 鑾峰彇妯℃澘
- Template temp = cfg.getTemplate("hollowGlass.ftl");
-
-
- // 灏嗙敓鎴愮殑鏂囦欢瀛樺叆鎸囧畾璺緞
- //todo:璁＄畻鐢熸垚鏉庤禌鍏嬮渶瑕佺殑鏁版嵁缁欏埌姣忎釜灞炴��
- StringWriter out = new StringWriter();
- File file = new File("D:\\temp", "temp.trf");
- try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
- temp.process(root, out);
- writer.write(out.toString());
- } catch (TemplateException | IOException e) {
- e.printStackTrace();
- }
- return null;
}
}
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-prod.yml
index 35c0670..96efde8 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@
cloud:
nacos:
discovery:
- server-addr: 10.153.19.150:8848
+ server-addr: 10.153.19.150:8849
redis:
database: 0
host: 10.153.19.150
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
index f9c22aa..693203c 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8181
+ port: 10014
spring:
profiles:
diff --git a/hangzhoumesParent/moduleService/pom.xml b/hangzhoumesParent/moduleService/pom.xml
index b76375b..23bb38b 100644
--- a/hangzhoumesParent/moduleService/pom.xml
+++ b/hangzhoumesParent/moduleService/pom.xml
@@ -19,7 +19,7 @@
<module>TemperingGlassModule</module>
<module>UnLoadGlassModule</module>
<module>GlassStorageModule</module>
- <module>howllowGlassModule</module>
+ <module>hollowGlassModule</module>
</modules>
<properties>
--
Gitblit v1.8.0