Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wu

2025-01-17 959a3e15699e4547706b05f07dff190b503d2390

Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

 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:

 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:

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 10011

spring:
  profiles:

 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

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8082
  port: 10012

spring:
  profiles:

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8086
  port: 10013

spring:
  profiles:

 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

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8083
  port: 10015
spring:
  profiles:
    active: prod

 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:

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8084
  port: 10016
spring:
  profiles:
    active: prod

 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

 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:

 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>

 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 {
// 创建和配置Freemarker配置实例
        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;
    }
}


 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

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8181
  port: 10014

spring:
  profiles:

 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>