From 03a3ea7e05a52d2c31a338d804826819f8cc39c4 Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Tue, 11 Jun 2024 18:17:16 +0800
Subject: [PATCH] no message

---
 youchain-system/pom.xml                       | 14 -----
 .../java/com/youchain/RequestData/ZpjlJj.java | 10 ++--
 .../modules/jimu/MyApiDataConvertAdapter.java | 56 -------------------
 .../src/main/resources/config/application.yml |  3 +-
 4 files changed, 6 insertions(+), 77 deletions(-)
 delete mode 100644 youchain-system/src/main/java/com/youchain/modules/jimu/MyApiDataConvertAdapter.java

diff --git a/youchain-system/pom.xml b/youchain-system/pom.xml
index 9416744..04503fa 100644
--- a/youchain-system/pom.xml
+++ b/youchain-system/pom.xml
@@ -38,20 +38,6 @@
             </exclusions>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.jeecgframework.jimureport</groupId>
-            <artifactId>jimureport-spring-boot-starter</artifactId>
-            <version>1.6.6</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi-ooxml-schemas</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
-
-        </dependency>
-
         <!-- 通用模块 -->
         <dependency>
             <groupId>com.youchain</groupId>
diff --git a/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java
index eb16b2c..e741166 100644
--- a/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java
+++ b/youchain-system/src/main/java/com/youchain/RequestData/ZpjlJj.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Set;
+
 @Data
 @Api(tags = "装配线叫料（紧急）")
 public class ZpjlJj {
@@ -13,12 +15,8 @@ public class ZpjlJj {
     String orderNo;
     @ApiModelProperty(value ="下发时间",required = true,example = "2023-07-03 00:00:00")
     String createTime;
-    @ApiModelProperty(value ="物料代码",required = true,example = "物料代码")
-    String itemCode;
-    @ApiModelProperty(value ="物料名称",required = true,example = "物料名称")
-    String itemName;
-    @ApiModelProperty(value ="物料数量",required = true,example = "物料数量(紧急叫料输入)")
-    Double itemQty=0d;
+    @ApiModelProperty(value ="紧急明细",required = true)
+    Set<ItemDate> itemDetail;
     @ApiModelProperty(value ="需求工位",required = true)
     String station;
     @ApiModelProperty(value ="需求点位",required = true)
diff --git a/youchain-system/src/main/java/com/youchain/modules/jimu/MyApiDataConvertAdapter.java b/youchain-system/src/main/java/com/youchain/modules/jimu/MyApiDataConvertAdapter.java
deleted file mode 100644
index 2a70e44..0000000
--- a/youchain-system/src/main/java/com/youchain/modules/jimu/MyApiDataConvertAdapter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.youchain.modules.jimu;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.jmreport.desreport.render.handler.convert.ApiDataConvertAdapter;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component("myApiDataConvertAdapter")
-public class MyApiDataConvertAdapter implements ApiDataConvertAdapter {
-    /**
-     * 返回list数据集
-     * @param jsonObject 接口数据原始对象
-     * @return
-     */
-    @Override
-    public String getData(JSONObject jsonObject) {
-        log.error(jsonObject.toJSONString());
-        if(jsonObject.containsKey("content")){
-            return jsonObject.getString("content");
-        }else{
-            return null;
-        }
-
-    }
-
-    /**
-     * 返回links
-     * @param jsonObject 接口数据原始对象
-     * @return
-     */
-    @Override
-    public String getLinks(JSONObject jsonObject) {
-        return null;
-    }
-
-    /**
-     * 返回总页数
-     * @param jsonObject 接口数据原始对象
-     * @return
-     */
-    @Override
-    public String getTotal(JSONObject jsonObject) {
-           return null;
-    }
-
-    /**
-     * 返回总条数
-     * @param jsonObject 接口数据原始对象
-     * @return
-     */
-    @Override
-    public String getCount(JSONObject jsonObject) {
-        return null;
-    }
-}
diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml
index 6a8d839..fe61839 100644
--- a/youchain-system/src/main/resources/config/application.yml
+++ b/youchain-system/src/main/resources/config/application.yml
@@ -6,6 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
+    #active: prod
     active: dev
   jackson:
     time-zone: GMT+8
@@ -34,7 +35,7 @@ spring:
     #password: ${REDIS_PWD:123456}
     #port: ${REDIS_PORT:6380}
 
-    host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:localhost}
     password: ${REDIS_PWD:}
     port: ${REDIS_PORT:6379}
     #连接超时时间