From 1fed5e7bab3a8f6b9adbfcd3695e14a03d47677f Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 31 十月 2025 09:52:35 +0800
Subject: [PATCH] 更新代码
---
mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcTestWriteServiceImpl.java | 295 +++
mes-processes/mes-plcSend/README_PLC_ADDRESS_MAPPING.md | 8
mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java | 2
mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java | 34
mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteController.java | 383 +---
mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestController.java | 376 ++++
mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAutoTestServiceImpl.java | 81 +
mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcAddressMapper.java | 6
mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAddressService.java | 407 ----
mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java | 9
mes-processes/mes-plcSend/src/main/java/com/mes/vo/Result.java | 5
/dev/null | 0
gateway/src/main/resources/application.yml | 64
mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteLegacyController.java | 352 ++++
mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAddressServiceImpl.java | 270 +++
mes-processes/mes-plcSend/src/main/resources/db/migration/V1.0.0__Create_plc_address_mapping_table.sql | 4
mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcAddress.java | 4
mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcAddressController.java | 113
mes-web/src/views/plcTest/Test.vue | 2229 +++++++++++++++++++---------
mes-processes/mes-plcSend/src/main/resources/application-dev.yml | 36
20 files changed, 3,088 insertions(+), 1,590 deletions(-)
diff --git "a/PLC\346\250\241\346\213\237\346\214\207\344\273\244\347\263\273\347\273\237\350\256\276\350\256\241\344\270\216\345\256\236\347\216\260.docx" "b/PLC\346\250\241\346\213\237\346\214\207\344\273\244\347\263\273\347\273\237\350\256\276\350\256\241\344\270\216\345\256\236\347\216\260.docx"
deleted file mode 100644
index e2aa26a..0000000
--- "a/PLC\346\250\241\346\213\237\346\214\207\344\273\244\347\263\273\347\273\237\350\256\276\350\256\241\344\270\216\345\256\236\347\216\260.docx"
+++ /dev/null
Binary files differ
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index bfb822f..7491a5e 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -17,68 +17,4 @@
predicates:
- Path=/api/plcSend/**
filters:
- - StripPrefix=2
-
- - id: glassStorage
- uri: lb://glassStorage
- predicates:
- - Path=/api/glassStorage/**
- -
- filters:
- - StripPrefix=2
-
- - id: loadGlass
- uri: lb://loadGlass
- predicates:
- - Path=/api/loadGlass/**
- filters:
- - StripPrefix=2
-
- - id: cutting
- uri: lb://cutting
- predicates:
- - Path=/api/cutting/**
- filters:
- - StripPrefix=2
-
- - id: horizontal
- uri: lb://horizontal
- predicates:
- - Path=/api/horizontal/**
- filters:
- - StripPrefix=2
-
- - id: edging
- uri: lb://edging
- predicates:
- - Path=/api/edging/**
- filters:
- - StripPrefix=2
-
- - id: verticalGlass
- uri: lb://verticalGlass
- predicates:
- - Path=/api/verticalGlass/**
- filters:
- - StripPrefix=2
-
- - id: temperingGlass
- uri: lb://temperingGlass
- predicates:
- - Path=/api/temperingGlass/**
- filters:
- - StripPrefix=2
-
- - id: unLoadGlass
- uri: lb://unLoadGlass
- predicates:
- - Path=/api/unLoadGlass/**
- filters:
- - StripPrefix=2
-
- - id: hollowGlass
- uri: lb://hollowGlass
- predicates:
- - Path=/api/hollowGlass/**
- filters:
- StripPrefix=2
\ No newline at end of file
diff --git a/gateway/target/classes/application.yml b/gateway/target/classes/application.yml
deleted file mode 100644
index bfb822f..0000000
--- a/gateway/target/classes/application.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-server:
- port: 88
-spring:
- application:
- name: gateway
- cloud:
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
- gateway:
- discovery:
- locator:
- enabled: true
- routes:
- - id: plcSend
- uri: lb://plcSend
- predicates:
- - Path=/api/plcSend/**
- filters:
- - StripPrefix=2
-
- - id: glassStorage
- uri: lb://glassStorage
- predicates:
- - Path=/api/glassStorage/**
- -
- filters:
- - StripPrefix=2
-
- - id: loadGlass
- uri: lb://loadGlass
- predicates:
- - Path=/api/loadGlass/**
- filters:
- - StripPrefix=2
-
- - id: cutting
- uri: lb://cutting
- predicates:
- - Path=/api/cutting/**
- filters:
- - StripPrefix=2
-
- - id: horizontal
- uri: lb://horizontal
- predicates:
- - Path=/api/horizontal/**
- filters:
- - StripPrefix=2
-
- - id: edging
- uri: lb://edging
- predicates:
- - Path=/api/edging/**
- filters:
- - StripPrefix=2
-
- - id: verticalGlass
- uri: lb://verticalGlass
- predicates:
- - Path=/api/verticalGlass/**
- filters:
- - StripPrefix=2
-
- - id: temperingGlass
- uri: lb://temperingGlass
- predicates:
- - Path=/api/temperingGlass/**
- filters:
- - StripPrefix=2
-
- - id: unLoadGlass
- uri: lb://unLoadGlass
- predicates:
- - Path=/api/unLoadGlass/**
- filters:
- - StripPrefix=2
-
- - id: hollowGlass
- uri: lb://hollowGlass
- predicates:
- - Path=/api/hollowGlass/**
- filters:
- - StripPrefix=2
\ No newline at end of file
diff --git a/gateway/target/classes/com/mes/GatewayApplication.class b/gateway/target/classes/com/mes/GatewayApplication.class
deleted file mode 100644
index 47801c3..0000000
--- a/gateway/target/classes/com/mes/GatewayApplication.class
+++ /dev/null
Binary files differ
diff --git a/gateway/target/classes/com/mes/config/MyCorsConfig.class b/gateway/target/classes/com/mes/config/MyCorsConfig.class
deleted file mode 100644
index b4a6223..0000000
--- a/gateway/target/classes/com/mes/config/MyCorsConfig.class
+++ /dev/null
Binary files differ
diff --git a/gateway/target/config/application.yml b/gateway/target/config/application.yml
deleted file mode 100644
index bfb822f..0000000
--- a/gateway/target/config/application.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-server:
- port: 88
-spring:
- application:
- name: gateway
- cloud:
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
- gateway:
- discovery:
- locator:
- enabled: true
- routes:
- - id: plcSend
- uri: lb://plcSend
- predicates:
- - Path=/api/plcSend/**
- filters:
- - StripPrefix=2
-
- - id: glassStorage
- uri: lb://glassStorage
- predicates:
- - Path=/api/glassStorage/**
- -
- filters:
- - StripPrefix=2
-
- - id: loadGlass
- uri: lb://loadGlass
- predicates:
- - Path=/api/loadGlass/**
- filters:
- - StripPrefix=2
-
- - id: cutting
- uri: lb://cutting
- predicates:
- - Path=/api/cutting/**
- filters:
- - StripPrefix=2
-
- - id: horizontal
- uri: lb://horizontal
- predicates:
- - Path=/api/horizontal/**
- filters:
- - StripPrefix=2
-
- - id: edging
- uri: lb://edging
- predicates:
- - Path=/api/edging/**
- filters:
- - StripPrefix=2
-
- - id: verticalGlass
- uri: lb://verticalGlass
- predicates:
- - Path=/api/verticalGlass/**
- filters:
- - StripPrefix=2
-
- - id: temperingGlass
- uri: lb://temperingGlass
- predicates:
- - Path=/api/temperingGlass/**
- filters:
- - StripPrefix=2
-
- - id: unLoadGlass
- uri: lb://unLoadGlass
- predicates:
- - Path=/api/unLoadGlass/**
- filters:
- - StripPrefix=2
-
- - id: hollowGlass
- uri: lb://hollowGlass
- predicates:
- - Path=/api/hollowGlass/**
- filters:
- - StripPrefix=2
\ No newline at end of file
diff --git a/gateway/target/gateway-1.0.0.jar b/gateway/target/gateway-1.0.0.jar
deleted file mode 100644
index b7ab747..0000000
--- a/gateway/target/gateway-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/gateway-1.0.0.jar.original b/gateway/target/gateway-1.0.0.jar.original
deleted file mode 100644
index ec822bd..0000000
--- a/gateway/target/gateway-1.0.0.jar.original
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/HdrHistogram-2.1.9.jar b/gateway/target/lib/HdrHistogram-2.1.9.jar
deleted file mode 100644
index efa2637..0000000
--- a/gateway/target/lib/HdrHistogram-2.1.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/archaius-core-0.7.6.jar b/gateway/target/lib/archaius-core-0.7.6.jar
deleted file mode 100644
index 58182d1..0000000
--- a/gateway/target/lib/archaius-core-0.7.6.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/bcpkix-jdk15on-1.60.jar b/gateway/target/lib/bcpkix-jdk15on-1.60.jar
deleted file mode 100644
index 87ce8b4..0000000
--- a/gateway/target/lib/bcpkix-jdk15on-1.60.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/bcprov-jdk15on-1.60.jar b/gateway/target/lib/bcprov-jdk15on-1.60.jar
deleted file mode 100644
index 5be567c..0000000
--- a/gateway/target/lib/bcprov-jdk15on-1.60.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/classmate-1.4.0.jar b/gateway/target/lib/classmate-1.4.0.jar
deleted file mode 100644
index e53587e..0000000
--- a/gateway/target/lib/classmate-1.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/commons-codec-1.11.jar b/gateway/target/lib/commons-codec-1.11.jar
deleted file mode 100644
index 2245120..0000000
--- a/gateway/target/lib/commons-codec-1.11.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/commons-collections-3.2.2.jar b/gateway/target/lib/commons-collections-3.2.2.jar
deleted file mode 100644
index fa5df82..0000000
--- a/gateway/target/lib/commons-collections-3.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/commons-configuration-1.8.jar b/gateway/target/lib/commons-configuration-1.8.jar
deleted file mode 100644
index ae9ae99..0000000
--- a/gateway/target/lib/commons-configuration-1.8.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/commons-io-2.2.jar b/gateway/target/lib/commons-io-2.2.jar
deleted file mode 100644
index 84ca565..0000000
--- a/gateway/target/lib/commons-io-2.2.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/commons-lang-2.6.jar b/gateway/target/lib/commons-lang-2.6.jar
deleted file mode 100644
index 98467d3..0000000
--- a/gateway/target/lib/commons-lang-2.6.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/commons-lang3-3.8.1.jar b/gateway/target/lib/commons-lang3-3.8.1.jar
deleted file mode 100644
index 2c65ce6..0000000
--- a/gateway/target/lib/commons-lang3-3.8.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/fastjson-1.2.47.jar b/gateway/target/lib/fastjson-1.2.47.jar
deleted file mode 100644
index f342bca..0000000
--- a/gateway/target/lib/fastjson-1.2.47.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/guava-19.0.jar b/gateway/target/lib/guava-19.0.jar
deleted file mode 100644
index b175ca8..0000000
--- a/gateway/target/lib/guava-19.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/hibernate-validator-6.0.17.Final.jar b/gateway/target/lib/hibernate-validator-6.0.17.Final.jar
deleted file mode 100644
index 25376af..0000000
--- a/gateway/target/lib/hibernate-validator-6.0.17.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/httpclient-4.5.9.jar b/gateway/target/lib/httpclient-4.5.9.jar
deleted file mode 100644
index 83bc29d..0000000
--- a/gateway/target/lib/httpclient-4.5.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/httpcore-4.4.12.jar b/gateway/target/lib/httpcore-4.4.12.jar
deleted file mode 100644
index 1838672..0000000
--- a/gateway/target/lib/httpcore-4.4.12.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/hystrix-core-1.5.18.jar b/gateway/target/lib/hystrix-core-1.5.18.jar
deleted file mode 100644
index f8875b6..0000000
--- a/gateway/target/lib/hystrix-core-1.5.18.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jackson-annotations-2.9.0.jar b/gateway/target/lib/jackson-annotations-2.9.0.jar
deleted file mode 100644
index c602d75..0000000
--- a/gateway/target/lib/jackson-annotations-2.9.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jackson-core-2.9.9.jar b/gateway/target/lib/jackson-core-2.9.9.jar
deleted file mode 100644
index 02bd446..0000000
--- a/gateway/target/lib/jackson-core-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jackson-databind-2.9.9.3.jar b/gateway/target/lib/jackson-databind-2.9.9.3.jar
deleted file mode 100644
index 5bf4ba8..0000000
--- a/gateway/target/lib/jackson-databind-2.9.9.3.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jackson-datatype-jdk8-2.9.9.jar b/gateway/target/lib/jackson-datatype-jdk8-2.9.9.jar
deleted file mode 100644
index 43c87a6..0000000
--- a/gateway/target/lib/jackson-datatype-jdk8-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jackson-datatype-jsr310-2.9.9.jar b/gateway/target/lib/jackson-datatype-jsr310-2.9.9.jar
deleted file mode 100644
index 911c7b2..0000000
--- a/gateway/target/lib/jackson-datatype-jsr310-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jackson-module-parameter-names-2.9.9.jar b/gateway/target/lib/jackson-module-parameter-names-2.9.9.jar
deleted file mode 100644
index df19c2f..0000000
--- a/gateway/target/lib/jackson-module-parameter-names-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/javax.annotation-api-1.3.2.jar b/gateway/target/lib/javax.annotation-api-1.3.2.jar
deleted file mode 100644
index a8a470a..0000000
--- a/gateway/target/lib/javax.annotation-api-1.3.2.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/javax.el-3.0.0.jar b/gateway/target/lib/javax.el-3.0.0.jar
deleted file mode 100644
index 9ac6e61..0000000
--- a/gateway/target/lib/javax.el-3.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/javax.inject-1.jar b/gateway/target/lib/javax.inject-1.jar
deleted file mode 100644
index b2a9d0b..0000000
--- a/gateway/target/lib/javax.inject-1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jboss-logging-3.3.3.Final.jar b/gateway/target/lib/jboss-logging-3.3.3.Final.jar
deleted file mode 100644
index 91db418..0000000
--- a/gateway/target/lib/jboss-logging-3.3.3.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jersey-apache-client4-1.19.1.jar b/gateway/target/lib/jersey-apache-client4-1.19.1.jar
deleted file mode 100644
index d88eab7..0000000
--- a/gateway/target/lib/jersey-apache-client4-1.19.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jersey-client-1.19.1.jar b/gateway/target/lib/jersey-client-1.19.1.jar
deleted file mode 100644
index 455a7f2..0000000
--- a/gateway/target/lib/jersey-client-1.19.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jersey-core-1.19.1.jar b/gateway/target/lib/jersey-core-1.19.1.jar
deleted file mode 100644
index 8e5185d..0000000
--- a/gateway/target/lib/jersey-core-1.19.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jsr305-3.0.1.jar b/gateway/target/lib/jsr305-3.0.1.jar
deleted file mode 100644
index 021df89..0000000
--- a/gateway/target/lib/jsr305-3.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jsr311-api-1.1.1.jar b/gateway/target/lib/jsr311-api-1.1.1.jar
deleted file mode 100644
index ec8bc81..0000000
--- a/gateway/target/lib/jsr311-api-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/jul-to-slf4j-1.7.28.jar b/gateway/target/lib/jul-to-slf4j-1.7.28.jar
deleted file mode 100644
index 8dd4a00..0000000
--- a/gateway/target/lib/jul-to-slf4j-1.7.28.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/log4j-api-2.11.2.jar b/gateway/target/lib/log4j-api-2.11.2.jar
deleted file mode 100644
index 809773c..0000000
--- a/gateway/target/lib/log4j-api-2.11.2.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/log4j-to-slf4j-2.11.2.jar b/gateway/target/lib/log4j-to-slf4j-2.11.2.jar
deleted file mode 100644
index 4bb1a00..0000000
--- a/gateway/target/lib/log4j-to-slf4j-2.11.2.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/logback-classic-1.2.3.jar b/gateway/target/lib/logback-classic-1.2.3.jar
deleted file mode 100644
index bed00c0..0000000
--- a/gateway/target/lib/logback-classic-1.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/logback-core-1.2.3.jar b/gateway/target/lib/logback-core-1.2.3.jar
deleted file mode 100644
index 487b395..0000000
--- a/gateway/target/lib/logback-core-1.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/nacos-api-1.1.1.jar b/gateway/target/lib/nacos-api-1.1.1.jar
deleted file mode 100644
index c02de15..0000000
--- a/gateway/target/lib/nacos-api-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/nacos-client-1.1.1.jar b/gateway/target/lib/nacos-client-1.1.1.jar
deleted file mode 100644
index 0c1e74d..0000000
--- a/gateway/target/lib/nacos-client-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/nacos-common-1.1.1.jar b/gateway/target/lib/nacos-common-1.1.1.jar
deleted file mode 100644
index 27e41d7..0000000
--- a/gateway/target/lib/nacos-common-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netflix-commons-util-0.3.0.jar b/gateway/target/lib/netflix-commons-util-0.3.0.jar
deleted file mode 100644
index ad881f3..0000000
--- a/gateway/target/lib/netflix-commons-util-0.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netflix-statistics-0.1.1.jar b/gateway/target/lib/netflix-statistics-0.1.1.jar
deleted file mode 100644
index e8f6d95..0000000
--- a/gateway/target/lib/netflix-statistics-0.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-buffer-4.1.39.Final.jar b/gateway/target/lib/netty-buffer-4.1.39.Final.jar
deleted file mode 100644
index 8cc1936..0000000
--- a/gateway/target/lib/netty-buffer-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-codec-4.1.39.Final.jar b/gateway/target/lib/netty-codec-4.1.39.Final.jar
deleted file mode 100644
index 295a8bb..0000000
--- a/gateway/target/lib/netty-codec-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-codec-http-4.1.39.Final.jar b/gateway/target/lib/netty-codec-http-4.1.39.Final.jar
deleted file mode 100644
index db5f31d..0000000
--- a/gateway/target/lib/netty-codec-http-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-codec-http2-4.1.39.Final.jar b/gateway/target/lib/netty-codec-http2-4.1.39.Final.jar
deleted file mode 100644
index bca274a..0000000
--- a/gateway/target/lib/netty-codec-http2-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-codec-socks-4.1.39.Final.jar b/gateway/target/lib/netty-codec-socks-4.1.39.Final.jar
deleted file mode 100644
index e57a9bb..0000000
--- a/gateway/target/lib/netty-codec-socks-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-common-4.1.39.Final.jar b/gateway/target/lib/netty-common-4.1.39.Final.jar
deleted file mode 100644
index 2feecd9..0000000
--- a/gateway/target/lib/netty-common-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-handler-4.1.39.Final.jar b/gateway/target/lib/netty-handler-4.1.39.Final.jar
deleted file mode 100644
index 1e294bc..0000000
--- a/gateway/target/lib/netty-handler-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-handler-proxy-4.1.39.Final.jar b/gateway/target/lib/netty-handler-proxy-4.1.39.Final.jar
deleted file mode 100644
index 55d03fd..0000000
--- a/gateway/target/lib/netty-handler-proxy-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-resolver-4.1.39.Final.jar b/gateway/target/lib/netty-resolver-4.1.39.Final.jar
deleted file mode 100644
index 8c2ffc6..0000000
--- a/gateway/target/lib/netty-resolver-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-transport-4.1.39.Final.jar b/gateway/target/lib/netty-transport-4.1.39.Final.jar
deleted file mode 100644
index f5029b9..0000000
--- a/gateway/target/lib/netty-transport-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-transport-native-epoll-4.1.39.Final-linux-x86_64.jar b/gateway/target/lib/netty-transport-native-epoll-4.1.39.Final-linux-x86_64.jar
deleted file mode 100644
index 77fa17b..0000000
--- a/gateway/target/lib/netty-transport-native-epoll-4.1.39.Final-linux-x86_64.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/netty-transport-native-unix-common-4.1.39.Final.jar b/gateway/target/lib/netty-transport-native-unix-common-4.1.39.Final.jar
deleted file mode 100644
index 1488aca..0000000
--- a/gateway/target/lib/netty-transport-native-unix-common-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/nio-multipart-parser-1.1.0.jar b/gateway/target/lib/nio-multipart-parser-1.1.0.jar
deleted file mode 100644
index 827ce23..0000000
--- a/gateway/target/lib/nio-multipart-parser-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/nio-stream-storage-1.1.3.jar b/gateway/target/lib/nio-stream-storage-1.1.3.jar
deleted file mode 100644
index 7993a4b..0000000
--- a/gateway/target/lib/nio-stream-storage-1.1.3.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/reactive-streams-1.0.3.jar b/gateway/target/lib/reactive-streams-1.0.3.jar
deleted file mode 100644
index b9b487c..0000000
--- a/gateway/target/lib/reactive-streams-1.0.3.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/reactor-core-3.2.12.RELEASE.jar b/gateway/target/lib/reactor-core-3.2.12.RELEASE.jar
deleted file mode 100644
index 382704a..0000000
--- a/gateway/target/lib/reactor-core-3.2.12.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/reactor-extra-3.2.3.RELEASE.jar b/gateway/target/lib/reactor-extra-3.2.3.RELEASE.jar
deleted file mode 100644
index 54a04e5..0000000
--- a/gateway/target/lib/reactor-extra-3.2.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/reactor-netty-0.8.11.RELEASE.jar b/gateway/target/lib/reactor-netty-0.8.11.RELEASE.jar
deleted file mode 100644
index fae7bdf..0000000
--- a/gateway/target/lib/reactor-netty-0.8.11.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/ribbon-2.3.0.jar b/gateway/target/lib/ribbon-2.3.0.jar
deleted file mode 100644
index 76cad0c..0000000
--- a/gateway/target/lib/ribbon-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/ribbon-core-2.3.0.jar b/gateway/target/lib/ribbon-core-2.3.0.jar
deleted file mode 100644
index 7e41f1a..0000000
--- a/gateway/target/lib/ribbon-core-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/ribbon-httpclient-2.3.0.jar b/gateway/target/lib/ribbon-httpclient-2.3.0.jar
deleted file mode 100644
index a3305ac..0000000
--- a/gateway/target/lib/ribbon-httpclient-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/ribbon-loadbalancer-2.3.0.jar b/gateway/target/lib/ribbon-loadbalancer-2.3.0.jar
deleted file mode 100644
index a179977..0000000
--- a/gateway/target/lib/ribbon-loadbalancer-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/ribbon-transport-2.3.0.jar b/gateway/target/lib/ribbon-transport-2.3.0.jar
deleted file mode 100644
index dfb7da4..0000000
--- a/gateway/target/lib/ribbon-transport-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/rxjava-1.3.8.jar b/gateway/target/lib/rxjava-1.3.8.jar
deleted file mode 100644
index 3b8b9e4..0000000
--- a/gateway/target/lib/rxjava-1.3.8.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/rxnetty-0.4.9.jar b/gateway/target/lib/rxnetty-0.4.9.jar
deleted file mode 100644
index ee2bdf6..0000000
--- a/gateway/target/lib/rxnetty-0.4.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/rxnetty-contexts-0.4.9.jar b/gateway/target/lib/rxnetty-contexts-0.4.9.jar
deleted file mode 100644
index 90edb47..0000000
--- a/gateway/target/lib/rxnetty-contexts-0.4.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/rxnetty-servo-0.4.9.jar b/gateway/target/lib/rxnetty-servo-0.4.9.jar
deleted file mode 100644
index 7899d18..0000000
--- a/gateway/target/lib/rxnetty-servo-0.4.9.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/servo-core-0.12.21.jar b/gateway/target/lib/servo-core-0.12.21.jar
deleted file mode 100644
index 731431d..0000000
--- a/gateway/target/lib/servo-core-0.12.21.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/simpleclient-0.5.0.jar b/gateway/target/lib/simpleclient-0.5.0.jar
deleted file mode 100644
index c7a24c6..0000000
--- a/gateway/target/lib/simpleclient-0.5.0.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/slf4j-api-1.7.28.jar b/gateway/target/lib/slf4j-api-1.7.28.jar
deleted file mode 100644
index 94e7902..0000000
--- a/gateway/target/lib/slf4j-api-1.7.28.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/snakeyaml-1.23.jar b/gateway/target/lib/snakeyaml-1.23.jar
deleted file mode 100644
index adcef4f..0000000
--- a/gateway/target/lib/snakeyaml-1.23.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-aop-5.1.9.RELEASE.jar b/gateway/target/lib/spring-aop-5.1.9.RELEASE.jar
deleted file mode 100644
index 0110e7b..0000000
--- a/gateway/target/lib/spring-aop-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-beans-5.1.9.RELEASE.jar b/gateway/target/lib/spring-beans-5.1.9.RELEASE.jar
deleted file mode 100644
index fbae4d6..0000000
--- a/gateway/target/lib/spring-beans-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-2.1.8.RELEASE.jar
deleted file mode 100644
index 91cafab..0000000
--- a/gateway/target/lib/spring-boot-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-autoconfigure-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-autoconfigure-2.1.8.RELEASE.jar
deleted file mode 100644
index 5f9c0b0..0000000
--- a/gateway/target/lib/spring-boot-autoconfigure-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-starter-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-starter-2.1.8.RELEASE.jar
deleted file mode 100644
index 108ec36..0000000
--- a/gateway/target/lib/spring-boot-starter-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-starter-json-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-starter-json-2.1.8.RELEASE.jar
deleted file mode 100644
index dd95ac9..0000000
--- a/gateway/target/lib/spring-boot-starter-json-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-starter-logging-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-starter-logging-2.1.8.RELEASE.jar
deleted file mode 100644
index b3e5089..0000000
--- a/gateway/target/lib/spring-boot-starter-logging-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-starter-reactor-netty-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-starter-reactor-netty-2.1.8.RELEASE.jar
deleted file mode 100644
index d90adcd..0000000
--- a/gateway/target/lib/spring-boot-starter-reactor-netty-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-boot-starter-webflux-2.1.8.RELEASE.jar b/gateway/target/lib/spring-boot-starter-webflux-2.1.8.RELEASE.jar
deleted file mode 100644
index 1ac1132..0000000
--- a/gateway/target/lib/spring-boot-starter-webflux-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar b/gateway/target/lib/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar
deleted file mode 100644
index d1c519d..0000000
--- a/gateway/target/lib/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-commons-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-commons-2.1.3.RELEASE.jar
deleted file mode 100644
index 7d834de..0000000
--- a/gateway/target/lib/spring-cloud-commons-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-context-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-context-2.1.3.RELEASE.jar
deleted file mode 100644
index 1dc53b4..0000000
--- a/gateway/target/lib/spring-cloud-context-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-gateway-core-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-gateway-core-2.1.3.RELEASE.jar
deleted file mode 100644
index 9bfcf8b..0000000
--- a/gateway/target/lib/spring-cloud-gateway-core-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-netflix-archaius-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-netflix-archaius-2.1.3.RELEASE.jar
deleted file mode 100644
index 2bacf11..0000000
--- a/gateway/target/lib/spring-cloud-netflix-archaius-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-netflix-ribbon-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-netflix-ribbon-2.1.3.RELEASE.jar
deleted file mode 100644
index 1094036..0000000
--- a/gateway/target/lib/spring-cloud-netflix-ribbon-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-starter-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-starter-2.1.3.RELEASE.jar
deleted file mode 100644
index adc47b9..0000000
--- a/gateway/target/lib/spring-cloud-starter-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-starter-alibaba-nacos-discovery-2.1.0.RELEASE.jar b/gateway/target/lib/spring-cloud-starter-alibaba-nacos-discovery-2.1.0.RELEASE.jar
deleted file mode 100644
index babe87f..0000000
--- a/gateway/target/lib/spring-cloud-starter-alibaba-nacos-discovery-2.1.0.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-starter-gateway-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-starter-gateway-2.1.3.RELEASE.jar
deleted file mode 100644
index 2eb489a..0000000
--- a/gateway/target/lib/spring-cloud-starter-gateway-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-starter-netflix-archaius-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-starter-netflix-archaius-2.1.3.RELEASE.jar
deleted file mode 100644
index 203946c..0000000
--- a/gateway/target/lib/spring-cloud-starter-netflix-archaius-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-cloud-starter-netflix-ribbon-2.1.3.RELEASE.jar b/gateway/target/lib/spring-cloud-starter-netflix-ribbon-2.1.3.RELEASE.jar
deleted file mode 100644
index 4a4df17..0000000
--- a/gateway/target/lib/spring-cloud-starter-netflix-ribbon-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-context-5.1.9.RELEASE.jar b/gateway/target/lib/spring-context-5.1.9.RELEASE.jar
deleted file mode 100644
index 3a5f4d0..0000000
--- a/gateway/target/lib/spring-context-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-core-5.1.9.RELEASE.jar b/gateway/target/lib/spring-core-5.1.9.RELEASE.jar
deleted file mode 100644
index b6c0ea6..0000000
--- a/gateway/target/lib/spring-core-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-expression-5.1.9.RELEASE.jar b/gateway/target/lib/spring-expression-5.1.9.RELEASE.jar
deleted file mode 100644
index 2d04615..0000000
--- a/gateway/target/lib/spring-expression-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-jcl-5.1.9.RELEASE.jar b/gateway/target/lib/spring-jcl-5.1.9.RELEASE.jar
deleted file mode 100644
index f47ef26..0000000
--- a/gateway/target/lib/spring-jcl-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-security-crypto-5.1.6.RELEASE.jar b/gateway/target/lib/spring-security-crypto-5.1.6.RELEASE.jar
deleted file mode 100644
index 27f6201..0000000
--- a/gateway/target/lib/spring-security-crypto-5.1.6.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-security-rsa-1.0.7.RELEASE.jar b/gateway/target/lib/spring-security-rsa-1.0.7.RELEASE.jar
deleted file mode 100644
index 67996ea..0000000
--- a/gateway/target/lib/spring-security-rsa-1.0.7.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-web-5.1.9.RELEASE.jar b/gateway/target/lib/spring-web-5.1.9.RELEASE.jar
deleted file mode 100644
index 6f5e889..0000000
--- a/gateway/target/lib/spring-web-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/spring-webflux-5.1.9.RELEASE.jar b/gateway/target/lib/spring-webflux-5.1.9.RELEASE.jar
deleted file mode 100644
index 2cd0330..0000000
--- a/gateway/target/lib/spring-webflux-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/lib/validation-api-2.0.1.Final.jar b/gateway/target/lib/validation-api-2.0.1.Final.jar
deleted file mode 100644
index 2368e10..0000000
--- a/gateway/target/lib/validation-api-2.0.1.Final.jar
+++ /dev/null
Binary files differ
diff --git a/gateway/target/maven-archiver/pom.properties b/gateway/target/maven-archiver/pom.properties
deleted file mode 100644
index 0c2f8af..0000000
--- a/gateway/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=gateway
-groupId=com.mes
-version=1.0.0
diff --git a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index c8a88a2..0000000
--- a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-com\mes\GatewayApplication.class
-com\mes\config\MyCorsConfig.class
diff --git a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index be5c3af..0000000
--- a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-D:\work\PlcTaskSend\gateway\src\main\java\com\mes\GatewayApplication.java
-D:\work\PlcTaskSend\gateway\src\main\java\com\mes\config\MyCorsConfig.java
diff --git a/mes-common/communication/target/classes/JsonFile/Edg.json b/mes-common/communication/target/classes/JsonFile/Edg.json
deleted file mode 100644
index 01c0091..0000000
--- a/mes-common/communication/target/classes/JsonFile/Edg.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "parameters": [
- {
- "serialNumber": 0,
- "content": "PLC璇锋眰",
- "codeId": "plcRequest",
- "plcDataType": "Word",
- "fontLocation": 0,
- "length": 2,
- "ratio": 1,
- "scale": 10,
- "address": "S7.DB8.DBW0",
- "remarks": ""
- },
- {
- "serialNumber": 1,
- "content": "Mes鍙戦�佸瓧",
- "codeId": "mesSend",
- "plcDataType": "Word",
- "fontLocation": 18,
- "length": 2,
- "ratio": 1,
- "scale": 10,
- "address": "S7.DB8.DBW2",
- "remarks": ""
- },
- {
- "serialNumber": 2,
- "content": "MES鍙戦�侀暱",
- "codeId": "width",
- "plcDataType": "Word",
- "fontLocation": 20,
- "length": 2,
- "ratio": 11,
- "scale": 11,
- "address": "S7.DB8.DBW4",
- "remarks": ""
- },
- {
- "serialNumber": 11,
- "content": "MES鍙戦�佸",
- "codeId": "height",
- "plcDataType": "Word",
- "fontLocation": 22,
- "length": 2,
- "ratio": 12,
- "scale": 12,
- "address":"S7.DB8.DBW6",
- "remarks": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/JsonFile/EdgLogicHttp.json b/mes-common/communication/target/classes/JsonFile/EdgLogicHttp.json
deleted file mode 100644
index e79c601..0000000
--- a/mes-common/communication/target/classes/JsonFile/EdgLogicHttp.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
- "logics": [
- {
- "name":"璇锋眰閫昏緫",
- "sequence":"1",
- "apiConfigBefore": {
- "codeId": "loadSelect",
- "type": "Http",
- "address": "http://localhost:8082/account/testApi",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcRequest",
- "value": [1]
- },
- {
- "codeId": "mesSend",
- "value": [0]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesSend",
- "fixed": true,
- "value": 1
- },
- {
- "codeId": "width",
- "fixed": false,
- "value": 1
- }
- ,
- {
- "codeId": "height",
- "fixed": false,
- "value": 2
- }
- ]
- },
- {
- "name":"璇锋眰娓呯┖",
- "sequence":"2",
- "apiConfigBefore": {
- "codeId": "",
- "type": "View",
- "address": "viewname",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcRequest",
- "value": [0]
- },
- {
- "codeId": "mesSend",
- "value": [1]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesSend",
- "fixed": true,
- "value": 0
- },
- {
- "codeId": "width",
- "fixed": true,
- "value": 0
- },
- {
- "codeId": "height",
- "fixed": true,
- "value": 0
- }
- ]
- },
- {
- "name":"瀹屾垚閫昏緫",
- "sequence":"3",
- "apiConfigBefore": {
- "codeId": "edgSelect",
- "type": "View",
- "address": "viewname",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcComplete",
- "value": [1]
- },
- {
- "codeId": "mesComplete",
- "value": [0]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesComplete",
- "fixed": true,
- "value": 1
- }
- ]
- },
- {
- "name":"瀹屾垚娓呯┖",
- "sequence":"4",
- "apiConfigBefore": {
- "codeId": "edgSelect",
- "type": "View",
- "address": "viewname",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcComplete",
- "value": [0]
- },
- {
- "codeId": "mesComplete",
- "value": [1,2,3]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesComplete",
- "fixed": true,
- "value": 0
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/JsonFile/EdgLogicProcedure.json b/mes-common/communication/target/classes/JsonFile/EdgLogicProcedure.json
deleted file mode 100644
index 31cdd26..0000000
--- a/mes-common/communication/target/classes/JsonFile/EdgLogicProcedure.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "logics": [
- {
- "name":"璇锋眰閫昏緫",
- "sequence":"1",
- "apiConfigBefore": {
- "codeId": "edgSelect",
- "type": "Procedure",
- "address": "testProcedure",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcRequest",
- "value": [1]
- },
- {
- "codeId": "mesSend",
- "value": [0]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesSend",
- "address": "S7.DB8.DBW2",
- "fixed": true,
- "value": 1,
- "plcDataType": "int",
- "length": 2
- },
- {
- "codeId": "width",
- "address": "S7.DB8.DBW4",
- "fixed": false,
- "value": 1,
- "plcDataType": "int",
- "length": 2
- }
- ,
- {
- "codeId": "height",
- "address": "S7.DB8.DBW6",
- "fixed": false,
- "value": 2,
- "plcDataType": "int",
- "length": 2
- }
- ]
- },
- {
- "name":"璇锋眰娓呯┖",
- "sequence":"2",
- "apiConfigBefore": {
- "codeId": "edgSelect",
- "type": "View",
- "address": "viewname",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcRequest",
- "value": [0]
- },
- {
- "codeId": "mesSend",
- "value": [1]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesSend",
- "fixed": true,
- "value": 0
- },
- {
- "codeId": "width",
- "fixed": true,
- "value": 0
- },
- {
- "codeId": "height",
- "fixed": true,
- "value": 0
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/JsonFile/EdgLogicView.json b/mes-common/communication/target/classes/JsonFile/EdgLogicView.json
deleted file mode 100644
index 9cd2552..0000000
--- a/mes-common/communication/target/classes/JsonFile/EdgLogicView.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- "logics": [
- {
- "name":"璇锋眰閫昏緫",
- "sequence":"1",
- "apiConfigBefore": {
- "codeId": "edgSelect",
- "type": "View",
- "address": "viewname"
- },
- "apiConfigAfter": {
- "codeId": "edgSelect",
- "type": "Http",
- "address": "http://localhost:8082/account/testApi",
- "parameters": {
- "method": "POST"
- }
- },
- "logic":[
- {
- "codeId": "plcRequest",
- "value": [1]
- },
- {
- "codeId": "mesSend",
- "value": [0]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesSend",
- "address": "S7.DB8.DBW2",
- "fixed": true,
- "value": 1,
- "plcDataType": "int",
- "length": 2
- },
- {
- "codeId": "width",
- "address": "S7.DB8.DBW4",
- "fixed": false,
- "value": 1,
- "plcDataType": "int",
- "length": 2
- }
- ,
- {
- "codeId": "height",
- "address": "S7.DB8.DBW6",
- "fixed": false,
- "value": 2,
- "plcDataType": "int",
- "length": 2
- }
- ]
- },
- {
- "name":"璇锋眰娓呯┖",
- "sequence":"2",
- "logic":[
- {
- "codeId": "plcRequest",
- "value": [0]
- },
- {
- "codeId": "mesSend",
- "value": [1]
- }
- ],
- "returnValue": [
- {
- "codeId": "mesSend",
- "fixed": true,
- "value": 0
- },
- {
- "codeId": "width",
- "fixed": true,
- "value": 0
- },
- {
- "codeId": "height",
- "fixed": true,
- "value": 0
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/JsonFile/ShelfModbusTcp.json b/mes-common/communication/target/classes/JsonFile/ShelfModbusTcp.json
deleted file mode 100644
index 4387aff..0000000
--- a/mes-common/communication/target/classes/JsonFile/ShelfModbusTcp.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
- "parameters": [
- {
- "serialNumber": 0,
- "content": "PLC璇锋眰",
- "codeId": "plcRequest",
- "plcDataType": "Word",
- "fontLocation": 0,
- "length": 2,
- "ratio": 1,
- "scale": 1,
- "address": "MB.4x0001",
- "remarks": ""
- },
- {
- "serialNumber": 1,
- "content": "PLC璇锋眰ID",
- "codeId": "plcRequestId",
- "plcDataType": "Word",
- "fontLocation": 2,
- "length": 2,
- "ratio": 2,
- "scale": 2,
- "address":"MB.4x0002",
- "remarks": ""
- },
- {
- "serialNumber": 2,
- "content": "澶囩敤_1",
- "codeId": "remarks_1",
- "plcDataType": "Word",
- "fontLocation": 4,
- "length": 2,
- "ratio": 3,
- "scale": 3,
- "address": "MB.4x0003",
- "remarks": ""
- },
- {
- "serialNumber": 3,
- "content": "澶囩敤_2",
- "codeId": "remarks_2",
- "plcDataType": "Word",
- "fontLocation": 6,
- "length": 2,
- "ratio": 4,
- "scale": 4,
- "address": "MB.4x0004",
- "remarks": ""
- },
- {
- "serialNumber": 4,
- "content": "PLC瀹屾垚瀛�",
- "codeId": "plcComplete",
- "plcDataType": "Word",
- "fontLocation": 8,
- "length": 2,
- "ratio": 5,
- "scale": 5,
- "address": "MB.4x0005",
- "remarks": ""
- },
- {
- "serialNumber": 5,
- "content": "澶囩敤_4",
- "codeId": "remarks_4",
- "plcDataType": "Word",
- "fontLocation": 10,
- "length": 2,
- "ratio": 6,
- "scale": 6,
- "address": "MB.4x0006",
- "remarks": ""
- },
- {
- "serialNumber": 6,
- "content": "澶囩敤_5",
- "codeId": "remarks_5",
- "plcDataType": "Word",
- "fontLocation": 12,
- "length": 2,
- "ratio": 7,
- "scale": 7,
- "address": "MB.4x0007",
- "remarks": ""
- },
- {
- "serialNumber": 7,
- "content": "澶囩敤_6",
- "codeId": "remarks_6",
- "plcDataType": "Word",
- "fontLocation": 14,
- "length": 2,
- "ratio": 8,
- "scale": 8,
- "address": "MB.4x0008",
- "remarks": ""
- },
- {
- "serialNumber": 8,
- "content": "澶囩敤_7",
- "codeId": "remarks_7",
- "plcDataType": "Word",
- "fontLocation": 16,
- "length": 2,
- "ratio": 9,
- "scale": 9,
- "address": "MB.4x0009",
- "remarks": ""
- },
- {
- "serialNumber": 9,
- "content": "Mes鍙戦�佸瓧",
- "codeId": "mesSend",
- "plcDataType": "Word",
- "fontLocation": 18,
- "length": 2,
- "ratio": 10,
- "scale": 10,
- "address": "MB.4x0010",
- "remarks": ""
- },
- {
- "serialNumber": 10,
- "content": "MES鍙戦�侀暱",
- "codeId": "width",
- "plcDataType": "Word",
- "fontLocation": 20,
- "length": 2,
- "ratio": 11,
- "scale": 11,
- "address": "MB.4x0011",
- "remarks": ""
- },
- {
- "serialNumber": 11,
- "content": "MES鍙戦�佸",
- "codeId": "height",
- "plcDataType": "Word",
- "fontLocation": 22,
- "length": 2,
- "ratio": 12,
- "scale": 12,
- "address":"MB.4x0012",
- "remarks": ""
- },
- {
- "serialNumber": 12,
- "content": "G3M7璁惧鐘舵��",
- "codeId": "13",
- "plcDataType": "Word",
- "fontLocation": 24,
- "length": 2,
- "ratio": 13,
- "scale": 13,
- "address": "MB.4x0013",
- "remarks": ""
- },
- {
- "serialNumber": 13,
- "content": "Z12璁惧鐘舵��",
- "codeId": "14",
- "plcDataType": "Word",
- "fontLocation": 26,
- "length": 2,
- "ratio": 14,
- "scale": 14,
- "address": "MB.4x0014",
- "remarks": ""
- },
- {
- "serialNumber": 14,
- "content": "S8璁惧鐘舵��",
- "codeId": "15",
- "plcDataType": "Word",
- "fontLocation": 28,
- "length": 2,
- "ratio": 15,
- "scale": 15,
- "address": "MB.4x0015",
- "remarks": ""
- },
- {
- "serialNumber": 15,
- "content": "W11瀹氫綅鍙拌澶囩姸鎬�",
- "codeId": "16",
- "plcDataType": "Word",
- "fontLocation": 30,
- "length": 2,
- "ratio": 16,
- "scale": 16,
- "address": "MB.4x0016",
- "remarks": ""
- },
- {
- "serialNumber": 16,
- "content": "S9璁惧鐘舵��",
- "codeId": "17",
- "plcDataType": "Word",
- "fontLocation": 32,
- "length": 2,
- "ratio": 17,
- "scale": 17,
- "address": "MB.4x0017",
- "remarks": ""
- },
- {
- "serialNumber": 17,
- "content": "S10璁惧鐘舵��",
- "codeId": "18",
- "plcDataType": "Word",
- "fontLocation": 34,
- "length": 2,
- "ratio": 18,
- "scale": 18,
- "address": "MB.4x0018",
- "remarks": ""
- },
- {
- "serialNumber": 19,
- "content": "S10璁惧鐘舵��",
- "codeId": "19",
- "plcDataType": "Word",
- "fontLocation": 34,
- "length": 2,
- "ratio": 18,
- "scale": 18,
- "address": "MB.4x0018",
- "remarks": ""
- },
- {
- "serialNumber": 20,
- "content": "mes纭瀹屾垚",
- "codeId": "mesComplete",
- "plcDataType": "Word",
- "fontLocation": 40,
- "length": 2,
- "ratio": 10,
- "scale": 10,
- "address": "MB.4x0020",
- "remarks": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/JsonFile/ShelfS7.json b/mes-common/communication/target/classes/JsonFile/ShelfS7.json
deleted file mode 100644
index d63455b..0000000
--- a/mes-common/communication/target/classes/JsonFile/ShelfS7.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
- "parameters": [
- {
- "serialNumber": 0,
- "content": "PLC璇锋眰",
- "codeId": "plcRequest",
- "plcDataType": "Word",
- "fontLocation": 0,
- "length": 2,
- "ratio": 1,
- "scale": 1,
- "address": "S7.DB8.DBW0",
- "remarks": ""
- },
- {
- "serialNumber": 1,
- "content": "PLC璇锋眰ID",
- "codeId": "plcRequestId",
- "plcDataType": "Word",
- "fontLocation": 2,
- "length": 2,
- "ratio": 2,
- "scale": 2,
- "address":"S7.DB8.DBW2",
- "remarks": ""
- },
- {
- "serialNumber": 2,
- "content": "澶囩敤_1",
- "codeId": "remarks_1",
- "plcDataType": "Word",
- "fontLocation": 4,
- "length": 2,
- "ratio": 3,
- "scale": 3,
- "address": "S7.DB8.DBW4",
- "remarks": ""
- },
- {
- "serialNumber": 3,
- "content": "澶囩敤_2",
- "codeId": "remarks_2",
- "plcDataType": "Word",
- "fontLocation": 6,
- "length": 2,
- "ratio": 4,
- "scale": 4,
- "address": "S7.DB8.DBW6",
- "remarks": ""
- },
- {
- "serialNumber": 4,
- "content": "PLC瀹屾垚瀛�",
- "codeId": "plcComplete",
- "plcDataType": "Word",
- "fontLocation": 10,
- "length": 2,
- "ratio": 5,
- "scale": 5,
- "address": "S7.DB8.DBW10",
- "remarks": ""
- },
- {
- "serialNumber": 5,
- "content": "澶囩敤_4",
- "codeId": "remarks_4",
- "plcDataType": "Word",
- "fontLocation": 10,
- "length": 2,
- "ratio": 6,
- "scale": 6,
- "address": "S7.DB8.DBW12",
- "remarks": ""
- },
- {
- "serialNumber": 6,
- "content": "澶囩敤_5",
- "codeId": "remarks_5",
- "plcDataType": "Word",
- "fontLocation": 12,
- "length": 2,
- "ratio": 7,
- "scale": 7,
- "address": "S7.DB8.DBW14",
- "remarks": ""
- },
- {
- "serialNumber": 7,
- "content": "澶囩敤_6",
- "codeId": "remarks_6",
- "plcDataType": "Word",
- "fontLocation": 14,
- "length": 2,
- "ratio": 8,
- "scale": 8,
- "address": "S7.DB8.DBW16",
- "remarks": ""
- },
- {
- "serialNumber": 8,
- "content": "澶囩敤_7",
- "codeId": "remarks_7",
- "plcDataType": "Word",
- "fontLocation": 16,
- "length": 2,
- "ratio": 9,
- "scale": 9,
- "address": "S7.DB8.DBW18",
- "remarks": ""
- },
- {
- "serialNumber": 9,
- "content": "Mes鍙戦�佸瓧",
- "codeId": "mesSend",
- "plcDataType": "Word",
- "fontLocation": 18,
- "length": 2,
- "ratio": 10,
- "scale": 10,
- "address": "S7.DB8.DBW20",
- "remarks": ""
- },
- {
- "serialNumber": 10,
- "content": "MES鍙戦�侀暱",
- "codeId": "width",
- "plcDataType": "Word",
- "fontLocation": 20,
- "length": 2,
- "ratio": 11,
- "scale": 11,
- "address": "S7.DB8.DBW22",
- "remarks": ""
- },
- {
- "serialNumber": 11,
- "content": "MES鍙戦�佸",
- "codeId": "height",
- "plcDataType": "Word",
- "fontLocation": 22,
- "length": 2,
- "ratio": 12,
- "scale": 12,
- "address":"S7.DB8.DBW24",
- "remarks": ""
- },
- {
- "serialNumber": 12,
- "content": "G3M7璁惧鐘舵��",
- "codeId": "13",
- "plcDataType": "Word",
- "fontLocation": 24,
- "length": 2,
- "ratio": 13,
- "scale": 13,
- "address": "S7.DB8.DBW26",
- "remarks": ""
- },
- {
- "serialNumber": 13,
- "content": "Z12璁惧鐘舵��",
- "codeId": "14",
- "plcDataType": "Word",
- "fontLocation": 26,
- "length": 2,
- "ratio": 14,
- "scale": 14,
- "address": "S7.DB8.DBW28",
- "remarks": ""
- },
- {
- "serialNumber": 14,
- "content": "S8璁惧鐘舵��",
- "codeId": "15",
- "plcDataType": "Word",
- "fontLocation": 28,
- "length": 2,
- "ratio": 15,
- "scale": 15,
- "address": "S7.DB8.DBW30",
- "remarks": ""
- },
- {
- "serialNumber": 15,
- "content": "W11瀹氫綅鍙拌澶囩姸鎬�",
- "codeId": "16",
- "plcDataType": "Word",
- "fontLocation": 30,
- "length": 2,
- "ratio": 16,
- "scale": 16,
- "address": "S7.DB8.DBW32",
- "remarks": ""
- },
- {
- "serialNumber": 16,
- "content": "S9璁惧鐘舵��",
- "codeId": "17",
- "plcDataType": "Word",
- "fontLocation": 32,
- "length": 2,
- "ratio": 17,
- "scale": 17,
- "address": "S7.DB8.DBW34",
- "remarks": ""
- },
- {
- "serialNumber": 17,
- "content": "S10璁惧鐘舵��",
- "codeId": "18",
- "plcDataType": "Word",
- "fontLocation": 34,
- "length": 2,
- "ratio": 18,
- "scale": 18,
- "address": "S7.DB8.DBW36",
- "remarks": ""
- },
- {
- "serialNumber": 19,
- "content": "S10璁惧鐘舵��",
- "codeId": "19",
- "plcDataType": "Word",
- "fontLocation": 34,
- "length": 2,
- "ratio": 18,
- "scale": 18,
- "address": "S7.DB8.DBW38",
- "remarks": ""
- },
- {
- "serialNumber": 20,
- "content": "mes纭瀹屾垚",
- "codeId": "mesComplete",
- "plcDataType": "Word",
- "fontLocation": 40,
- "length": 2,
- "ratio": 10,
- "scale": 10,
- "address": "S7.DB8.DBW40",
- "remarks": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/application-cz.yml b/mes-common/communication/target/classes/application-cz.yml
deleted file mode 100644
index 49ee448..0000000
--- a/mes-common/communication/target/classes/application-cz.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-spring:
- datasource:
- dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- hangzhoumes:
- url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://192.168.1.199:3306/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- salve_hangzhoumes:
- url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes
- username: sa
- password: beibo.123/
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- cloud:
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
- application:
- name: deviceInteraction
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: 123456
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/application-dev.yml b/mes-common/communication/target/classes/application-dev.yml
deleted file mode 100644
index 618f60d..0000000
--- a/mes-common/communication/target/classes/application-dev.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-spring:
- datasource:
- dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- salve_hangzhoumes:
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
- username: sa
- password: beibo.123/
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- cloud:
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
- application:
- name: deviceInteraction
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: 123456
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/application-prod.yml b/mes-common/communication/target/classes/application-prod.yml
deleted file mode 100644
index 0af260b..0000000
--- a/mes-common/communication/target/classes/application-prod.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-spring:
- datasource:
- dynamic:
- primary: mes_machine #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- mes_machine:
- url: jdbc:mysql://localhost:3306/mes_machine?serverTimezone=GMT%2b8&rewriteBatchedStatements=true
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- # salve_JomooKBB:
- # url: jdbc:sqlserver://localhost:1433;databasename=JomooKBB
- # username: sa
- # password: beibo.123/
- # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # salve_JomooKBB:
- # url: jdbc:sqlserver://172.18.19.85:1433;databasename=JomooKBB
- # username: thok
- # password: jomoo@123
- # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- cloud:
- nacos:
- discovery:
- server-addr: localhost:8849
- application:
- name: plcConnect
- redis:
- database: 0
- host: localhost
- port: 6379
- password: 123456
\ No newline at end of file
diff --git a/mes-common/communication/target/classes/application.yml b/mes-common/communication/target/classes/application.yml
deleted file mode 100644
index 385a455..0000000
--- a/mes-common/communication/target/classes/application.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-server:
- port: 8001
- tomcat:
- uri-encoding: UTF-8
- max-threads: 800 #鏈�澶у伐浣滅嚎绋嬫暟閲�
- min-spare-threads: 20 #鏈�灏忓伐浣滅嚎绋嬫暟閲�
- #max-connections: 10000 #涓�鐬棿鏈�澶ф敮鎸佺殑骞跺彂鐨勮繛鎺ユ暟
- accept-count: 200 #绛夊緟闃熷垪闀垮害
-spring:
- profiles:
- active: prod
- application:
- name: deviceInteraction
-mybatis-plus:
- mapper-locations: classpath*:mapper/*.xml
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
diff --git a/mes-common/communication/target/classes/com/mes/AppRunnerConfig.class b/mes-common/communication/target/classes/com/mes/AppRunnerConfig.class
deleted file mode 100644
index 529ba74..0000000
--- a/mes-common/communication/target/classes/com/mes/AppRunnerConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/PlcConnectModuleApplication.class b/mes-common/communication/target/classes/com/mes/PlcConnectModuleApplication.class
deleted file mode 100644
index b86b1c9..0000000
--- a/mes-common/communication/target/classes/com/mes/PlcConnectModuleApplication.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/common/JsonConversion.class b/mes-common/communication/target/classes/com/mes/common/JsonConversion.class
deleted file mode 100644
index be3c675..0000000
--- a/mes-common/communication/target/classes/com/mes/common/JsonConversion.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/common/ReadFile.class b/mes-common/communication/target/classes/com/mes/common/ReadFile.class
deleted file mode 100644
index 5b809c1..0000000
--- a/mes-common/communication/target/classes/com/mes/common/ReadFile.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/common/RestTemplateConfig.class b/mes-common/communication/target/classes/com/mes/common/RestTemplateConfig.class
deleted file mode 100644
index 5fc9e78..0000000
--- a/mes-common/communication/target/classes/com/mes/common/RestTemplateConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/ExampleDataHandler.class b/mes-common/communication/target/classes/com/mes/connect/ExampleDataHandler.class
deleted file mode 100644
index 6e1d82c..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/ExampleDataHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusAddressParser.class b/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusAddressParser.class
deleted file mode 100644
index 1eb5192..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusAddressParser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusIpAddressParser.class b/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusIpAddressParser.class
deleted file mode 100644
index 90617a4..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusIpAddressParser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusRtuAddressParser.class b/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusRtuAddressParser.class
deleted file mode 100644
index 483483a..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/addressparser/ModbusRtuAddressParser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/addressparser/S7OldAddressParser.class b/mes-common/communication/target/classes/com/mes/connect/addressparser/S7OldAddressParser.class
deleted file mode 100644
index 5b1c80d..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/addressparser/S7OldAddressParser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/ApiConfig.class b/mes-common/communication/target/classes/com/mes/connect/entity/ApiConfig.class
deleted file mode 100644
index 6492479..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/ApiConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/Logic.class b/mes-common/communication/target/classes/com/mes/connect/entity/Logic.class
deleted file mode 100644
index 446a7d0..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/Logic.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/LogicConfig.class b/mes-common/communication/target/classes/com/mes/connect/entity/LogicConfig.class
deleted file mode 100644
index 4fb647b..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/LogicConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/LogicItem.class b/mes-common/communication/target/classes/com/mes/connect/entity/LogicItem.class
deleted file mode 100644
index 2daaa1d..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/LogicItem.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/Parameters.class b/mes-common/communication/target/classes/com/mes/connect/entity/Parameters.class
deleted file mode 100644
index 2505033..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/Parameters.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/PlcParameters.class b/mes-common/communication/target/classes/com/mes/connect/entity/PlcParameters.class
deleted file mode 100644
index 171bb48..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/PlcParameters.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/entity/ReturnValue.class b/mes-common/communication/target/classes/com/mes/connect/entity/ReturnValue.class
deleted file mode 100644
index 55a9bf2..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/entity/ReturnValue.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/AddressParser.class b/mes-common/communication/target/classes/com/mes/connect/industrialinterface/AddressParser.class
deleted file mode 100644
index 4104543..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/AddressParser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/ApiImpl.class b/mes-common/communication/target/classes/com/mes/connect/industrialinterface/ApiImpl.class
deleted file mode 100644
index 564cee7..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/ApiImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/ApiService.class b/mes-common/communication/target/classes/com/mes/connect/industrialinterface/ApiService.class
deleted file mode 100644
index 265e17c..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/ApiService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialClient.class b/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialClient.class
deleted file mode 100644
index da55ccc..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialClient.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialDataHandler.class b/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialDataHandler.class
deleted file mode 100644
index 226473f..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialDataHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialServer.class b/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialServer.class
deleted file mode 100644
index d0084aa..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/industrialinterface/IndustrialServer.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusIpClient.class b/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusIpClient.class
deleted file mode 100644
index 050eb6b..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusIpClient.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusIpServer.class b/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusIpServer.class
deleted file mode 100644
index 64e3ce3..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusIpServer.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusTcpClient.class b/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusTcpClient.class
deleted file mode 100644
index f191c5f..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusTcpClient.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusTcpServer.class b/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusTcpServer.class
deleted file mode 100644
index 596c5c9..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/modbus/ModbusTcpServer.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/protocol/ProtocolAddress.class b/mes-common/communication/target/classes/com/mes/connect/protocol/ProtocolAddress.class
deleted file mode 100644
index ba5e66f..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/protocol/ProtocolAddress.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/protocol/ProtocolType.class b/mes-common/communication/target/classes/com/mes/connect/protocol/ProtocolType.class
deleted file mode 100644
index 58580b5..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/protocol/ProtocolType.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/s7/S7ClientOld.class b/mes-common/communication/target/classes/com/mes/connect/s7/S7ClientOld.class
deleted file mode 100644
index 9fc56c1..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/s7/S7ClientOld.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/connect/thread/MachineThread.class b/mes-common/communication/target/classes/com/mes/connect/thread/MachineThread.class
deleted file mode 100644
index f3cebe9..0000000
--- a/mes-common/communication/target/classes/com/mes/connect/thread/MachineThread.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/controller/AccountController.class b/mes-common/communication/target/classes/com/mes/model/controller/AccountController.class
deleted file mode 100644
index 284d46c..0000000
--- a/mes-common/communication/target/classes/com/mes/model/controller/AccountController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/entity/Account.class b/mes-common/communication/target/classes/com/mes/model/entity/Account.class
deleted file mode 100644
index 225ed2c..0000000
--- a/mes-common/communication/target/classes/com/mes/model/entity/Account.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/entity/Machine.class b/mes-common/communication/target/classes/com/mes/model/entity/Machine.class
deleted file mode 100644
index 737bd82..0000000
--- a/mes-common/communication/target/classes/com/mes/model/entity/Machine.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/entity/PlcType.class b/mes-common/communication/target/classes/com/mes/model/entity/PlcType.class
deleted file mode 100644
index dc5a3d9..0000000
--- a/mes-common/communication/target/classes/com/mes/model/entity/PlcType.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/entity/ProtocolType.class b/mes-common/communication/target/classes/com/mes/model/entity/ProtocolType.class
deleted file mode 100644
index f36026e..0000000
--- a/mes-common/communication/target/classes/com/mes/model/entity/ProtocolType.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/AccountMapper.class b/mes-common/communication/target/classes/com/mes/model/mapper/AccountMapper.class
deleted file mode 100644
index 9fd0a6f..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/AccountMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/MachineMapper.class b/mes-common/communication/target/classes/com/mes/model/mapper/MachineMapper.class
deleted file mode 100644
index f45c3a7..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/MachineMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/PlcTypeMapper.class b/mes-common/communication/target/classes/com/mes/model/mapper/PlcTypeMapper.class
deleted file mode 100644
index fafaeaa..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/PlcTypeMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/ProtocolTypeMapper.class b/mes-common/communication/target/classes/com/mes/model/mapper/ProtocolTypeMapper.class
deleted file mode 100644
index 193c54a..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/ProtocolTypeMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/xml/AccountMapper.xml b/mes-common/communication/target/classes/com/mes/model/mapper/xml/AccountMapper.xml
deleted file mode 100644
index d4b9833..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/xml/AccountMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.model.mapper.AccountMapper">
-
-</mapper>
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/xml/MachineMapper.xml b/mes-common/communication/target/classes/com/mes/model/mapper/xml/MachineMapper.xml
deleted file mode 100644
index fe133d2..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/xml/MachineMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.model.mapper.MachineMapper">
-
-</mapper>
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/xml/PlcTypeMapper.xml b/mes-common/communication/target/classes/com/mes/model/mapper/xml/PlcTypeMapper.xml
deleted file mode 100644
index f0dd528..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/xml/PlcTypeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.model.mapper.PlcTypeMapper">
-
-</mapper>
diff --git a/mes-common/communication/target/classes/com/mes/model/mapper/xml/ProtocolTypeMapper.xml b/mes-common/communication/target/classes/com/mes/model/mapper/xml/ProtocolTypeMapper.xml
deleted file mode 100644
index 29019a6..0000000
--- a/mes-common/communication/target/classes/com/mes/model/mapper/xml/ProtocolTypeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.model.mapper.ProtocolTypeMapper">
-
-</mapper>
diff --git a/mes-common/communication/target/classes/com/mes/model/service/AccountService.class b/mes-common/communication/target/classes/com/mes/model/service/AccountService.class
deleted file mode 100644
index e112b7c..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/AccountService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/MachineService.class b/mes-common/communication/target/classes/com/mes/model/service/MachineService.class
deleted file mode 100644
index f15a32c..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/MachineService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/PlcTypeService.class b/mes-common/communication/target/classes/com/mes/model/service/PlcTypeService.class
deleted file mode 100644
index f66b33c..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/PlcTypeService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/ProtocolTypeService.class b/mes-common/communication/target/classes/com/mes/model/service/ProtocolTypeService.class
deleted file mode 100644
index 970d535..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/ProtocolTypeService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/impl/AccountServiceImpl.class b/mes-common/communication/target/classes/com/mes/model/service/impl/AccountServiceImpl.class
deleted file mode 100644
index 3339c06..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/impl/AccountServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/impl/MachineServiceImpl.class b/mes-common/communication/target/classes/com/mes/model/service/impl/MachineServiceImpl.class
deleted file mode 100644
index 0063260..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/impl/MachineServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/impl/PlcTypeServiceImpl.class b/mes-common/communication/target/classes/com/mes/model/service/impl/PlcTypeServiceImpl.class
deleted file mode 100644
index 1d63f2b..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/impl/PlcTypeServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/com/mes/model/service/impl/ProtocolTypeServiceImpl.class b/mes-common/communication/target/classes/com/mes/model/service/impl/ProtocolTypeServiceImpl.class
deleted file mode 100644
index 607caa2..0000000
--- a/mes-common/communication/target/classes/com/mes/model/service/impl/ProtocolTypeServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/classes/logback-spring.xml b/mes-common/communication/target/classes/logback-spring.xml
deleted file mode 100644
index d5e7fdf..0000000
--- a/mes-common/communication/target/classes/logback-spring.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="10 seconds">
- <!-- logger涓婁笅鏂囧悕绉帮紙鏍规嵁涓氬姟淇敼锛� -->
- <contextName>deviceInteraction</contextName>
-
- <!-- 瀹氫箟浜嗕竴涓悕涓簊erverName鐨勫睘鎬э紝瀹冪殑鍊兼潵鑷簬logging.file.name锛屽鏋滄病鏈夋壘鍒拌灞炴�ч粯璁や负MyServerName锛堟牴鎹笟鍔′慨鏀癸級 -->
- <springProperty name="serverName" source="logging.file.name" defaultValue="deviceInteraction"/>
- <springProperty name="logging.path" source="logging.file.path" defaultValue="././logs/"/>
-
- <!-- 褰╄壊鏃ュ織渚濊禆鐨勬覆鏌撶被 -->
- <!-- 瀹氫箟浜嗕竴涓悕涓篶lr鐨勮浆鎹㈣鍒欙紝瀹冧娇鐢╫rg.springframework.boot.logging.logback.ColorConverter绫昏繘琛岃浆鎹紝杩欎釜鍏冪礌閫氬父鐢ㄤ簬灏嗘棩蹇楄緭鍑轰腑鐨勬枃鏈潃鑹诧紝浠ヤ究鏇村鏄撳湴鍖哄垎涓嶅悓鐨勬棩蹇楃骇鍒垨鍏朵粬淇℃伅 -->
- <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
- <!-- WhitespaceThrowableProxyConverter鍜孍xtendedWhitespaceThrowableProxyConverter閮芥槸鐢ㄤ簬灏嗗紓甯镐俊鎭浆鎹负瀛楃涓诧紝骞跺皢鍏朵腑鐨勬崲琛岀鏇挎崲涓虹┖鏍硷紝浠ヤ究鏇村鏄撳湴鍦ㄦ棩蹇楄緭鍑轰腑鏄剧ず鐨勭被銆傚畠浠箣闂寸殑鍖哄埆鍦ㄤ簬锛孍xtendedWhitespaceThrowableProxyConverter鍦ㄨ緭鍑哄紓甯镐俊鎭椂浼氬寘鍚洿澶氱殑璇︾粏淇℃伅锛屼緥濡傚紓甯哥殑绫诲悕銆佹柟娉曞悕鍜岃鍙风瓑 -->
- <!-- 瀹氫箟浜嗕竴涓悕涓簑ex鐨勮浆鎹㈣鍒欙紝瀹冧娇鐢╫rg.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter绫昏繘琛岃浆鎹紝杩欎釜鍏冪礌閫氬父鐢ㄤ簬灏嗗紓甯镐俊鎭浆鎹负瀛楃涓诧紝骞跺皢鍏朵腑鐨勬崲琛岀鏇挎崲涓虹┖鏍硷紝浠ヤ究鏇村鏄撳湴鍦ㄦ棩蹇楄緭鍑轰腑鏄剧ず -->
- <conversionRule conversionWord="wex"
- converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
- <!-- 瀹氫箟浜嗕竴涓悕涓簑Ex鐨勮浆鎹㈣鍒欙紝瀹冧娇鐢╫rg.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter绫昏繘琛岃浆鎹紝杩欎釜鍏冪礌閫氬父鐢ㄤ簬灏嗗紓甯镐俊鎭浆鎹负瀛楃涓诧紝骞跺皢鍏朵腑鐨勬崲琛岀鏇挎崲涓虹┖鏍硷紝浠ヤ究鏇村鏄撳湴鍦ㄦ棩蹇楄緭鍑轰腑鏄剧ず -->
- <conversionRule conversionWord="wEx"
- converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-
- <!-- 褰╄壊鏃ュ織鏍煎紡 -->
- <!-- value鍊兼槸鏃ュ織杈撳嚭妯℃澘锛� :-鏄睘鎬у悕鍜屽叾榛樿鍊间箣闂寸殑鍒嗛殧绗︼紝浣滅敤涓�:鐩稿悓 -->
- <!-- 瀹氫箟鏃ュ織杈撳嚭鏍煎紡鐨勮浆鎹㈣鍒欙紝%d{yyyy-MM-dd HH:mm:ss.SSS}琛ㄧず鏃ユ湡鍜屾椂闂达紝%clr琛ㄧず灏嗚緭鍑烘枃鏈潃鑹诧紝{faint}琛ㄧず浣跨敤娣¤壊 -->
- <!-- %5p琛ㄧず鏃ュ織绾у埆杈撳嚭鍙冲榻愶紝宸﹁竟浠ョ┖鏍煎～鍏� -->
- <!-- ${PID:- }琛ㄧず杩涚▼ID锛�%clr琛ㄧず灏嗚緭鍑烘枃鏈潃鑹诧紝{magenta}琛ㄧず浣跨敤娲嬬孩鑹� -->
- <!-- -琛ㄧず涓�涓垎闅旂 -->
- <!-- %t锛氭樉绀轰骇鐢熻鏃ュ織鐨勭嚎绋嬪悕锛�%15锛氳嫢瀛楃闀垮害灏忎簬15锛屽垯宸﹁竟鐢ㄧ┖鏍煎～鍏咃紱%.15锛氳嫢瀛楃闀垮害瓒呰繃15锛屾埅鍘诲浣欏瓧绗� -->
- <!-- %-40锛氳嫢瀛楃闀垮害灏忎簬40锛屽垯鍙宠竟鐢ㄧ┖鏍煎～鍏咃紱%.40锛氳嫢瀛楃闀垮害瓒呰繃40锛屾埅鍘诲浣欏瓧绗︼紱logger{39}瀵瑰簲鐨勬槸鈥渓ogging.WARNING鈥濈骇鍒�傚叿浣撴潵璇达紝Python鐨刲ogging妯″潡瀹氫箟浜嗕互涓嬪嚑涓骇鍒紙浠庝綆鍒伴珮锛夛細NOTSET銆丏EBUG銆両NFO銆乄ARNING銆丒RROR銆丆RITICAL銆傚洜姝わ紝logger{39}琛ㄧず鐨勬槸WARNING绾у埆锛屽嵆鏃ュ織璁板綍鍣ㄤ細璁板綍鎵�鏈塛ARNING绾у埆鍙婁互涓婄殑鏃ュ織淇℃伅 -->
- <!-- %m琛ㄧず鏃ュ織娑堟伅锛�%n琛ㄧず鎹㈣绗︼紱${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}琛ㄧず寮傚父淇℃伅銆傚鏋滄棩蹇楄緭鍑轰腑鍖呭惈寮傚父淇℃伅锛岃繖涓鍒欏皢浼氬皢鍏惰浆鎹负瀛楃涓诧紝骞跺皢鍏朵腑鐨勬崲琛岀鏇挎崲涓虹┖鏍硷紝浠ヤ究鏇村鏄撳湴鍦ㄦ棩蹇楄緭鍑轰腑鏄剧ず -->
- <property name="CONSOLE_LOG_PATTERN"
- value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
- <!--1. 杈撳嚭鍒版帶鍒跺彴-->
- <!-- 瀹氫箟鎺у埗鍙版棩蹇楄緭鍑虹殑appender锛宑lass="ch.qos.logback.core.ConsoleAppender"琛ㄧず浣跨敤Logback妗嗘灦鎻愪緵鐨凜onsoleAppender绫绘潵杈撳嚭鏃ュ織鍒版帶鍒跺彴 -->
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <!--姝ゆ棩蹇梐ppender鏄负寮�鍙戜娇鐢紝鍙厤缃渶搴曠骇鍒紝鎺у埗鍙拌緭鍑虹殑鏃ュ織绾у埆鏄ぇ浜庢垨绛変簬姝ょ骇鍒殑鏃ュ織淇℃伅-->
- <!-- 瀹氫箟鏃ュ織杈撳嚭绾у埆鐨勮繃婊ゅ櫒锛宑lass="ch.qos.logback.classic.filter.ThresholdFilter"琛ㄧず浣跨敤Logback妗嗘灦鎻愪緵鐨凾hresholdFilter绫绘潵杩囨护鏃ュ織杈撳嚭锛�<level>debug</level>琛ㄧず鍙緭鍑篸ebug绾у埆鍙婁互涓婄殑鏃ュ織 -->
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>debug</level>
- </filter>
- <encoder>
- <!-- ${CONSOLE_LOG_PATTERN}琛ㄧず鎺у埗鍙版棩蹇楄緭鍑烘牸寮忥紝UTF-8琛ㄧず缂栫爜鏍煎紡 -->
- <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
- <!-- 璁剧疆瀛楃闆� -->
- <charset>UTF-8</charset>
- </encoder>
- </appender>
- <!--2. 杈撳嚭鍒版枃妗�-->
- <!-- 2.1 level涓� DEBUG 鏃ュ織锛屾椂闂存粴鍔ㄨ緭鍑� -->
- <!-- 瀹氫箟鏂囦欢鏃ュ織杈撳嚭鐨刟ppender锛宑lass="ch.qos.logback.core.rolling.RollingFileAppender"琛ㄧず浣跨敤Logback妗嗘灦鎻愪緵鐨凴ollingFileAppender绫绘潵杈撳嚭鏃ュ織鍒版枃浠� -->
- <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- 姝ｅ湪璁板綍鐨勬棩蹇楁枃妗ｇ殑璺緞鍙婃枃妗ｅ悕 -->
- <file>${logging.path}/${serverName}/web_debug.log</file>
- <!--鏃ュ織鏂囨。杈撳嚭鏍煎紡-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
- <charset>UTF-8</charset> <!-- 璁剧疆瀛楃闆� -->
- </encoder>
- <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <!-- 瀹氫箟鏃ュ織鏂囦欢婊氬姩绛栫暐鐨勬爣绛撅紝class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"琛ㄧず浣跨敤Logback妗嗘灦鎻愪緵鐨凾imeBasedRollingPolicy绫绘潵瀹氫箟鏃ュ織鏂囦欢鐨勬粴鍔ㄧ瓥鐣� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織褰掓。 -->
- <!-- 瀹氫箟鏃ュ織鏂囦欢鍚嶇殑妯″紡銆傚湪杩欎釜妯″紡涓紝${logging.path}琛ㄧず鏃ュ織鏂囦欢鐨勮矾寰勶紝%d{yyyy-MM-dd}琛ㄧず鏃ユ湡鏍煎紡锛�%i琛ㄧず鏂囦欢绱㈠紩 -->
- <fileNamePattern>${logging.path}/${serverName}/web-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <!-- 瀹氫箟鏃ュ織鏂囦欢婊氬姩绛栫暐鐨勬爣绛撅紝class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"琛ㄧず浣跨敤Logback妗嗘灦鎻愪緵鐨凷izeAndTimeBasedFNATP绫绘潵瀹氫箟鏃ュ織鏂囦欢鐨勬粴鍔ㄧ瓥鐣ワ紝<maxFileSize>100MB</maxFileSize>琛ㄧず鏃ュ織鏂囦欢鐨勬渶澶уぇ灏忎负100MB銆傝繖涓粴鍔ㄧ瓥鐣ラ�氬父鐢ㄤ簬鎸夌収鏃堕棿鍜屾枃浠跺ぇ灏忔粴鍔ㄦ棩蹇楁枃浠讹紝浠ヤ究鏇村ソ鍦扮鐞嗘棩蹇楁枃浠剁殑澶у皬鍜屾暟閲� -->
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--鏃ュ織鏂囨。淇濈暀澶╂暟-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- 姝ゆ棩蹇楁枃妗ｅ彧璁板綍debug绾у埆鐨� -->
- <!-- 瀹氫箟鏃ュ織杈撳嚭绾у埆鐨勮繃婊ゅ櫒銆傚湪杩欎釜杩囨护鍣ㄤ腑锛宑lass="ch.qos.logback.classic.filter.LevelFilter"琛ㄧず浣跨敤Logback妗嗘灦鎻愪緵鐨凩evelFilter绫绘潵杩囨护鏃ュ織杈撳嚭锛�<level>debug</level>琛ㄧず鍙緭鍑篸ebug绾у埆鍙婁互涓婄殑鏃ュ織 -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>debug</level>
- <!-- <onMatch>ACCEPT</onMatch>琛ㄧず濡傛灉鏃ュ織浜嬩欢涓庤繃婊ゅ櫒鍖归厤锛屽垯鎺ュ彈璇ヤ簨浠讹紝<onMismatch>DENY</onMismatch>琛ㄧず濡傛灉鏃ュ織浜嬩欢涓庤繃婊ゅ櫒涓嶅尮閰嶏紝鍒欐嫆缁濊浜嬩欢 -->
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
- <!-- 2.2 level涓� INFO 鏃ュ織锛屾椂闂存粴鍔ㄨ緭鍑� -->
- <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- 姝ｅ湪璁板綍鐨勬棩蹇楁枃妗ｇ殑璺緞鍙婃枃妗ｅ悕 -->
- <file>${logging.path}/${serverName}/web_info.log</file>
- <!--鏃ュ織鏂囨。杈撳嚭鏍煎紡-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 澶╁ぉ鏃ュ織褰掓。璺緞浠ュ強鏍煎紡 -->
- <fileNamePattern>${logging.path}/${serverName}/web-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--鏃ュ織鏂囨。淇濈暀澶╂暟-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- 姝ゆ棩蹇楁枃妗ｅ彧璁板綍info绾у埆鐨� -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>info</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
- <!-- 2.3 level涓� WARN 鏃ュ織锛屾椂闂存粴鍔ㄨ緭鍑� -->
- <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- 姝ｅ湪璁板綍鐨勬棩蹇楁枃妗ｇ殑璺緞鍙婃枃妗ｅ悕 -->
- <file>${logging.path}/${serverName}/web_warn.log</file>
- <!--鏃ュ織鏂囨。杈撳嚭鏍煎紡-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
- <charset>UTF-8</charset> <!-- 姝ゅ璁剧疆瀛楃闆� -->
- </encoder>
- <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logging.path}/${serverName}/web-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--鏃ュ織鏂囨。淇濈暀澶╂暟-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- 姝ゆ棩蹇楁枃妗ｅ彧璁板綍warn绾у埆鐨� -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>warn</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
- <!-- 2.4 level涓� ERROR 鏃ュ織锛屾椂闂存粴鍔ㄨ緭鍑� -->
- <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- 姝ｅ湪璁板綍鐨勬棩蹇楁枃妗ｇ殑璺緞鍙婃枃妗ｅ悕 -->
- <file>${logging.path}/${serverName}/web_error.log</file>
- <!--鏃ュ織鏂囨。杈撳嚭鏍煎紡-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
- <charset>UTF-8</charset> <!-- 姝ゅ璁剧疆瀛楃闆� -->
- </encoder>
- <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logging.path}/${serverName}/web-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--鏃ュ織鏂囨。淇濈暀澶╂暟-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- 姝ゆ棩蹇楁枃妗ｅ彧璁板綍ERROR绾у埆鐨� -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
- <!-- 4.1 寮�鍙戠幆澧�:鎵撳嵃鎺у埗鍙�-->
- <!-- 鐢ㄤ簬鍦⊿pring Boot搴旂敤绋嬪簭涓厤缃棩蹇楄褰曠殑鏍囩銆傚湪杩欎釜鏍囩涓紝name="dev"琛ㄧず杩欎釜閰嶇疆鏂囦欢鍙湪dev鐜涓敓鏁堬紝<logger name="com.myClass.controller" level="debug"/>琛ㄧず涓篶om.myClass.controller锛堟牴鎹笟鍔′慨鏀癸級杩欎釜鍖呬笅鐨勭被閰嶇疆鏃ュ織杈撳嚭绾у埆涓篸ebug -->
- <!-- <springProfile name="dev">-->
- <!-- <logger name="com.myClass.controller" level="debug"/>-->
- <!-- </springProfile>-->
- <!-- 鐢ㄤ簬閰嶇疆鏃ュ織杈撳嚭鐨勬爣绛俱�傚湪杩欎釜鏍囩涓紝level="info"琛ㄧず鏃ュ織杈撳嚭绾у埆涓篿nfo锛�<appender-ref ref="CONSOLE"/>銆�<appender-ref ref="DEBUG_FILE"/>銆�<appender-ref ref="INFO_FILE"/>銆�<appender-ref ref="WARN_FILE"/>銆�<appender-ref ref="ERROR_FILE"/>琛ㄧず灏嗘棩蹇楄緭鍑哄埌涓嶅悓鐨刟ppender涓紝鍒嗗埆涓烘帶鍒跺彴銆乨ebug鏂囦欢銆乮nfo鏂囦欢銆亀arn鏂囦欢鍜宔rror鏂囦欢 -->
- <root level="info">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="DEBUG_FILE"/>
- <appender-ref ref="INFO_FILE"/>
- <appender-ref ref="WARN_FILE"/>
- <appender-ref ref="ERROR_FILE"/>
- </root>
-</configuration>
diff --git a/mes-common/communication/target/communication-1.0.0.jar b/mes-common/communication/target/communication-1.0.0.jar
deleted file mode 100644
index ccc9d3b..0000000
--- a/mes-common/communication/target/communication-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-common/communication/target/maven-archiver/pom.properties b/mes-common/communication/target/maven-archiver/pom.properties
deleted file mode 100644
index f9afc69..0000000
--- a/mes-common/communication/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-version=1.0.0
-groupId=com.mes
-artifactId=communication
diff --git a/mes-common/communication/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mes-common/communication/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 4c00e05..0000000
--- a/mes-common/communication/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,48 +0,0 @@
-com\mes\AppRunnerConfig.class
-com\mes\connect\entity\LogicItem.class
-com\mes\model\service\impl\PlcTypeServiceImpl.class
-com\mes\common\RestTemplateConfig.class
-com\mes\connect\modbus\ModbusTcpServer.class
-com\mes\connect\industrialinterface\IndustrialDataHandler.class
-com\mes\model\mapper\PlcTypeMapper.class
-com\mes\connect\s7\S7ClientOld.class
-com\mes\model\service\impl\ProtocolTypeServiceImpl.class
-com\mes\connect\thread\MachineThread.class
-com\mes\model\service\impl\AccountServiceImpl.class
-com\mes\connect\entity\Logic.class
-com\mes\PlcConnectModuleApplication.class
-com\mes\model\entity\Machine.class
-com\mes\connect\ExampleDataHandler.class
-com\mes\connect\industrialinterface\IndustrialClient.class
-com\mes\common\JsonConversion.class
-com\mes\connect\industrialinterface\AddressParser.class
-com\mes\connect\protocol\ProtocolAddress.class
-com\mes\connect\modbus\ModbusIpClient.class
-com\mes\model\mapper\ProtocolTypeMapper.class
-com\mes\model\service\PlcTypeService.class
-com\mes\connect\entity\LogicConfig.class
-com\mes\model\controller\AccountController.class
-com\mes\connect\addressparser\ModbusRtuAddressParser.class
-com\mes\model\service\MachineService.class
-com\mes\connect\protocol\ProtocolType.class
-com\mes\common\ReadFile.class
-com\mes\connect\industrialinterface\ApiService.class
-com\mes\model\entity\ProtocolType.class
-com\mes\connect\modbus\ModbusTcpClient.class
-com\mes\connect\addressparser\S7OldAddressParser.class
-com\mes\connect\addressparser\ModbusIpAddressParser.class
-com\mes\connect\industrialinterface\ApiImpl.class
-com\mes\model\entity\PlcType.class
-com\mes\model\service\impl\MachineServiceImpl.class
-com\mes\connect\entity\Parameters.class
-com\mes\connect\entity\ApiConfig.class
-com\mes\connect\industrialinterface\IndustrialServer.class
-com\mes\model\service\ProtocolTypeService.class
-com\mes\model\service\AccountService.class
-com\mes\connect\entity\PlcParameters.class
-com\mes\connect\addressparser\ModbusAddressParser.class
-com\mes\connect\modbus\ModbusIpServer.class
-com\mes\model\entity\Account.class
-com\mes\model\mapper\AccountMapper.class
-com\mes\model\mapper\MachineMapper.class
-com\mes\connect\entity\ReturnValue.class
diff --git a/mes-common/communication/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mes-common/communication/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 3db3680..0000000
--- a/mes-common/communication/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,48 +0,0 @@
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\AppRunnerConfig.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\industrialinterface\ApiImpl.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\industrialinterface\IndustrialClient.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\ExampleDataHandler.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\mapper\MachineMapper.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\impl\AccountServiceImpl.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\modbus\ModbusIpServer.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\mapper\PlcTypeMapper.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\mapper\ProtocolTypeMapper.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\s7\S7ClientOld.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\protocol\ProtocolType.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\entity\Machine.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\industrialinterface\ApiService.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\industrialinterface\IndustrialDataHandler.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\entity\PlcType.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\common\JsonConversion.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\impl\MachineServiceImpl.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\ProtocolTypeService.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\modbus\ModbusTcpServer.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\controller\AccountController.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\Parameters.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\entity\Account.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\LogicConfig.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\impl\PlcTypeServiceImpl.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\entity\ProtocolType.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\industrialinterface\IndustrialServer.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\PlcTypeService.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\PlcParameters.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\PlcConnectModuleApplication.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\modbus\ModbusIpClient.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\addressparser\ModbusRtuAddressParser.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\Logic.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\addressparser\ModbusAddressParser.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\common\RestTemplateConfig.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\modbus\ModbusTcpClient.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\ReturnValue.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\industrialinterface\AddressParser.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\LogicItem.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\mapper\AccountMapper.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\thread\MachineThread.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\impl\ProtocolTypeServiceImpl.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\protocol\ProtocolAddress.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\addressparser\ModbusIpAddressParser.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\addressparser\S7OldAddressParser.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\connect\entity\ApiConfig.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\AccountService.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\model\service\MachineService.java
-D:\work\PlcTaskSend\mes-common\communication\src\main\java\com\mes\common\ReadFile.java
diff --git a/mes-common/model/target/classes/com/mes/base/request/BaseRequest.class b/mes-common/model/target/classes/com/mes/base/request/BaseRequest.class
deleted file mode 100644
index 24fd3cc..0000000
--- a/mes-common/model/target/classes/com/mes/base/request/BaseRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/base/request/PageRequest.class b/mes-common/model/target/classes/com/mes/base/request/PageRequest.class
deleted file mode 100644
index 29e8ab7..0000000
--- a/mes-common/model/target/classes/com/mes/base/request/PageRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/base/request/TimeRequest.class b/mes-common/model/target/classes/com/mes/base/request/TimeRequest.class
deleted file mode 100644
index da3906b..0000000
--- a/mes-common/model/target/classes/com/mes/base/request/TimeRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/cutting/history/CutHistoryTask.class b/mes-common/model/target/classes/com/mes/cutting/history/CutHistoryTask.class
deleted file mode 100644
index 3f7ce95..0000000
--- a/mes-common/model/target/classes/com/mes/cutting/history/CutHistoryTask.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/cutting/history/requst/CutTerritoryRequest.class b/mes-common/model/target/classes/com/mes/cutting/history/requst/CutTerritoryRequest.class
deleted file mode 100644
index 3aa95de..0000000
--- a/mes-common/model/target/classes/com/mes/cutting/history/requst/CutTerritoryRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/cutting/history/vo/CutTerritoryVO.class b/mes-common/model/target/classes/com/mes/cutting/history/vo/CutTerritoryVO.class
deleted file mode 100644
index e7192ee..0000000
--- a/mes-common/model/target/classes/com/mes/cutting/history/vo/CutTerritoryVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/cutting/history/vo/CuttingIndexMessageVO.class b/mes-common/model/target/classes/com/mes/cutting/history/vo/CuttingIndexMessageVO.class
deleted file mode 100644
index fdfaabc..0000000
--- a/mes-common/model/target/classes/com/mes/cutting/history/vo/CuttingIndexMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/damage/Damage.class b/mes-common/model/target/classes/com/mes/damage/Damage.class
deleted file mode 100644
index c9a2da9..0000000
--- a/mes-common/model/target/classes/com/mes/damage/Damage.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/damage/dto/DamageDTO.class b/mes-common/model/target/classes/com/mes/damage/dto/DamageDTO.class
deleted file mode 100644
index c8e72ad..0000000
--- a/mes-common/model/target/classes/com/mes/damage/dto/DamageDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/damage/request/DamageReportRequest.class b/mes-common/model/target/classes/com/mes/damage/request/DamageReportRequest.class
deleted file mode 100644
index a972070..0000000
--- a/mes-common/model/target/classes/com/mes/damage/request/DamageReportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/damage/request/DamageRequest.class b/mes-common/model/target/classes/com/mes/damage/request/DamageRequest.class
deleted file mode 100644
index de38c44..0000000
--- a/mes-common/model/target/classes/com/mes/damage/request/DamageRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/damagedetails/DamageDetails.class b/mes-common/model/target/classes/com/mes/damagedetails/DamageDetails.class
deleted file mode 100644
index fb95eac..0000000
--- a/mes-common/model/target/classes/com/mes/damagedetails/DamageDetails.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/history/request/EdgHistoryTaskRequest.class b/mes-common/model/target/classes/com/mes/edging/history/request/EdgHistoryTaskRequest.class
deleted file mode 100644
index eade313..0000000
--- a/mes-common/model/target/classes/com/mes/edging/history/request/EdgHistoryTaskRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/history/request/EdgingRequest.class b/mes-common/model/target/classes/com/mes/edging/history/request/EdgingRequest.class
deleted file mode 100644
index 045f887..0000000
--- a/mes-common/model/target/classes/com/mes/edging/history/request/EdgingRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/job/request/EdgJobRequest.class b/mes-common/model/target/classes/com/mes/edging/job/request/EdgJobRequest.class
deleted file mode 100644
index 923c44a..0000000
--- a/mes-common/model/target/classes/com/mes/edging/job/request/EdgJobRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/queue/EdgQueueInfo.class b/mes-common/model/target/classes/com/mes/edging/queue/EdgQueueInfo.class
deleted file mode 100644
index e19bb24..0000000
--- a/mes-common/model/target/classes/com/mes/edging/queue/EdgQueueInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/queue/request/EdgQueueInfoRequest.class b/mes-common/model/target/classes/com/mes/edging/queue/request/EdgQueueInfoRequest.class
deleted file mode 100644
index c05c5a9..0000000
--- a/mes-common/model/target/classes/com/mes/edging/queue/request/EdgQueueInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/queue/request/EdgUpdateQueueInfoRequest.class b/mes-common/model/target/classes/com/mes/edging/queue/request/EdgUpdateQueueInfoRequest.class
deleted file mode 100644
index 5090102..0000000
--- a/mes-common/model/target/classes/com/mes/edging/queue/request/EdgUpdateQueueInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/edging/queue/vo/EdgIndexMessageVO.class b/mes-common/model/target/classes/com/mes/edging/queue/vo/EdgIndexMessageVO.class
deleted file mode 100644
index fe43746..0000000
--- a/mes-common/model/target/classes/com/mes/edging/queue/vo/EdgIndexMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/engineering/Engineering.class b/mes-common/model/target/classes/com/mes/engineering/Engineering.class
deleted file mode 100644
index 7338110..0000000
--- a/mes-common/model/target/classes/com/mes/engineering/Engineering.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/engineering/request/EngineerRequest.class b/mes-common/model/target/classes/com/mes/engineering/request/EngineerRequest.class
deleted file mode 100644
index 4cdb0a5..0000000
--- a/mes-common/model/target/classes/com/mes/engineering/request/EngineerRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/erp/DamageDetailsList.class b/mes-common/model/target/classes/com/mes/erp/DamageDetailsList.class
deleted file mode 100644
index 058410a..0000000
--- a/mes-common/model/target/classes/com/mes/erp/DamageDetailsList.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/erp/RawInventory.class b/mes-common/model/target/classes/com/mes/erp/RawInventory.class
deleted file mode 100644
index b70e52a..0000000
--- a/mes-common/model/target/classes/com/mes/erp/RawInventory.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/erp/ReportingWork.class b/mes-common/model/target/classes/com/mes/erp/ReportingWork.class
deleted file mode 100644
index b15d697..0000000
--- a/mes-common/model/target/classes/com/mes/erp/ReportingWork.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/erp/ReportingWorkDetail.class b/mes-common/model/target/classes/com/mes/erp/ReportingWorkDetail.class
deleted file mode 100644
index f0e1629..0000000
--- a/mes-common/model/target/classes/com/mes/erp/ReportingWorkDetail.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/flowcard/FlowCardInfo.class b/mes-common/model/target/classes/com/mes/flowcard/FlowCardInfo.class
deleted file mode 100644
index 06f1efa..0000000
--- a/mes-common/model/target/classes/com/mes/flowcard/FlowCardInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/flowcard/request/FlowCardInfoImportRequest.class b/mes-common/model/target/classes/com/mes/flowcard/request/FlowCardInfoImportRequest.class
deleted file mode 100644
index a0d6d4b..0000000
--- a/mes-common/model/target/classes/com/mes/flowcard/request/FlowCardInfoImportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/GlassInfo.class b/mes-common/model/target/classes/com/mes/glassinfo/GlassInfo.class
deleted file mode 100644
index 5adcfb9..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/GlassInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/request/EngineerUnreportedRequest.class b/mes-common/model/target/classes/com/mes/glassinfo/request/EngineerUnreportedRequest.class
deleted file mode 100644
index 7e3a510..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/request/EngineerUnreportedRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/request/GlassInfoImportRequest.class b/mes-common/model/target/classes/com/mes/glassinfo/request/GlassInfoImportRequest.class
deleted file mode 100644
index ee7b014..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/request/GlassInfoImportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/request/NotReportRequest.class b/mes-common/model/target/classes/com/mes/glassinfo/request/NotReportRequest.class
deleted file mode 100644
index 6444618..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/request/NotReportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/vo/ConfigVO.class b/mes-common/model/target/classes/com/mes/glassinfo/vo/ConfigVO.class
deleted file mode 100644
index 56a7a03..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/vo/ConfigVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/vo/GlassInfoFlowCardVO.class b/mes-common/model/target/classes/com/mes/glassinfo/vo/GlassInfoFlowCardVO.class
deleted file mode 100644
index 408742c..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/vo/GlassInfoFlowCardVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/glassinfo/vo/WorkLineConfigVO.class b/mes-common/model/target/classes/com/mes/glassinfo/vo/WorkLineConfigVO.class
deleted file mode 100644
index 3006a51..0000000
--- a/mes-common/model/target/classes/com/mes/glassinfo/vo/WorkLineConfigVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/formula/HollowFormulaDetails.class b/mes-common/model/target/classes/com/mes/hollow/formula/HollowFormulaDetails.class
deleted file mode 100644
index 8363834..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/formula/HollowFormulaDetails.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/formula/dto/HollowGlassFormulaDTO.class b/mes-common/model/target/classes/com/mes/hollow/formula/dto/HollowGlassFormulaDTO.class
deleted file mode 100644
index 7d921b4..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/formula/dto/HollowGlassFormulaDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/formula/request/HollowFormulaDetailsImportRequest.class b/mes-common/model/target/classes/com/mes/hollow/formula/request/HollowFormulaDetailsImportRequest.class
deleted file mode 100644
index 73ed4c4..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/formula/request/HollowFormulaDetailsImportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/formula/request/HollowGlassFormulaRequest.class b/mes-common/model/target/classes/com/mes/hollow/formula/request/HollowGlassFormulaRequest.class
deleted file mode 100644
index 62fe485..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/formula/request/HollowGlassFormulaRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/HollowGlassTaskHistory.class b/mes-common/model/target/classes/com/mes/hollow/history/HollowGlassTaskHistory.class
deleted file mode 100644
index b2e026c..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/HollowGlassTaskHistory.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowDetailsDTO.class b/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowDetailsDTO.class
deleted file mode 100644
index 370ad6a..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowDetailsDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowFrameDetailsDTO.class b/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowFrameDetailsDTO.class
deleted file mode 100644
index 5600473..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowFrameDetailsDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowGlassAndFrameDetailsDTO.class b/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowGlassAndFrameDetailsDTO.class
deleted file mode 100644
index 32da579..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowGlassAndFrameDetailsDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowGlassDetailsDTO.class b/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowGlassDetailsDTO.class
deleted file mode 100644
index 7f13c6d..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/dto/LisecHollowGlassDetailsDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/dto/OrderDTO.class b/mes-common/model/target/classes/com/mes/hollow/history/dto/OrderDTO.class
deleted file mode 100644
index eeba6af..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/dto/OrderDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/request/HollowHistoryTaskRequest.class b/mes-common/model/target/classes/com/mes/hollow/history/request/HollowHistoryTaskRequest.class
deleted file mode 100644
index 9043215..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/request/HollowHistoryTaskRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/history/request/HollowTaskRequest.class b/mes-common/model/target/classes/com/mes/hollow/history/request/HollowTaskRequest.class
deleted file mode 100644
index f54b77f..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/history/request/HollowTaskRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/queue/HollowGlassQueueInfo.class b/mes-common/model/target/classes/com/mes/hollow/queue/HollowGlassQueueInfo.class
deleted file mode 100644
index a1b6075..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/queue/HollowGlassQueueInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/hollow/queue/request/HollowQueueRequest.class b/mes-common/model/target/classes/com/mes/hollow/queue/request/HollowQueueRequest.class
deleted file mode 100644
index 0415154..0000000
--- a/mes-common/model/target/classes/com/mes/hollow/queue/request/HollowQueueRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/details/HorizontalSheetCageDetails.class b/mes-common/model/target/classes/com/mes/horizontal/details/HorizontalSheetCageDetails.class
deleted file mode 100644
index 52f3ab3..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/details/HorizontalSheetCageDetails.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/details/request/HorizontalCageVO.class b/mes-common/model/target/classes/com/mes/horizontal/details/request/HorizontalCageVO.class
deleted file mode 100644
index 1a79a5b..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/details/request/HorizontalCageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/details/request/HorizontalDetailsRequest.class b/mes-common/model/target/classes/com/mes/horizontal/details/request/HorizontalDetailsRequest.class
deleted file mode 100644
index ac2e332..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/details/request/HorizontalDetailsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/history/HorizontalSheetCageHistoryTask.class b/mes-common/model/target/classes/com/mes/horizontal/history/HorizontalSheetCageHistoryTask.class
deleted file mode 100644
index 30d3f55..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/history/HorizontalSheetCageHistoryTask.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/history/request/HorizontalHistoryRequest.class b/mes-common/model/target/classes/com/mes/horizontal/history/request/HorizontalHistoryRequest.class
deleted file mode 100644
index 2196d15..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/history/request/HorizontalHistoryRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/history/vo/HorizontalHistoryVO.class b/mes-common/model/target/classes/com/mes/horizontal/history/vo/HorizontalHistoryVO.class
deleted file mode 100644
index 59c1435..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/history/vo/HorizontalHistoryVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/station/HorizontalSheetCage.class b/mes-common/model/target/classes/com/mes/horizontal/station/HorizontalSheetCage.class
deleted file mode 100644
index 2ac3995..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/station/HorizontalSheetCage.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/station/request/StationRequest.class b/mes-common/model/target/classes/com/mes/horizontal/station/request/StationRequest.class
deleted file mode 100644
index 7990fde..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/station/request/StationRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/station/vo/HorizontalIndexMessageVO.class b/mes-common/model/target/classes/com/mes/horizontal/station/vo/HorizontalIndexMessageVO.class
deleted file mode 100644
index f0f6fc4..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/station/vo/HorizontalIndexMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/horizontal/station/vo/HorizontalSheetCageVO.class b/mes-common/model/target/classes/com/mes/horizontal/station/vo/HorizontalSheetCageVO.class
deleted file mode 100644
index a428f25..0000000
--- a/mes-common/model/target/classes/com/mes/horizontal/station/vo/HorizontalSheetCageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/details/LoadStationDetails.class b/mes-common/model/target/classes/com/mes/load/details/LoadStationDetails.class
deleted file mode 100644
index 9295b31..0000000
--- a/mes-common/model/target/classes/com/mes/load/details/LoadStationDetails.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/details/entity/request/CancelRequest.class b/mes-common/model/target/classes/com/mes/load/details/entity/request/CancelRequest.class
deleted file mode 100644
index a730dfb..0000000
--- a/mes-common/model/target/classes/com/mes/load/details/entity/request/CancelRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/details/entity/request/LoadStationDetailsRequest.class b/mes-common/model/target/classes/com/mes/load/details/entity/request/LoadStationDetailsRequest.class
deleted file mode 100644
index 1c0b87b..0000000
--- a/mes-common/model/target/classes/com/mes/load/details/entity/request/LoadStationDetailsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/details/entity/request/StationRequest.class b/mes-common/model/target/classes/com/mes/load/details/entity/request/StationRequest.class
deleted file mode 100644
index b773a23..0000000
--- a/mes-common/model/target/classes/com/mes/load/details/entity/request/StationRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/history/LoadGlassHistoryTask.class b/mes-common/model/target/classes/com/mes/load/history/LoadGlassHistoryTask.class
deleted file mode 100644
index f7aeb5a..0000000
--- a/mes-common/model/target/classes/com/mes/load/history/LoadGlassHistoryTask.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/job/vo/LoadIndexMessageVO.class b/mes-common/model/target/classes/com/mes/load/job/vo/LoadIndexMessageVO.class
deleted file mode 100644
index 25b4243..0000000
--- a/mes-common/model/target/classes/com/mes/load/job/vo/LoadIndexMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/station/entity/LoadStation.class b/mes-common/model/target/classes/com/mes/load/station/entity/LoadStation.class
deleted file mode 100644
index a6e221b..0000000
--- a/mes-common/model/target/classes/com/mes/load/station/entity/LoadStation.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/load/station/entity/vo/LoadStationInfoVo.class b/mes-common/model/target/classes/com/mes/load/station/entity/vo/LoadStationInfoVo.class
deleted file mode 100644
index a00bfec..0000000
--- a/mes-common/model/target/classes/com/mes/load/station/entity/vo/LoadStationInfoVo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/menu/SysMenu.class b/mes-common/model/target/classes/com/mes/menu/SysMenu.class
deleted file mode 100644
index 2ceaa95..0000000
--- a/mes-common/model/target/classes/com/mes/menu/SysMenu.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/optimize/OptimizeProject.class b/mes-common/model/target/classes/com/mes/optimize/OptimizeProject.class
deleted file mode 100644
index 34ed3d5..0000000
--- a/mes-common/model/target/classes/com/mes/optimize/OptimizeProject.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/RawGlassStorageDetails.class b/mes-common/model/target/classes/com/mes/rawglass/details/RawGlassStorageDetails.class
deleted file mode 100644
index 64bdd65..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/RawGlassStorageDetails.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/dto/EngineeringDetailDTO.class b/mes-common/model/target/classes/com/mes/rawglass/details/dto/EngineeringDetailDTO.class
deleted file mode 100644
index 1ba2cf8..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/dto/EngineeringDetailDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/dto/RawGlassDetailsDTO.class b/mes-common/model/target/classes/com/mes/rawglass/details/dto/RawGlassDetailsDTO.class
deleted file mode 100644
index f585a14..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/dto/RawGlassDetailsDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/request/DetailsRequest.class b/mes-common/model/target/classes/com/mes/rawglass/details/request/DetailsRequest.class
deleted file mode 100644
index af9161d..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/request/DetailsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/request/RawGlassDetailsRequest.class b/mes-common/model/target/classes/com/mes/rawglass/details/request/RawGlassDetailsRequest.class
deleted file mode 100644
index f2ff951..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/request/RawGlassDetailsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/request/RawGlassQuantityRequest.class b/mes-common/model/target/classes/com/mes/rawglass/details/request/RawGlassQuantityRequest.class
deleted file mode 100644
index f0029a2..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/request/RawGlassQuantityRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/request/RawLoadRequest.class b/mes-common/model/target/classes/com/mes/rawglass/details/request/RawLoadRequest.class
deleted file mode 100644
index aeb7005..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/request/RawLoadRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawGlassCountVO.class b/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawGlassCountVO.class
deleted file mode 100644
index 107282e..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawGlassCountVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawGlassDetailsVO.class b/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawGlassDetailsVO.class
deleted file mode 100644
index 1712aa2..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawGlassDetailsVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawIndexMessageVO.class b/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawIndexMessageVO.class
deleted file mode 100644
index 89fca6b..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawIndexMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawLoadDetailsVO.class b/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawLoadDetailsVO.class
deleted file mode 100644
index 9af68ea..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/details/vo/RawLoadDetailsVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/history/RawGlassStorageHistoryTask.class b/mes-common/model/target/classes/com/mes/rawglass/history/RawGlassStorageHistoryTask.class
deleted file mode 100644
index 4024d4f..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/history/RawGlassStorageHistoryTask.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/history/dto/GlassStorageTaskDTO.class b/mes-common/model/target/classes/com/mes/rawglass/history/dto/GlassStorageTaskDTO.class
deleted file mode 100644
index af58616..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/history/dto/GlassStorageTaskDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/history/request/LoadGlassHistoryTaskRequest.class b/mes-common/model/target/classes/com/mes/rawglass/history/request/LoadGlassHistoryTaskRequest.class
deleted file mode 100644
index ae946a6..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/history/request/LoadGlassHistoryTaskRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/history/request/LoadGlassHistoryTaskUpdateRequest.class b/mes-common/model/target/classes/com/mes/rawglass/history/request/LoadGlassHistoryTaskUpdateRequest.class
deleted file mode 100644
index 608f7f7..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/history/request/LoadGlassHistoryTaskUpdateRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/history/request/RawGlassTaskRequest.class b/mes-common/model/target/classes/com/mes/rawglass/history/request/RawGlassTaskRequest.class
deleted file mode 100644
index 4567f8e..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/history/request/RawGlassTaskRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/station/RawGlassStorageStation.class b/mes-common/model/target/classes/com/mes/rawglass/station/RawGlassStorageStation.class
deleted file mode 100644
index 345982f..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/station/RawGlassStorageStation.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/station/request/LoadStationEnableRequest.class b/mes-common/model/target/classes/com/mes/rawglass/station/request/LoadStationEnableRequest.class
deleted file mode 100644
index 0b393f4..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/station/request/LoadStationEnableRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/station/request/LoadStationRequest.class b/mes-common/model/target/classes/com/mes/rawglass/station/request/LoadStationRequest.class
deleted file mode 100644
index 48da691..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/station/request/LoadStationRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/station/request/StationRequest.class b/mes-common/model/target/classes/com/mes/rawglass/station/request/StationRequest.class
deleted file mode 100644
index a5ffdbe..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/station/request/StationRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawglass/station/request/UpdateStorageRequest.class b/mes-common/model/target/classes/com/mes/rawglass/station/request/UpdateStorageRequest.class
deleted file mode 100644
index 1bb6761..0000000
--- a/mes-common/model/target/classes/com/mes/rawglass/station/request/UpdateStorageRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawqueue/EngineeringRawQueue.class b/mes-common/model/target/classes/com/mes/rawqueue/EngineeringRawQueue.class
deleted file mode 100644
index 4da43eb..0000000
--- a/mes-common/model/target/classes/com/mes/rawqueue/EngineeringRawQueue.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawqueue/request/EngineeringRawQueueImportRequest.class b/mes-common/model/target/classes/com/mes/rawqueue/request/EngineeringRawQueueImportRequest.class
deleted file mode 100644
index 4c16ff1..0000000
--- a/mes-common/model/target/classes/com/mes/rawqueue/request/EngineeringRawQueueImportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawqueue/request/EngineeringRawQueueRequest.class b/mes-common/model/target/classes/com/mes/rawqueue/request/EngineeringRawQueueRequest.class
deleted file mode 100644
index ba7d780..0000000
--- a/mes-common/model/target/classes/com/mes/rawqueue/request/EngineeringRawQueueRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/rawqueue/vo/EngineeringRawQueueVO.class b/mes-common/model/target/classes/com/mes/rawqueue/vo/EngineeringRawQueueVO.class
deleted file mode 100644
index 2bc42d4..0000000
--- a/mes-common/model/target/classes/com/mes/rawqueue/vo/EngineeringRawQueueVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/reportinfo/ReportInfo.class b/mes-common/model/target/classes/com/mes/reportinfo/ReportInfo.class
deleted file mode 100644
index 978f459..0000000
--- a/mes-common/model/target/classes/com/mes/reportinfo/ReportInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/reportinfo/dto/ReportInfoDTO.class b/mes-common/model/target/classes/com/mes/reportinfo/dto/ReportInfoDTO.class
deleted file mode 100644
index 2a3d3a5..0000000
--- a/mes-common/model/target/classes/com/mes/reportinfo/dto/ReportInfoDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/reportinfo/request/ReportQueryRequest.class b/mes-common/model/target/classes/com/mes/reportinfo/request/ReportQueryRequest.class
deleted file mode 100644
index 27d0f4e..0000000
--- a/mes-common/model/target/classes/com/mes/reportinfo/request/ReportQueryRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/role/SysRole.class b/mes-common/model/target/classes/com/mes/role/SysRole.class
deleted file mode 100644
index 17dafb0..0000000
--- a/mes-common/model/target/classes/com/mes/role/SysRole.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/role/SysRoleMenu.class b/mes-common/model/target/classes/com/mes/role/SysRoleMenu.class
deleted file mode 100644
index 8e41379..0000000
--- a/mes-common/model/target/classes/com/mes/role/SysRoleMenu.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/role/vo/SysRoleVO.class b/mes-common/model/target/classes/com/mes/role/vo/SysRoleVO.class
deleted file mode 100644
index 1be3b65..0000000
--- a/mes-common/model/target/classes/com/mes/role/vo/SysRoleVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/sysconfig/SysConfig.class b/mes-common/model/target/classes/com/mes/sysconfig/SysConfig.class
deleted file mode 100644
index 1a6e694..0000000
--- a/mes-common/model/target/classes/com/mes/sysconfig/SysConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/sysconfig/request/SysConfigRequest.class b/mes-common/model/target/classes/com/mes/sysconfig/request/SysConfigRequest.class
deleted file mode 100644
index 0fdd1ea..0000000
--- a/mes-common/model/target/classes/com/mes/sysconfig/request/SysConfigRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/sysdict/SysDictData.class b/mes-common/model/target/classes/com/mes/sysdict/SysDictData.class
deleted file mode 100644
index b2a9d9d..0000000
--- a/mes-common/model/target/classes/com/mes/sysdict/SysDictData.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/sysdict/SysDictType.class b/mes-common/model/target/classes/com/mes/sysdict/SysDictType.class
deleted file mode 100644
index 982f0c7..0000000
--- a/mes-common/model/target/classes/com/mes/sysdict/SysDictType.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/TemperingComputeGlassInfo.class b/mes-common/model/target/classes/com/mes/tempering/compute/TemperingComputeGlassInfo.class
deleted file mode 100644
index c6bfb40..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/TemperingComputeGlassInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/TemperingComputeRecord.class b/mes-common/model/target/classes/com/mes/tempering/compute/TemperingComputeRecord.class
deleted file mode 100644
index b3e4c22..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/TemperingComputeRecord.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/request/GlassDetailsRequest.class b/mes-common/model/target/classes/com/mes/tempering/compute/request/GlassDetailsRequest.class
deleted file mode 100644
index 7332f1d..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/request/GlassDetailsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/request/ProcessCardsRequest.class b/mes-common/model/target/classes/com/mes/tempering/compute/request/ProcessCardsRequest.class
deleted file mode 100644
index ada373c..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/request/ProcessCardsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingComputeIndexRequest.class b/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingComputeIndexRequest.class
deleted file mode 100644
index f0153fa..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingComputeIndexRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingComputeRequest.class b/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingComputeRequest.class
deleted file mode 100644
index 0170c25..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingComputeRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingFlowCardIdRequest.class b/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingFlowCardIdRequest.class
deleted file mode 100644
index ea31bc9..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/request/TemperingFlowCardIdRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingComputeResultVO.class b/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingComputeResultVO.class
deleted file mode 100644
index 0929475..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingComputeResultVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingFlowCardIdCountVO.class b/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingFlowCardIdCountVO.class
deleted file mode 100644
index d0414b0..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingFlowCardIdCountVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingFlowCardIdVO.class b/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingFlowCardIdVO.class
deleted file mode 100644
index a6f7a2e..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingFlowCardIdVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingGlassDetailsVO.class b/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingGlassDetailsVO.class
deleted file mode 100644
index ade87de..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingGlassDetailsVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingRatioVO.class b/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingRatioVO.class
deleted file mode 100644
index 460fff5..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TemperingRatioVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TempingComputeIndexMessageAllVO.class b/mes-common/model/target/classes/com/mes/tempering/compute/vo/TempingComputeIndexMessageAllVO.class
deleted file mode 100644
index 4f470e1..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/compute/vo/TempingComputeIndexMessageAllVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/param/TemperingParameter.class b/mes-common/model/target/classes/com/mes/tempering/param/TemperingParameter.class
deleted file mode 100644
index b93478a..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/param/TemperingParameter.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/queue/TemperingGlassQueueInfo.class b/mes-common/model/target/classes/com/mes/tempering/queue/TemperingGlassQueueInfo.class
deleted file mode 100644
index 7ca4c7d..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/queue/TemperingGlassQueueInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/queue/request/TemperingJobRequest.class b/mes-common/model/target/classes/com/mes/tempering/queue/request/TemperingJobRequest.class
deleted file mode 100644
index 3ff9357..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/queue/request/TemperingJobRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/queue/vo/TempIndexMessageAllVO.class b/mes-common/model/target/classes/com/mes/tempering/queue/vo/TempIndexMessageAllVO.class
deleted file mode 100644
index 06a7e8d..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/queue/vo/TempIndexMessageAllVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/queue/vo/TemperingLayoutMessageVO.class b/mes-common/model/target/classes/com/mes/tempering/queue/vo/TemperingLayoutMessageVO.class
deleted file mode 100644
index 7d7c3ea..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/queue/vo/TemperingLayoutMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/tempering/request/TemperingParameterImportRequest.class b/mes-common/model/target/classes/com/mes/tempering/request/TemperingParameterImportRequest.class
deleted file mode 100644
index 8ff4af1..0000000
--- a/mes-common/model/target/classes/com/mes/tempering/request/TemperingParameterImportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/VerticalSheetCageDetails.class b/mes-common/model/target/classes/com/mes/vertical/details/VerticalSheetCageDetails.class
deleted file mode 100644
index ceffae1..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/VerticalSheetCageDetails.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/dto/FlowCardGlassInfoDTO.class b/mes-common/model/target/classes/com/mes/vertical/details/dto/FlowCardGlassInfoDTO.class
deleted file mode 100644
index 1451307..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/dto/FlowCardGlassInfoDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/dto/VerticalSequenceDTO.class b/mes-common/model/target/classes/com/mes/vertical/details/dto/VerticalSequenceDTO.class
deleted file mode 100644
index 42fa065..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/dto/VerticalSequenceDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/dto/VerticalSheetCageDetailsDTO.class b/mes-common/model/target/classes/com/mes/vertical/details/dto/VerticalSheetCageDetailsDTO.class
deleted file mode 100644
index 4e88ef8..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/dto/VerticalSheetCageDetailsDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/request/HollowRequest.class b/mes-common/model/target/classes/com/mes/vertical/details/request/HollowRequest.class
deleted file mode 100644
index 45b1139..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/request/HollowRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/request/UpdateVerticalSheetCageStateRequest.class b/mes-common/model/target/classes/com/mes/vertical/details/request/UpdateVerticalSheetCageStateRequest.class
deleted file mode 100644
index b02b8c9..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/request/UpdateVerticalSheetCageStateRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/request/VerticalSheetCageDetailsRequest.class b/mes-common/model/target/classes/com/mes/vertical/details/request/VerticalSheetCageDetailsRequest.class
deleted file mode 100644
index b3dac7a..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/request/VerticalSheetCageDetailsRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/HollowAllFlowCardVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/HollowAllFlowCardVO.class
deleted file mode 100644
index 76b5be3..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/HollowAllFlowCardVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/TemperingGlassCountVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/TemperingGlassCountVO.class
deleted file mode 100644
index 7d6f8d3..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/TemperingGlassCountVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/TemperingGlassLackVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/TemperingGlassLackVO.class
deleted file mode 100644
index e418c1a..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/TemperingGlassLackVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageAndDetailsVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageAndDetailsVO.class
deleted file mode 100644
index ee7eda0..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageAndDetailsVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageDetailsVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageDetailsVO.class
deleted file mode 100644
index acbdf87..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageDetailsVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageIndexMessageVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageIndexMessageVO.class
deleted file mode 100644
index c85b1a3..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageIndexMessageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageSummaryVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageSummaryVO.class
deleted file mode 100644
index e36fd45..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageSummaryVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageVO.class b/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageVO.class
deleted file mode 100644
index a70a89d..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/details/vo/VerticalSheetCageVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/history/VerticalSheetCageHistoryTask.class b/mes-common/model/target/classes/com/mes/vertical/history/VerticalSheetCageHistoryTask.class
deleted file mode 100644
index 9182452..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/history/VerticalSheetCageHistoryTask.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/history/dto/VerticalSheetCarTaskDTO.class b/mes-common/model/target/classes/com/mes/vertical/history/dto/VerticalSheetCarTaskDTO.class
deleted file mode 100644
index ddd6400..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/history/dto/VerticalSheetCarTaskDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/history/request/VerticalSheetCageHistoryRequest.class b/mes-common/model/target/classes/com/mes/vertical/history/request/VerticalSheetCageHistoryRequest.class
deleted file mode 100644
index 1f6d9e3..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/history/request/VerticalSheetCageHistoryRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/hollowrelation/HollowGlassRelationInfo.class b/mes-common/model/target/classes/com/mes/vertical/hollowrelation/HollowGlassRelationInfo.class
deleted file mode 100644
index 6f14cf0..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/hollowrelation/HollowGlassRelationInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/hollowrelation/vo/LackDetailsVO.class b/mes-common/model/target/classes/com/mes/vertical/hollowrelation/vo/LackDetailsVO.class
deleted file mode 100644
index 43f013e..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/hollowrelation/vo/LackDetailsVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/queue/VerticalSheetCageQueueInfo.class b/mes-common/model/target/classes/com/mes/vertical/queue/VerticalSheetCageQueueInfo.class
deleted file mode 100644
index 7bf4176..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/queue/VerticalSheetCageQueueInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/station/VerticalSheetCage.class b/mes-common/model/target/classes/com/mes/vertical/station/VerticalSheetCage.class
deleted file mode 100644
index a8ff51a..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/station/VerticalSheetCage.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/station/dto/VerticalSheetDTO.class b/mes-common/model/target/classes/com/mes/vertical/station/dto/VerticalSheetDTO.class
deleted file mode 100644
index aabcf2a..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/station/dto/VerticalSheetDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/temperingtask/TemperingTask.class b/mes-common/model/target/classes/com/mes/vertical/temperingtask/TemperingTask.class
deleted file mode 100644
index 54651a4..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/temperingtask/TemperingTask.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/temperingtask/dto/TemperingTaskDTO.class b/mes-common/model/target/classes/com/mes/vertical/temperingtask/dto/TemperingTaskDTO.class
deleted file mode 100644
index f96e109..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/temperingtask/dto/TemperingTaskDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/temperingtask/request/TemperingTaskRequest.class b/mes-common/model/target/classes/com/mes/vertical/temperingtask/request/TemperingTaskRequest.class
deleted file mode 100644
index e917b45..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/temperingtask/request/TemperingTaskRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/temperingtask/vo/TemperingTaskVO.class b/mes-common/model/target/classes/com/mes/vertical/temperingtask/vo/TemperingTaskVO.class
deleted file mode 100644
index 2e2e3c9..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/temperingtask/vo/TemperingTaskVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/temprelation/TemperingGlassRelationInfo.class b/mes-common/model/target/classes/com/mes/vertical/temprelation/TemperingGlassRelationInfo.class
deleted file mode 100644
index 4691c71..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/temprelation/TemperingGlassRelationInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/vertical/temprelation/dto/FlowCardVirtualSlotDTO.class b/mes-common/model/target/classes/com/mes/vertical/temprelation/dto/FlowCardVirtualSlotDTO.class
deleted file mode 100644
index 5959d4a..0000000
--- a/mes-common/model/target/classes/com/mes/vertical/temprelation/dto/FlowCardVirtualSlotDTO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/classes/com/mes/work/WorkAssignment.class b/mes-common/model/target/classes/com/mes/work/WorkAssignment.class
deleted file mode 100644
index 78393c6..0000000
--- a/mes-common/model/target/classes/com/mes/work/WorkAssignment.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/model/target/maven-archiver/pom.properties b/mes-common/model/target/maven-archiver/pom.properties
deleted file mode 100644
index a686d3a..0000000
--- a/mes-common/model/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-version=1.0.0
-groupId=com.mes
-artifactId=model
diff --git a/mes-common/model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mes-common/model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index fa9679e..0000000
--- a/mes-common/model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,152 +0,0 @@
-com\mes\load\job\vo\LoadIndexMessageVO.class
-com\mes\rawqueue\request\EngineeringRawQueueRequest.class
-com\mes\vertical\temperingtask\dto\TemperingTaskDTO.class
-com\mes\erp\DamageDetailsList.class
-com\mes\sysconfig\SysConfig.class
-com\mes\horizontal\details\request\HorizontalCageVO.class
-com\mes\rawglass\station\request\UpdateStorageRequest.class
-com\mes\vertical\details\vo\VerticalSheetCageIndexMessageVO.class
-com\mes\base\request\BaseRequest.class
-com\mes\base\request\PageRequest.class
-com\mes\vertical\details\vo\VerticalSheetCageAndDetailsVO.class
-com\mes\rawglass\station\request\StationRequest.class
-com\mes\edging\queue\EdgQueueInfo.class
-com\mes\edging\queue\request\EdgQueueInfoRequest.class
-com\mes\hollow\formula\HollowFormulaDetails.class
-com\mes\hollow\history\request\HollowHistoryTaskRequest.class
-com\mes\rawglass\details\vo\RawGlassDetailsVO.class
-com\mes\vertical\hollowrelation\HollowGlassRelationInfo.class
-com\mes\rawglass\history\request\LoadGlassHistoryTaskRequest.class
-com\mes\load\details\entity\request\StationRequest.class
-com\mes\reportinfo\dto\ReportInfoDTO.class
-com\mes\load\details\entity\request\LoadStationDetailsRequest.class
-com\mes\base\request\TimeRequest.class
-com\mes\tempering\compute\vo\TemperingGlassDetailsVO.class
-com\mes\tempering\queue\request\TemperingJobRequest.class
-com\mes\vertical\details\vo\VerticalSheetCageDetailsVO.class
-com\mes\rawglass\details\dto\RawGlassDetailsDTO.class
-com\mes\load\details\LoadStationDetails.class
-com\mes\rawglass\history\request\RawGlassTaskRequest.class
-com\mes\hollow\history\HollowGlassTaskHistory.class
-com\mes\rawglass\details\vo\RawLoadDetailsVO.class
-com\mes\cutting\history\requst\CutTerritoryRequest.class
-com\mes\erp\ReportingWork.class
-com\mes\hollow\formula\request\HollowFormulaDetailsImportRequest.class
-com\mes\reportinfo\ReportInfo.class
-com\mes\erp\ReportingWorkDetail.class
-com\mes\damage\dto\DamageDTO.class
-com\mes\vertical\station\dto\VerticalSheetDTO.class
-com\mes\cutting\history\vo\CuttingIndexMessageVO.class
-com\mes\vertical\temperingtask\request\TemperingTaskRequest.class
-com\mes\edging\history\request\EdgingRequest.class
-com\mes\rawglass\details\RawGlassStorageDetails.class
-com\mes\tempering\param\TemperingParameter.class
-com\mes\vertical\details\request\UpdateVerticalSheetCageStateRequest.class
-com\mes\load\station\entity\LoadStation.class
-com\mes\hollow\formula\request\HollowGlassFormulaRequest.class
-com\mes\tempering\queue\vo\TemperingLayoutMessageVO.class
-com\mes\horizontal\station\request\StationRequest.class
-com\mes\rawglass\history\dto\GlassStorageTaskDTO.class
-com\mes\hollow\history\dto\LisecHollowFrameDetailsDTO.class
-com\mes\tempering\compute\vo\TemperingFlowCardIdVO.class
-com\mes\tempering\compute\TemperingComputeRecord.class
-com\mes\tempering\compute\vo\TemperingComputeResultVO.class
-com\mes\tempering\compute\request\TemperingFlowCardIdRequest.class
-com\mes\tempering\compute\TemperingComputeGlassInfo.class
-com\mes\rawglass\station\request\LoadStationEnableRequest.class
-com\mes\sysconfig\request\SysConfigRequest.class
-com\mes\vertical\hollowrelation\vo\LackDetailsVO.class
-com\mes\glassinfo\request\NotReportRequest.class
-com\mes\rawglass\details\request\RawLoadRequest.class
-com\mes\vertical\details\vo\VerticalSheetCageVO.class
-com\mes\horizontal\history\HorizontalSheetCageHistoryTask.class
-com\mes\sysdict\SysDictType.class
-com\mes\tempering\compute\request\ProcessCardsRequest.class
-com\mes\vertical\details\VerticalSheetCageDetails.class
-com\mes\tempering\compute\vo\TempingComputeIndexMessageAllVO.class
-com\mes\damagedetails\DamageDetails.class
-com\mes\vertical\details\dto\VerticalSequenceDTO.class
-com\mes\vertical\history\VerticalSheetCageHistoryTask.class
-com\mes\optimize\OptimizeProject.class
-com\mes\edging\history\request\EdgHistoryTaskRequest.class
-com\mes\horizontal\history\request\HorizontalHistoryRequest.class
-com\mes\vertical\details\vo\HollowAllFlowCardVO.class
-com\mes\vertical\temprelation\TemperingGlassRelationInfo.class
-com\mes\cutting\history\vo\CutTerritoryVO.class
-com\mes\role\SysRole.class
-com\mes\tempering\compute\vo\TemperingRatioVO.class
-com\mes\hollow\history\dto\OrderDTO.class
-com\mes\vertical\details\dto\FlowCardGlassInfoDTO.class
-com\mes\glassinfo\request\GlassInfoImportRequest.class
-com\mes\tempering\request\TemperingParameterImportRequest.class
-com\mes\load\details\entity\request\CancelRequest.class
-com\mes\rawqueue\EngineeringRawQueue.class
-com\mes\rawqueue\vo\EngineeringRawQueueVO.class
-com\mes\role\SysRoleMenu.class
-com\mes\cutting\history\CutHistoryTask.class
-com\mes\rawglass\details\vo\RawIndexMessageVO.class
-com\mes\vertical\history\request\VerticalSheetCageHistoryRequest.class
-com\mes\damage\Damage.class
-com\mes\vertical\temprelation\dto\FlowCardVirtualSlotDTO.class
-com\mes\hollow\queue\request\HollowQueueRequest.class
-com\mes\edging\job\request\EdgJobRequest.class
-com\mes\tempering\queue\vo\TempIndexMessageAllVO.class
-com\mes\tempering\compute\request\TemperingComputeIndexRequest.class
-com\mes\horizontal\history\vo\HorizontalHistoryVO.class
-com\mes\engineering\Engineering.class
-com\mes\rawglass\station\RawGlassStorageStation.class
-com\mes\vertical\queue\VerticalSheetCageQueueInfo.class
-com\mes\vertical\details\vo\TemperingGlassCountVO.class
-com\mes\engineering\request\EngineerRequest.class
-com\mes\hollow\queue\HollowGlassQueueInfo.class
-com\mes\rawglass\station\request\LoadStationRequest.class
-com\mes\menu\SysMenu.class
-com\mes\edging\queue\vo\EdgIndexMessageVO.class
-com\mes\vertical\details\vo\TemperingGlassLackVO.class
-com\mes\glassinfo\GlassInfo.class
-com\mes\reportinfo\request\ReportQueryRequest.class
-com\mes\glassinfo\vo\GlassInfoFlowCardVO.class
-com\mes\rawglass\details\request\RawGlassQuantityRequest.class
-com\mes\vertical\details\dto\VerticalSheetCageDetailsDTO.class
-com\mes\rawglass\history\request\LoadGlassHistoryTaskUpdateRequest.class
-com\mes\glassinfo\vo\WorkLineConfigVO.class
-com\mes\vertical\history\dto\VerticalSheetCarTaskDTO.class
-com\mes\vertical\temperingtask\TemperingTask.class
-com\mes\edging\queue\request\EdgUpdateQueueInfoRequest.class
-com\mes\tempering\compute\request\GlassDetailsRequest.class
-com\mes\tempering\queue\TemperingGlassQueueInfo.class
-com\mes\rawglass\details\dto\EngineeringDetailDTO.class
-com\mes\rawglass\details\request\DetailsRequest.class
-com\mes\flowcard\FlowCardInfo.class
-com\mes\horizontal\station\HorizontalSheetCage.class
-com\mes\rawqueue\request\EngineeringRawQueueImportRequest.class
-com\mes\rawglass\history\RawGlassStorageHistoryTask.class
-com\mes\rawglass\details\vo\RawGlassCountVO.class
-com\mes\vertical\temperingtask\vo\TemperingTaskVO.class
-com\mes\role\vo\SysRoleVO.class
-com\mes\work\WorkAssignment.class
-com\mes\load\history\LoadGlassHistoryTask.class
-com\mes\damage\request\DamageRequest.class
-com\mes\hollow\history\dto\LisecHollowGlassDetailsDTO.class
-com\mes\hollow\history\dto\LisecHollowDetailsDTO.class
-com\mes\vertical\details\vo\VerticalSheetCageSummaryVO.class
-com\mes\hollow\formula\dto\HollowGlassFormulaDTO.class
-com\mes\vertical\details\request\HollowRequest.class
-com\mes\horizontal\station\vo\HorizontalIndexMessageVO.class
-com\mes\horizontal\station\vo\HorizontalSheetCageVO.class
-com\mes\glassinfo\request\EngineerUnreportedRequest.class
-com\mes\hollow\history\request\HollowTaskRequest.class
-com\mes\load\station\entity\vo\LoadStationInfoVo.class
-com\mes\vertical\details\request\VerticalSheetCageDetailsRequest.class
-com\mes\vertical\station\VerticalSheetCage.class
-com\mes\flowcard\request\FlowCardInfoImportRequest.class
-com\mes\horizontal\details\HorizontalSheetCageDetails.class
-com\mes\horizontal\details\request\HorizontalDetailsRequest.class
-com\mes\hollow\history\dto\LisecHollowGlassAndFrameDetailsDTO.class
-com\mes\tempering\compute\vo\TemperingFlowCardIdCountVO.class
-com\mes\damage\request\DamageReportRequest.class
-com\mes\glassinfo\vo\ConfigVO.class
-com\mes\erp\RawInventory.class
-com\mes\rawglass\details\request\RawGlassDetailsRequest.class
-com\mes\sysdict\SysDictData.class
-com\mes\tempering\compute\request\TemperingComputeRequest.class
diff --git a/mes-common/model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mes-common/model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 0caa2a2..0000000
--- a/mes-common/model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,152 +0,0 @@
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\job\request\EdgJobRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\history\vo\HorizontalHistoryVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\param\TemperingParameter.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\dto\FlowCardGlassInfoDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\cutting\history\requst\CutTerritoryRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\dto\LisecHollowGlassDetailsDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\request\DetailsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\vo\RawGlassCountVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\VerticalSheetCageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\queue\HollowGlassQueueInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\queue\request\TemperingJobRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\vo\TemperingFlowCardIdCountVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\details\request\HorizontalDetailsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\hollowrelation\vo\LackDetailsVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\history\request\LoadGlassHistoryTaskRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\station\entity\vo\LoadStationInfoVo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\work\WorkAssignment.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\vo\TemperingComputeResultVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\request\UpdateVerticalSheetCageStateRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\cutting\history\vo\CuttingIndexMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\dto\EngineeringDetailDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\request\GlassDetailsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\dto\OrderDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\queue\VerticalSheetCageQueueInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\queue\vo\TemperingLayoutMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\dto\LisecHollowGlassAndFrameDetailsDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\formula\request\HollowGlassFormulaRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\dto\VerticalSequenceDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\queue\TemperingGlassQueueInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\history\request\EdgHistoryTaskRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawqueue\EngineeringRawQueue.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\vo\TemperingRatioVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\request\RawGlassDetailsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\history\request\EdgingRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\erp\DamageDetailsList.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\request\TemperingFlowCardIdRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\request\GlassInfoImportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\queue\request\EdgQueueInfoRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\damage\request\DamageReportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\history\LoadGlassHistoryTask.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\dto\RawGlassDetailsDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\request\HollowTaskRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\flowcard\FlowCardInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\temprelation\dto\FlowCardVirtualSlotDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\vo\GlassInfoFlowCardVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\sysconfig\SysConfig.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\TemperingGlassLackVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\HollowAllFlowCardVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\request\TemperingComputeRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\reportinfo\ReportInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\vo\TemperingFlowCardIdVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\details\LoadStationDetails.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\temperingtask\TemperingTask.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\queue\EdgQueueInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\station\HorizontalSheetCage.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\queue\request\HollowQueueRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\dto\LisecHollowDetailsDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\details\HorizontalSheetCageDetails.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\details\entity\request\LoadStationDetailsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\erp\RawInventory.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\base\request\BaseRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\station\vo\HorizontalIndexMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\vo\ConfigVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\request\EngineerUnreportedRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\vo\RawIndexMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\vo\RawLoadDetailsVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\vo\WorkLineConfigVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\history\dto\GlassStorageTaskDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\queue\vo\TempIndexMessageAllVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\vo\TempingComputeIndexMessageAllVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\damage\request\DamageRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\request\TemperingParameterImportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\VerticalSheetCageDetailsVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\station\VerticalSheetCage.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\role\vo\SysRoleVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\engineering\Engineering.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\formula\request\HollowFormulaDetailsImportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\base\request\PageRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\history\RawGlassStorageHistoryTask.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\temperingtask\request\TemperingTaskRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\job\vo\LoadIndexMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\station\request\StationRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\station\RawGlassStorageStation.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\station\entity\LoadStation.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\history\request\VerticalSheetCageHistoryRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\damage\dto\DamageDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\request\RawGlassQuantityRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\engineering\request\EngineerRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\flowcard\request\FlowCardInfoImportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\RawGlassStorageDetails.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\station\request\LoadStationRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\request\RawLoadRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\station\request\LoadStationEnableRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\TemperingComputeGlassInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\history\request\RawGlassTaskRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\history\VerticalSheetCageHistoryTask.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\temprelation\TemperingGlassRelationInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\details\entity\request\StationRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawqueue\request\EngineeringRawQueueRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\erp\ReportingWorkDetail.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\dto\VerticalSheetCageDetailsDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\damagedetails\DamageDetails.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\history\HorizontalSheetCageHistoryTask.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\load\details\entity\request\CancelRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\reportinfo\request\ReportQueryRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\TemperingComputeRecord.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\VerticalSheetCageSummaryVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\VerticalSheetCageDetails.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\base\request\TimeRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\details\request\HorizontalCageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\request\NotReportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\dto\LisecHollowFrameDetailsDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\request\ProcessCardsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawqueue\request\EngineeringRawQueueImportRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\history\request\HorizontalHistoryRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\hollowrelation\HollowGlassRelationInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\queue\request\EdgUpdateQueueInfoRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\details\vo\RawGlassDetailsVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\history\request\LoadGlassHistoryTaskUpdateRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\reportinfo\dto\ReportInfoDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\cutting\history\CutHistoryTask.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawglass\station\request\UpdateStorageRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\menu\SysMenu.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\rawqueue\vo\EngineeringRawQueueVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\edging\queue\vo\EdgIndexMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\formula\HollowFormulaDetails.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\request\VerticalSheetCageDetailsRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\temperingtask\vo\TemperingTaskVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\cutting\history\vo\CutTerritoryVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\erp\ReportingWork.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\history\dto\VerticalSheetCarTaskDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\formula\dto\HollowGlassFormulaDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\station\vo\HorizontalSheetCageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\station\dto\VerticalSheetDTO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\glassinfo\GlassInfo.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\optimize\OptimizeProject.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\request\TemperingComputeIndexRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\VerticalSheetCageIndexMessageVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\request\HollowHistoryTaskRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\tempering\compute\vo\TemperingGlassDetailsVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\VerticalSheetCageAndDetailsVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\sysdict\SysDictType.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\horizontal\station\request\StationRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\role\SysRole.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\role\SysRoleMenu.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\sysconfig\request\SysConfigRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\damage\Damage.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\hollow\history\HollowGlassTaskHistory.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\request\HollowRequest.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\details\vo\TemperingGlassCountVO.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\sysdict\SysDictData.java
-D:\work\PlcTaskSend\mes-common\model\src\main\java\com\mes\vertical\temperingtask\dto\TemperingTaskDTO.java
diff --git a/mes-common/model/target/model-1.0.0.jar b/mes-common/model/target/model-1.0.0.jar
deleted file mode 100644
index 07bde22..0000000
--- a/mes-common/model/target/model-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/application-common.yml b/mes-common/serverBase/target/classes/application-common.yml
deleted file mode 100644
index 76aea5c..0000000
--- a/mes-common/serverBase/target/classes/application-common.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-engineering:
- mode: lm
-erp:
- url: http://10.153.19.150:8086
\ No newline at end of file
diff --git a/mes-common/serverBase/target/classes/application.yml b/mes-common/serverBase/target/classes/application.yml
deleted file mode 100644
index 083e879..0000000
--- a/mes-common/serverBase/target/classes/application.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-engineering:
- mode: lm
diff --git a/mes-common/serverBase/target/classes/com/kangaroohy/milo/configuration/MiloAutoConfiguration.class b/mes-common/serverBase/target/classes/com/kangaroohy/milo/configuration/MiloAutoConfiguration.class
deleted file mode 100644
index 7b2445e..0000000
--- a/mes-common/serverBase/target/classes/com/kangaroohy/milo/configuration/MiloAutoConfiguration.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/kangaroohy/milo/pool/MiloConnectFactory.class b/mes-common/serverBase/target/classes/com/kangaroohy/milo/pool/MiloConnectFactory.class
deleted file mode 100644
index f801f01..0000000
--- a/mes-common/serverBase/target/classes/com/kangaroohy/milo/pool/MiloConnectFactory.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/bigstorage/BigStorageCageBaseInfo.class b/mes-common/serverBase/target/classes/com/mes/base/bigstorage/BigStorageCageBaseInfo.class
deleted file mode 100644
index 0d87eda..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/bigstorage/BigStorageCageBaseInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damage/controller/DamageController.class b/mes-common/serverBase/target/classes/com/mes/base/damage/controller/DamageController.class
deleted file mode 100644
index 30798f6..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damage/controller/DamageController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damage/mapper/DamageMapper.class b/mes-common/serverBase/target/classes/com/mes/base/damage/mapper/DamageMapper.class
deleted file mode 100644
index 3e36dac..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damage/mapper/DamageMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damage/service/DamageService.class b/mes-common/serverBase/target/classes/com/mes/base/damage/service/DamageService.class
deleted file mode 100644
index 93ef777..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damage/service/DamageService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damage/service/impl/DamageServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/damage/service/impl/DamageServiceImpl.class
deleted file mode 100644
index 8b68866..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damage/service/impl/DamageServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damagedetails/mapper/DamageDetailsMapper.class b/mes-common/serverBase/target/classes/com/mes/base/damagedetails/mapper/DamageDetailsMapper.class
deleted file mode 100644
index a60b88e..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damagedetails/mapper/DamageDetailsMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damagedetails/service/DamageDetailsService.class b/mes-common/serverBase/target/classes/com/mes/base/damagedetails/service/DamageDetailsService.class
deleted file mode 100644
index 70f3a08..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damagedetails/service/DamageDetailsService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/damagedetails/service/impl/DamageDetailsServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/damagedetails/service/impl/DamageDetailsServiceImpl.class
deleted file mode 100644
index 0947d53..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/damagedetails/service/impl/DamageDetailsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/controller/EngineeringController.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/controller/EngineeringController.class
deleted file mode 100644
index 69e12b5..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/controller/EngineeringController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/request/EngineerImportRequest.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/request/EngineerImportRequest.class
deleted file mode 100644
index ee55989..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/request/EngineerImportRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/request/EngineerRequest.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/request/EngineerRequest.class
deleted file mode 100644
index 7bf6f76..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/request/EngineerRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/vo/CutDrawingInfoVO.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/vo/CutDrawingInfoVO.class
deleted file mode 100644
index 494613c..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/entity/vo/CutDrawingInfoVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/mapper/EngineeringMapper.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/mapper/EngineeringMapper.class
deleted file mode 100644
index 469c011..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/mapper/EngineeringMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/AbstractEngineeringService.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/service/AbstractEngineeringService.class
deleted file mode 100644
index c75ec79..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/AbstractEngineeringService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/EngineeringService.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/service/EngineeringService.class
deleted file mode 100644
index 1e7bb09..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/EngineeringService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/impl/EngineeringServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/service/impl/EngineeringServiceImpl.class
deleted file mode 100644
index d9dee6b..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/impl/EngineeringServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/impl/LmEngineeringServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/engineering/service/impl/LmEngineeringServiceImpl.class
deleted file mode 100644
index 92ff434..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/engineering/service/impl/LmEngineeringServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/flowcard/mapper/FlowCardInfoMapper.class b/mes-common/serverBase/target/classes/com/mes/base/flowcard/mapper/FlowCardInfoMapper.class
deleted file mode 100644
index 988cd06..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/flowcard/mapper/FlowCardInfoMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/flowcard/service/FlowCardInfoService.class b/mes-common/serverBase/target/classes/com/mes/base/flowcard/service/FlowCardInfoService.class
deleted file mode 100644
index dc53997..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/flowcard/service/FlowCardInfoService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/flowcard/service/impl/FlowCardInfoServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/flowcard/service/impl/FlowCardInfoServiceImpl.class
deleted file mode 100644
index b5a486e..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/flowcard/service/impl/FlowCardInfoServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/formula/controller/HollowFormulaDetailsController.class b/mes-common/serverBase/target/classes/com/mes/base/formula/controller/HollowFormulaDetailsController.class
deleted file mode 100644
index afcb372..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/formula/controller/HollowFormulaDetailsController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/formula/mapper/HollowFormulaDetailsMapper.class b/mes-common/serverBase/target/classes/com/mes/base/formula/mapper/HollowFormulaDetailsMapper.class
deleted file mode 100644
index 45f81d4..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/formula/mapper/HollowFormulaDetailsMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/formula/service/HollowFormulaDetailsService.class b/mes-common/serverBase/target/classes/com/mes/base/formula/service/HollowFormulaDetailsService.class
deleted file mode 100644
index 2fcd1f9..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/formula/service/HollowFormulaDetailsService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/formula/service/impl/HollowFormulaDetailsServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/formula/service/impl/HollowFormulaDetailsServiceImpl.class
deleted file mode 100644
index 2ed5c4f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/formula/service/impl/HollowFormulaDetailsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/controller/GlassInfoController.class b/mes-common/serverBase/target/classes/com/mes/base/glassinfo/controller/GlassInfoController.class
deleted file mode 100644
index aaf08f9..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/controller/GlassInfoController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/mapper/GlassInfoMapper.class b/mes-common/serverBase/target/classes/com/mes/base/glassinfo/mapper/GlassInfoMapper.class
deleted file mode 100644
index 4832e1e..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/mapper/GlassInfoMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/service/GlassInfoService.class b/mes-common/serverBase/target/classes/com/mes/base/glassinfo/service/GlassInfoService.class
deleted file mode 100644
index 615d7ad..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/service/GlassInfoService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/service/impl/GlassInfoServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/glassinfo/service/impl/GlassInfoServiceImpl.class
deleted file mode 100644
index c21b8df..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/glassinfo/service/impl/GlassInfoServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/controller/EngineeringRawQueueController.class b/mes-common/serverBase/target/classes/com/mes/base/rawqueue/controller/EngineeringRawQueueController.class
deleted file mode 100644
index 25f2461..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/controller/EngineeringRawQueueController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/mapper/EngineeringRawQueueMapper.class b/mes-common/serverBase/target/classes/com/mes/base/rawqueue/mapper/EngineeringRawQueueMapper.class
deleted file mode 100644
index c8559c5..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/mapper/EngineeringRawQueueMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/service/EngineeringRawQueueService.class b/mes-common/serverBase/target/classes/com/mes/base/rawqueue/service/EngineeringRawQueueService.class
deleted file mode 100644
index 2e7f065..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/service/EngineeringRawQueueService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/service/impl/EngineeringRawQueueServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/rawqueue/service/impl/EngineeringRawQueueServiceImpl.class
deleted file mode 100644
index 703eeca..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/rawqueue/service/impl/EngineeringRawQueueServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/report/controller/ReportController.class b/mes-common/serverBase/target/classes/com/mes/base/report/controller/ReportController.class
deleted file mode 100644
index b70e1ef..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/report/controller/ReportController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/report/mapper/ReportInfoMapper.class b/mes-common/serverBase/target/classes/com/mes/base/report/mapper/ReportInfoMapper.class
deleted file mode 100644
index 4447889..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/report/mapper/ReportInfoMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/report/service/ReportInfoService.class b/mes-common/serverBase/target/classes/com/mes/base/report/service/ReportInfoService.class
deleted file mode 100644
index f57d6d4..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/report/service/ReportInfoService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl$1.class b/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl$1.class
deleted file mode 100644
index d938268..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl$1.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl$2.class b/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl$2.class
deleted file mode 100644
index ed1fb5c..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl$2.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl.class
deleted file mode 100644
index 79313a7..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/report/service/impl/ReportInfoServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/controller/SysConfigController.class b/mes-common/serverBase/target/classes/com/mes/base/sysconfig/controller/SysConfigController.class
deleted file mode 100644
index 452e1b8..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/controller/SysConfigController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/mapper/SysConfigMapper.class b/mes-common/serverBase/target/classes/com/mes/base/sysconfig/mapper/SysConfigMapper.class
deleted file mode 100644
index 56ebea0..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/mapper/SysConfigMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/service/SysConfigService.class b/mes-common/serverBase/target/classes/com/mes/base/sysconfig/service/SysConfigService.class
deleted file mode 100644
index 6dbcd1f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/service/SysConfigService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/service/impl/SysConfigServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/sysconfig/service/impl/SysConfigServiceImpl.class
deleted file mode 100644
index 9e9c3e1..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysconfig/service/impl/SysConfigServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysdict/mapper/SysDictDataMapper.class b/mes-common/serverBase/target/classes/com/mes/base/sysdict/mapper/SysDictDataMapper.class
deleted file mode 100644
index e3ce8c1..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysdict/mapper/SysDictDataMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysdict/mapper/SysDictTypeMapper.class b/mes-common/serverBase/target/classes/com/mes/base/sysdict/mapper/SysDictTypeMapper.class
deleted file mode 100644
index d2290df..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysdict/mapper/SysDictTypeMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/SysDictDataService.class b/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/SysDictDataService.class
deleted file mode 100644
index 0656d3f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/SysDictDataService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/SysDictTypeService.class b/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/SysDictTypeService.class
deleted file mode 100644
index 1ce8cab..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/SysDictTypeService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/impl/SysDictDataServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/impl/SysDictDataServiceImpl.class
deleted file mode 100644
index a3d7ca6..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/impl/SysDictDataServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/impl/SysDictTypeServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/impl/SysDictTypeServiceImpl.class
deleted file mode 100644
index 3a37e83..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/sysdict/service/impl/SysDictTypeServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/tempparameter/mapper/TemperingParameterMapper.class b/mes-common/serverBase/target/classes/com/mes/base/tempparameter/mapper/TemperingParameterMapper.class
deleted file mode 100644
index 7eff29a..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/tempparameter/mapper/TemperingParameterMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/tempparameter/service/TemperingParameterService.class b/mes-common/serverBase/target/classes/com/mes/base/tempparameter/service/TemperingParameterService.class
deleted file mode 100644
index 4d87529..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/tempparameter/service/TemperingParameterService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/tempparameter/service/impl/TemperingParameterServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/tempparameter/service/impl/TemperingParameterServiceImpl.class
deleted file mode 100644
index 449234f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/tempparameter/service/impl/TemperingParameterServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/work/mapper/WorkAssignmentMapper.class b/mes-common/serverBase/target/classes/com/mes/base/work/mapper/WorkAssignmentMapper.class
deleted file mode 100644
index 35b4273..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/work/mapper/WorkAssignmentMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/work/service/WorkAssignmentService.class b/mes-common/serverBase/target/classes/com/mes/base/work/service/WorkAssignmentService.class
deleted file mode 100644
index e528cfd..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/work/service/WorkAssignmentService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/base/work/service/impl/WorkAssignmentServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/base/work/service/impl/WorkAssignmentServiceImpl.class
deleted file mode 100644
index 4a48a34..0000000
--- a/mes-common/serverBase/target/classes/com/mes/base/work/service/impl/WorkAssignmentServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/config/MybatisPlusConfig.class b/mes-common/serverBase/target/classes/com/mes/config/MybatisPlusConfig.class
deleted file mode 100644
index 3583b06..0000000
--- a/mes-common/serverBase/target/classes/com/mes/config/MybatisPlusConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/config/SchedulerConfig.class b/mes-common/serverBase/target/classes/com/mes/config/SchedulerConfig.class
deleted file mode 100644
index 777d122..0000000
--- a/mes-common/serverBase/target/classes/com/mes/config/SchedulerConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/config/Swagger2Config.class b/mes-common/serverBase/target/classes/com/mes/config/Swagger2Config.class
deleted file mode 100644
index 2f1721a..0000000
--- a/mes-common/serverBase/target/classes/com/mes/config/Swagger2Config.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/config/WebSocketConfig.class b/mes-common/serverBase/target/classes/com/mes/config/WebSocketConfig.class
deleted file mode 100644
index fd3ed46..0000000
--- a/mes-common/serverBase/target/classes/com/mes/config/WebSocketConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/erp/service/ErpService.class b/mes-common/serverBase/target/classes/com/mes/erp/service/ErpService.class
deleted file mode 100644
index 3151519..0000000
--- a/mes-common/serverBase/target/classes/com/mes/erp/service/ErpService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/erp/service/impl/ErpServiceImpl.class b/mes-common/serverBase/target/classes/com/mes/erp/service/impl/ErpServiceImpl.class
deleted file mode 100644
index 48661c7..0000000
--- a/mes-common/serverBase/target/classes/com/mes/erp/service/impl/ErpServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/exception/GlobalExceptionHandler.class b/mes-common/serverBase/target/classes/com/mes/exception/GlobalExceptionHandler.class
deleted file mode 100644
index 7b05aea..0000000
--- a/mes-common/serverBase/target/classes/com/mes/exception/GlobalExceptionHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/exception/ServiceException.class b/mes-common/serverBase/target/classes/com/mes/exception/ServiceException.class
deleted file mode 100644
index 8d009d7..0000000
--- a/mes-common/serverBase/target/classes/com/mes/exception/ServiceException.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/feign/ErpUrlOpenFeignService.class b/mes-common/serverBase/target/classes/com/mes/feign/ErpUrlOpenFeignService.class
deleted file mode 100644
index 090c581..0000000
--- a/mes-common/serverBase/target/classes/com/mes/feign/ErpUrlOpenFeignService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/feign/MesHubOpenFeignService.class b/mes-common/serverBase/target/classes/com/mes/feign/MesHubOpenFeignService.class
deleted file mode 100644
index 6d1343f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/feign/MesHubOpenFeignService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/feign/OpenFeignService.class b/mes-common/serverBase/target/classes/com/mes/feign/OpenFeignService.class
deleted file mode 100644
index 9a3cca1..0000000
--- a/mes-common/serverBase/target/classes/com/mes/feign/OpenFeignService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/feign/TemperingOpenFeignService.class b/mes-common/serverBase/target/classes/com/mes/feign/TemperingOpenFeignService.class
deleted file mode 100644
index a288e2b..0000000
--- a/mes-common/serverBase/target/classes/com/mes/feign/TemperingOpenFeignService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/feign/TemperingTaskOpenFeignService.class b/mes-common/serverBase/target/classes/com/mes/feign/TemperingTaskOpenFeignService.class
deleted file mode 100644
index 4c54b5a..0000000
--- a/mes-common/serverBase/target/classes/com/mes/feign/TemperingTaskOpenFeignService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/request/TimeRequest.class b/mes-common/serverBase/target/classes/com/mes/request/TimeRequest.class
deleted file mode 100644
index 2b953a4..0000000
--- a/mes-common/serverBase/target/classes/com/mes/request/TimeRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/result/ResponseUtil.class b/mes-common/serverBase/target/classes/com/mes/result/ResponseUtil.class
deleted file mode 100644
index 202c41b..0000000
--- a/mes-common/serverBase/target/classes/com/mes/result/ResponseUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/result/Result.class b/mes-common/serverBase/target/classes/com/mes/result/Result.class
deleted file mode 100644
index 1f328fa..0000000
--- a/mes-common/serverBase/target/classes/com/mes/result/Result.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/result/ResultCodeEnum.class b/mes-common/serverBase/target/classes/com/mes/result/ResultCodeEnum.class
deleted file mode 100644
index 8ce5bad..0000000
--- a/mes-common/serverBase/target/classes/com/mes/result/ResultCodeEnum.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/InitUtil.class b/mes-common/serverBase/target/classes/com/mes/s7/InitUtil.class
deleted file mode 100644
index 91a1011..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/InitUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/S7control.class b/mes-common/serverBase/target/classes/com/mes/s7/S7control.class
deleted file mode 100644
index 7a7ab8e..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/S7control.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcBitInfo.class b/mes-common/serverBase/target/classes/com/mes/s7/device/PlcBitInfo.class
deleted file mode 100644
index b54eab1..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcBitInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcBitObject.class b/mes-common/serverBase/target/classes/com/mes/s7/device/PlcBitObject.class
deleted file mode 100644
index 6b268b4..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcBitObject.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcParameterInfo.class b/mes-common/serverBase/target/classes/com/mes/s7/device/PlcParameterInfo.class
deleted file mode 100644
index 354eeb0..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcParameterInfo.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcParameterObject.class b/mes-common/serverBase/target/classes/com/mes/s7/device/PlcParameterObject.class
deleted file mode 100644
index e343f89..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/device/PlcParameterObject.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/enhanced/EnhancedS7Serializer.class b/mes-common/serverBase/target/classes/com/mes/s7/enhanced/EnhancedS7Serializer.class
deleted file mode 100644
index b0f76ff..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/enhanced/EnhancedS7Serializer.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/enhanced/S7AddressProperties.class b/mes-common/serverBase/target/classes/com/mes/s7/enhanced/S7AddressProperties.class
deleted file mode 100644
index ce6f825..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/enhanced/S7AddressProperties.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/s7/enhanced/S7AnnotationProcessor.class b/mes-common/serverBase/target/classes/com/mes/s7/enhanced/S7AnnotationProcessor.class
deleted file mode 100644
index 063d988..0000000
--- a/mes-common/serverBase/target/classes/com/mes/s7/enhanced/S7AnnotationProcessor.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/sysconst/Const.class b/mes-common/serverBase/target/classes/com/mes/sysconst/Const.class
deleted file mode 100644
index c486186..0000000
--- a/mes-common/serverBase/target/classes/com/mes/sysconst/Const.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstRequest.class b/mes-common/serverBase/target/classes/com/mes/sysconst/ConstRequest.class
deleted file mode 100644
index 0a3ddbb..0000000
--- a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstRequest.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstSwitch.class b/mes-common/serverBase/target/classes/com/mes/sysconst/ConstSwitch.class
deleted file mode 100644
index a7607db..0000000
--- a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstSwitch.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstSysConfig.class b/mes-common/serverBase/target/classes/com/mes/sysconst/ConstSysConfig.class
deleted file mode 100644
index 2678e5e..0000000
--- a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstSysConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstWebSocket.class b/mes-common/serverBase/target/classes/com/mes/sysconst/ConstWebSocket.class
deleted file mode 100644
index bc8c384..0000000
--- a/mes-common/serverBase/target/classes/com/mes/sysconst/ConstWebSocket.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/tools/CodeGet.class b/mes-common/serverBase/target/classes/com/mes/tools/CodeGet.class
deleted file mode 100644
index 9f2ca72..0000000
--- a/mes-common/serverBase/target/classes/com/mes/tools/CodeGet.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/tools/DatabaseDesignDoc.class b/mes-common/serverBase/target/classes/com/mes/tools/DatabaseDesignDoc.class
deleted file mode 100644
index d0fd6df..0000000
--- a/mes-common/serverBase/target/classes/com/mes/tools/DatabaseDesignDoc.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/tools/EntityTool.class b/mes-common/serverBase/target/classes/com/mes/tools/EntityTool.class
deleted file mode 100644
index 11c01f6..0000000
--- a/mes-common/serverBase/target/classes/com/mes/tools/EntityTool.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/DateUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/DateUtil.class
deleted file mode 100644
index 19f5a5a..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/DateUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/FileUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/FileUtil.class
deleted file mode 100644
index 9f0983d..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/FileUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/JsonUtils.class b/mes-common/serverBase/target/classes/com/mes/utils/JsonUtils.class
deleted file mode 100644
index cbf10c2..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/JsonUtils.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/MD5.class b/mes-common/serverBase/target/classes/com/mes/utils/MD5.class
deleted file mode 100644
index 9f961b1..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/MD5.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/NbUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/NbUtil.class
deleted file mode 100644
index 2d46acb..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/NbUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/PageUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/PageUtil.class
deleted file mode 100644
index 320c3af..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/PageUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/RedisUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/RedisUtil.class
deleted file mode 100644
index b892045..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/RedisUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/S7ParameterUtils.class b/mes-common/serverBase/target/classes/com/mes/utils/S7ParameterUtils.class
deleted file mode 100644
index 03d504a..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/S7ParameterUtils.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/WebNbUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/WebNbUtil.class
deleted file mode 100644
index bc1e2a5..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/WebNbUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/excel/CustomCellStyleHandler.class b/mes-common/serverBase/target/classes/com/mes/utils/excel/CustomCellStyleHandler.class
deleted file mode 100644
index 53c4ccb..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/excel/CustomCellStyleHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/excel/CustomCellWriteWidthConfig.class b/mes-common/serverBase/target/classes/com/mes/utils/excel/CustomCellWriteWidthConfig.class
deleted file mode 100644
index 340de84..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/excel/CustomCellWriteWidthConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelMerge.class b/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelMerge.class
deleted file mode 100644
index 656137c..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelMerge.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelMergeStrategy.class b/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelMergeStrategy.class
deleted file mode 100644
index 7cbde2f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelMergeStrategy.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelUtil.class b/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelUtil.class
deleted file mode 100644
index 251c63f..0000000
--- a/mes-common/serverBase/target/classes/com/mes/utils/excel/ExcelUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/websocket/WebSocketServer.class b/mes-common/serverBase/target/classes/com/mes/websocket/WebSocketServer.class
deleted file mode 100644
index 08f3502..0000000
--- a/mes-common/serverBase/target/classes/com/mes/websocket/WebSocketServer.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/com/mes/websocket/WebSocketUtils.class b/mes-common/serverBase/target/classes/com/mes/websocket/WebSocketUtils.class
deleted file mode 100644
index 07717b8..0000000
--- a/mes-common/serverBase/target/classes/com/mes/websocket/WebSocketUtils.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/serverBase/target/classes/mapper/DamageMapper.xml b/mes-common/serverBase/target/classes/mapper/DamageMapper.xml
deleted file mode 100644
index 72c95bb..0000000
--- a/mes-common/serverBase/target/classes/mapper/DamageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.base.damage.mapper.DamageMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/mes-common/serverBase/target/classes/mapper/EngineeringMapper.xml b/mes-common/serverBase/target/classes/mapper/EngineeringMapper.xml
deleted file mode 100644
index f8d4f7e..0000000
--- a/mes-common/serverBase/target/classes/mapper/EngineeringMapper.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.base.engineering.mapper.EngineeringMapper">
-
-
- <select id="queryEngineeringByErp" resultType="com.mes.engineering.Engineering">
- select project_no as engineer_Id,
- project_name as engineer_name,
- avg_cut_pct as avg_availability,
- valid_cut_pct as valid_availability,
- last_cut_pct as last_availability,
- glass_total as glass_total,
- glass_total_area as glass_total_area,
- raw_stock_qty as plan_pattern_total,
- raw_stock_area as plan_pattern_total_area,
- glass_type as films_id,
- 1 as state,
- remark as notes
- from pp.optimize_project
- where project_no = #{engineerId}
- </select>
- <select id="queryGlassListByErp" resultType="com.mes.glassinfo.request.GlassInfoImportRequest">
- SELECT t1.project_no AS engineer_id,
- t1.process_id AS flow_card_id,
- t1.glass_id,
- t.glass_type AS films_id,
- t1.order_sort AS glass_type,
- t1.o_width AS width,
- t1.o_height AS height,
- t1.p_width AS edg_width,
- t1.p_height AS edg_height,
- t.glass_thickness AS thickness,
- t1.layer AS layer,
- t3.layers_number AS total_layer,
- t1.stock_id AS raw_sequence,
- t1.x_axis,
- t1.y_axis,
- t1.heat_layout_id AS tempering_layout_id,
- t1.heat_layout_sort AS tempering_feed_sequence,
- t2.x_axis AS x_coordinate,
- t2.y_axis AS y_coordinate,
- t2.rotate_angle AS angle,
- t3.MERGE AS combine,
- t1.mark_icon
- FROM pp.optimize_project t
- LEFT JOIN pp.optimize_detail t1 ON t.project_no = t1.project_no
- LEFT JOIN pp.optimize_heat_detail t2 ON t.project_no = t2.project_no
- AND t1.heat_layout_id = t2.layout_id
- AND t1.heat_layout_sort = t2.sort
- LEFT JOIN pp.flow_card t3 ON t3.process_id = t1.process_id
- AND t3.technology_number = t1.layer
- AND t3.order_number = t1.order_sort
- WHERE t.project_no = #{engineerId}
- </select>
-
- <select id="queryRawListByErp" resultType="com.mes.rawqueue.request.EngineeringRawQueueImportRequest">
- SELECT t.project_no as engineering_id,
- t.glass_type as films_id,
- t1.realwidth AS raw_glass_width,
- t1.realheight AS raw_glass_height,
- t.glass_thickness as raw_glass_thickness,
- t1.stock_id as raw_sequence,
- 0 as state
- FROM pp.optimize_project t
- INNER JOIN pp.optimize_layout t1 ON t.project_no = t1.project_no
- WHERE t.project_no = #{engineerId}
- order by t1.stock_id
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/mes-common/serverBase/target/classes/mapper/EngineeringRawQueueMapper.xml b/mes-common/serverBase/target/classes/mapper/EngineeringRawQueueMapper.xml
deleted file mode 100644
index 7c20c51..0000000
--- a/mes-common/serverBase/target/classes/mapper/EngineeringRawQueueMapper.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.base.rawqueue.mapper.EngineeringRawQueueMapper">
-
- <resultMap id="baseMap" type="com.mes.rawqueue.vo.EngineeringRawQueueVO">
- <result column="id" property="id"/>
- <result column="engineering_id" property="engineeringId"/>
- <result column="films_id" property="filmsId"/>
- <result column="raw_glass_width" property="rawGlassWidth"/>
- <result column="raw_glass_height" property="rawGlassHeight"/>
- <result column="raw_glass_thickness" property="rawGlassThickness"/>
- <result column="raw_sequence" property="rawSequence"/>
- <result column="state" property="state"/>
- <result column="group_number" property="groupNumber"/>
- </resultMap>
-
-
- <select id="queryRawGlassByEngineeringId" resultMap="baseMap">
- SET @prev_width := NULL;
- SET @prev_height := NULL;
- SET @counter := 0;
- SELECT t.*,
- @counter := IF(@prev_width = raw_glass_width and @prev_height = raw_glass_height, @counter,
- @counter + 1) AS group_number,
- @prev_width := raw_glass_width,
- @prev_height := raw_glass_height
- FROM engineering_raw_queue t
- where t.engineering_id = #{engineerId}
- and t.state = 0
- ORDER BY t.raw_sequence
- </select>
-
- <select id="queryRawQueueByWorkLine" resultType="com.mes.rawqueue.EngineeringRawQueue">
- select t1.*
- from engineering t
- INNER JOIN engineering_raw_queue t1
- on t.engineer_id = t1.engineering_id
- where t.state = 1
- and t1.state <= 2
- and t.work_line = #{workLine}
- order by t1.raw_sequence
- limit 1
- </select>
-
- <update id="updateRawQueueByCount">
- update engineering_raw_queue
- set state = #{finishTaskState}
- where engineering_id = #{engineerId}
- <if test="taskStateList != null and taskStateList.size() > 0">
- and state in (
- <foreach collection="taskStateList" item="item" separator=",">
- #{item}
- </foreach>
- )
- </if>
- order by raw_sequence
- limit #{count}
- </update>
-
-</mapper>
\ No newline at end of file
diff --git a/mes-common/serverBase/target/classes/mapper/GlassInfoMapper.xml b/mes-common/serverBase/target/classes/mapper/GlassInfoMapper.xml
deleted file mode 100644
index 431a719..0000000
--- a/mes-common/serverBase/target/classes/mapper/GlassInfoMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.base.glassinfo.mapper.GlassInfoMapper">
- <select id="queryNotReport" resultType="com.mes.glassinfo.GlassInfo">
- SELECT g.*
-
- FROM glass_info g
- LEFT JOIN damage d ON g.glass_id = d.glass_id
- LEFT JOIN report_info r ON g.glass_id = r.glass_id
- WHERE g.engineer_id = #{engineerId}
- AND d.glass_id is null
- AND r.glass_id is null
- </select>
-
- <select id="queryGlassListByErp" resultType="com.mes.glassinfo.GlassInfo">
- SELECT t1.project_no AS engineer_id,
- t1.process_id AS flow_card_id,
- t1.glass_id,
- t.glass_type AS films_id,
- t1.order_sort AS glass_type,
- t1.o_width AS width,
- t1.o_height AS height,
- t1.p_width AS edg_width,
- t1.p_height AS edg_height,
- t.glass_thickness AS glass_thickness,
- t1.layer AS layer,
- t3.layers_number AS total_layer,
- t1.stock_id AS raw_sequence,
- t1.x_axis,
- t1.y_axis,
- t1.heat_layout_id AS tempering_layout_id,
- t1.heat_layout_sort AS tempering_feed_sequence,
- t2.x_axis AS x_coordinate,
- t2.y_axis AS y_coordinate,
- t2.rotate_angle AS angle,
- t3.MERGE AS combine,
- t1.mark_icon
- FROM pp.optimize_project t
- LEFT JOIN pp.optimize_detail t1 ON t.project_no = t1.project_no
- LEFT JOIN pp.optimize_heat_detail t2 ON t.project_no = t2.project_no
- AND t1.heat_layout_id = t2.layout_id
- AND t1.heat_layout_sort = t2.sort
- LEFT JOIN pp.flow_card t3 ON t3.process_id = t1.process_id
- AND t3.technology_number = t1.layer
- AND t3.order_number = t1.order_sort
- WHERE t.project_no = #{engineerId}
- </select>
- <select id="queryUnreportedList" resultType="com.mes.glassinfo.GlassInfo">
- SELECT t.*
- FROM glass_info t
- left join report_info t1 on t.glass_id = t1.glass_id
- left join damage t2 on t.glass_id = t2.glass_id
- where t1.glass_id is null
- and t2.glass_id is null
- and t.engineer_id = #{engineerId}
- </select>
- <select id="queryGlassListByLayer" resultType="com.mes.tempering.compute.request.ProcessCardsRequest">
- SELECT flow_card_id,
- layer as layers,
- total_layer,
- COUNT(glass_id) as total_num,
- round(sum(width * height / 1000000), 2) as total_area
- FROM glass_info
- WHERE flow_card_id = #{flowCardId}
- AND layer = #{layer}
- <if test="orderNumberList != null and orderNumberList.size() > 0">
- and product_sort_number in (
- <foreach collection="orderNumberList" item="item" separator=",">
- #{item}
- </foreach>
- )
- </if>
- GROUP BY flow_card_id, layer, total_layer
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/mes-common/serverBase/target/maven-archiver/pom.properties b/mes-common/serverBase/target/maven-archiver/pom.properties
deleted file mode 100644
index a1fc16c..0000000
--- a/mes-common/serverBase/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-version=1.0.0
-groupId=com.mes
-artifactId=serverBase
diff --git a/mes-common/serverBase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mes-common/serverBase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 8d33274..0000000
--- a/mes-common/serverBase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,108 +0,0 @@
-com\mes\feign\TemperingOpenFeignService.class
-com\mes\utils\NbUtil.class
-com\kangaroohy\milo\pool\MiloConnectFactory.class
-com\mes\exception\GlobalExceptionHandler.class
-com\mes\exception\ServiceException.class
-com\mes\s7\S7control.class
-com\mes\base\glassinfo\service\GlassInfoService.class
-com\mes\s7\enhanced\EnhancedS7Serializer$1.class
-com\mes\base\damage\service\DamageService.class
-com\mes\tools\EntityTool.class
-com\mes\websocket\WebSocketServer.class
-com\mes\config\SchedulerConfig.class
-com\mes\base\sysdict\mapper\SysDictTypeMapper.class
-com\mes\utils\excel\ExcelMerge.class
-com\mes\base\sysconfig\mapper\SysConfigMapper.class
-com\mes\utils\S7ParameterUtils.class
-com\mes\base\report\service\impl\ReportInfoServiceImpl$2.class
-com\mes\base\glassinfo\mapper\GlassInfoMapper.class
-com\mes\base\rawqueue\controller\EngineeringRawQueueController.class
-com\mes\s7\device\PlcBitObject.class
-com\mes\base\sysdict\service\impl\SysDictDataServiceImpl.class
-com\mes\s7\device\PlcParameterInfo.class
-com\mes\base\rawqueue\service\impl\EngineeringRawQueueServiceImpl.class
-com\mes\base\damagedetails\service\impl\DamageDetailsServiceImpl.class
-com\mes\utils\excel\CustomCellWriteWidthConfig.class
-com\mes\base\flowcard\mapper\FlowCardInfoMapper.class
-com\mes\s7\enhanced\S7AddressProperties.class
-com\mes\utils\WebNbUtil.class
-com\mes\feign\OpenFeignService.class
-com\mes\base\engineering\service\AbstractEngineeringService.class
-com\mes\base\rawqueue\mapper\EngineeringRawQueueMapper.class
-com\mes\s7\enhanced\EnhancedS7Serializer.class
-com\mes\base\tempparameter\service\impl\TemperingParameterServiceImpl.class
-com\mes\utils\DateUtil.class
-com\mes\utils\PageUtil.class
-com\mes\config\MybatisPlusConfig.class
-com\mes\base\sysconfig\service\SysConfigService.class
-com\mes\websocket\WebSocketUtils.class
-com\mes\base\report\service\ReportInfoService.class
-com\mes\utils\excel\ExcelMergeStrategy.class
-com\mes\s7\device\PlcBitInfo.class
-com\mes\base\engineering\mapper\EngineeringMapper.class
-com\mes\utils\excel\CustomCellWriteWidthConfig$1.class
-com\mes\config\WebSocketConfig.class
-com\mes\base\tempparameter\mapper\TemperingParameterMapper.class
-com\mes\base\engineering\entity\request\EngineerRequest.class
-com\mes\s7\device\PlcParameterObject.class
-com\mes\tools\DatabaseDesignDoc.class
-com\mes\tools\CodeGet.class
-com\mes\base\damage\mapper\DamageMapper.class
-com\mes\request\TimeRequest.class
-com\mes\base\sysdict\service\SysDictTypeService.class
-com\mes\result\ResultCodeEnum.class
-com\mes\base\formula\mapper\HollowFormulaDetailsMapper.class
-com\mes\base\damagedetails\service\DamageDetailsService.class
-com\mes\feign\MesHubOpenFeignService.class
-com\mes\base\flowcard\service\FlowCardInfoService.class
-com\mes\base\sysconfig\controller\SysConfigController.class
-com\mes\base\report\service\impl\ReportInfoServiceImpl$1.class
-com\mes\sysconst\ConstSwitch.class
-com\mes\base\report\service\impl\ReportInfoServiceImpl.class
-com\mes\sysconst\ConstRequest.class
-com\mes\base\formula\service\HollowFormulaDetailsService.class
-com\mes\base\sysdict\service\SysDictDataService.class
-com\mes\base\formula\controller\HollowFormulaDetailsController.class
-com\mes\base\glassinfo\service\impl\GlassInfoServiceImpl.class
-com\mes\base\damage\service\impl\DamageServiceImpl.class
-com\mes\utils\excel\CustomCellStyleHandler.class
-com\mes\base\glassinfo\controller\GlassInfoController.class
-com\mes\erp\service\ErpService.class
-com\mes\base\sysconfig\service\impl\SysConfigServiceImpl.class
-com\mes\feign\ErpUrlOpenFeignService.class
-com\mes\sysconst\ConstWebSocket.class
-com\mes\feign\TemperingTaskOpenFeignService.class
-com\mes\s7\InitUtil.class
-com\mes\base\flowcard\service\impl\FlowCardInfoServiceImpl.class
-com\mes\s7\enhanced\S7AnnotationProcessor.class
-com\mes\base\work\service\impl\WorkAssignmentServiceImpl.class
-com\mes\base\report\controller\ReportController.class
-com\mes\utils\MD5.class
-com\mes\base\engineering\service\impl\LmEngineeringServiceImpl.class
-com\mes\result\Result.class
-com\mes\utils\JsonUtils.class
-com\mes\base\damage\controller\DamageController.class
-com\mes\base\bigstorage\BigStorageCageBaseInfo.class
-com\mes\base\rawqueue\service\EngineeringRawQueueService.class
-com\mes\base\work\service\WorkAssignmentService.class
-com\kangaroohy\milo\configuration\MiloAutoConfiguration.class
-com\mes\base\formula\service\impl\HollowFormulaDetailsServiceImpl.class
-com\mes\base\engineering\service\impl\EngineeringServiceImpl.class
-com\mes\sysconst\ConstSysConfig.class
-com\mes\utils\RedisUtil.class
-com\mes\utils\FileUtil.class
-com\mes\base\engineering\controller\EngineeringController.class
-com\mes\base\work\mapper\WorkAssignmentMapper.class
-com\mes\base\tempparameter\service\TemperingParameterService.class
-com\mes\base\damagedetails\mapper\DamageDetailsMapper.class
-com\mes\base\report\mapper\ReportInfoMapper.class
-com\mes\config\Swagger2Config.class
-com\mes\base\engineering\service\EngineeringService.class
-com\mes\utils\excel\ExcelUtil.class
-com\mes\base\sysdict\service\impl\SysDictTypeServiceImpl.class
-com\mes\sysconst\Const.class
-com\mes\base\sysdict\mapper\SysDictDataMapper.class
-com\mes\base\engineering\entity\request\EngineerImportRequest.class
-com\mes\result\ResponseUtil.class
-com\mes\base\engineering\entity\vo\CutDrawingInfoVO.class
-com\mes\erp\service\impl\ErpServiceImpl.class
diff --git a/mes-common/serverBase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mes-common/serverBase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 0b13ced..0000000
--- a/mes-common/serverBase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,104 +0,0 @@
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\feign\MesHubOpenFeignService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\sysconst\ConstRequest.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysconfig\controller\SysConfigController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\feign\TemperingOpenFeignService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysdict\mapper\SysDictDataMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\formula\service\impl\HollowFormulaDetailsServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysdict\service\SysDictTypeService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\entity\request\EngineerRequest.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\work\service\WorkAssignmentService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysdict\service\impl\SysDictTypeServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\mapper\EngineeringMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\work\service\impl\WorkAssignmentServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\FileUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\service\AbstractEngineeringService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\flowcard\service\impl\FlowCardInfoServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\config\WebSocketConfig.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damage\controller\DamageController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\report\controller\ReportController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\device\PlcBitInfo.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\device\PlcParameterInfo.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\service\impl\LmEngineeringServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\tempparameter\service\impl\TemperingParameterServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysconfig\service\impl\SysConfigServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\flowcard\mapper\FlowCardInfoMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\websocket\WebSocketUtils.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\tempparameter\mapper\TemperingParameterMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\controller\EngineeringController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\glassinfo\controller\GlassInfoController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\result\Result.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\enhanced\S7AddressProperties.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\formula\mapper\HollowFormulaDetailsMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\request\TimeRequest.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\rawqueue\service\impl\EngineeringRawQueueServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damage\mapper\DamageMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\excel\ExcelMergeStrategy.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damage\service\impl\DamageServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\flowcard\service\FlowCardInfoService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\device\PlcParameterObject.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\PageUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\kangaroohy\milo\configuration\MiloAutoConfiguration.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\sysconst\Const.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\exception\GlobalExceptionHandler.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysconfig\mapper\SysConfigMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\MD5.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\config\MybatisPlusConfig.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\tools\CodeGet.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\formula\controller\HollowFormulaDetailsController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\erp\service\ErpService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\JsonUtils.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\excel\ExcelMerge.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\rawqueue\controller\EngineeringRawQueueController.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\tools\EntityTool.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\bigstorage\BigStorageCageBaseInfo.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\InitUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\glassinfo\service\impl\GlassInfoServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\rawqueue\service\EngineeringRawQueueService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\sysconst\ConstWebSocket.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\rawqueue\mapper\EngineeringRawQueueMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\result\ResponseUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\config\Swagger2Config.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damagedetails\service\impl\DamageDetailsServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\tools\DatabaseDesignDoc.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\excel\CustomCellStyleHandler.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\report\service\ReportInfoService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\entity\vo\CutDrawingInfoVO.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\exception\ServiceException.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\WebNbUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damagedetails\mapper\DamageDetailsMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\feign\ErpUrlOpenFeignService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damagedetails\service\DamageDetailsService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\service\EngineeringService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\DateUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\report\mapper\ReportInfoMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\config\SchedulerConfig.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\sysconst\ConstSwitch.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\S7control.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysdict\mapper\SysDictTypeMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\RedisUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\enhanced\S7AnnotationProcessor.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysdict\service\impl\SysDictDataServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\work\mapper\WorkAssignmentMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\NbUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\websocket\WebSocketServer.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\feign\TemperingTaskOpenFeignService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysconfig\service\SysConfigService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\glassinfo\service\GlassInfoService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\tempparameter\service\TemperingParameterService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\sysdict\service\SysDictDataService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\report\service\impl\ReportInfoServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\kangaroohy\milo\pool\MiloConnectFactory.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\result\ResultCodeEnum.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\service\impl\EngineeringServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\S7ParameterUtils.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\erp\service\impl\ErpServiceImpl.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\sysconst\ConstSysConfig.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\device\PlcBitObject.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\engineering\entity\request\EngineerImportRequest.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\excel\ExcelUtil.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\s7\enhanced\EnhancedS7Serializer.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\utils\excel\CustomCellWriteWidthConfig.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\feign\OpenFeignService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\formula\service\HollowFormulaDetailsService.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\glassinfo\mapper\GlassInfoMapper.java
-D:\work\PlcTaskSend\mes-common\serverBase\src\main\java\com\mes\base\damage\service\DamageService.java
diff --git a/mes-common/serverBase/target/serverBase-1.0.0.jar b/mes-common/serverBase/target/serverBase-1.0.0.jar
deleted file mode 100644
index 99e279b..0000000
--- a/mes-common/serverBase/target/serverBase-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/application-dev.yml b/mes-common/springSecurity/target/classes/application-dev.yml
deleted file mode 100644
index 56b0ecb..0000000
--- a/mes-common/springSecurity/target/classes/application-dev.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/north_glass_mes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
- cloud:
- nacos:
- discovery:
- server-addr: 10.153.19.150:8848
- redis:
- database: 0
- host: 10.153.19.150
- port: 6379
- password: 123456
\ No newline at end of file
diff --git a/mes-common/springSecurity/target/classes/application-loc.yml b/mes-common/springSecurity/target/classes/application-loc.yml
deleted file mode 100644
index 8068d08..0000000
--- a/mes-common/springSecurity/target/classes/application-loc.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.56.10:3306/north_glass_mes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: root
- cloud:
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: 123456
\ No newline at end of file
diff --git a/mes-common/springSecurity/target/classes/application-prod.yml b/mes-common/springSecurity/target/classes/application-prod.yml
deleted file mode 100644
index b8aa00a..0000000
--- a/mes-common/springSecurity/target/classes/application-prod.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/north_glass_mes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
- cloud:
- nacos:
- discovery:
- server-addr: 127.0.0.1:8848
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: 123456
\ No newline at end of file
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/config/RedisConfig.class b/mes-common/springSecurity/target/classes/com/mes/common/config/RedisConfig.class
deleted file mode 100644
index 609ebd8..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/config/RedisConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/config/TokenWebSecurityConfig.class b/mes-common/springSecurity/target/classes/com/mes/common/config/TokenWebSecurityConfig.class
deleted file mode 100644
index 9048f59..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/config/TokenWebSecurityConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/filter/JwtAuthenticationTokenFilter.class b/mes-common/springSecurity/target/classes/com/mes/common/filter/JwtAuthenticationTokenFilter.class
deleted file mode 100644
index 083419c..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/filter/JwtAuthenticationTokenFilter.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtAccessDeniedHandler.class b/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtAccessDeniedHandler.class
deleted file mode 100644
index ea2ab0a..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtAccessDeniedHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtAuthenticationEntryPoint.class b/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtAuthenticationEntryPoint.class
deleted file mode 100644
index 51a4b4c..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtAuthenticationEntryPoint.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtLogoutSuccessHandler.class b/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtLogoutSuccessHandler.class
deleted file mode 100644
index 4534e01..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/handler/JwtLogoutSuccessHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/handler/LoginFailureHandler.class b/mes-common/springSecurity/target/classes/com/mes/common/handler/LoginFailureHandler.class
deleted file mode 100644
index 1207ecc..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/handler/LoginFailureHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/handler/LoginSuccessHandler.class b/mes-common/springSecurity/target/classes/com/mes/common/handler/LoginSuccessHandler.class
deleted file mode 100644
index 006a796..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/handler/LoginSuccessHandler.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/utils/FastJsonRedisSerializer.class b/mes-common/springSecurity/target/classes/com/mes/common/utils/FastJsonRedisSerializer.class
deleted file mode 100644
index 78a1309..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/utils/FastJsonRedisSerializer.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/utils/JwtUtil.class b/mes-common/springSecurity/target/classes/com/mes/common/utils/JwtUtil.class
deleted file mode 100644
index d6babae..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/utils/JwtUtil.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/utils/UserInfoUtils.class b/mes-common/springSecurity/target/classes/com/mes/common/utils/UserInfoUtils.class
deleted file mode 100644
index 0e509d2..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/utils/UserInfoUtils.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/common/utils/WebUtils.class b/mes-common/springSecurity/target/classes/com/mes/common/utils/WebUtils.class
deleted file mode 100644
index d808c11..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/common/utils/WebUtils.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/menu/controller/SysMenuController.class b/mes-common/springSecurity/target/classes/com/mes/menu/controller/SysMenuController.class
deleted file mode 100644
index 6a4a5de..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/menu/controller/SysMenuController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/menu/mapper/SysMenuMapper.class b/mes-common/springSecurity/target/classes/com/mes/menu/mapper/SysMenuMapper.class
deleted file mode 100644
index 76c0f81..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/menu/mapper/SysMenuMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/menu/service/SysMenuService.class b/mes-common/springSecurity/target/classes/com/mes/menu/service/SysMenuService.class
deleted file mode 100644
index 7f75678..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/menu/service/SysMenuService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/menu/service/impl/SysMenuServiceImpl.class b/mes-common/springSecurity/target/classes/com/mes/menu/service/impl/SysMenuServiceImpl.class
deleted file mode 100644
index 60c82f0..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/menu/service/impl/SysMenuServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/controller/SysRoleController.class b/mes-common/springSecurity/target/classes/com/mes/role/controller/SysRoleController.class
deleted file mode 100644
index f5a2b5a..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/controller/SysRoleController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/mapper/SysRoleMapper.class b/mes-common/springSecurity/target/classes/com/mes/role/mapper/SysRoleMapper.class
deleted file mode 100644
index 0a66046..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/mapper/SysRoleMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/mapper/SysRoleMenuMapper.class b/mes-common/springSecurity/target/classes/com/mes/role/mapper/SysRoleMenuMapper.class
deleted file mode 100644
index 07e6131..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/mapper/SysRoleMenuMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/mapper/xml/SysRoleMapper.xml b/mes-common/springSecurity/target/classes/com/mes/role/mapper/xml/SysRoleMapper.xml
deleted file mode 100644
index 5e2beaa..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/mapper/xml/SysRoleMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.role.mapper.SysRoleMapper">
-
- <resultMap id="baseMap" type="com.mes.role.vo.SysRoleVO">
- <result column="id" property="id"/>
- <result column="user_name" property="name"/>
- <result column="nick_name" property="state"/>
- <result column="password" property="delFlag"/>
- <result column="avatar" property="remark"/>
- <collection property="menuList" ofType="com.mes.menu.SysMenu">
- <id column="id" property="id"/>
- <result column="parent_id" property="parentId"/>
- <result column="menu_mame" property="menuName"/>
- <result column="icon" property="icon"/>
- <result column="url" property="url"/>
- <result column="language_type" property="languageType"/>
- <result column="state" property="state"/>
- <result column="list_sort" property="listSort"/>
- <result column="create_time" property="createTime"/>
- <result column="perms" property="perms"/>
- </collection>
- </resultMap>
-
-
- <select id="roleList" resultMap="baseMap">
- SELECT t.*, t2.*
- FROM sys_role t
- LEFT JOIN sys_role_menu t1 ON t.id = t1.role_id
- LEFT JOIN sys_menu t2 ON t1.menu_id = t2.id
- WHERE 1=1
- <if test="key != null and key != ''">
- and t.name LIKE CONCAT('%', #{key}, '%')
- </if>
- </select>
-</mapper>
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/mapper/xml/SysRoleMenuMapper.xml b/mes-common/springSecurity/target/classes/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
deleted file mode 100644
index af0749b..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.role.mapper.SysRoleMenuMapper">
-
-</mapper>
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/service/SysRoleMenuService.class b/mes-common/springSecurity/target/classes/com/mes/role/service/SysRoleMenuService.class
deleted file mode 100644
index 7cdfff8..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/service/SysRoleMenuService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/service/SysRoleService.class b/mes-common/springSecurity/target/classes/com/mes/role/service/SysRoleService.class
deleted file mode 100644
index f0a0db3..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/service/SysRoleService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/service/impl/SysRoleMenuServiceImpl.class b/mes-common/springSecurity/target/classes/com/mes/role/service/impl/SysRoleMenuServiceImpl.class
deleted file mode 100644
index 381e3ca..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/service/impl/SysRoleMenuServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/role/service/impl/SysRoleServiceImpl.class b/mes-common/springSecurity/target/classes/com/mes/role/service/impl/SysRoleServiceImpl.class
deleted file mode 100644
index d7fcc98..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/role/service/impl/SysRoleServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/controller/SysUserController.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/controller/SysUserController.class
deleted file mode 100644
index 8a2d43a..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/controller/SysUserController.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/LoginUser.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/LoginUser.class
deleted file mode 100644
index 1db6525..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/LoginUser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/SysUser.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/SysUser.class
deleted file mode 100644
index b54c570..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/SysUser.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/SysUserRole.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/SysUserRole.class
deleted file mode 100644
index fc53351..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/SysUserRole.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/vo/SysUserVO.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/vo/SysUserVO.class
deleted file mode 100644
index 16d0a76..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/entity/vo/SysUserVO.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/mapper/SysUserMapper.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/mapper/SysUserMapper.class
deleted file mode 100644
index 8b2208f..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/mapper/SysUserMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/mapper/SysUserRoleMapper.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/mapper/SysUserRoleMapper.class
deleted file mode 100644
index 8aa9fb8..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/mapper/SysUserRoleMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/SysUserRoleService.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/service/SysUserRoleService.class
deleted file mode 100644
index d856e7c..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/SysUserRoleService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/SysUserService.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/service/SysUserService.class
deleted file mode 100644
index c4d9bd5..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/SysUserService.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/impl/SysUserRoleServiceImpl.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/service/impl/SysUserRoleServiceImpl.class
deleted file mode 100644
index 620f2bb..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/impl/SysUserRoleServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/impl/SysUserServiceImpl.class b/mes-common/springSecurity/target/classes/com/mes/userinfo/service/impl/SysUserServiceImpl.class
deleted file mode 100644
index 920953b..0000000
--- a/mes-common/springSecurity/target/classes/com/mes/userinfo/service/impl/SysUserServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-common/springSecurity/target/classes/mapper/SysMenuMapper.xml b/mes-common/springSecurity/target/classes/mapper/SysMenuMapper.xml
deleted file mode 100644
index 7e919e7..0000000
--- a/mes-common/springSecurity/target/classes/mapper/SysMenuMapper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.menu.mapper.SysMenuMapper">
-
- <select id="selectPermsByUserId" resultType="java.lang.String">
- SELECT DISTINCT m.perms
- FROM sys_user_role ur
- LEFT JOIN sys_role r ON ur.role_id = r.id
- LEFT JOIN sys_role_menu rm ON ur.role_id = rm.role_id
- LEFT JOIN sys_menu m ON m.id = rm.menu_id
- WHERE user_id = #{userid}
- AND r.state = 0
- AND m.state = 0
- </select>
-</mapper>
diff --git a/mes-common/springSecurity/target/classes/mapper/SysUserMapper.xml b/mes-common/springSecurity/target/classes/mapper/SysUserMapper.xml
deleted file mode 100644
index 446c8c1..0000000
--- a/mes-common/springSecurity/target/classes/mapper/SysUserMapper.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.userinfo.mapper.SysUserMapper">
-
- <resultMap id="baseMap" type="com.mes.userinfo.entity.vo.SysUserVO">
- <result column="id" property="id"/>
- <result column="user_name" property="userName"/>
- <result column="nick_name" property="nickName"/>
- <result column="password" property="password"/>
- <result column="avatar" property="avatar"/>
- <collection property="roleList" ofType="com.mes.role.SysRole">
- <id column="id" property="id"/>
- <result column="name" property="name"/>
- <result column="state" property="state"/>
- <result column="role_key" property="roleKey"/>
- <result column="state" property="state"/>
- <result column="del_flag" property="delFlag"/>
- <result column="width" property="remark"/>
- </collection>
- </resultMap>
-
-
- <select id="userList" resultMap="baseMap">
- SELECT t.*, t2.*
- FROM sys_user t
- LEFT JOIN sys_user_role t1 ON t.id = t1.user_id
- LEFT JOIN sys_role t2 ON t1.role_id = t2.id
- WHERE 1=1
- <if test="key != null and key != ''">
- and t.user_name LIKE CONCAT('%', #{key}, '%')
- </if>
- </select>
-</mapper>
diff --git a/mes-common/springSecurity/target/classes/mapper/SysUserRoleMapper.xml b/mes-common/springSecurity/target/classes/mapper/SysUserRoleMapper.xml
deleted file mode 100644
index 060f663..0000000
--- a/mes-common/springSecurity/target/classes/mapper/SysUserRoleMapper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.userinfo.mapper.SysUserRoleMapper">
-
-
- <select id="menuList" resultType="com.mes.menu.SysMenu">
- SELECT DISTINCT m.*
- FROM sys_menu m
- INNER JOIN sys_role_menu rm ON m.id = rm.menu_id
- INNER JOIN sys_user_role ur ON rm.role_id = ur.role_id
- INNER JOIN sys_user u ON ur.user_id = u.id
- WHERE u.id = #{userId}
- <if test="key != null and key != ''">
- and m.menu_name LIKE CONCAT('%', #{key}, '%')
- </if>
- order by m.list_sort
- </select>
-</mapper>
diff --git a/mes-common/springSecurity/target/maven-archiver/pom.properties b/mes-common/springSecurity/target/maven-archiver/pom.properties
deleted file mode 100644
index 472622b..0000000
--- a/mes-common/springSecurity/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-version=1.0.0
-groupId=com.mes
-artifactId=springSecurity
diff --git a/mes-common/springSecurity/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mes-common/springSecurity/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index b3de70c..0000000
--- a/mes-common/springSecurity/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,34 +0,0 @@
-com\mes\role\service\impl\SysRoleMenuServiceImpl.class
-com\mes\userinfo\entity\LoginUser.class
-com\mes\common\utils\FastJsonRedisSerializer.class
-com\mes\menu\service\impl\SysMenuServiceImpl.class
-com\mes\role\service\SysRoleMenuService.class
-com\mes\common\handler\LoginSuccessHandler.class
-com\mes\menu\mapper\SysMenuMapper.class
-com\mes\role\mapper\SysRoleMenuMapper.class
-com\mes\userinfo\entity\SysUserRole.class
-com\mes\common\handler\JwtAuthenticationEntryPoint.class
-com\mes\role\mapper\SysRoleMapper.class
-com\mes\common\config\TokenWebSecurityConfig.class
-com\mes\menu\controller\SysMenuController.class
-com\mes\role\controller\SysRoleController.class
-com\mes\common\config\RedisConfig.class
-com\mes\menu\service\SysMenuService.class
-com\mes\role\service\SysRoleService.class
-com\mes\common\utils\JwtUtil.class
-com\mes\common\utils\WebUtils.class
-com\mes\common\utils\UserInfoUtils.class
-com\mes\common\handler\JwtLogoutSuccessHandler.class
-com\mes\userinfo\service\impl\SysUserRoleServiceImpl.class
-com\mes\userinfo\entity\SysUser.class
-com\mes\userinfo\entity\vo\SysUserVO.class
-com\mes\userinfo\service\SysUserRoleService.class
-com\mes\userinfo\mapper\SysUserRoleMapper.class
-com\mes\userinfo\controller\SysUserController.class
-com\mes\userinfo\service\impl\SysUserServiceImpl.class
-com\mes\userinfo\service\SysUserService.class
-com\mes\common\handler\JwtAccessDeniedHandler.class
-com\mes\userinfo\mapper\SysUserMapper.class
-com\mes\common\handler\LoginFailureHandler.class
-com\mes\role\service\impl\SysRoleServiceImpl.class
-com\mes\common\filter\JwtAuthenticationTokenFilter.class
diff --git a/mes-common/springSecurity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mes-common/springSecurity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index a0bf8fb..0000000
--- a/mes-common/springSecurity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,34 +0,0 @@
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\service\SysUserService.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\menu\mapper\SysMenuMapper.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\menu\service\impl\SysMenuServiceImpl.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\entity\vo\SysUserVO.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\utils\FastJsonRedisSerializer.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\utils\JwtUtil.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\controller\SysUserController.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\config\TokenWebSecurityConfig.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\service\SysRoleMenuService.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\mapper\SysRoleMapper.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\entity\SysUserRole.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\service\impl\SysUserRoleServiceImpl.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\service\impl\SysRoleMenuServiceImpl.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\service\SysUserRoleService.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\controller\SysRoleController.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\service\impl\SysRoleServiceImpl.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\mapper\SysRoleMenuMapper.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\handler\LoginFailureHandler.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\utils\UserInfoUtils.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\service\impl\SysUserServiceImpl.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\handler\LoginSuccessHandler.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\menu\service\SysMenuService.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\config\RedisConfig.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\filter\JwtAuthenticationTokenFilter.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\handler\JwtAccessDeniedHandler.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\mapper\SysUserRoleMapper.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\role\service\SysRoleService.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\handler\JwtAuthenticationEntryPoint.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\utils\WebUtils.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\entity\SysUser.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\mapper\SysUserMapper.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\userinfo\entity\LoginUser.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\menu\controller\SysMenuController.java
-D:\work\PlcTaskSend\mes-common\springSecurity\src\main\java\com\mes\common\handler\JwtLogoutSuccessHandler.java
diff --git a/mes-common/springSecurity/target/springSecurity-1.0.0.jar b/mes-common/springSecurity/target/springSecurity-1.0.0.jar
deleted file mode 100644
index 4d86e0c..0000000
--- a/mes-common/springSecurity/target/springSecurity-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/README_PLC_ADDRESS_MAPPING.md b/mes-processes/mes-plcSend/README_PLC_ADDRESS_MAPPING.md
index df1a5fd..ad7b7cd 100644
--- a/mes-processes/mes-plcSend/README_PLC_ADDRESS_MAPPING.md
+++ b/mes-processes/mes-plcSend/README_PLC_ADDRESS_MAPPING.md
@@ -20,16 +20,16 @@
- 鏀寔浠庨厤缃枃浠跺姞杞介粯璁ら厤缃�
### 2. PlcAddressMapping
-- 浣嶇疆锛歚com.mes.entity.PlcAddressMapping`
+- 浣嶇疆锛歚com.mes.entity.PlcAddress`
- 鍔熻兘锛氬疄浣撶被锛屽搴旀暟鎹簱琛ㄧ粨鏋�
- 瀛樺偍椤圭洰PLC鍦板潃鏄犲皠閰嶇疆
### 3. PlcAddressMappingMapper
-- 浣嶇疆锛歚com.mes.mapper.PlcAddressMappingMapper`
+- 浣嶇疆锛歚com.mes.mapper.PlcAddressMapper`
- 鍔熻兘锛歁yBatis Mapper鎺ュ彛锛屾彁渚涙暟鎹簱鎿嶄綔
### 4. PlcAddressMappingService
-- 浣嶇疆锛歚com.mes.service.PlcAddressMappingService`
+- 浣嶇疆锛歚com.mes.service.PlcAddressService`
- 鍔熻兘锛氭湇鍔＄被锛屾彁渚汸LC鍦板潃鏄犲皠閰嶇疆鐨勫鍒犳敼鏌ュ姛鑳�
- 鏀寔浠庢暟鎹簱鍜岄厤缃枃浠跺姞杞介厤缃�
@@ -39,7 +39,7 @@
- 缂撳瓨涓嶅悓椤圭洰鐨凷7Serializer瀹炰緥
### 6. PlcAddressMappingController
-- 浣嶇疆锛歚com.mes.controller.PlcAddressMappingController`
+- 浣嶇疆锛歚com.mes.controller.PlcAddressController`
- 鍔熻兘锛氭帶鍒跺櫒锛屾彁渚汻EST API鎺ュ彛
## API鎺ュ彛
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcAddressController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcAddressController.java
index 4ba1292..71bff44 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcAddressController.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcAddressController.java
@@ -1,9 +1,8 @@
package com.mes.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.mes.config.PlcAddressMappingConfig;
-import com.mes.entity.PlcAddressMapping;
-import com.mes.service.PlcAddressMappingService;
+import com.mes.entity.PlcAddress;
+import com.mes.service.PlcAddressService;
import com.mes.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,26 +19,26 @@
* PLC鍦板潃鏄犲皠閰嶇疆鎺у埗鍣�
* 鎻愪緵PLC鍦板潃鏄犲皠閰嶇疆鐨勫鍒犳敼鏌ユ帴鍙�
*
- * @author zhoush
+ * @author huang
* @date 2025/10/29
*/
@Slf4j
@RestController
@RequestMapping("address-mapping")
@Api(tags = "PLC鍦板潃鏄犲皠閰嶇疆绠＄悊")
-public class PlcAddressMappingController {
+public class PlcAddressController {
@Resource
- private PlcAddressMappingService plcAddressMappingService;
+ private PlcAddressService plcAddressService;
/**
* 鑾峰彇鎵�鏈塒LC鍦板潃鏄犲皠閰嶇疆
*/
@GetMapping("/list")
@ApiOperation("鑾峰彇鎵�鏈塒LC鍦板潃鏄犲皠閰嶇疆")
- public Result<List<PlcAddressMapping>> getAllMappings() {
+ public Result<List<PlcAddress>> getAllMappings() {
try {
- List<PlcAddressMapping> mappings = plcAddressMappingService.getAllMappings();
+ List<PlcAddress> mappings = plcAddressService.getAllMappings();
return Result.success(mappings);
} catch (Exception e) {
log.error("鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆鍒楄〃澶辫触", e);
@@ -52,13 +51,13 @@
*/
@GetMapping("/page")
@ApiOperation("鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆")
- public Result<IPage<PlcAddressMapping>> getMappingsByPage(
+ public Result<IPage<PlcAddress>> getMappingsByPage(
@ApiParam("椤电爜锛屼粠1寮�濮�") @RequestParam(defaultValue = "1") int page,
@ApiParam("姣忛〉鏉℃暟") @RequestParam(defaultValue = "10") int size,
@ApiParam("椤圭洰鏍囪瘑锛屾敮鎸佹ā绯婃煡璇�") @RequestParam(required = false) String projectId,
@ApiParam("PLC IP鍦板潃锛屾敮鎸佹ā绯婃煡璇�") @RequestParam(required = false) String plcIp) {
try {
- IPage<PlcAddressMapping> pageResult = plcAddressMappingService.getMappingsByPage(page, size, projectId, plcIp);
+ IPage<PlcAddress> pageResult = plcAddressService.getMappingsByPage(page, size, projectId, plcIp);
return Result.success(pageResult);
} catch (Exception e) {
log.error("鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
@@ -69,12 +68,12 @@
/**
* 鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
*/
- @GetMapping("/{id}")
+ @GetMapping("/detail")
@ApiOperation("鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆")
- public Result<PlcAddressMapping> getMappingById(
- @ApiParam("閰嶇疆ID") @PathVariable Long id) {
+ public Result<PlcAddress> getMappingById(
+ @ApiParam("閰嶇疆ID") @RequestParam Long id) {
try {
- PlcAddressMapping mapping = plcAddressMappingService.getMappingById(id);
+ PlcAddress mapping = plcAddressService.getMappingById(id);
if (mapping != null) {
return Result.success(mapping);
} else {
@@ -89,12 +88,12 @@
/**
* 鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
*/
- @GetMapping("/project/{projectId}")
+ @GetMapping("/project")
@ApiOperation("鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆")
- public Result<PlcAddressMapping> getMappingByProjectId(
- @ApiParam("椤圭洰鏍囪瘑") @PathVariable String projectId) {
+ public Result<PlcAddress> getMappingByProjectId(
+ @ApiParam("椤圭洰鏍囪瘑") @RequestParam String projectId) {
try {
- PlcAddressMapping mapping = plcAddressMappingService.getMappingByProjectId(projectId);
+ PlcAddress mapping = plcAddressService.getMappingByProjectId(projectId);
if (mapping != null) {
return Result.success(mapping);
} else {
@@ -114,22 +113,28 @@
@ApiOperation("鏍规嵁椤圭洰ID鑾峰彇椤圭洰閰嶇疆锛堝寘鍚湴鍧�鏄犲皠锛�")
public Result<Map<String, Object>> getProjectConfig(String projectId) {
try {
- // 鑾峰彇鍩虹閰嶇疆
- PlcAddressMapping mapping = plcAddressMappingService.getMappingByProjectId(projectId);
+ PlcAddress mapping = plcAddressService.getProjectConfig(projectId);
- // 鑾峰彇瀹屾暣椤圭洰閰嶇疆锛堝寘鍚湴鍧�鏄犲皠锛�
- PlcAddressMappingConfig.ProjectPlcConfig projectConfig = plcAddressMappingService.getProjectConfigWithMapping(projectId);
-
- // 鍚堝苟鍩虹閰嶇疆淇℃伅
+ // 缁勮杈撳嚭锛屼粎鍩轰簬鏁版嵁搴撳疄浣�
Map<String, Object> result = new HashMap<>();
result.put("projectId", projectId);
- result.put("dbArea", projectConfig.getDbArea());
- result.put("beginIndex", projectConfig.getBeginIndex());
- result.put("plcIp", projectConfig.getPlcIp());
- result.put("plcType", projectConfig.getPlcType());
- result.put("addressMapping", projectConfig.getAddressMapping());
+ result.put("dbArea", mapping != null ? mapping.getDbArea() : "DB1");
+ result.put("beginIndex", mapping != null ? mapping.getBeginIndex() : 0);
+ result.put("plcIp", mapping != null ? mapping.getPlcIp() : null);
+ result.put("plcType", mapping != null ? mapping.getPlcType() : null);
- // 濡傛灉鏁版嵁搴撲腑鏈夐厤缃紝娣诲姞鏁版嵁搴撲腑鐨勯澶栦俊鎭�
+ // 瑙ｆ瀽addressMapping JSON涓篗ap
+ Map<String, Integer> addressMap = new HashMap<>();
+ if (mapping != null && mapping.getAddressMapping() != null && !mapping.getAddressMapping().trim().isEmpty()) {
+ try {
+ addressMap = new com.fasterxml.jackson.databind.ObjectMapper()
+ .readValue(mapping.getAddressMapping(), new com.fasterxml.jackson.core.type.TypeReference<Map<String, Integer>>() {});
+ } catch (Exception parseEx) {
+ log.warn("瑙ｆ瀽鍦板潃鏄犲皠JSON澶辫触: {}", mapping.getAddressMapping());
+ }
+ }
+ result.put("addressMapping", addressMap);
+
if (mapping != null) {
result.put("id", mapping.getId());
result.put("projectName", mapping.getProjectName());
@@ -148,8 +153,8 @@
*/
@PostMapping
@ApiOperation("鍒涘缓鏂扮殑PLC鍦板潃鏄犲皠閰嶇疆")
- public Result<PlcAddressMapping> createMapping(
- @ApiParam("PLC鍦板潃鏄犲皠閰嶇疆") @RequestBody PlcAddressMapping mapping) {
+ public Result<PlcAddress> createMapping(
+ @ApiParam("PLC鍦板潃鏄犲皠閰嶇疆") @RequestBody PlcAddress mapping) {
try {
// 鍙傛暟楠岃瘉
if (mapping.getProjectId() == null || mapping.getProjectId().trim().isEmpty()) {
@@ -163,7 +168,7 @@
mapping.setBeginIndex(0); // 濡傛灉涓鸿礋鏁帮紝璁剧疆涓洪粯璁よ捣濮嬬储寮�0
}
- PlcAddressMapping created = plcAddressMappingService.saveMapping(mapping);
+ PlcAddress created = plcAddressService.saveMapping(mapping);
log.info("鍒涘缓PLC鍦板潃鏄犲皠閰嶇疆鎴愬姛锛孖D: {}, 椤圭洰鏍囪瘑: {}", created.getId(), created.getProjectId());
return Result.success(created);
} catch (Exception e) {
@@ -175,11 +180,11 @@
/**
* 鏇存柊PLC鍦板潃鏄犲皠閰嶇疆
*/
- @PutMapping("/{id}")
+ @PutMapping("/update")
@ApiOperation("鏇存柊PLC鍦板潃鏄犲皠閰嶇疆")
- public Result<PlcAddressMapping> updateMapping(
- @ApiParam("閰嶇疆ID") @PathVariable Long id,
- @ApiParam("鏇存柊鐨凱LC鍦板潃鏄犲皠閰嶇疆") @RequestBody PlcAddressMapping mapping) {
+ public Result<PlcAddress> updateMapping(
+ @ApiParam("閰嶇疆ID") @RequestParam Long id,
+ @ApiParam("鏇存柊鐨凱LC鍦板潃鏄犲皠閰嶇疆") @RequestBody PlcAddress mapping) {
try {
// 鍙傛暟楠岃瘉
if (mapping.getProjectId() == null || mapping.getProjectId().trim().isEmpty()) {
@@ -190,7 +195,7 @@
}
mapping.setId(id);
- PlcAddressMapping updated = plcAddressMappingService.updateMapping(mapping);
+ PlcAddress updated = plcAddressService.updateMapping(mapping);
if (updated != null) {
log.info("鏇存柊PLC鍦板潃鏄犲皠閰嶇疆鎴愬姛锛孖D: {}, 椤圭洰鏍囪瘑: {}", updated.getId(), updated.getProjectId());
return Result.success(updated);
@@ -207,11 +212,11 @@
* 鏍规嵁椤圭洰ID鏇存柊閰嶇疆
* 瀵瑰簲鍓嶇锛歶pdateConfig
*/
- @PutMapping("/project/{projectId}")
+ @PutMapping("/project/update")
@ApiOperation("鏍规嵁椤圭洰ID鏇存柊閰嶇疆")
- public Result<PlcAddressMapping> updateMappingByProjectId(
- @ApiParam("椤圭洰鏍囪瘑") @PathVariable String projectId,
- @ApiParam("鏇存柊鐨凱LC鍦板潃鏄犲皠閰嶇疆") @RequestBody PlcAddressMapping mapping) {
+ public Result<PlcAddress> updateMappingByProjectId(
+ @ApiParam("椤圭洰鏍囪瘑") @RequestParam String projectId,
+ @ApiParam("鏇存柊鐨凱LC鍦板潃鏄犲皠閰嶇疆") @RequestBody PlcAddress mapping) {
try {
// 鍙傛暟楠岃瘉
if (mapping.getDbArea() == null || mapping.getDbArea().trim().isEmpty()) {
@@ -222,16 +227,16 @@
mapping.setProjectId(projectId);
// 鏌ユ壘鐜版湁閰嶇疆
- PlcAddressMapping existing = plcAddressMappingService.getMappingByProjectId(projectId);
+ PlcAddress existing = plcAddressService.getMappingByProjectId(projectId);
if (existing != null) {
// 鏇存柊鐜版湁閰嶇疆
mapping.setId(existing.getId());
- PlcAddressMapping updated = plcAddressMappingService.updateMapping(mapping);
+ PlcAddress updated = plcAddressService.updateMapping(mapping);
log.info("鏍规嵁椤圭洰ID鏇存柊PLC鍦板潃鏄犲皠閰嶇疆鎴愬姛锛岄」鐩爣璇�: {}", projectId);
return Result.success(updated);
} else {
// 鍒涘缓鏂伴厤缃�
- PlcAddressMapping created = plcAddressMappingService.saveMapping(mapping);
+ PlcAddress created = plcAddressService.saveMapping(mapping);
log.info("鏍规嵁椤圭洰ID鍒涘缓PLC鍦板潃鏄犲皠閰嶇疆鎴愬姛锛岄」鐩爣璇�: {}", projectId);
return Result.success(created);
}
@@ -244,12 +249,12 @@
/**
* 鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆
*/
- @DeleteMapping("/{id}")
+ @DeleteMapping("/delete")
@ApiOperation("鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆")
public Result<Void> deleteMapping(
- @ApiParam("閰嶇疆ID") @PathVariable Long id) {
+ @ApiParam("閰嶇疆ID") @RequestParam Long id) {
try {
- boolean deleted = plcAddressMappingService.deleteMapping(id);
+ boolean deleted = plcAddressService.deleteMapping(id);
if (deleted) {
log.info("鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆鎴愬姛锛孖D: {}", id);
return Result.success();
@@ -274,7 +279,7 @@
return Result.error("ID鍒楄〃涓嶈兘涓虹┖");
}
- int deletedCount = plcAddressMappingService.deleteMappings(ids);
+ int deletedCount = plcAddressService.deleteMappings(ids);
log.info("鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆鎴愬姛锛屽垹闄ゆ暟閲�: {}, ID鍒楄〃: {}", deletedCount, ids);
return Result.success();
} catch (Exception e) {
@@ -286,17 +291,17 @@
/**
* 娴嬭瘯PLC杩炴帴
*/
- @PostMapping("/{id}/test-connection")
+ @PostMapping("/test-connection")
@ApiOperation("娴嬭瘯PLC杩炴帴")
public Result<String> testConnection(
- @ApiParam("閰嶇疆ID") @PathVariable Long id) {
+ @ApiParam("閰嶇疆ID") @RequestParam Long id) {
try {
- PlcAddressMapping mapping = plcAddressMappingService.getMappingById(id);
+ PlcAddress mapping = plcAddressService.getMappingById(id);
if (mapping == null) {
return Result.error("鏈壘鍒癐D涓� " + id + " 鐨凱LC鍦板潃鏄犲皠閰嶇疆");
}
- boolean isConnected = plcAddressMappingService.testConnection(mapping);
+ boolean isConnected = plcAddressService.testConnection(mapping);
if (isConnected) {
String message = String.format("PLC杩炴帴娴嬭瘯鎴愬姛 - 椤圭洰: %s, IP: %s, DB鍧�: %s",
mapping.getProjectId(), mapping.getPlcIp(), mapping.getDbArea());
@@ -321,7 +326,7 @@
@ApiOperation("閲嶆柊鍔犺浇閰嶇疆鏂囦欢涓殑鍦板潃鏄犲皠")
public Result<String> reloadConfig() {
try {
- plcAddressMappingService.reloadConfigMappings();
+ plcAddressService.reloadConfigMappings();
String message = "閰嶇疆鏂囦欢涓殑PLC鍦板潃鏄犲皠宸查噸鏂板姞杞�";
log.info(message);
return Result.success(message);
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestController.java
new file mode 100644
index 0000000..f9b4bae
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestController.java
@@ -0,0 +1,376 @@
+package com.mes.controller;
+
+import com.mes.service.PlcAutoTestService;
+import com.mes.service.PlcTestWriteService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * PLC娴嬭瘯浠诲姟鎺у埗鍣�
+ * 鎻愪緵PLC娴嬭瘯浠诲姟绠＄悊鐩稿叧鐨凙PI鎺ュ彛
+ * <p>
+ * 瀹炵幇鍓嶇Test.vue缁勪欢鎵�闇�鐨勬墍鏈堿PI鎺ュ彛
+ *
+ * @author huang
+ * @date 2025/10/30
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/plc/test")
+@Api(tags = "PLC娴嬭瘯浠诲姟绠＄悊")
+public class PlcTestController {
+
+ @Resource
+ private PlcTestWriteService plcTestWriteService;
+
+ @Resource
+ private PlcAutoTestService plcAutoTestService;
+
+ // 妯℃嫙浠诲姟鏁版嵁瀛樺偍
+ private final Map<String, Map<String, Object>> taskMap = new ConcurrentHashMap<>();
+ private final Map<String, Map<String, Object>> moduleStatusMap = new ConcurrentHashMap<>();
+
+ /**
+ * 鎵ц鎸囧畾妯″潡鐨勬祴璇曚换鍔�
+ * 瀵瑰簲鍓嶇锛歴ubmitTest
+ */
+ @PostMapping("/execute/{module}")
+ @ApiOperation("鎵ц鎸囧畾妯″潡鐨勬祴璇曚换鍔�")
+ public Map<String, Object> executeTest(@ApiParam("妯″潡鍚嶇О") @PathVariable String module) {
+ log.info("鎵ц娴嬭瘯浠诲姟锛屾ā鍧�: {}", module);
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ // 妯℃嫙鎵ц娴嬭瘯浠诲姟
+ boolean success = plcTestWriteService.simulatePlcRequest(module);
+
+ // 鍒涘缓浠诲姟璁板綍
+ String taskId = UUID.randomUUID().toString();
+ Map<String, Object> task = new HashMap<>();
+ task.put("id", taskId);
+ task.put("module", module);
+ task.put("status", success ? "running" : "failed");
+ task.put("createTime", new Date());
+ task.put("message", success ? "娴嬭瘯浠诲姟宸插惎鍔�" : "娴嬭瘯浠诲姟鍚姩澶辫触");
+
+ taskMap.put(taskId, task);
+
+ // 鏇存柊妯″潡鐘舵��
+ updateModuleStatus(module, "running");
+
+ result.put("success", success);
+ result.put("data", taskId);
+ result.put("message", success ? "娴嬭瘯浠诲姟宸插惎鍔�" : "娴嬭瘯浠诲姟鍚姩澶辫触");
+ } catch (Exception e) {
+ log.error("鎵ц娴嬭瘯浠诲姟寮傚父锛屾ā鍧�: {}", module, e);
+ result.put("success", false);
+ result.put("message", "鎵ц娴嬭瘯浠诲姟寮傚父: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇鎸囧畾妯″潡鐨勪换鍔＄姸鎬�
+ * 瀵瑰簲鍓嶇锛歡etTaskStatus
+ */
+ @GetMapping("/status/{module}")
+ @ApiOperation("鑾峰彇鎸囧畾妯″潡鐨勪换鍔＄姸鎬�")
+ public Map<String, Object> getTaskStatus(@ApiParam("妯″潡鍚嶇О") @PathVariable String module) {
+ log.info("鑾峰彇浠诲姟鐘舵�侊紝妯″潡: {}", module);
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ // 鏌ユ壘璇ユā鍧楃殑鏈�鏂颁换鍔�
+ Optional<Map.Entry<String, Map<String, Object>>> latestTask =
+ taskMap.entrySet().stream()
+ .filter(entry -> module.equals(entry.getValue().get("module")))
+ .max(Map.Entry.comparingByKey());
+
+ if (latestTask.isPresent()) {
+ Map<String, Object> task = latestTask.get().getValue();
+
+ // 妯℃嫙浠诲姟鐘舵�佸彉鍖�
+ String status = (String) task.get("status");
+ if ("running".equals(status)) {
+ // 闅忔満鍐冲畾浠诲姟鏄惁瀹屾垚
+ if (Math.random() > 0.5) {
+ task.put("status", "success");
+ task.put("message", "娴嬭瘯浠诲姟鎵ц鎴愬姛");
+ updateModuleStatus(module, "idle");
+ }
+ }
+
+ result.put("success", true);
+ result.put("data", task);
+ } else {
+ result.put("success", false);
+ result.put("message", "鏈壘鍒版ā鍧楃殑浠诲姟璁板綍");
+ }
+ } catch (Exception e) {
+ log.error("鑾峰彇浠诲姟鐘舵�佸紓甯革紝妯″潡: {}", module, e);
+ result.put("success", false);
+ result.put("message", "鑾峰彇浠诲姟鐘舵�佸紓甯�: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 鎵归噺娴嬭瘯
+ * 瀵瑰簲鍓嶇锛歜atchTest
+ */
+ @PostMapping("/batch")
+ @ApiOperation("鎵归噺娴嬭瘯")
+ public Map<String, Object> batchTest(@ApiParam("鎵归噺娴嬭瘯璇锋眰") @RequestBody Map<String, Object> request) {
+ List<String> modules = (List<String>) request.get("modules");
+ log.info("鎵ц鎵归噺娴嬭瘯锛屾ā鍧楀垪琛�: {}", modules);
+
+ Map<String, Object> result = new HashMap<>();
+ List<Map<String, Object>> results = new ArrayList<>();
+
+ try {
+ for (String module : modules) {
+ Map<String, Object> moduleResult = new HashMap<>();
+ moduleResult.put("module", module);
+
+ try {
+ boolean success = plcTestWriteService.simulatePlcRequest(module);
+ moduleResult.put("success", success);
+ moduleResult.put("message", success ? "娴嬭瘯浠诲姟宸插惎鍔�" : "娴嬭瘯浠诲姟鍚姩澶辫触");
+
+ if (success) {
+ updateModuleStatus(module, "running");
+ }
+ } catch (Exception e) {
+ moduleResult.put("success", false);
+ moduleResult.put("message", "鎵ц娴嬭瘯寮傚父: " + e.getMessage());
+ log.error("鎵归噺娴嬭瘯妯″潡寮傚父锛屾ā鍧�: {}", module, e);
+ }
+
+ results.add(moduleResult);
+ }
+
+ result.put("success", true);
+ result.put("data", results);
+ result.put("message", "鎵归噺娴嬭瘯浠诲姟宸叉彁浜�");
+ } catch (Exception e) {
+ log.error("鎵归噺娴嬭瘯寮傚父", e);
+ result.put("success", false);
+ result.put("message", "鎵归噺娴嬭瘯寮傚父: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 瀵煎叆娴嬭瘯浠诲姟
+ * 瀵瑰簲鍓嶇锛歩mportTask
+ */
+ @PostMapping("/import")
+ @ApiOperation("瀵煎叆娴嬭瘯浠诲姟")
+ public Map<String, Object> importTask(@ApiParam("浠诲姟鏂囦欢") @RequestParam("file") MultipartFile file) {
+ log.info("瀵煎叆娴嬭瘯浠诲姟鏂囦欢: {}", file.getOriginalFilename());
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ // 杩欓噷鍙槸妯℃嫙瀵煎叆鍔熻兘
+ // 瀹為檯搴旇瑙ｆ瀽鏂囦欢鍐呭锛屽垱寤烘祴璇曚换鍔�
+
+ result.put("success", true);
+ result.put("data", file.getOriginalFilename());
+ result.put("message", "娴嬭瘯浠诲姟瀵煎叆鎴愬姛");
+ } catch (Exception e) {
+ log.error("瀵煎叆娴嬭瘯浠诲姟寮傚父", e);
+ result.put("success", false);
+ result.put("message", "瀵煎叆娴嬭瘯浠诲姟寮傚父: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夋ā鍧楃姸鎬�
+ * 瀵瑰簲鍓嶇锛歡etModulesStatus
+ */
+ @GetMapping("/modules/status")
+ @ApiOperation("鑾峰彇鎵�鏈夋ā鍧楃姸鎬�")
+ public Map<String, Object> getModulesStatus() {
+ log.info("鑾峰彇鎵�鏈夋ā鍧楃姸鎬�");
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ // 鍒濆鍖栭粯璁ゆā鍧楃姸鎬侊紙濡傛灉涓嶅瓨鍦級
+ initDefaultModuleStatus();
+
+ // 鏇存柊鎵�鏈夋ā鍧楃姸鎬�
+ for (String module : moduleStatusMap.keySet()) {
+ checkModuleStatus(module);
+ }
+
+ result.put("success", true);
+ result.put("data", new ArrayList<>(moduleStatusMap.values()));
+ } catch (Exception e) {
+ log.error("鑾峰彇妯″潡鐘舵�佸紓甯�", e);
+ result.put("success", false);
+ result.put("message", "鑾峰彇妯″潡鐘舵�佸紓甯�: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 閲嶇疆鎸囧畾妯″潡
+ * 瀵瑰簲鍓嶇锛歳esetModule
+ */
+ @PostMapping("/reset/{module}")
+ @ApiOperation("閲嶇疆鎸囧畾妯″潡")
+ public Map<String, Object> resetModule(@ApiParam("妯″潡鍚嶇О") @PathVariable String module) {
+ log.info("閲嶇疆妯″潡: {}", module);
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ boolean success = plcTestWriteService.resetPlc(module);
+
+ if (success) {
+ updateModuleStatus(module, "idle");
+ // 娓呴櫎璇ユā鍧楃殑鎵�鏈変换鍔�
+ taskMap.entrySet().removeIf(entry -> module.equals(entry.getValue().get("module")));
+ }
+
+ result.put("success", success);
+ result.put("message", success ? "妯″潡閲嶇疆鎴愬姛" : "妯″潡閲嶇疆澶辫触");
+ } catch (Exception e) {
+ log.error("閲嶇疆妯″潡寮傚父锛屾ā鍧�: {}", module, e);
+ result.put("success", false);
+ result.put("message", "閲嶇疆妯″潡寮傚父: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 閲嶈瘯鎸囧畾妯″潡鐨勪换鍔�
+ * 瀵瑰簲鍓嶇锛歳etryTask
+ */
+ @PostMapping("/retry/{module}")
+ @ApiOperation("閲嶈瘯鎸囧畾妯″潡鐨勪换鍔�")
+ public Map<String, Object> retryTask(@ApiParam("妯″潡鍚嶇О") @PathVariable String module) {
+ log.info("閲嶈瘯妯″潡浠诲姟: {}", module);
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ // 鍏堥噸缃ā鍧�
+ plcTestWriteService.resetPlc(module);
+ // 鐒跺悗閲嶆柊鎵ц娴嬭瘯
+ boolean success = plcTestWriteService.simulatePlcRequest(module);
+
+ // 鍒涘缓鏂颁换鍔¤褰�
+ String taskId = UUID.randomUUID().toString();
+ Map<String, Object> task = new HashMap<>();
+ task.put("id", taskId);
+ task.put("module", module);
+ task.put("status", success ? "running" : "failed");
+ task.put("createTime", new Date());
+ task.put("message", success ? "娴嬭瘯浠诲姟宸查噸鍚�" : "娴嬭瘯浠诲姟閲嶅惎澶辫触");
+
+ taskMap.put(taskId, task);
+
+ if (success) {
+ updateModuleStatus(module, "running");
+ }
+
+ result.put("success", success);
+ result.put("data", taskId);
+ result.put("message", success ? "娴嬭瘯浠诲姟宸查噸鍚�" : "娴嬭瘯浠诲姟閲嶅惎澶辫触");
+ } catch (Exception e) {
+ log.error("閲嶈瘯妯″潡浠诲姟寮傚父锛屾ā鍧�: {}", module, e);
+ result.put("success", false);
+ result.put("message", "閲嶈瘯妯″潡浠诲姟寮傚父: " + e.getMessage());
+ }
+ return result;
+ }
+
+ /**
+ * 鍋滄鎸囧畾妯″潡鐨勬祴璇�
+ * 瀵瑰簲鍓嶇锛歴topTest
+ */
+ @PostMapping("/stop/{module}")
+ @ApiOperation("鍋滄鎸囧畾妯″潡鐨勬祴璇�")
+ public Map<String, Object> stopTest(@ApiParam("妯″潡鍚嶇О") @PathVariable String module) {
+ log.info("鍋滄妯″潡娴嬭瘯: {}", module);
+
+ Map<String, Object> result = new HashMap<>();
+ try {
+ // 閲嶇疆PLC鐘舵�佹潵鍋滄娴嬭瘯
+ boolean success = plcTestWriteService.resetPlc(module);
+
+ if (success) {
+ updateModuleStatus(module, "idle");
+ // 鏇存柊璇ユā鍧楃殑鎵�鏈夎繍琛屼腑浠诲姟鐘舵��
+ taskMap.entrySet().stream()
+ .filter(entry -> module.equals(entry.getValue().get("module")) && "running".equals(entry.getValue().get("status")))
+ .forEach(entry -> {
+ entry.getValue().put("status", "stopped");
+ entry.getValue().put("message", "娴嬭瘯浠诲姟宸叉墜鍔ㄥ仠姝�");
+ });
+ }
+
+ result.put("success", success);
+ result.put("message", success ? "娴嬭瘯宸插仠姝�" : "鍋滄娴嬭瘯澶辫触");
+ } catch (Exception e) {
+ log.error("鍋滄妯″潡娴嬭瘯寮傚父锛屾ā鍧�: {}", module, e);
+ result.put("success", false);
+ result.put("message", "鍋滄妯″潡娴嬭瘯寮傚父: " + e.getMessage());
+ }
+ return result;
+ }
+
+ // 鍒濆鍖栭粯璁ゆā鍧楃姸鎬�
+ private void initDefaultModuleStatus() {
+ // 瀹氫箟榛樿鐨勬ā鍧楀垪琛�
+ List<String> defaultModules = Arrays.asList(
+ "gantryStorage",
+ "upperModule",
+ "lowerModule",
+ "stackerModule",
+ "shuttleModule",
+ "verticalModule",
+ "horizontalModule"
+ );
+
+ for (String module : defaultModules) {
+ moduleStatusMap.computeIfAbsent(module, k -> {
+ Map<String, Object> status = new HashMap<>();
+ status.put("module", module);
+ status.put("status", "idle");
+ status.put("updateTime", new Date());
+ return status;
+ });
+ }
+ }
+
+ // 鏇存柊妯″潡鐘舵��
+ private void updateModuleStatus(String module, String status) {
+ Map<String, Object> moduleStatus = moduleStatusMap.computeIfAbsent(module, k -> new HashMap<>());
+ moduleStatus.put("module", module);
+ moduleStatus.put("status", status);
+ moduleStatus.put("updateTime", new Date());
+ }
+
+ // 妫�鏌ュ苟鏇存柊妯″潡鐘舵��
+ private void checkModuleStatus(String module) {
+ Map<String, Object> moduleStatus = moduleStatusMap.get(module);
+ if (moduleStatus != null) {
+ String status = (String) moduleStatus.get("status");
+ // 濡傛灉妯″潡鐘舵�佷负running锛屽彲浠ュ湪杩欓噷娣诲姞閫昏緫鏉ユ鏌ュ疄闄呯姸鎬�
+ // 杩欓噷绠�鍗曟ā鎷熺姸鎬佸彉鍖�
+ if ("running".equals(status) && Math.random() > 0.7) {
+ moduleStatus.put("status", "idle");
+ moduleStatus.put("updateTime", new Date());
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteController.java
index 3c93ff3..e2c2566 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteController.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteController.java
@@ -1,343 +1,128 @@
package com.mes.controller;
import com.mes.entity.PlcBaseData;
-import com.mes.service.PlcAutoTestService;
import com.mes.service.PlcTestWriteService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
/**
* PLC娴嬭瘯鍐欏叆鎺у埗鍣�
- * 涓哄墠绔彁渚涙ā鎷烶LC鍐欏叆鎿嶄綔鐨勬帴鍙�
+ * 鎻愪緵PLC娴嬭瘯鍐欏叆鐩稿叧鐨凙PI鎺ュ彛
*
- * @author zhoush
+ * @author huang
* @date 2025/10/29
*/
@Slf4j
@RestController
-@RequestMapping("/plcTest/write")
+@RequestMapping("/api/plc/test")
+@Api(tags = "PLC娴嬭瘯鍐欏叆鎺ュ彛")
public class PlcTestWriteController {
@Resource
private PlcTestWriteService plcTestWriteService;
-
- @Resource
- private PlcAutoTestService plcAutoTestService;
- /**
- * 妯℃嫙PLC鍙戦�佽姹傚瓧
- */
- @PostMapping("/request")
- public Map<String, Object> simulateRequest(@RequestBody(required = false) Map<String, Object> params) {
- Map<String, Object> result = new HashMap<>();
-
- try {
- boolean success;
- if (params != null && params.containsKey("dbBlock")) {
- String dbBlock = (String) params.get("dbBlock");
- int beginIndex = (int) params.getOrDefault("beginIndex", 0);
- success = plcTestWriteService.simulatePlcRequest(dbBlock, beginIndex);
- } else {
- success = plcTestWriteService.simulatePlcRequest();
- }
-
- result.put("success", success);
- result.put("message", success ? "PLC璇锋眰瀛楀彂閫佹垚鍔�" : "鍙戦�佸け璐�");
-
- // 杩斿洖褰撳墠鐘舵��
- PlcBaseData status = plcTestWriteService.readPlcStatus();
- result.put("currentStatus", status);
-
- } catch (Exception e) {
- log.error("妯℃嫙PLC璇锋眰寮傚父", e);
- result.put("success", false);
- result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ @PostMapping("/simulate/request")
+ @ApiOperation("妯℃嫙PLC鍙戦�佽姹傚瓧锛堣Е鍙慚ES浠诲姟涓嬪彂锛�")
+ public boolean simulatePlcRequest(
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛夛紝涓嶆寚瀹氬垯浣跨敤榛樿椤圭洰", example = "vertical")
+ @RequestParam(required = false) String projectId) {
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ return plcTestWriteService.simulatePlcRequest(projectId.trim());
+ } else {
+ return plcTestWriteService.simulatePlcRequest();
}
-
- return result;
}
- /**
- * 妯℃嫙PLC浠诲姟瀹屾垚姹囨姤
- */
- @PostMapping("/report")
- public Map<String, Object> simulateReport(@RequestBody(required = false) Map<String, Object> params) {
- Map<String, Object> result = new HashMap<>();
-
- try {
- boolean success;
- if (params != null && params.containsKey("dbBlock")) {
- String dbBlock = (String) params.get("dbBlock");
- int beginIndex = (int) params.getOrDefault("beginIndex", 0);
- success = plcTestWriteService.simulatePlcReport(dbBlock, beginIndex);
- } else {
- success = plcTestWriteService.simulatePlcReport();
- }
-
- result.put("success", success);
- result.put("message", success ? "PLC浠诲姟姹囨姤鎴愬姛" : "姹囨姤澶辫触");
-
- PlcBaseData status = plcTestWriteService.readPlcStatus();
- result.put("currentStatus", status);
-
- } catch (Exception e) {
- log.error("妯℃嫙涓婄墖PLC姹囨姤寮傚父", e);
- result.put("success", false);
- result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ @PostMapping("/simulate/report")
+ @ApiOperation("妯℃嫙PLC浠诲姟瀹屾垚姹囨姤")
+ public boolean simulatePlcReport(
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛夛紝涓嶆寚瀹氬垯浣跨敤榛樿椤圭洰", example = "vertical")
+ @RequestParam(required = false) String projectId) {
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ return plcTestWriteService.simulatePlcReport(projectId.trim());
+ } else {
+ return plcTestWriteService.simulatePlcReport();
}
-
- return result;
}
- /**
- * 妯℃嫙PLC鑱旀満鐘舵��
- */
- @PostMapping("/online")
- public Map<String, Object> simulateOnline(@RequestBody Map<String, Object> params) {
- Map<String, Object> result = new HashMap<>();
-
- try {
- int onlineState = (int) params.getOrDefault("onlineState", 1);
- boolean success;
-
- if (params.containsKey("dbBlock")) {
- String dbBlock = (String) params.get("dbBlock");
- int beginIndex = (int) params.getOrDefault("beginIndex", 0);
- success = plcTestWriteService.simulateOnlineStatus(onlineState, dbBlock, beginIndex);
- } else {
- success = plcTestWriteService.simulateOnlineStatus(onlineState);
- }
-
- result.put("success", success);
- result.put("message", success ? "PLC鑱旀満鐘舵�佽缃垚鍔�: " + onlineState : "璁剧疆澶辫触");
-
- PlcBaseData status = plcTestWriteService.readPlcStatus();
- result.put("currentStatus", status);
-
- } catch (Exception e) {
- log.error("妯℃嫙PLC鑱旀満鐘舵�佸紓甯�", e);
- result.put("success", false);
- result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ @PostMapping("/simulate/online")
+ @ApiOperation("妯℃嫙PLC鍙戦�佽仈鏈虹姸鎬�")
+ public boolean simulateOnlineStatus(
+ @ApiParam(value = "鑱旀満鐘舵�侊細1-鑱旀満锛�0-鑴辨満", required = true, example = "1")
+ @RequestParam int onlineState,
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛夛紝涓嶆寚瀹氬垯浣跨敤榛樿椤圭洰", example = "vertical")
+ @RequestParam(required = false) String projectId) {
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ return plcTestWriteService.simulateOnlineStatus(onlineState, projectId.trim());
+ } else {
+ return plcTestWriteService.simulateOnlineStatus(onlineState);
}
-
- return result;
}
- /**
- * 閲嶇疆PLC鐘舵��
- */
@PostMapping("/reset")
- public Map<String, Object> resetPlc(@RequestBody(required = false) Map<String, Object> params) {
- Map<String, Object> result = new HashMap<>();
-
- try {
- boolean success;
- if (params != null && params.containsKey("dbBlock")) {
- String dbBlock = (String) params.get("dbBlock");
- int beginIndex = (int) params.getOrDefault("beginIndex", 0);
- success = plcTestWriteService.resetPlc(dbBlock, beginIndex);
- } else {
- success = plcTestWriteService.resetPlc();
- }
-
- result.put("success", success);
- result.put("message", success ? "PLC鐘舵�侀噸缃垚鍔�" : "閲嶇疆澶辫触");
-
- PlcBaseData status = plcTestWriteService.readPlcStatus();
- result.put("currentStatus", status);
-
- } catch (Exception e) {
- log.error("閲嶇疆涓婄墖PLC鐘舵�佸紓甯�", e);
- result.put("success", false);
- result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ @ApiOperation("閲嶇疆PLC鎵�鏈夌姸鎬�")
+ public boolean resetPlc(
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛夛紝涓嶆寚瀹氬垯浣跨敤榛樿椤圭洰", example = "vertical")
+ @RequestParam(required = false) String projectId) {
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ return plcTestWriteService.resetPlc(projectId.trim());
+ } else {
+ return plcTestWriteService.resetPlc();
}
-
- return result;
}
- /**
- * 璇诲彇PLC褰撳墠鐘舵��
- */
@GetMapping("/status")
- public Map<String, Object> getPlcStatus(@RequestParam(required = false) String dbBlock,
- @RequestParam(required = false, defaultValue = "0") Integer beginIndex) {
- Map<String, Object> result = new HashMap<>();
-
- try {
- PlcBaseData status;
- if (dbBlock != null) {
- status = plcTestWriteService.readPlcStatus(dbBlock, beginIndex);
- } else {
- status = plcTestWriteService.readPlcStatus();
- }
-
- result.put("success", true);
- result.put("data", status);
- result.put("message", "鑾峰彇涓婄墖PLC鐘舵�佹垚鍔�");
-
- } catch (Exception e) {
- log.error("璇诲彇涓婄墖PLC鐘舵�佸紓甯�", e);
- result.put("success", false);
- result.put("message", "鑾峰彇鐘舵�佸け璐�: " + e.getMessage());
+ @ApiOperation("璇诲彇PLC褰撳墠鐘舵��")
+ public PlcBaseData readPlcStatus(
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛夛紝涓嶆寚瀹氬垯浣跨敤榛樿椤圭洰", example = "vertical")
+ @RequestParam(required = false) String projectId) {
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ return plcTestWriteService.readPlcStatus(projectId.trim());
+ } else {
+ return plcTestWriteService.readPlcStatus();
}
-
- return result;
}
- /**
- * 鎵归噺娴嬭瘯 - 妯℃嫙瀹屾暣浠诲姟娴佺▼
- */
- @PostMapping("/batch/test")
- public Map<String, Object> batchTest(@RequestBody Map<String, Object> params) {
- Map<String, Object> result = new HashMap<>();
-
+ @PostMapping("/current-project")
+ @ApiOperation("璁剧疆褰撳墠椤圭洰鏍囪瘑")
+ public boolean setCurrentProjectId(
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛�", required = true, example = "vertical")
+ @RequestParam String projectId) {
try {
- String protocolType = (String) params.get("protocolType");
- int taskCount = (int) params.getOrDefault("taskCount", 1);
-
- log.info("寮�濮嬫壒閲忔祴璇曪紝鍗忚绫诲瀷: {}, 浠诲姟鏁伴噺: {}", protocolType, taskCount);
-
- // 妯℃嫙瀹屾暣鐨勪换鍔℃祦绋�
- for (int i = 1; i <= taskCount; i++) {
- log.info("鎵ц绗瑊}涓换鍔�", i);
-
- if ("load".equals(protocolType)) {
- // 娴佺▼
- plcTestWriteService.simulatePlcRequest(); // 鍙戦�佽姹�
- // 绛夊緟MES鍝嶅簲
- Thread.sleep(1000);
- plcTestWriteService.simulatePlcReport(); // 浠诲姟瀹屾垚
-
- } else if ("raw".equals(protocolType)) {
- // 娴佺▼
- plcTestWriteService.simulatePlcRequest(); // 鍙戦�佽姹�
- // 绛夊緟MES鍝嶅簲
- Thread.sleep(1000);
- plcTestWriteService.simulatePlcReport(); // 浠诲姟瀹屾垚
- }
-
- // 浠诲姟闂撮殧
- if (i < taskCount) {
- Thread.sleep(2000);
- }
+ plcTestWriteService.setCurrentProjectId(projectId.trim());
+ return true;
+ } catch (Exception e) {
+ log.error("璁剧疆褰撳墠椤圭洰鏍囪瘑澶辫触", e);
+ return false;
+ }
+ }
+
+ @GetMapping("/current-project")
+ @ApiOperation("鑾峰彇褰撳墠椤圭洰鏍囪瘑")
+ public String getCurrentProjectId() {
+ return plcTestWriteService.getCurrentProjectId();
+ }
+
+ @PostMapping("/cache/clear")
+ @ApiOperation("娓呴櫎S7Serializer缂撳瓨")
+ public boolean clearSerializerCache(
+ @ApiParam(value = "椤圭洰鏍囪瘑锛屽vertical銆乭orizontal绛夛紝涓嶆寚瀹氬垯娓呴櫎鎵�鏈夌紦瀛�", example = "vertical")
+ @RequestParam(required = false) String projectId) {
+ try {
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ plcTestWriteService.clearSerializerCache(projectId.trim());
+ } else {
+ plcTestWriteService.clearAllSerializerCache();
}
-
- result.put("success", true);
- result.put("message", "鎵归噺娴嬭瘯瀹屾垚锛屽叡鎵ц" + taskCount + "涓换鍔�");
-
+ return true;
} catch (Exception e) {
- log.error("鎵归噺娴嬭瘯寮傚父", e);
- result.put("success", false);
- result.put("message", "鎵归噺娴嬭瘯澶辫触: " + e.getMessage());
+ log.error("娓呴櫎S7Serializer缂撳瓨澶辫触", e);
+ return false;
}
-
- return result;
- }
-
- /**
- * 璁剧疆DB鍧楀湴鍧�
- */
- @PostMapping("/dbBlock")
- public Map<String, Object> setDbBlock(@RequestBody Map<String, Object> params) {
- Map<String, Object> result = new HashMap<>();
-
- try {
- String dbBlock = (String) params.get("dbBlock");
- plcTestWriteService.setCurrentDbBlock(dbBlock);
- result.put("success", true);
- result.put("message", "DB鍧楀湴鍧�璁剧疆鎴愬姛: " + dbBlock);
- } catch (Exception e) {
- log.error("璁剧疆DB鍧楀湴鍧�寮傚父", e);
- result.put("success", false);
- result.put("message", "璁剧疆DB鍧楀湴鍧�澶辫触: " + e.getMessage());
- }
-
- return result;
- }
-
- /**
- * 鑾峰彇褰撳墠DB鍧楀湴鍧�
- */
- @GetMapping("/dbBlock")
- public Map<String, Object> getDbBlock() {
- Map<String, Object> result = new HashMap<>();
-
- try {
- String dbBlock = plcTestWriteService.getCurrentDbBlock();
- result.put("success", true);
- result.put("data", dbBlock);
- result.put("message", "鑾峰彇DB鍧楀湴鍧�鎴愬姛");
- } catch (Exception e) {
- log.error("鑾峰彇DB鍧楀湴鍧�寮傚父", e);
- result.put("success", false);
- result.put("message", "鑾峰彇DB鍧楀湴鍧�澶辫触: " + e.getMessage());
- }
-
- return result;
- }
-
- /**
- * 鍚敤鑷姩娴嬭瘯妯″紡
- */
- @PostMapping("/auto/enable")
- public Map<String, Object> enableAutoTest() {
- Map<String, Object> result = new HashMap<>();
-
- try {
- plcAutoTestService.enableAutoTest();
- result.put("success", true);
- result.put("message", "鑷姩娴嬭瘯妯″紡宸插惎鐢�");
- } catch (Exception e) {
- log.error("鍚敤鑷姩娴嬭瘯妯″紡寮傚父", e);
- result.put("success", false);
- result.put("message", "鍚敤鑷姩娴嬭瘯妯″紡澶辫触: " + e.getMessage());
- }
-
- return result;
- }
-
- /**
- * 绂佺敤鑷姩娴嬭瘯妯″紡
- */
- @PostMapping("/auto/disable")
- public Map<String, Object> disableAutoTest() {
- Map<String, Object> result = new HashMap<>();
-
- try {
- plcAutoTestService.disableAutoTest();
- result.put("success", true);
- result.put("message", "鑷姩娴嬭瘯妯″紡宸茬鐢�");
- } catch (Exception e) {
- log.error("绂佺敤鑷姩娴嬭瘯妯″紡寮傚父", e);
- result.put("success", false);
- result.put("message", "绂佺敤鑷姩娴嬭瘯妯″紡澶辫触: " + e.getMessage());
- }
-
- return result;
- }
-
- /**
- * 鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵��
- */
- @GetMapping("/auto/status")
- public Map<String, Object> getAutoTestStatus() {
- Map<String, Object> result = new HashMap<>();
-
- try {
- boolean isEnabled = plcAutoTestService.isAutoTestEnabled();
- result.put("success", true);
- result.put("data", isEnabled);
- result.put("message", "鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵�佹垚鍔�");
- } catch (Exception e) {
- log.error("鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵�佸紓甯�", e);
- result.put("success", false);
- result.put("message", "鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵�佸け璐�: " + e.getMessage());
- }
-
- return result;
}
}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteLegacyController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteLegacyController.java
new file mode 100644
index 0000000..19288d0
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/controller/PlcTestWriteLegacyController.java
@@ -0,0 +1,352 @@
+package com.mes.controller;
+
+import com.mes.entity.PlcBaseData;
+import com.mes.service.PlcAutoTestService;
+import com.mes.service.PlcTestWriteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * PLC娴嬭瘯鍐欏叆鎺у埗鍣紙鍏煎鏃PI锛�
+ * 涓哄墠绔彁渚涙ā鎷烶LC鍐欏叆鎿嶄綔鐨勬帴鍙�
+ *
+ * @author huang
+ * @date 2025/10/29
+ */
+@Slf4j
+@RestController
+@RequestMapping("/plcTest/write")
+public class PlcTestWriteLegacyController {
+
+ @Resource
+ private PlcTestWriteService plcTestWriteService;
+
+ @Resource
+ private PlcAutoTestService plcAutoTestService;
+
+ /**
+ * 妯℃嫙PLC鍙戦�佽姹傚瓧
+ */
+ @PostMapping("/request")
+ public Map<String, Object> simulateRequest(@RequestBody(required = false) Map<String, Object> params) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ boolean success;
+ if (params != null && params.containsKey("dbBlock")) {
+ String dbBlock = (String) params.get("dbBlock");
+ int beginIndex = (int) params.getOrDefault("beginIndex", 0);
+ // 浣跨敤榛樿椤圭洰锛屼絾璁板綍璀﹀憡
+ log.warn("浣跨敤鏃PI鍙傛暟dbBlock={}, beginIndex={}锛屽缓璁娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮�", dbBlock, beginIndex);
+ success = plcTestWriteService.simulatePlcRequest();
+ } else {
+ success = plcTestWriteService.simulatePlcRequest();
+ }
+
+ result.put("success", success);
+ result.put("message", success ? "PLC璇锋眰瀛楀彂閫佹垚鍔�" : "鍙戦�佸け璐�");
+
+ // 杩斿洖褰撳墠鐘舵��
+ PlcBaseData status = plcTestWriteService.readPlcStatus();
+ result.put("currentStatus", status);
+
+ } catch (Exception e) {
+ log.error("妯℃嫙PLC璇锋眰寮傚父", e);
+ result.put("success", false);
+ result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 妯℃嫙PLC浠诲姟瀹屾垚姹囨姤
+ */
+ @PostMapping("/report")
+ public Map<String, Object> simulateReport(@RequestBody(required = false) Map<String, Object> params) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ boolean success;
+ if (params != null && params.containsKey("dbBlock")) {
+ String dbBlock = (String) params.get("dbBlock");
+ int beginIndex = (int) params.getOrDefault("beginIndex", 0);
+ // 浣跨敤榛樿椤圭洰锛屼絾璁板綍璀﹀憡
+ log.warn("浣跨敤鏃PI鍙傛暟dbBlock={}, beginIndex={}锛屽缓璁娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮�", dbBlock, beginIndex);
+ success = plcTestWriteService.simulatePlcReport();
+ } else {
+ success = plcTestWriteService.simulatePlcReport();
+ }
+
+ result.put("success", success);
+ result.put("message", success ? "PLC浠诲姟姹囨姤鎴愬姛" : "姹囨姤澶辫触");
+
+ PlcBaseData status = plcTestWriteService.readPlcStatus();
+ result.put("currentStatus", status);
+
+ } catch (Exception e) {
+ log.error("妯℃嫙涓婄墖PLC姹囨姤寮傚父", e);
+ result.put("success", false);
+ result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 妯℃嫙PLC鑱旀満鐘舵��
+ */
+ @PostMapping("/online")
+ public Map<String, Object> simulateOnline(@RequestBody Map<String, Object> params) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ int onlineState = (int) params.getOrDefault("onlineState", 1);
+ boolean success;
+
+ if (params.containsKey("dbBlock")) {
+ String dbBlock = (String) params.get("dbBlock");
+ int beginIndex = (int) params.getOrDefault("beginIndex", 0);
+ // 浣跨敤榛樿椤圭洰锛屼絾璁板綍璀﹀憡
+ log.warn("浣跨敤鏃PI鍙傛暟dbBlock={}, beginIndex={}锛屽缓璁娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮�", dbBlock, beginIndex);
+ success = plcTestWriteService.simulateOnlineStatus(onlineState);
+ } else {
+ success = plcTestWriteService.simulateOnlineStatus(onlineState);
+ }
+
+ result.put("success", success);
+ result.put("message", success ? "PLC鑱旀満鐘舵�佽缃垚鍔�: " + onlineState : "璁剧疆澶辫触");
+
+ PlcBaseData status = plcTestWriteService.readPlcStatus();
+ result.put("currentStatus", status);
+
+ } catch (Exception e) {
+ log.error("妯℃嫙PLC鑱旀満鐘舵�佸紓甯�", e);
+ result.put("success", false);
+ result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 閲嶇疆PLC鐘舵��
+ */
+ @PostMapping("/reset")
+ public Map<String, Object> resetPlc(@RequestBody(required = false) Map<String, Object> params) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ boolean success;
+ if (params != null && params.containsKey("dbBlock")) {
+ String dbBlock = (String) params.get("dbBlock");
+ int beginIndex = (int) params.getOrDefault("beginIndex", 0);
+ // 浣跨敤榛樿椤圭洰锛屼絾璁板綍璀﹀憡
+ log.warn("浣跨敤鏃PI鍙傛暟dbBlock={}, beginIndex={}锛屽缓璁娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮�", dbBlock, beginIndex);
+ success = plcTestWriteService.resetPlc();
+ } else {
+ success = plcTestWriteService.resetPlc();
+ }
+
+ result.put("success", success);
+ result.put("message", success ? "PLC鐘舵�侀噸缃垚鍔�" : "閲嶇疆澶辫触");
+
+ PlcBaseData status = plcTestWriteService.readPlcStatus();
+ result.put("currentStatus", status);
+
+ } catch (Exception e) {
+ log.error("閲嶇疆涓婄墖PLC鐘舵�佸紓甯�", e);
+ result.put("success", false);
+ result.put("message", "鎿嶄綔澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 璇诲彇PLC褰撳墠鐘舵��
+ */
+ @GetMapping("/status")
+ public Map<String, Object> getPlcStatus(@RequestParam(required = false) String dbBlock,
+ @RequestParam(required = false, defaultValue = "0") Integer beginIndex) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ PlcBaseData status;
+ if (dbBlock != null) {
+ // 浣跨敤榛樿椤圭洰锛屼絾璁板綍璀﹀憡
+ log.warn("浣跨敤鏃PI鍙傛暟dbBlock={}, beginIndex={}锛屽缓璁娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮�", dbBlock, beginIndex);
+ status = plcTestWriteService.readPlcStatus();
+ } else {
+ status = plcTestWriteService.readPlcStatus();
+ }
+
+ result.put("success", true);
+ result.put("data", status);
+ result.put("message", "鑾峰彇涓婄墖PLC鐘舵�佹垚鍔�");
+
+ } catch (Exception e) {
+ log.error("璇诲彇涓婄墖PLC鐘舵�佸紓甯�", e);
+ result.put("success", false);
+ result.put("message", "鑾峰彇鐘舵�佸け璐�: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鎵归噺娴嬭瘯 - 妯℃嫙瀹屾暣浠诲姟娴佺▼
+ */
+ @PostMapping("/batch/test")
+ public Map<String, Object> batchTest(@RequestBody Map<String, Object> params) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ String protocolType = (String) params.get("protocolType");
+ int taskCount = (int) params.getOrDefault("taskCount", 1);
+
+ log.info("寮�濮嬫壒閲忔祴璇曪紝鍗忚绫诲瀷: {}, 浠诲姟鏁伴噺: {}", protocolType, taskCount);
+
+ // 妯℃嫙瀹屾暣鐨勪换鍔℃祦绋�
+ for (int i = 1; i <= taskCount; i++) {
+ log.info("鎵ц绗瑊}涓换鍔�", i);
+
+ if ("load".equals(protocolType)) {
+ // 娴佺▼
+ plcTestWriteService.simulatePlcRequest(); // 鍙戦�佽姹�
+ // 绛夊緟MES鍝嶅簲
+ Thread.sleep(1000);
+ plcTestWriteService.simulatePlcReport(); // 浠诲姟瀹屾垚
+
+ } else if ("raw".equals(protocolType)) {
+ // 娴佺▼
+ plcTestWriteService.simulatePlcRequest(); // 鍙戦�佽姹�
+ // 绛夊緟MES鍝嶅簲
+ Thread.sleep(1000);
+ plcTestWriteService.simulatePlcReport(); // 浠诲姟瀹屾垚
+ }
+
+ // 浠诲姟闂撮殧
+ if (i < taskCount) {
+ Thread.sleep(2000);
+ }
+ }
+
+ result.put("success", true);
+ result.put("message", "鎵归噺娴嬭瘯瀹屾垚锛屽叡鎵ц" + taskCount + "涓换鍔�");
+
+ } catch (Exception e) {
+ log.error("鎵归噺娴嬭瘯寮傚父", e);
+ result.put("success", false);
+ result.put("message", "鎵归噺娴嬭瘯澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 璁剧疆DB鍧楀湴鍧�锛堝凡搴熷純锛屼粎淇濈暀鍏煎鎬э級
+ */
+ @PostMapping("/dbBlock")
+ public Map<String, Object> setDbBlock(@RequestBody Map<String, Object> params) {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ String dbBlock = (String) params.get("dbBlock");
+ log.warn("璁剧疆DB鍧楀湴鍧�鍔熻兘宸插簾寮冿紝璇蜂娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮忕鐞哖LC閰嶇疆");
+ result.put("success", false);
+ result.put("message", "璁剧疆DB鍧楀湴鍧�鍔熻兘宸插簾寮冿紝璇蜂娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮忕鐞哖LC閰嶇疆");
+ } catch (Exception e) {
+ log.error("璁剧疆DB鍧楀湴鍧�寮傚父", e);
+ result.put("success", false);
+ result.put("message", "璁剧疆DB鍧楀湴鍧�澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠DB鍧楀湴鍧�锛堝凡搴熷純锛屼粎淇濈暀鍏煎鎬э級
+ */
+ @GetMapping("/dbBlock")
+ public Map<String, Object> getDbBlock() {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ log.warn("鑾峰彇DB鍧楀湴鍧�鍔熻兘宸插簾寮冿紝璇蜂娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮忕鐞哖LC閰嶇疆");
+ result.put("success", false);
+ result.put("message", "鑾峰彇DB鍧楀湴鍧�鍔熻兘宸插簾寮冿紝璇蜂娇鐢ㄦ柊API鍩轰簬椤圭洰ID鐨勬柟寮忕鐞哖LC閰嶇疆");
+ } catch (Exception e) {
+ log.error("鑾峰彇DB鍧楀湴鍧�寮傚父", e);
+ result.put("success", false);
+ result.put("message", "鑾峰彇DB鍧楀湴鍧�澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鍚敤鑷姩娴嬭瘯妯″紡
+ */
+ @PostMapping("/auto/enable")
+ public Map<String, Object> enableAutoTest() {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ plcAutoTestService.enableAutoTest();
+ result.put("success", true);
+ result.put("message", "鑷姩娴嬭瘯妯″紡宸插惎鐢�");
+ } catch (Exception e) {
+ log.error("鍚敤鑷姩娴嬭瘯妯″紡寮傚父", e);
+ result.put("success", false);
+ result.put("message", "鍚敤鑷姩娴嬭瘯妯″紡澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 绂佺敤鑷姩娴嬭瘯妯″紡
+ */
+ @PostMapping("/auto/disable")
+ public Map<String, Object> disableAutoTest() {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ plcAutoTestService.disableAutoTest();
+ result.put("success", true);
+ result.put("message", "鑷姩娴嬭瘯妯″紡宸茬鐢�");
+ } catch (Exception e) {
+ log.error("绂佺敤鑷姩娴嬭瘯妯″紡寮傚父", e);
+ result.put("success", false);
+ result.put("message", "绂佺敤鑷姩娴嬭瘯妯″紡澶辫触: " + e.getMessage());
+ }
+
+ return result;
+ }
+
+ /**
+ * 鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵��
+ */
+ @GetMapping("/auto/status")
+ public Map<String, Object> getAutoTestStatus() {
+ Map<String, Object> result = new HashMap<>();
+
+ try {
+ boolean isEnabled = plcAutoTestService.isAutoTestEnabled();
+ result.put("success", true);
+ result.put("data", isEnabled);
+ result.put("message", "鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵�佹垚鍔�");
+ } catch (Exception e) {
+ log.error("鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵�佸紓甯�", e);
+ result.put("success", false);
+ result.put("message", "鑾峰彇鑷姩娴嬭瘯妯″紡鐘舵�佸け璐�: " + e.getMessage());
+ }
+
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcAddress.java b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcAddress.java
index 09c3945..70bcb4b 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcAddress.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcAddress.java
@@ -11,12 +11,12 @@
/**
* PLC鍦板潃鏄犲皠閰嶇疆琛�
*
- * @author zhoush
+ * @author huang
* @date 2025/10/30
*/
@Data
@TableName("plc_address_mapping")
-public class PlcAddressMapping implements Serializable {
+public class PlcAddress implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java
index 76bcb44..01ba831 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/entity/PlcBaseData.java
@@ -3,14 +3,12 @@
import com.github.xingshuangs.iot.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data;
-import org.springframework.stereotype.Component;
/**
* @author huang
* @since 2025/10/30
*/
@Data
-@Component
public class PlcBaseData {
/**
* plc
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/job/config/S7PlcSendConfig.java b/mes-processes/mes-plcSend/src/main/java/com/mes/job/config/S7PlcSendConfig.java
deleted file mode 100644
index 9a0f13e..0000000
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/job/config/S7PlcSendConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.job.config;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.mes.s7.enhanced.EnhancedS7Serializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author : zhoush
- * @Date: 2025/10/30
- * @Description: PLC鍙戦�佹ā鍧桽7閰嶇疆
- */
-@Configuration
-public class S7PlcSendConfig {
-
- @Bean
- public EnhancedS7Serializer s7Serializer() {
- // 杩欓噷浣跨敤涓�涓粯璁ょ殑PLC鍦板潃锛屽疄闄呭簲鐢ㄤ腑搴旇浠庨厤缃枃浠惰鍙�
- S7PLC s7Plc = new S7PLC(EPlcType.S1200, "192.168.10.21");
- return EnhancedS7Serializer.newInstance(s7Plc);
- }
-}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcAddressMapper.java b/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcAddressMapper.java
index 3144543..19dd9bf 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcAddressMapper.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/mapper/PlcAddressMapper.java
@@ -1,16 +1,16 @@
package com.mes.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.PlcAddressMapping;
+import com.mes.entity.PlcAddress;
import org.apache.ibatis.annotations.Mapper;
/**
* PLC鍦板潃鏄犲皠閰嶇疆Mapper
*
- * @author zhoush
+ * @author huang
* @date 2025/10/30
*/
@Mapper
-public interface PlcAddressMappingMapper extends BaseMapper<PlcAddressMapping> {
+public interface PlcAddressMapper extends BaseMapper<PlcAddress> {
}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAddressService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAddressService.java
index 35aa692..2f3ae9e 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAddressService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAddressService.java
@@ -1,411 +1,100 @@
package com.mes.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.mes.config.PlcAddressMappingConfig;
-import com.mes.entity.PlcAddressMapping;
-import com.mes.mapper.PlcAddressMappingMapper;
-import com.mes.s7.enhanced.EnhancedS7Serializer;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.core.ApplicationContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.mes.entity.PlcAddress;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
- * PLC鍦板潃鏄犲皠鏈嶅姟
- * 绠＄悊PLC鍦板潃鏄犲皠閰嶇疆锛屾敮鎸佷粠鏁版嵁搴撳拰閰嶇疆鏂囦欢鍔犺浇
- *
- * @author zhoush
- * @date 2025/10/29
+ * PLC鍦板潃鏄犲皠鏈嶅姟鎺ュ彛
+ * 瀹氫箟PLC鍦板潃鏄犲皠閰嶇疆绠＄悊鐨勬牳蹇冩柟娉�
+ *
+ * @author huang
+ * @date 2025/10/30
*/
-@Slf4j
-@Service
-public class PlcAddressMappingService {
-
- @Autowired
- private PlcAddressMappingMapper plcAddressMappingMapper;
-
- @Autowired
- private PlcAddressMappingConfig plcAddressMappingConfig;
-
- // JSON瑙ｆ瀽鍣�
- private final ObjectMapper objectMapper = new ObjectMapper();
+public interface PlcAddressService {
/**
- * 鑾峰彇鍖呭惈鍦板潃鏄犲皠鐨勯」鐩厤缃�
- * 鍚堝苟鏁版嵁搴撳拰閰嶇疆鏂囦欢涓殑鏄犲皠淇℃伅
+ * 鑾峰彇鍖呭惈鍦板潃鏄犲皠鐨勯」鐩厤缃紙鍚堝苟鏁版嵁搴撲笌閰嶇疆鏂囦欢锛�
+ * @param projectId 椤圭洰ID
+ * @return 鍚堝苟鍚庣殑椤圭洰閰嶇疆
*/
- public PlcAddressMappingConfig.ProjectPlcConfig getProjectConfigWithMapping(String projectId) {
- try {
- // 1. 鑾峰彇鏁版嵁搴撲腑鐨勯厤缃�
- PlcAddressMapping mapping = getMappingByProjectId(projectId);
- PlcAddressMappingConfig.ProjectPlcConfig projectConfig = null;
-
- if (mapping != null) {
- // 浠庢暟鎹簱瀹炰綋杞崲涓洪」鐩厤缃璞�
- projectConfig = convertToProjectConfig(mapping);
- } else {
- // 鏁版嵁搴撲腑娌℃湁閰嶇疆锛屽皾璇曚粠閰嶇疆鏂囦欢鑾峰彇
- if (fileConfig != null && fileConfig.getProjects().containsKey(projectId)) {
- projectConfig = fileConfig.getProjects().get(projectId);
- } else {
- // 鍒涘缓榛樿閰嶇疆
- projectConfig = new PlcAddressMappingConfig.ProjectPlcConfig();
- projectConfig.setDbArea(fileConfig != null ? fileConfig.getDefaultDbArea() : "DB1");
- projectConfig.setBeginIndex(fileConfig != null ? fileConfig.getDefaultBeginIndex() : 0);
- projectConfig.setAddressMapping(new HashMap<>());
- }
- }
-
- // 2. 濡傛灉閰嶇疆鏂囦欢涓湁棰濆鐨勬槧灏勪俊鎭紝杩涜鍚堝苟
- if (fileConfig != null && fileConfig.getProjects() != null && fileConfig.getProjects().containsKey(projectId)) {
- PlcAddressMappingConfig.ProjectPlcConfig fileProjectConfig = fileConfig.getProjects().get(projectId);
-
- // 鍚堝苟鍦板潃鏄犲皠
- if (fileProjectConfig.getAddressMapping() != null) {
- if (projectConfig.getAddressMapping() == null) {
- projectConfig.setAddressMapping(new HashMap<>());
- }
- // 鏂囦欢閰嶇疆浣滀负鍩虹锛屾暟鎹簱閰嶇疆浣滀负瑕嗙洊锛堜紭鍏堢骇鏇撮珮锛�
- Map<String, Integer> mergedMapping = new HashMap<>(fileProjectConfig.getAddressMapping());
- if (projectConfig.getAddressMapping() != null) {
- mergedMapping.putAll(projectConfig.getAddressMapping());
- }
- projectConfig.setAddressMapping(mergedMapping);
- }
-
- // 濡傛灉椤圭洰閰嶇疆涓己灏戞煇浜涘睘鎬э紝浠庢枃浠堕厤缃腑琛ュ厖
- if (projectConfig.getDbArea() == null || projectConfig.getDbArea().trim().isEmpty()) {
- projectConfig.setDbArea(fileProjectConfig.getDbArea());
- }
- if (projectConfig.getPlcIp() == null || projectConfig.getPlcIp().trim().isEmpty()) {
- projectConfig.setPlcIp(fileProjectConfig.getPlcIp());
- }
- if (projectConfig.getPlcType() == null || projectConfig.getPlcType().trim().isEmpty()) {
- projectConfig.setPlcType(fileProjectConfig.getPlcType());
- }
- }
-
- return projectConfig;
- } catch (Exception e) {
- log.error("鑾峰彇椤圭洰閰嶇疆澶辫触锛岄」鐩甀D: {}", projectId, e);
- // 杩斿洖榛樿閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig defaultConfig = new PlcAddressMappingConfig.ProjectPlcConfig();
- defaultConfig.setDbArea(fileConfig != null ? fileConfig.getDefaultDbArea() : "DB1");
- defaultConfig.setBeginIndex(fileConfig != null ? fileConfig.getDefaultBeginIndex() : 0);
- defaultConfig.setAddressMapping(new HashMap<>());
- return defaultConfig;
- }
- }
+ PlcAddress getProjectConfigWithMapping(String projectId);
/**
* 浠庢暟鎹簱鑾峰彇椤圭洰閰嶇疆
+ * @param projectId 椤圭洰ID
+ * @return 椤圭洰閰嶇疆锛圥lcAddress瀹炰綋锛夛紝涓嶅瓨鍦ㄥ垯杩斿洖null
*/
- public PlcAddressMappingConfig.ProjectPlcConfig getProjectConfig(String projectId) {
- try {
- // 浼樺厛浠庢暟鎹簱鑾峰彇閰嶇疆
- PlcAddressMapping mapping = plcAddressMappingMapper.selectOne(
- new LambdaQueryWrapper<PlcAddressMapping>()
- .eq(PlcAddressMapping::getProjectId, projectId)
- );
-
- if (mapping != null) {
- return convertToProjectConfig(mapping);
- }
-
- // 濡傛灉鏁版嵁搴撲腑娌℃湁锛屽垯浠庨厤缃枃浠惰幏鍙�
- if (fileConfig != null && fileConfig.getProjects() != null && fileConfig.getProjects().containsKey(projectId)) {
- return fileConfig.getProjects().get(projectId);
- }
-
- // 濡傛灉閮芥病鏈夛紝杩斿洖null
- return null;
- } catch (Exception e) {
- log.error("鑾峰彇椤圭洰閰嶇疆澶辫触锛岄」鐩甀D: {}", projectId, e);
- return null;
- }
- }
+ PlcAddress getProjectConfig(String projectId);
/**
- * 鑾峰彇鎵�鏈夋槧灏勯厤缃�
- * 鍚堝苟鏁版嵁搴撳拰閰嶇疆鏂囦欢涓殑鏄犲皠淇℃伅
+ * 鑾峰彇鎵�鏈夋槧灏勯厤缃紙鍚堝苟鍚庣殑addressMapping浼氬啓鍥炲疄浣撶殑JSON瀛楁锛�
+ * @return 鎵�鏈夋槧灏勯厤缃垪琛�
*/
- public List<PlcAddressMapping> getAllMappings() {
- try {
- List<PlcAddressMapping> mappings = plcAddressMappingMapper.selectList(null);
-
- // 澶勭悊姣忎釜鏄犲皠閰嶇疆
- for (PlcAddressMapping mapping : mappings) {
- // 鑾峰彇椤圭洰鏍囪瘑
- String projectId = mapping.getProjectId();
-
- // 鑾峰彇鍚堝苟鍚庣殑椤圭洰閰嶇疆锛堝寘鍚暟鎹簱鍜岄厤缃枃浠剁殑鏄犲皠淇℃伅锛�
- PlcAddressMappingConfig.ProjectPlcConfig projectConfig = getProjectConfigWithMapping(projectId);
-
- // 灏嗗悎骞跺悗鐨勬槧灏勪俊鎭浆鎹负JSON瀛楃涓�
- if (projectConfig.getAddressMapping() != null && !projectConfig.getAddressMapping().isEmpty()) {
- try {
- String mergedMappingJson = objectMapper.writeValueAsString(projectConfig.getAddressMapping());
- mapping.setAddressMapping(mergedMappingJson);
- // addressMapping灞炴�у凡缁忔槧灏勫埌鏁版嵁搴撶殑address_mapping_json瀛楁
- } catch (Exception e) {
- log.warn("杞崲鍚堝苟鍚庣殑鏄犲皠淇℃伅澶辫触锛岄」鐩甀D: {}", projectId, e);
- // 淇濇寔鍘熸湁鐨刟ddressMapping鍊�
- }
- }
- }
-
- return mappings;
- } catch (Exception e) {
- log.error("鑾峰彇鎵�鏈塒LC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- throw new RuntimeException("鑾峰彇鎵�鏈塒LC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ List<PlcAddress> getAllMappings();
/**
* 鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ * @param page 椤电爜
+ * @param size 姣忛〉澶у皬
+ * @param projectId 椤圭洰ID锛堝彲閫夛級
+ * @param plcIp PLC IP锛堝彲閫夛級
+ * @return 鍒嗛〉缁撴灉
*/
- public IPage<PlcAddressMapping> getMappingsByPage(int page, int size, String projectId, String plcIp) {
- try {
- Page<PlcAddressMapping> pageParam = new Page<>(page, size);
- LambdaQueryWrapper<PlcAddressMapping> queryWrapper = new LambdaQueryWrapper<>();
-
- if (projectId != null && !projectId.trim().isEmpty()) {
- queryWrapper.like(PlcAddressMapping::getProjectId, projectId);
- }
-
- if (plcIp != null && !plcIp.trim().isEmpty()) {
- queryWrapper.like(PlcAddressMapping::getPlcIp, plcIp);
- }
-
- return plcAddressMappingMapper.selectPage(pageParam, queryWrapper);
- } catch (Exception e) {
- log.error("鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- throw new RuntimeException("鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ IPage<PlcAddress> getMappingsByPage(int page, int size, String projectId, String plcIp);
/**
* 鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ * @param id 閰嶇疆ID
+ * @return PLC鍦板潃鏄犲皠閰嶇疆
*/
- public PlcAddressMapping getMappingById(Long id) {
- try {
- return plcAddressMappingMapper.selectById(id);
- } catch (Exception e) {
- log.error("鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛孖D: {}", id, e);
- throw new RuntimeException("鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ PlcAddress getMappingById(Long id);
/**
- * 鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ * 鏍规嵁椤圭洰ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ * @param projectId 椤圭洰ID
+ * @return PLC鍦板潃鏄犲皠閰嶇疆
*/
- public PlcAddressMapping getMappingByProjectId(String projectId) {
- try {
- return plcAddressMappingMapper.selectOne(
- new LambdaQueryWrapper<PlcAddressMapping>()
- .eq(PlcAddressMapping::getProjectId, projectId)
- );
- } catch (Exception e) {
- log.error("鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛岄」鐩甀D: {}", projectId, e);
- throw new RuntimeException("鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ PlcAddress getMappingByProjectId(String projectId);
/**
- * 淇濆瓨PLC鍦板潃鏄犲皠閰嶇疆
+ * 鍒涘缓PLC鍦板潃鏄犲皠閰嶇疆
+ * @param mapping 鏄犲皠閰嶇疆
+ * @return 鍒涘缓鍚庣殑閰嶇疆
*/
- public PlcAddressMapping saveMapping(PlcAddressMapping mapping) {
- try {
- // 妫�鏌ラ」鐩甀D鏄惁宸插瓨鍦�
- PlcAddressMapping existing = plcAddressMappingMapper.selectOne(
- new LambdaQueryWrapper<PlcAddressMapping>()
- .eq(PlcAddressMapping::getProjectId, mapping.getProjectId())
- );
-
- if (existing != null) {
- throw new RuntimeException("椤圭洰鏍囪瘑 " + mapping.getProjectId() + " 宸插瓨鍦�");
- }
-
- plcAddressMappingMapper.insert(mapping);
- return mapping;
- } catch (Exception e) {
- log.error("淇濆瓨PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- throw new RuntimeException("淇濆瓨PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ PlcAddress saveMapping(PlcAddress mapping);
/**
* 鏇存柊PLC鍦板潃鏄犲皠閰嶇疆
+ * @param mapping 鏄犲皠閰嶇疆
+ * @return 鏇存柊鍚庣殑閰嶇疆锛屾湭鎵惧埌杩斿洖null
*/
- public PlcAddressMapping updateMapping(PlcAddressMapping mapping) {
- try {
- // 妫�鏌D鏄惁瀛樺湪
- PlcAddressMapping existing = plcAddressMappingMapper.selectById(mapping.getId());
- if (existing == null) {
- return null;
- }
-
- // 濡傛灉椤圭洰ID鏈夊彉鍖栵紝妫�鏌ユ柊椤圭洰ID鏄惁宸插瓨鍦�
- if (!existing.getProjectId().equals(mapping.getProjectId())) {
- PlcAddressMapping duplicate = plcAddressMappingMapper.selectOne(
- new LambdaQueryWrapper<PlcAddressMapping>()
- .eq(PlcAddressMapping::getProjectId, mapping.getProjectId())
- );
-
- if (duplicate != null) {
- throw new RuntimeException("椤圭洰鏍囪瘑 " + mapping.getProjectId() + " 宸插瓨鍦�");
- }
- }
-
- plcAddressMappingMapper.updateById(mapping);
- return mapping;
- } catch (Exception e) {
- log.error("鏇存柊PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- throw new RuntimeException("鏇存柊PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ PlcAddress updateMapping(PlcAddress mapping);
/**
* 鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆
+ * @param id 閰嶇疆ID
+ * @return 鏄惁鎴愬姛
*/
- public boolean deleteMapping(Long id) {
- try {
- int result = plcAddressMappingMapper.deleteById(id);
- return result > 0;
- } catch (Exception e) {
- log.error("鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛孖D: {}", id, e);
- throw new RuntimeException("鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ boolean deleteMapping(Long id);
/**
* 鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆
+ * @param ids 閰嶇疆ID鍒楄〃
+ * @return 鍒犻櫎鏁伴噺
*/
- public int deleteMappings(List<Long> ids) {
- try {
- if (ids == null || ids.isEmpty()) {
- return 0;
- }
- return plcAddressMappingMapper.deleteBatchIds(ids);
- } catch (Exception e) {
- log.error("鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛孖D鍒楄〃: {}", ids, e);
- throw new RuntimeException("鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
- }
- }
+ int deleteMappings(List<Long> ids);
/**
* 娴嬭瘯PLC杩炴帴
+ * @param mapping 鏄犲皠閰嶇疆
+ * @return 鏄惁鎴愬姛
*/
- public boolean testConnection(PlcAddressMapping mapping) {
- try {
- // 瑙ｆ瀽PLC绫诲瀷
- EPlcType plcType = EPlcType.S1200; // 榛樿鍊�
- if (mapping.getPlcType() != null && !mapping.getPlcType().trim().isEmpty()) {
- try {
- plcType = EPlcType.valueOf(mapping.getPlcType());
- } catch (IllegalArgumentException e) {
- log.warn("鏈煡鐨凱LC绫诲瀷: {}, 浣跨敤榛樿绫诲瀷 S1200", mapping.getPlcType());
- }
- }
-
- // 鍒涘缓S7PLC瀹炰緥
- String plcIp = mapping.getPlcIp() != null ? mapping.getPlcIp() : "192.168.10.21";
- S7PLC s7Plc = new S7PLC(plcType, plcIp);
-
- // 鍒涘缓EnhancedS7Serializer瀹炰緥
- EnhancedS7Serializer serializer = EnhancedS7Serializer.newInstance(s7Plc);
-
- // 灏濊瘯璇诲彇涓�涓畝鍗曠殑鏁版嵁鏉ユ祴璇曡繛鎺�
- String dbArea = mapping.getDbArea() != null ? mapping.getDbArea() : "DB1";
- int beginIndex = mapping.getBeginIndex();
-
- // 杩欓噷鎴戜滑鍙祴璇曡繛鎺ワ紝涓嶈鍙栧疄闄呮暟鎹�
- // 瀹為檯椤圭洰涓彲鑳介渶瑕佹牴鎹叿浣撻渶姹傝皟鏁�
- return true;
- } catch (Exception e) {
- log.error("PLC杩炴帴娴嬭瘯澶辫触", e);
- return false;
- }
- }
+ boolean testConnection(PlcAddress mapping);
/**
- * 閲嶆柊鍔犺浇閰嶇疆鏂囦欢涓殑鏄犲皠
+ * 閲嶆柊鍔犺浇閰嶇疆鏂囦欢涓殑鏄犲皠閰嶇疆
*/
- public void reloadConfigMappings() {
- try {
- // 鍏抽敭淇敼3锛氶�氳繃Spring涓婁笅鏂囧埛鏂伴厤缃紙閫傜敤浜嶴pring Boot 2.x锛�
- ApplicationContext applicationContext = SpringContextHolder.getApplicationContext();
- if (applicationContext != null) {
- // 鑾峰彇閰嶇疆缁戝畾鐨凚eanDefinition
- ConfigurableApplicationContext configurableContext = (ConfigurableApplicationContext) applicationContext;
- ConfigurableEnvironment environment = configurableContext.getEnvironment();
-
- // 鍒锋柊閰嶇疆婧愶紙閲嶆柊璇诲彇閰嶇疆鏂囦欢锛�
- for (PropertySource<?> source : environment.getPropertySources()) {
- if (source instanceof ResourcePropertySource) {
- ResourcePropertySource resourceSource = (ResourcePropertySource) source;
- // 閲嶆柊鍔犺浇閰嶇疆鏂囦欢璧勬簮
- resourceSource.refresh();
- }
- }
-
- // 閲嶆柊缁戝畾閰嶇疆鍒癙lcAddressMappingConfig
- Binder.get(environment)
- .bind("plc.address.mapping", PlcAddressMappingConfig.class)
- .ifBound(config -> {
- // 鏇存柊娉ㄥ叆鐨勯厤缃疄渚嬶紙鍥燖ConfigurationProperties榛樿鏄崟渚嬶紝闇�鎵嬪姩鏇存柊灞炴�э級
- this.plcAddressMappingConfig.setDefaultDbArea(config.getDefaultDbArea());
- this.plcAddressMappingConfig.setDefaultBeginIndex(config.getDefaultBeginIndex());
- this.plcAddressMappingConfig.setProjects(config.getProjects());
- });
-
- log.info("鎴愬姛閲嶆柊鍔犺浇閰嶇疆鏂囦欢涓殑PLC鍦板潃鏄犲皠");
- }
- } catch (Exception e) {
- log.error("閲嶆柊鍔犺浇閰嶇疆鏂囦欢涓殑PLC鍦板潃鏄犲皠澶辫触", e);
- }
- }
-
- /**
- * 灏嗘暟鎹簱瀹炰綋杞崲涓洪」鐩厤缃璞�
- */
- private PlcAddressMappingConfig.ProjectPlcConfig convertToProjectConfig(PlcAddressMapping mapping) {
- PlcAddressMappingConfig.ProjectPlcConfig config = new PlcAddressMappingConfig.ProjectPlcConfig();
-
- config.setDbArea(mapping.getDbArea());
- config.setBeginIndex(mapping.getBeginIndex());
- config.setPlcIp(mapping.getPlcIp());
- config.setPlcType(mapping.getPlcType());
-
- // 瑙ｆ瀽鍦板潃鏄犲皠JSON
- if (mapping.getAddressMapping() != null && !mapping.getAddressMapping().trim().isEmpty()) {
- try {
- // 浣跨敤Jackson瑙ｆ瀽JSON瀛楃涓蹭负Map<String, Integer>
- Map<String, Integer> addressMap = objectMapper.readValue(
- mapping.getAddressMapping(),
- new TypeReference<Map<String, Integer>>() {}
- );
- config.setAddressMapping(addressMap);
- } catch (Exception e) {
- log.warn("瑙ｆ瀽鍦板潃鏄犲皠JSON澶辫触: {}", mapping.getAddressMapping(), e);
- // 濡傛灉瑙ｆ瀽澶辫触锛屽垱寤轰竴涓┖鐨勬槧灏�
- config.setAddressMapping(new HashMap<>());
- }
- } else {
- // 濡傛灉娌℃湁鍦板潃鏄犲皠锛屽垱寤轰竴涓┖鐨勬槧灏�
- config.setAddressMapping(new HashMap<>());
- }
-
- return config;
- }
+ void reloadConfigMappings();
}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java
index 6880525..10823d3 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcAutoTestService.java
@@ -1,6 +1,5 @@
package com.mes.service;
-import com.mes.s7.enhanced.EnhancedS7Serializer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
@@ -12,15 +11,12 @@
* PLC鑷姩娴嬭瘯鏈嶅姟
* 瀹氭椂妯℃嫙PLC琛屼负锛屽悜PLC鍐欏叆娴嬭瘯鏁版嵁锛岀敤浜庤嚜鍔ㄦ祴璇昅ES绋嬪簭
*
- * @author zhoush
+ * @author huang
* @date 2025/10/30
*/
@Slf4j
@Service
public class PlcAutoTestService {
-
- @Resource
- private EnhancedS7Serializer s7Serializer;
@Resource
private PlcTestWriteService plcTestWriteService;
@@ -32,9 +28,6 @@
// 鑷姩娴嬭瘯闂撮殧锛堟绉掞級
@Value("${plc.auto.test.interval:5000}")
private long autoTestInterval;
-
- private static final int ON = 1;
- private static final int OFF = 0;
/**
* 瀹氭椂鑷姩娴嬭瘯浠诲姟
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java
index d5181bc..9e53e9f 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/PlcTestWriteService.java
@@ -2,8 +2,8 @@
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.mes.config.PlcAddressMappingConfig;
import com.mes.entity.PlcBaseData;
+import com.mes.entity.PlcAddress;
import com.mes.s7.enhanced.EnhancedS7Serializer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -16,7 +16,7 @@
* PLC娴嬭瘯鍐欏叆鏈嶅姟
* 妯℃嫙PLC琛屼负锛屽悜PLC鍐欏叆娴嬭瘯鏁版嵁锛岀敤浜庢祴璇昅ES绋嬪簭
*
- * @author zhoush
+ * @author huang
* @date 2025/10/29
*/
@Slf4j
@@ -24,13 +24,13 @@
public class PlcTestWriteService {
@Resource
- private PlcAddressMappingService plcAddressMappingService;
+ private PlcAddressService plcAddressService;
private static final int ON = 1;
private static final int OFF = 0;
// 褰撳墠浣跨敤鐨勯」鐩爣璇�
- private String currentProjectId = "shuttle";
+ private String currentProjectId = "vertical";
// 缂撳瓨涓嶅悓椤圭洰鐨凷7Serializer瀹炰緥
private final ConcurrentMap<String, EnhancedS7Serializer> serializerCache = new ConcurrentHashMap<>();
@@ -47,8 +47,8 @@
*/
public boolean simulatePlcRequest(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -88,8 +88,8 @@
*/
public boolean simulatePlcReport(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -127,8 +127,8 @@
*/
public boolean simulateOnlineStatus(int onlineState, String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -161,8 +161,8 @@
*/
public boolean resetPlc(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -203,8 +203,8 @@
*/
public PlcBaseData readPlcStatus(String projectId) {
try {
- // 鑾峰彇椤圭洰閰嶇疆
- PlcAddressMappingConfig.ProjectPlcConfig config = plcAddressMappingService.getProjectConfig(projectId);
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
// 鑾峰彇瀵瑰簲鐨凷7Serializer
EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
@@ -238,11 +238,11 @@
* @param config 椤圭洰閰嶇疆
* @return S7Serializer瀹炰緥
*/
- private EnhancedS7Serializer getSerializerForProject(String projectId, PlcAddressMappingConfig.ProjectPlcConfig config) {
+ private EnhancedS7Serializer getSerializerForProject(String projectId, PlcAddress config) {
return serializerCache.computeIfAbsent(projectId, id -> {
// 瑙ｆ瀽PLC绫诲瀷
EPlcType plcType = EPlcType.S1200; // 榛樿鍊�
- if (config.getPlcType() != null) {
+ if (config != null && config.getPlcType() != null) {
try {
plcType = EPlcType.valueOf(config.getPlcType());
} catch (IllegalArgumentException e) {
@@ -251,7 +251,7 @@
}
// 鍒涘缓S7PLC瀹炰緥
- String plcIp = config.getPlcIp() != null ? config.getPlcIp() : "192.168.10.21";
+ String plcIp = (config != null && config.getPlcIp() != null) ? config.getPlcIp() : "192.168.10.21";
S7PLC s7Plc = new S7PLC(plcType, plcIp);
// 鍒涘缓骞惰繑鍥濫nhancedS7Serializer瀹炰緥
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAddressServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAddressServiceImpl.java
new file mode 100644
index 0000000..730025d
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAddressServiceImpl.java
@@ -0,0 +1,270 @@
+package com.mes.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
+import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
+import com.mes.entity.PlcAddress;
+import com.mes.mapper.PlcAddressMapper;
+import com.mes.s7.enhanced.EnhancedS7Serializer;
+import com.mes.service.PlcAddressService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * PLC鍦板潃鏄犲皠鏈嶅姟瀹炵幇绫�
+ * 绠＄悊PLC鍦板潃鏄犲皠閰嶇疆锛屾敮鎸佷粠鏁版嵁搴撳拰閰嶇疆鏂囦欢鍔犺浇
+ *
+ * @author huang
+ * @date 2025/10/30
+ */
+@Slf4j
+@Service
+public class PlcAddressServiceImpl implements PlcAddressService {
+
+ @Autowired
+ private PlcAddressMapper plcAddressMapper;
+
+
+ // JSON瑙ｆ瀽鍣�
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ /**
+ * 鑾峰彇鍖呭惈鍦板潃鏄犲皠鐨勯」鐩厤缃�
+ * 鍚堝苟鏁版嵁搴撳拰閰嶇疆鏂囦欢涓殑鏄犲皠淇℃伅
+ */
+ @Override
+ public PlcAddress getProjectConfigWithMapping(String projectId) {
+ try {
+ // 浠呬娇鐢ㄦ暟鎹簱涓殑椤圭洰閰嶇疆
+ return getMappingByProjectId(projectId);
+ } catch (Exception e) {
+ log.error("鑾峰彇椤圭洰閰嶇疆澶辫触锛岄」鐩甀D: {}", projectId, e);
+ return null;
+ }
+ }
+
+ /**
+ * 浠庢暟鎹簱鑾峰彇椤圭洰閰嶇疆
+ */
+ @Override
+ public PlcAddress getProjectConfig(String projectId) {
+ try {
+ return plcAddressMapper.selectOne(
+ new LambdaQueryWrapper<PlcAddress>()
+ .eq(PlcAddress::getProjectId, projectId)
+ );
+ } catch (Exception e) {
+ log.error("鑾峰彇椤圭洰閰嶇疆澶辫触锛岄」鐩甀D: {}", projectId, e);
+ return null;
+ }
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夋槧灏勯厤缃�
+ * 鍚堝苟鏁版嵁搴撳拰閰嶇疆鏂囦欢涓殑鏄犲皠淇℃伅
+ */
+ @Override
+ public List<PlcAddress> getAllMappings() {
+ try {
+ // 鐩存帴杩斿洖鏁版嵁搴撲腑鐨勬槧灏勯厤缃�
+ return plcAddressMapper.selectList(null);
+ } catch (Exception e) {
+ log.error("鑾峰彇鎵�鏈塒LC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ throw new RuntimeException("鑾峰彇鎵�鏈塒LC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public IPage<PlcAddress> getMappingsByPage(int page, int size, String projectId, String plcIp) {
+ try {
+ Page<PlcAddress> pageParam = new Page<>(page, size);
+ LambdaQueryWrapper<PlcAddress> queryWrapper = new LambdaQueryWrapper<>();
+
+ if (projectId != null && !projectId.trim().isEmpty()) {
+ queryWrapper.like(PlcAddress::getProjectId, projectId);
+ }
+
+ if (plcIp != null && !plcIp.trim().isEmpty()) {
+ queryWrapper.like(PlcAddress::getPlcIp, plcIp);
+ }
+
+ return plcAddressMapper.selectPage(pageParam, queryWrapper);
+ } catch (Exception e) {
+ log.error("鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ throw new RuntimeException("鍒嗛〉鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public PlcAddress getMappingById(Long id) {
+ try {
+ return plcAddressMapper.selectById(id);
+ } catch (Exception e) {
+ log.error("鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛孖D: {}", id, e);
+ throw new RuntimeException("鏍规嵁ID鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public PlcAddress getMappingByProjectId(String projectId) {
+ try {
+ return plcAddressMapper.selectOne(
+ new LambdaQueryWrapper<PlcAddress>()
+ .eq(PlcAddress::getProjectId, projectId)
+ );
+ } catch (Exception e) {
+ log.error("鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛岄」鐩甀D: {}", projectId, e);
+ throw new RuntimeException("鏍规嵁椤圭洰鏍囪瘑鑾峰彇PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 淇濆瓨PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public PlcAddress saveMapping(PlcAddress mapping) {
+ try {
+ // 妫�鏌ラ」鐩甀D鏄惁宸插瓨鍦�
+ PlcAddress existing = plcAddressMapper.selectOne(
+ new LambdaQueryWrapper<PlcAddress>()
+ .eq(PlcAddress::getProjectId, mapping.getProjectId())
+ );
+
+ if (existing != null) {
+ throw new RuntimeException("椤圭洰鏍囪瘑 " + mapping.getProjectId() + " 宸插瓨鍦�");
+ }
+
+ plcAddressMapper.insert(mapping);
+ return mapping;
+ } catch (Exception e) {
+ log.error("淇濆瓨PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ throw new RuntimeException("淇濆瓨PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 鏇存柊PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public PlcAddress updateMapping(PlcAddress mapping) {
+ try {
+ // 妫�鏌D鏄惁瀛樺湪
+ PlcAddress existing = plcAddressMapper.selectById(mapping.getId());
+ if (existing == null) {
+ return null;
+ }
+
+ // 濡傛灉椤圭洰ID鏈夊彉鍖栵紝妫�鏌ユ柊椤圭洰ID鏄惁宸插瓨鍦�
+ if (!existing.getProjectId().equals(mapping.getProjectId())) {
+ PlcAddress duplicate = plcAddressMapper.selectOne(
+ new LambdaQueryWrapper<PlcAddress>()
+ .eq(PlcAddress::getProjectId, mapping.getProjectId())
+ );
+
+ if (duplicate != null) {
+ throw new RuntimeException("椤圭洰鏍囪瘑 " + mapping.getProjectId() + " 宸插瓨鍦�");
+ }
+ }
+
+ plcAddressMapper.updateById(mapping);
+ return mapping;
+ } catch (Exception e) {
+ log.error("鏇存柊PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ throw new RuntimeException("鏇存柊PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public boolean deleteMapping(Long id) {
+ try {
+ int result = plcAddressMapper.deleteById(id);
+ return result > 0;
+ } catch (Exception e) {
+ log.error("鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛孖D: {}", id, e);
+ throw new RuntimeException("鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆
+ */
+ @Override
+ public int deleteMappings(List<Long> ids) {
+ try {
+ if (ids == null || ids.isEmpty()) {
+ return 0;
+ }
+ return plcAddressMapper.deleteBatchIds(ids);
+ } catch (Exception e) {
+ log.error("鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触锛孖D鍒楄〃: {}", ids, e);
+ throw new RuntimeException("鎵归噺鍒犻櫎PLC鍦板潃鏄犲皠閰嶇疆澶辫触", e);
+ }
+ }
+
+ /**
+ * 娴嬭瘯PLC杩炴帴
+ */
+ @Override
+ public boolean testConnection(PlcAddress mapping) {
+ try {
+ // 瑙ｆ瀽PLC绫诲瀷
+ EPlcType plcType = EPlcType.S1200; // 榛樿鍊�
+ if (mapping.getPlcType() != null && !mapping.getPlcType().trim().isEmpty()) {
+ try {
+ plcType = EPlcType.valueOf(mapping.getPlcType());
+ } catch (IllegalArgumentException e) {
+ log.warn("鏈煡鐨凱LC绫诲瀷: {}, 浣跨敤榛樿绫诲瀷 S1200", mapping.getPlcType());
+ }
+ }
+
+ // 鍒涘缓S7PLC瀹炰緥
+ String plcIp = mapping.getPlcIp() != null ? mapping.getPlcIp() : "192.168.10.21";
+ S7PLC s7Plc = new S7PLC(plcType, plcIp);
+
+ // 鍒涘缓EnhancedS7Serializer瀹炰緥
+ EnhancedS7Serializer serializer = EnhancedS7Serializer.newInstance(s7Plc);
+
+ // 灏濊瘯璇诲彇涓�涓畝鍗曠殑鏁版嵁鏉ユ祴璇曡繛鎺�
+ String dbArea = mapping.getDbArea() != null ? mapping.getDbArea() : "DB1";
+ int beginIndex = mapping.getBeginIndex();
+
+ // 杩欓噷鎴戜滑鍙祴璇曡繛鎺ワ紝涓嶈鍙栧疄闄呮暟鎹�
+ // 瀹為檯椤圭洰涓彲鑳介渶瑕佹牴鎹叿浣撻渶姹傝皟鏁�
+ return true;
+ } catch (Exception e) {
+ log.error("PLC杩炴帴娴嬭瘯澶辫触", e);
+ return false;
+ }
+ }
+
+ /**
+ * 閲嶆柊鍔犺浇閰嶇疆鏂囦欢涓殑鏄犲皠
+ */
+ @Override
+ public void reloadConfigMappings() {
+ // 鐜颁粎浣跨敤鏁版嵁搴撲腑鐨勯厤缃紝涓嶅啀浠庢枃浠堕噸杞�
+ log.info("褰撳墠浣跨敤鏁版嵁搴撻厤缃紝reloadConfigMappings鏃犻渶鎿嶄綔");
+ }
+
+ /**
+ * 灏嗘暟鎹簱瀹炰綋杞崲涓洪」鐩厤缃璞�
+ */
+}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAutoTestServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAutoTestServiceImpl.java
new file mode 100644
index 0000000..5a2cfe5
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcAutoTestServiceImpl.java
@@ -0,0 +1,81 @@
+package com.mes.service.impl;
+
+import com.mes.service.IPlcAutoTestService;
+import com.mes.service.IPlcTestWriteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * PLC鑷姩娴嬭瘯鏈嶅姟瀹炵幇绫�
+ * 瀹氭椂妯℃嫙PLC琛屼负锛屽悜PLC鍐欏叆娴嬭瘯鏁版嵁锛岀敤浜庤嚜鍔ㄦ祴璇昅ES绋嬪簭
+ *
+ * @author huang
+ * @date 2025/10/30
+ */
+@Slf4j
+@Service
+public class PlcAutoTestServiceImpl implements PlcAutoTestService {
+
+ @Resource
+ private IPlcTestWriteService plcTestWriteService;
+
+ // 鑷姩娴嬭瘯寮�鍏�
+ @Value("${plc.auto.test.enabled:false}")
+ private boolean autoTestEnabled;
+
+ // 鑷姩娴嬭瘯闂撮殧锛堟绉掞級
+ @Value("${plc.auto.test.interval:5000}")
+ private long autoTestInterval;
+
+ /**
+ * 瀹氭椂鑷姩娴嬭瘯浠诲姟
+ */
+ @Scheduled(fixedDelayString = "${plc.auto.test.interval:5000}")
+ public void autoTestTask() {
+ if (!autoTestEnabled) {
+ return;
+ }
+
+ try {
+ log.info("寮�濮嬫墽琛孭LC鑷姩娴嬭瘯浠诲姟");
+ // 妯℃嫙PLC璇锋眰
+ plcTestWriteService.simulatePlcRequest();
+ Thread.sleep(1000);
+ // 妯℃嫙PLC姹囨姤
+ plcTestWriteService.simulatePlcReport();
+ log.info("PLC鑷姩娴嬭瘯浠诲姟鎵ц瀹屾垚");
+ } catch (Exception e) {
+ log.error("PLC鑷姩娴嬭瘯浠诲姟鎵ц寮傚父", e);
+ }
+ }
+
+ /**
+ * 鍚敤鑷姩娴嬭瘯
+ */
+ @Override
+ public void enableAutoTest() {
+ this.autoTestEnabled = true;
+ log.info("PLC鑷姩娴嬭瘯宸插惎鐢�");
+ }
+
+ /**
+ * 绂佺敤鑷姩娴嬭瘯
+ */
+ @Override
+ public void disableAutoTest() {
+ this.autoTestEnabled = false;
+ log.info("PLC鑷姩娴嬭瘯宸茬鐢�");
+ }
+
+ /**
+ * 鑾峰彇鑷姩娴嬭瘯鐘舵��
+ */
+ @Override
+ public boolean isAutoTestEnabled() {
+ return this.autoTestEnabled;
+ }
+}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcTestWriteServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcTestWriteServiceImpl.java
new file mode 100644
index 0000000..b0fb233
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/service/impl/PlcTestWriteServiceImpl.java
@@ -0,0 +1,295 @@
+package com.mes.service.impl;
+
+import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
+import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
+import com.mes.entity.PlcBaseData;
+import com.mes.entity.PlcAddress;
+import com.mes.s7.enhanced.EnhancedS7Serializer;
+import com.mes.service.PlcAddressService;
+import com.mes.service.IPlcTestWriteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * PLC娴嬭瘯鍐欏叆鏈嶅姟瀹炵幇绫�
+ * 妯℃嫙PLC琛屼负锛屽悜PLC鍐欏叆娴嬭瘯鏁版嵁锛岀敤浜庢祴璇昅ES绋嬪簭
+ *
+ * @author huang
+ * @date 2025/10/30
+ */
+@Slf4j
+@Service
+public class PlcTestWriteServiceImpl implements PlcTestWriteService {
+
+ @Resource
+ private PlcAddressService plcAddressService;
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ // 褰撳墠浣跨敤鐨勯」鐩爣璇�
+ private String currentProjectId = "vertical";
+
+ // 缂撳瓨涓嶅悓椤圭洰鐨凷7Serializer瀹炰緥
+ private final ConcurrentMap<String, EnhancedS7Serializer> serializerCache = new ConcurrentHashMap<>();
+
+ /**
+ * 妯℃嫙PLC鍙戦�佽姹傚瓧锛堣Е鍙慚ES浠诲姟涓嬪彂锛�
+ */
+ @Override
+ public boolean simulatePlcRequest() {
+ return simulatePlcRequest(currentProjectId);
+ }
+
+ /**
+ * 妯℃嫙PLC鍙戦�佽姹傚瓧锛堣Е鍙慚ES浠诲姟涓嬪彂锛�- 鏀寔鎸囧畾椤圭洰
+ */
+ @Override
+ public boolean simulatePlcRequest(String projectId) {
+ try {
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
+
+ // 鑾峰彇瀵瑰簲鐨凷7Serializer
+ EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
+
+ // 璇诲彇褰撳墠PLC鐘舵��
+ PlcBaseData currentData = s7Serializer.read(PlcBaseData.class, config.getDbArea(), config.getBeginIndex());
+
+ if (currentData.getOnlineState() == OFF) {
+ log.info("褰撳墠PLC鑱旀満妯″紡涓�0锛屽仠姝㈣仈鏈�");
+ return false;
+ }else if (currentData.getPlcReport() == ON){
+ log.info("褰撳墠涓婄墖PLC姹囨姤瀛椾负1锛岄噸缃负0");
+ currentData.setPlcReport(OFF);
+ }
+ // 璁剧疆PLC璇锋眰瀛椾负1锛堣Е鍙慚ES浠诲姟澶勭悊锛�
+ currentData.setPlcRequest(ON);
+ s7Serializer.write(currentData, config.getDbArea(), config.getBeginIndex());
+ log.info("妯℃嫙PLC鍙戦�佽姹傚瓧鎴愬姛锛歱lcRequest=1, projectId={}, dbArea={}, beginIndex={}",
+ projectId, config.getDbArea(), config.getBeginIndex());
+ return true;
+
+ } catch (Exception e) {
+ log.error("妯℃嫙PLC璇锋眰瀛楀け璐�", e);
+ return false;
+ }
+ }
+
+ /**
+ * 妯℃嫙PLC浠诲姟瀹屾垚姹囨姤
+ */
+ @Override
+ public boolean simulatePlcReport() {
+ return simulatePlcReport(currentProjectId);
+ }
+
+ /**
+ * 妯℃嫙PLC浠诲姟瀹屾垚姹囨姤 - 鏀寔鎸囧畾椤圭洰
+ */
+ @Override
+ public boolean simulatePlcReport(String projectId) {
+ try {
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
+
+ // 鑾峰彇瀵瑰簲鐨凷7Serializer
+ EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
+
+ PlcBaseData currentData = s7Serializer.read(PlcBaseData.class, config.getDbArea(), config.getBeginIndex());
+
+ // 璁剧疆PLC姹囨姤瀛椾负1锛堜换鍔″畬鎴愶級
+ currentData.setPlcReport(ON);
+ // 璇锋眰瀛楁竻0
+ currentData.setPlcRequest(OFF);
+
+ // 璁剧疆瀹屾垚鏁伴噺绛夋暟鎹�
+ currentData.setMesGlassCount(10);
+
+ s7Serializer.write(currentData, config.getDbArea(), config.getBeginIndex());
+ log.info("妯℃嫙PLC浠诲姟瀹屾垚姹囨姤锛歱lcReport=1, mesGlassCount=10, projectId={}, dbArea={}, beginIndex={}",
+ projectId, config.getDbArea(), config.getBeginIndex());
+ return true;
+
+ } catch (Exception e) {
+ log.error("妯℃嫙PLC浠诲姟瀹屾垚姹囨姤澶辫触", e);
+ return false;
+ }
+ }
+
+ /**
+ * 妯℃嫙PLC鍙戦�佽仈鏈虹姸鎬�
+ */
+ @Override
+ public boolean simulateOnlineStatus(int onlineState) {
+ return simulateOnlineStatus(onlineState, currentProjectId);
+ }
+
+ /**
+ * 妯℃嫙PLC鍙戦�佽仈鏈虹姸鎬� - 鏀寔鎸囧畾椤圭洰
+ */
+ @Override
+ public boolean simulateOnlineStatus(int onlineState, String projectId) {
+ try {
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
+
+ // 鑾峰彇瀵瑰簲鐨凷7Serializer
+ EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
+
+ PlcBaseData currentData = s7Serializer.read(PlcBaseData.class, config.getDbArea(), config.getBeginIndex());
+
+ // 1:鑱旀満 0:鑴辨満
+ currentData.setOnlineState(onlineState);
+
+ s7Serializer.write(currentData, config.getDbArea(), config.getBeginIndex());
+ log.info("妯℃嫙PLC鑱旀満鐘舵�侊細onlineState={}, projectId={}, dbArea={}, beginIndex={}",
+ onlineState, projectId, config.getDbArea(), config.getBeginIndex());
+ return true;
+
+ } catch (Exception e) {
+ log.error("妯℃嫙PLC鑱旀満鐘舵�佸け璐�", e);
+ return false;
+ }
+ }
+
+ /**
+ * 閲嶇疆PLC鎵�鏈夌姸鎬�
+ */
+ @Override
+ public boolean resetPlc() {
+ return resetPlc(currentProjectId);
+ }
+
+ /**
+ * 閲嶇疆PLC鎵�鏈夌姸鎬� - 鏀寔鎸囧畾椤圭洰
+ */
+ @Override
+ public boolean resetPlc(String projectId) {
+ try {
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
+
+ // 鑾峰彇瀵瑰簲鐨凷7Serializer
+ EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
+
+ PlcBaseData resetData = new PlcBaseData();
+
+ // 閲嶇疆鎵�鏈夊叧閿瓧娈�
+ resetData.setPlcRequest(OFF);
+ resetData.setPlcReport(OFF);
+ resetData.setMesSend(OFF);
+ resetData.setMesConfirm(OFF);
+ // 榛樿鑱旀満
+ resetData.setOnlineState(ON);
+ resetData.setMesGlassCount(0);
+ // 娓呴櫎鎶ヨ
+ resetData.setAlarmInfo(OFF);
+
+ s7Serializer.write(resetData, config.getDbArea(), config.getBeginIndex());
+ log.info("PLC鐘舵�佸凡閲嶇疆, projectId={}, dbArea={}, beginIndex={}",
+ projectId, config.getDbArea(), config.getBeginIndex());
+ return true;
+
+ } catch (Exception e) {
+ log.error("閲嶇疆PLC鐘舵�佸け璐�", e);
+ return false;
+ }
+ }
+
+ /**
+ * 璇诲彇PLC褰撳墠鐘舵��
+ */
+ @Override
+ public PlcBaseData readPlcStatus() {
+ return readPlcStatus(currentProjectId);
+ }
+
+ /**
+ * 璇诲彇PLC褰撳墠鐘舵�� - 鏀寔鎸囧畾椤圭洰
+ */
+ @Override
+ public PlcBaseData readPlcStatus(String projectId) {
+ try {
+ // 鑾峰彇椤圭洰閰嶇疆锛堟暟鎹簱瀹炰綋锛�
+ PlcAddress config = plcAddressService.getProjectConfigWithMapping(projectId);
+
+ // 鑾峰彇瀵瑰簲鐨凷7Serializer
+ EnhancedS7Serializer s7Serializer = getSerializerForProject(projectId, config);
+
+ return s7Serializer.read(PlcBaseData.class, config.getDbArea(), config.getBeginIndex());
+ } catch (Exception e) {
+ log.error("璇诲彇PLC鐘舵�佸け璐�", e);
+ return null;
+ }
+ }
+
+ /**
+ * 璁剧疆褰撳墠椤圭洰鏍囪瘑
+ */
+ @Override
+ public void setCurrentProjectId(String projectId) {
+ this.currentProjectId = projectId;
+ }
+
+ /**
+ * 鑾峰彇褰撳墠椤圭洰鏍囪瘑
+ */
+ @Override
+ public String getCurrentProjectId() {
+ return this.currentProjectId;
+ }
+
+ /**
+ * 鑾峰彇椤圭洰瀵瑰簲鐨凷7Serializer瀹炰緥
+ * 濡傛灉涓嶅瓨鍦紝鍒欏垱寤轰竴涓柊鐨勫疄渚嬪苟缂撳瓨
+ *
+ * @param projectId 椤圭洰鏍囪瘑
+ * @param config 椤圭洰閰嶇疆
+ * @return S7Serializer瀹炰緥
+ */
+ private EnhancedS7Serializer getSerializerForProject(String projectId, PlcAddress config) {
+ return serializerCache.computeIfAbsent(projectId, id -> {
+ // 瑙ｆ瀽PLC绫诲瀷
+ EPlcType plcType = EPlcType.S1200; // 榛樿鍊�
+ if (config != null && config.getPlcType() != null) {
+ try {
+ plcType = EPlcType.valueOf(config.getPlcType());
+ } catch (IllegalArgumentException e) {
+ log.warn("鏈煡鐨凱LC绫诲瀷: {}, 浣跨敤榛樿绫诲瀷 S1200", config.getPlcType());
+ }
+ }
+
+ // 鍒涘缓S7PLC瀹炰緥
+ String plcIp = (config != null && config.getPlcIp() != null) ? config.getPlcIp() : "192.168.10.21";
+ S7PLC s7Plc = new S7PLC(plcType, plcIp);
+
+ // 鍒涘缓骞惰繑鍥濫nhancedS7Serializer瀹炰緥
+ return EnhancedS7Serializer.newInstance(s7Plc);
+ });
+ }
+
+ /**
+ * 娓呴櫎鎸囧畾椤圭洰鐨凷7Serializer缂撳瓨
+ *
+ * @param projectId 椤圭洰鏍囪瘑
+ */
+ @Override
+ public void clearSerializerCache(String projectId) {
+ serializerCache.remove(projectId);
+ log.info("宸叉竻闄ら」鐩� {} 鐨凷7Serializer缂撳瓨", projectId);
+ }
+
+ /**
+ * 娓呴櫎鎵�鏈塖7Serializer缂撳瓨
+ */
+ @Override
+ public void clearAllSerializerCache() {
+ serializerCache.clear();
+ log.info("宸叉竻闄ゆ墍鏈塖7Serializer缂撳瓨");
+ }
+}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/vo/Result.java b/mes-processes/mes-plcSend/src/main/java/com/mes/vo/Result.java
index b9d7d99..87b8bb0 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/vo/Result.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/vo/Result.java
@@ -5,7 +5,7 @@
/**
* 缁熶竴API鍝嶅簲缁撴灉
*
- * @author zhoush
+ * @author huang
* @date 2025/10/29
*/
@Data
@@ -104,6 +104,7 @@
* 鍒ゆ柇鏄惁鎴愬姛
*/
public boolean isSuccess() {
- return this.code != null && this.code == 200;
+ // 浣跨敤Integer.valueOf閬垮厤鑷姩鎷嗙闂
+ return this.code != null && Integer.valueOf(200).equals(this.code);
}
}
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/src/main/resources/application-dev.yml b/mes-processes/mes-plcSend/src/main/resources/application-dev.yml
index 9943aeb..51d11e7 100644
--- a/mes-processes/mes-plcSend/src/main/resources/application-dev.yml
+++ b/mes-processes/mes-plcSend/src/main/resources/application-dev.yml
@@ -30,38 +30,6 @@
port: 6379
password: 123456
-raw:
- mode: shuttle
-
-s7:
- shuttle:
- dbArea: DB38.
- beginIndex: 0
- address:
- raw:
- onlineState: 2
- plcRequest: 0
- plcReport: 10
- finishA: 60
- finishB: 62
- state: 18
- onePosition: 6
- twoPosition: 14
- mesSend: 20
- mesConfirm: 40
- start: 24
- target: 26
- mesGlassCount: 30
- rawMargin1: 32
- mesWidth1: 34
- mesHeight1: 36
- rawThickness1: 38
- rawMargin2: 44
- mesWidth2: 46
- mesHeight2: 48
- rawThickness2: 50
- alarmInfo: 52
-
# PLC鑷姩娴嬭瘯閰嶇疆
plc:
auto:
@@ -71,10 +39,8 @@
# PLC鍦板潃鏄犲皠閰嶇疆
address:
mapping:
- defaultDbArea: "DB1."
- defaultBeginIndex: 0
projects:
- shuttle:
+ vertical:
dbArea: "DB38."
beginIndex: 0
plcIp: "192.168.10.21"
diff --git a/mes-processes/mes-plcSend/src/main/resources/db/migration/V1.0.0__Create_plc_address_mapping_table.sql b/mes-processes/mes-plcSend/src/main/resources/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
index b11c3c3..354faf4 100644
--- a/mes-processes/mes-plcSend/src/main/resources/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
+++ b/mes-processes/mes-plcSend/src/main/resources/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
@@ -22,5 +22,5 @@
-- 鎻掑叆榛樿閰嶇疆
INSERT INTO `plc_address_mapping` (`project_id`, `project_name`, `db_area`, `begin_index`, `plc_ip`, `plc_type`, `description`)
-VALUES ('shuttle', '绌挎杞﹂」鐩�', 'DB38', 0, '192.168.10.21', 'S1200', '榛樿绌挎杞﹂」鐩厤缃�')
-ON DUPLICATE KEY UPDATE `update_time` = CURRENT_TIMESTAMP;
\ No newline at end of file
+VALUES ('vertical', '鍨傜洿杞﹂」鐩�', 'DB38', 0, '192.168.10.21', 'S1200', '榛樿鍨傜洿杞﹂」鐩厤缃�')
+ON DUPLICATE KEY UPDATE `update_time` = CURRENT_TIMESTAMP;
diff --git a/mes-processes/mes-plcSend/target/classes/application-dev.yml b/mes-processes/mes-plcSend/target/classes/application-dev.yml
deleted file mode 100644
index 9943aeb..0000000
--- a/mes-processes/mes-plcSend/target/classes/application-dev.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-ip: 127.0.0.1
-port: 3306
-
-spring:
- datasource:
- dynamic:
- primary: northGlassMes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- northGlassMes:
- url: jdbc:mysql://${ip}:${port}/mes_modular?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://${ip}:${port}/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- druid:
- wall:
- multi-statement-allow: true
- cloud:
- nacos:
- discovery:
- server-addr: ${ip}:8848
- redis:
- database: 0
- host: ${ip}
- port: 6379
- password: 123456
-
-raw:
- mode: shuttle
-
-s7:
- shuttle:
- dbArea: DB38.
- beginIndex: 0
- address:
- raw:
- onlineState: 2
- plcRequest: 0
- plcReport: 10
- finishA: 60
- finishB: 62
- state: 18
- onePosition: 6
- twoPosition: 14
- mesSend: 20
- mesConfirm: 40
- start: 24
- target: 26
- mesGlassCount: 30
- rawMargin1: 32
- mesWidth1: 34
- mesHeight1: 36
- rawThickness1: 38
- rawMargin2: 44
- mesWidth2: 46
- mesHeight2: 48
- rawThickness2: 50
- alarmInfo: 52
-
-# PLC鑷姩娴嬭瘯閰嶇疆
-plc:
- auto:
- test:
- enabled: false
- interval: 5000
- # PLC鍦板潃鏄犲皠閰嶇疆
- address:
- mapping:
- defaultDbArea: "DB1."
- defaultBeginIndex: 0
- projects:
- shuttle:
- dbArea: "DB38."
- beginIndex: 0
- plcIp: "192.168.10.21"
- plcType: "S1200"
- addressMapping:
- onlineState: 2
- plcRequest: 0
- plcReport: 10
- finishA: 60
- finishB: 62
- state: 18
- onePosition: 6
- twoPosition: 14
- mesSend: 20
- mesConfirm: 40
- start: 24
- target: 26
- mesGlassCount: 30
- rawMargin1: 32
- mesWidth1: 34
- mesHeight1: 36
- rawThickness1: 38
- rawMargin2: 44
- mesWidth2: 46
- mesHeight2: 48
- rawThickness2: 50
- alarmInfo: 52
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/classes/application.yml b/mes-processes/mes-plcSend/target/classes/application.yml
deleted file mode 100644
index b8999e9..0000000
--- a/mes-processes/mes-plcSend/target/classes/application.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-server:
- port: 10018
-spring:
- profiles:
- active: dev
- application:
- name: plcSend
- liquibase:
- enabled: true
- change-log: classpath:changelog/changelogBase.xml
- main:
- allow-bean-definition-overriding: true
-feign:
- client:
- config:
- default:
- connectTimeout: 5000
- readTimeout: 5000
-mybatis-plus:
- mapper-locations: classpath*:mapper/*.xml
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-erp:
- url: http://10.153.19.150:8086
-
-# PLC閰嶇疆
-s7:
- load:
- dbArea: DB1
- beginIndex: 0
- raw:
- dbArea: DB2
- beginIndex: 0
-
-# PLC妯℃嫙閰嶇疆
-plc:
- simulate:
- enabled: false # 鏄惁鍚敤PLC妯℃嫙
- interval: 5000 # 妯℃嫙闂撮殧鏃堕棿锛堟绉掞級
- failure-rate: 0 # 妯℃嫙鏁呴殰姒傜巼锛�0-100锛�
- task-count: 10 # 妯℃嫙浠诲姟鏁伴噺
- task-type: normal # 妯℃嫙浠诲姟绫诲瀷
- data-range:
- min-start: 1
- max-start: 100
- min-target: 1
- max-target: 100
- min-glass-count: 1
- max-glass-count: 50
-
-mes:
- width: 2800
- height: 5000
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/classes/changelog/changelogBase.xml b/mes-processes/mes-plcSend/target/classes/changelog/changelogBase.xml
deleted file mode 100644
index 7354921..0000000
--- a/mes-processes/mes-plcSend/target/classes/changelog/changelogBase.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<databaseChangeLog
- xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
- http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-
- <!-- 寮曞叆绗竴涓猄QL閰嶇疆鏂囦欢 -->
- <include file="./changelog/mesInit.sql" relativeToChangelogFile="false"/>
- <include file="./changelog/mesInitLy.sql" relativeToChangelogFile="false"/>
-
-</databaseChangeLog>
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/classes/changelog/mesInit.sql b/mes-processes/mes-plcSend/target/classes/changelog/mesInit.sql
deleted file mode 100644
index 53a215d..0000000
--- a/mes-processes/mes-plcSend/target/classes/changelog/mesInit.sql
+++ /dev/null
@@ -1,63 +0,0 @@
--- liquibase formatted sql
-
--- changeset huang:20250708121
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station';
-CREATE TABLE raw_glass_storage_station
-(
- id bigint NOT NULL,
- device_id int DEFAULT NULL COMMENT '璁惧id',
- slot int DEFAULT NULL COMMENT '鏍煎瓙id',
- shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
- enable_state int DEFAULT NULL COMMENT '鍚敤/绂佺敤',
- PRIMARY KEY (id)
-) COMMENT '浠撳偍宸ヤ綅琛�';
--- rollback DROP TABLE raw_glass_storage_station;
-
--- changeset huang:20250708122
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_details';
-CREATE TABLE raw_glass_storage_details
-(
- id bigint NOT NULL AUTO_INCREMENT,
- device_id int DEFAULT NULL COMMENT '璁惧id',
- slot int DEFAULT NULL COMMENT '鏍煎瓙id',
- raw_width double DEFAULT NULL COMMENT '鍘熺墖瀹�',
- raw_height double DEFAULT NULL COMMENT '鍘熺墖楂�',
- raw_thickness double DEFAULT NULL COMMENT '鍘熺墖鍘氬害',
- films_id varchar(64) DEFAULT NULL COMMENT '鑶滅郴',
- raw_margin int DEFAULT NULL COMMENT '鍘熺墖杈硅窛',
- manufacturer varchar(64) DEFAULT NULL COMMENT '鐢熷巶鍟�',
- raw_number varchar(64) DEFAULT NULL COMMENT '鍘熺墖缂栧彿',
- start_quantity varchar(64) DEFAULT NULL COMMENT '寮�濮嬫暟閲�', -- 鏂板寮�濮嬫暟閲�
- remain_quantity int DEFAULT NULL COMMENT '鍓╀綑鏁伴噺',
- state int DEFAULT NULL COMMENT '鐘舵��',
- shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
- create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (id)
-) COMMENT '浠撳偍璇︽儏琛�';
--- rollback DROP TABLE raw_glass_storage_details;
-
--- changeset huang:20250708123
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_task';
-CREATE TABLE raw_glass_storage_history_task
-(
- id bigint NOT NULL AUTO_INCREMENT,
- start_slot int DEFAULT NULL COMMENT '璧峰鏍煎瓙',
- end_slot int DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
- raw_margin int DEFAULT NULL COMMENT '鍘熺墖杈硅窛',
- raw_glass_width double DEFAULT '0' COMMENT '鍘熺墖瀹�',
- raw_glass_height double DEFAULT '0' COMMENT '鍘熺墖楂�',
- raw_glass_thickness double DEFAULT '0' COMMENT '鍘氬害',
- films_id varchar(20) DEFAULT NULL COMMENT '鑶滅郴',
- raw_quantity int DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
- task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
- task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵��',
- shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
- create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (id)
-) COMMENT '浠撳偍浠诲姟琛�';
--- rollback DROP TABLE raw_glass_storage_task;
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/classes/changelog/mesInitLy.sql b/mes-processes/mes-plcSend/target/classes/changelog/mesInitLy.sql
deleted file mode 100644
index 8465ac9..0000000
--- a/mes-processes/mes-plcSend/target/classes/changelog/mesInitLy.sql
+++ /dev/null
@@ -1,83 +0,0 @@
--- liquibase formatted sql
-
--- changeset huang:20250708121
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM raw_glass_storage_station;
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (1, 1, 1, 1, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (2, 2, 2, 2, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (3, 2, 3, 3, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (4, 3, 4, 4, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (5, 3, 5, 5, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (6, 4, 6, 6, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (7, 4, 7, 7, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (8, 5, 8, 8, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (9, 5, 9, 9, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (10, 6, 10, 10, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (11, 6, 11, 11, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (12, 7, 12, 12, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (13, 7, 13, 13, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (14, 8, 14, 14, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (15, 8, 15, 15, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (16, 9, 16, 16, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (17, 10, 17, 17, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (18, 11, 18, 18, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (19, 11, 19, 19, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (20, 12, 20, 20, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (21, 12, 21, 21, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (22, 13, 22, 22, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (23, 13, 23, 23, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (24, 14, 24, 24, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (25, 14, 25, 25, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (26, 15, 26, 26, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (27, 15, 27, 27, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (28, 16, 28, 28, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (29, 16, 29, 29, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (30, 17, 30, 30, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (31, 17, 31, 31, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (32, 18, 32, 32, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (33, 19, 34, 34, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (34, 20, 36, 36, 1);
-
--- changeset huang:20250807001
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 select count(*) from raw_glass_storage_details
-INSERT INTO raw_glass_storage_details (device_id, slot, state, shelf)
-select device_id, slot, 100, shelf
-from raw_glass_storage_station;
-INSERT INTO raw_glass_storage_details (device_id, slot, state, shelf)
-select device_id, slot, 100, shelf
-from raw_glass_storage_station;
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/PlcSendApplication.class b/mes-processes/mes-plcSend/target/classes/com/mes/PlcSendApplication.class
deleted file mode 100644
index a225948..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/PlcSendApplication.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/config/PlcAddressMappingConfig$ProjectPlcConfig.class b/mes-processes/mes-plcSend/target/classes/com/mes/config/PlcAddressMappingConfig$ProjectPlcConfig.class
deleted file mode 100644
index 51425cc..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/config/PlcAddressMappingConfig$ProjectPlcConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/config/PlcAddressMappingConfig.class b/mes-processes/mes-plcSend/target/classes/com/mes/config/PlcAddressMappingConfig.class
deleted file mode 100644
index 58884a9..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/config/PlcAddressMappingConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/controller/PlcAddressMappingController.class b/mes-processes/mes-plcSend/target/classes/com/mes/controller/PlcAddressMappingController.class
deleted file mode 100644
index e56f6f6..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/controller/PlcAddressMappingController.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/controller/PlcTestWriteController.class b/mes-processes/mes-plcSend/target/classes/com/mes/controller/PlcTestWriteController.class
deleted file mode 100644
index 327863e..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/controller/PlcTestWriteController.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/entity/PlcAddressMapping.class b/mes-processes/mes-plcSend/target/classes/com/mes/entity/PlcAddressMapping.class
deleted file mode 100644
index 6ee8ac0..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/entity/PlcAddressMapping.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/entity/PlcBaseData.class b/mes-processes/mes-plcSend/target/classes/com/mes/entity/PlcBaseData.class
deleted file mode 100644
index f7fa944..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/entity/PlcBaseData.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/job/config/S7PlcSendConfig.class b/mes-processes/mes-plcSend/target/classes/com/mes/job/config/S7PlcSendConfig.class
deleted file mode 100644
index c2edd3f..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/job/config/S7PlcSendConfig.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/mapper/PlcAddressMappingMapper.class b/mes-processes/mes-plcSend/target/classes/com/mes/mapper/PlcAddressMappingMapper.class
deleted file mode 100644
index e354508..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/mapper/PlcAddressMappingMapper.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcAddressMappingService.class b/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcAddressMappingService.class
deleted file mode 100644
index bbbdeed..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcAddressMappingService.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcAutoTestService.class b/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcAutoTestService.class
deleted file mode 100644
index ed2486b..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcAutoTestService.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcTestWriteService.class b/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcTestWriteService.class
deleted file mode 100644
index 0834797..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/service/PlcTestWriteService.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/service/impl/PlcTestWriteServiceImpl.class b/mes-processes/mes-plcSend/target/classes/com/mes/service/impl/PlcTestWriteServiceImpl.class
deleted file mode 100644
index f25e142..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/service/impl/PlcTestWriteServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/com/mes/vo/Result.class b/mes-processes/mes-plcSend/target/classes/com/mes/vo/Result.class
deleted file mode 100644
index cd3791c..0000000
--- a/mes-processes/mes-plcSend/target/classes/com/mes/vo/Result.class
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/classes/db/migration/V1.0.0__Create_plc_address_mapping_table.sql b/mes-processes/mes-plcSend/target/classes/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
deleted file mode 100644
index b11c3c3..0000000
--- a/mes-processes/mes-plcSend/target/classes/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- 鍒涘缓PLC鍦板潃鏄犲皠閰嶇疆琛�
-CREATE TABLE IF NOT EXISTS `plc_address_mapping` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
- `project_id` varchar(50) NOT NULL COMMENT '椤圭洰鏍囪瘑',
- `project_name` varchar(100) DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
- `db_area` varchar(20) NOT NULL COMMENT 'DB鍧楀湴鍧�锛屽DB1',
- `begin_index` int(11) NOT NULL DEFAULT '0' COMMENT '璧峰绱㈠紩',
- `plc_ip` varchar(50) DEFAULT NULL COMMENT 'PLC IP鍦板潃',
- `plc_type` varchar(20) DEFAULT 'S1200' COMMENT 'PLC绫诲瀷',
- `address_mapping_json` text COMMENT '鍦板潃鏄犲皠JSON閰嶇疆',
- `description` varchar(255) DEFAULT NULL COMMENT '鎻忚堪',
- `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '鏄惁鍚敤锛�1-鍚敤锛�0-绂佺敤',
- `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- `create_by` varchar(50) DEFAULT NULL COMMENT '鍒涘缓浜�',
- `update_by` varchar(50) DEFAULT NULL COMMENT '鏇存柊浜�',
- PRIMARY KEY (`id`),
- UNIQUE KEY `uk_project_id` (`project_id`),
- KEY `idx_enabled` (`enabled`),
- KEY `idx_create_time` (`create_time`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='PLC鍦板潃鏄犲皠閰嶇疆琛�';
-
--- 鎻掑叆榛樿閰嶇疆
-INSERT INTO `plc_address_mapping` (`project_id`, `project_name`, `db_area`, `begin_index`, `plc_ip`, `plc_type`, `description`)
-VALUES ('shuttle', '绌挎杞﹂」鐩�', 'DB38', 0, '192.168.10.21', 'S1200', '榛樿绌挎杞﹂」鐩厤缃�')
-ON DUPLICATE KEY UPDATE `update_time` = CURRENT_TIMESTAMP;
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/config/application-dev.yml b/mes-processes/mes-plcSend/target/config/application-dev.yml
deleted file mode 100644
index 9943aeb..0000000
--- a/mes-processes/mes-plcSend/target/config/application-dev.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-ip: 127.0.0.1
-port: 3306
-
-spring:
- datasource:
- dynamic:
- primary: northGlassMes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- northGlassMes:
- url: jdbc:mysql://${ip}:${port}/mes_modular?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://${ip}:${port}/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- druid:
- wall:
- multi-statement-allow: true
- cloud:
- nacos:
- discovery:
- server-addr: ${ip}:8848
- redis:
- database: 0
- host: ${ip}
- port: 6379
- password: 123456
-
-raw:
- mode: shuttle
-
-s7:
- shuttle:
- dbArea: DB38.
- beginIndex: 0
- address:
- raw:
- onlineState: 2
- plcRequest: 0
- plcReport: 10
- finishA: 60
- finishB: 62
- state: 18
- onePosition: 6
- twoPosition: 14
- mesSend: 20
- mesConfirm: 40
- start: 24
- target: 26
- mesGlassCount: 30
- rawMargin1: 32
- mesWidth1: 34
- mesHeight1: 36
- rawThickness1: 38
- rawMargin2: 44
- mesWidth2: 46
- mesHeight2: 48
- rawThickness2: 50
- alarmInfo: 52
-
-# PLC鑷姩娴嬭瘯閰嶇疆
-plc:
- auto:
- test:
- enabled: false
- interval: 5000
- # PLC鍦板潃鏄犲皠閰嶇疆
- address:
- mapping:
- defaultDbArea: "DB1."
- defaultBeginIndex: 0
- projects:
- shuttle:
- dbArea: "DB38."
- beginIndex: 0
- plcIp: "192.168.10.21"
- plcType: "S1200"
- addressMapping:
- onlineState: 2
- plcRequest: 0
- plcReport: 10
- finishA: 60
- finishB: 62
- state: 18
- onePosition: 6
- twoPosition: 14
- mesSend: 20
- mesConfirm: 40
- start: 24
- target: 26
- mesGlassCount: 30
- rawMargin1: 32
- mesWidth1: 34
- mesHeight1: 36
- rawThickness1: 38
- rawMargin2: 44
- mesWidth2: 46
- mesHeight2: 48
- rawThickness2: 50
- alarmInfo: 52
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/config/application.yml b/mes-processes/mes-plcSend/target/config/application.yml
deleted file mode 100644
index b8999e9..0000000
--- a/mes-processes/mes-plcSend/target/config/application.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-server:
- port: 10018
-spring:
- profiles:
- active: dev
- application:
- name: plcSend
- liquibase:
- enabled: true
- change-log: classpath:changelog/changelogBase.xml
- main:
- allow-bean-definition-overriding: true
-feign:
- client:
- config:
- default:
- connectTimeout: 5000
- readTimeout: 5000
-mybatis-plus:
- mapper-locations: classpath*:mapper/*.xml
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-erp:
- url: http://10.153.19.150:8086
-
-# PLC閰嶇疆
-s7:
- load:
- dbArea: DB1
- beginIndex: 0
- raw:
- dbArea: DB2
- beginIndex: 0
-
-# PLC妯℃嫙閰嶇疆
-plc:
- simulate:
- enabled: false # 鏄惁鍚敤PLC妯℃嫙
- interval: 5000 # 妯℃嫙闂撮殧鏃堕棿锛堟绉掞級
- failure-rate: 0 # 妯℃嫙鏁呴殰姒傜巼锛�0-100锛�
- task-count: 10 # 妯℃嫙浠诲姟鏁伴噺
- task-type: normal # 妯℃嫙浠诲姟绫诲瀷
- data-range:
- min-start: 1
- max-start: 100
- min-target: 1
- max-target: 100
- min-glass-count: 1
- max-glass-count: 50
-
-mes:
- width: 2800
- height: 5000
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/config/changelog/changelogBase.xml b/mes-processes/mes-plcSend/target/config/changelog/changelogBase.xml
deleted file mode 100644
index 7354921..0000000
--- a/mes-processes/mes-plcSend/target/config/changelog/changelogBase.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<databaseChangeLog
- xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
- http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-
- <!-- 寮曞叆绗竴涓猄QL閰嶇疆鏂囦欢 -->
- <include file="./changelog/mesInit.sql" relativeToChangelogFile="false"/>
- <include file="./changelog/mesInitLy.sql" relativeToChangelogFile="false"/>
-
-</databaseChangeLog>
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/config/changelog/mesInit.sql b/mes-processes/mes-plcSend/target/config/changelog/mesInit.sql
deleted file mode 100644
index 53a215d..0000000
--- a/mes-processes/mes-plcSend/target/config/changelog/mesInit.sql
+++ /dev/null
@@ -1,63 +0,0 @@
--- liquibase formatted sql
-
--- changeset huang:20250708121
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station';
-CREATE TABLE raw_glass_storage_station
-(
- id bigint NOT NULL,
- device_id int DEFAULT NULL COMMENT '璁惧id',
- slot int DEFAULT NULL COMMENT '鏍煎瓙id',
- shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
- enable_state int DEFAULT NULL COMMENT '鍚敤/绂佺敤',
- PRIMARY KEY (id)
-) COMMENT '浠撳偍宸ヤ綅琛�';
--- rollback DROP TABLE raw_glass_storage_station;
-
--- changeset huang:20250708122
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_details';
-CREATE TABLE raw_glass_storage_details
-(
- id bigint NOT NULL AUTO_INCREMENT,
- device_id int DEFAULT NULL COMMENT '璁惧id',
- slot int DEFAULT NULL COMMENT '鏍煎瓙id',
- raw_width double DEFAULT NULL COMMENT '鍘熺墖瀹�',
- raw_height double DEFAULT NULL COMMENT '鍘熺墖楂�',
- raw_thickness double DEFAULT NULL COMMENT '鍘熺墖鍘氬害',
- films_id varchar(64) DEFAULT NULL COMMENT '鑶滅郴',
- raw_margin int DEFAULT NULL COMMENT '鍘熺墖杈硅窛',
- manufacturer varchar(64) DEFAULT NULL COMMENT '鐢熷巶鍟�',
- raw_number varchar(64) DEFAULT NULL COMMENT '鍘熺墖缂栧彿',
- start_quantity varchar(64) DEFAULT NULL COMMENT '寮�濮嬫暟閲�', -- 鏂板寮�濮嬫暟閲�
- remain_quantity int DEFAULT NULL COMMENT '鍓╀綑鏁伴噺',
- state int DEFAULT NULL COMMENT '鐘舵��',
- shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
- create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (id)
-) COMMENT '浠撳偍璇︽儏琛�';
--- rollback DROP TABLE raw_glass_storage_details;
-
--- changeset huang:20250708123
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_task';
-CREATE TABLE raw_glass_storage_history_task
-(
- id bigint NOT NULL AUTO_INCREMENT,
- start_slot int DEFAULT NULL COMMENT '璧峰鏍煎瓙',
- end_slot int DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
- raw_margin int DEFAULT NULL COMMENT '鍘熺墖杈硅窛',
- raw_glass_width double DEFAULT '0' COMMENT '鍘熺墖瀹�',
- raw_glass_height double DEFAULT '0' COMMENT '鍘熺墖楂�',
- raw_glass_thickness double DEFAULT '0' COMMENT '鍘氬害',
- films_id varchar(20) DEFAULT NULL COMMENT '鑶滅郴',
- raw_quantity int DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
- task_type int DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
- task_state int DEFAULT NULL COMMENT '浠诲姟鐘舵��',
- shelf int DEFAULT NULL COMMENT '鏋跺瓙鍙�',
- create_time timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (id)
-) COMMENT '浠撳偍浠诲姟琛�';
--- rollback DROP TABLE raw_glass_storage_task;
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/config/changelog/mesInitLy.sql b/mes-processes/mes-plcSend/target/config/changelog/mesInitLy.sql
deleted file mode 100644
index 8465ac9..0000000
--- a/mes-processes/mes-plcSend/target/config/changelog/mesInitLy.sql
+++ /dev/null
@@ -1,83 +0,0 @@
--- liquibase formatted sql
-
--- changeset huang:20250708121
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM raw_glass_storage_station;
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (1, 1, 1, 1, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (2, 2, 2, 2, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (3, 2, 3, 3, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (4, 3, 4, 4, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (5, 3, 5, 5, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (6, 4, 6, 6, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (7, 4, 7, 7, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (8, 5, 8, 8, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (9, 5, 9, 9, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (10, 6, 10, 10, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (11, 6, 11, 11, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (12, 7, 12, 12, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (13, 7, 13, 13, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (14, 8, 14, 14, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (15, 8, 15, 15, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (16, 9, 16, 16, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (17, 10, 17, 17, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (18, 11, 18, 18, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (19, 11, 19, 19, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (20, 12, 20, 20, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (21, 12, 21, 21, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (22, 13, 22, 22, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (23, 13, 23, 23, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (24, 14, 24, 24, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (25, 14, 25, 25, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (26, 15, 26, 26, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (27, 15, 27, 27, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (28, 16, 28, 28, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (29, 16, 29, 29, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (30, 17, 30, 30, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (31, 17, 31, 31, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (32, 18, 32, 32, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (33, 19, 34, 34, 1);
-INSERT INTO raw_glass_storage_station (id, device_id, slot, shelf, enable_state)
-VALUES (34, 20, 36, 36, 1);
-
--- changeset huang:20250807001
--- preconditions onFail:CONTINUE onError:CONTINUE
--- precondition-sql-check expectedResult:0 select count(*) from raw_glass_storage_details
-INSERT INTO raw_glass_storage_details (device_id, slot, state, shelf)
-select device_id, slot, 100, shelf
-from raw_glass_storage_station;
-INSERT INTO raw_glass_storage_details (device_id, slot, state, shelf)
-select device_id, slot, 100, shelf
-from raw_glass_storage_station;
diff --git a/mes-processes/mes-plcSend/target/config/db/migration/V1.0.0__Create_plc_address_mapping_table.sql b/mes-processes/mes-plcSend/target/config/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
deleted file mode 100644
index b11c3c3..0000000
--- a/mes-processes/mes-plcSend/target/config/db/migration/V1.0.0__Create_plc_address_mapping_table.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- 鍒涘缓PLC鍦板潃鏄犲皠閰嶇疆琛�
-CREATE TABLE IF NOT EXISTS `plc_address_mapping` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
- `project_id` varchar(50) NOT NULL COMMENT '椤圭洰鏍囪瘑',
- `project_name` varchar(100) DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
- `db_area` varchar(20) NOT NULL COMMENT 'DB鍧楀湴鍧�锛屽DB1',
- `begin_index` int(11) NOT NULL DEFAULT '0' COMMENT '璧峰绱㈠紩',
- `plc_ip` varchar(50) DEFAULT NULL COMMENT 'PLC IP鍦板潃',
- `plc_type` varchar(20) DEFAULT 'S1200' COMMENT 'PLC绫诲瀷',
- `address_mapping_json` text COMMENT '鍦板潃鏄犲皠JSON閰嶇疆',
- `description` varchar(255) DEFAULT NULL COMMENT '鎻忚堪',
- `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '鏄惁鍚敤锛�1-鍚敤锛�0-绂佺敤',
- `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- `create_by` varchar(50) DEFAULT NULL COMMENT '鍒涘缓浜�',
- `update_by` varchar(50) DEFAULT NULL COMMENT '鏇存柊浜�',
- PRIMARY KEY (`id`),
- UNIQUE KEY `uk_project_id` (`project_id`),
- KEY `idx_enabled` (`enabled`),
- KEY `idx_create_time` (`create_time`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='PLC鍦板潃鏄犲皠閰嶇疆琛�';
-
--- 鎻掑叆榛樿閰嶇疆
-INSERT INTO `plc_address_mapping` (`project_id`, `project_name`, `db_area`, `begin_index`, `plc_ip`, `plc_type`, `description`)
-VALUES ('shuttle', '绌挎杞﹂」鐩�', 'DB38', 0, '192.168.10.21', 'S1200', '榛樿绌挎杞﹂」鐩厤缃�')
-ON DUPLICATE KEY UPDATE `update_time` = CURRENT_TIMESTAMP;
\ No newline at end of file
diff --git a/mes-processes/mes-plcSend/target/lib/FastInfoset-1.2.15.jar b/mes-processes/mes-plcSend/target/lib/FastInfoset-1.2.15.jar
deleted file mode 100644
index 2671209..0000000
--- a/mes-processes/mes-plcSend/target/lib/FastInfoset-1.2.15.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/HdrHistogram-2.1.9.jar b/mes-processes/mes-plcSend/target/lib/HdrHistogram-2.1.9.jar
deleted file mode 100644
index efa2637..0000000
--- a/mes-processes/mes-plcSend/target/lib/HdrHistogram-2.1.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/HikariCP-3.2.0.jar b/mes-processes/mes-plcSend/target/lib/HikariCP-3.2.0.jar
deleted file mode 100644
index a030a7f..0000000
--- a/mes-processes/mes-plcSend/target/lib/HikariCP-3.2.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/SparseBitSet-1.2.jar b/mes-processes/mes-plcSend/target/lib/SparseBitSet-1.2.jar
deleted file mode 100644
index bdb6771..0000000
--- a/mes-processes/mes-plcSend/target/lib/SparseBitSet-1.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/archaius-core-0.7.6.jar b/mes-processes/mes-plcSend/target/lib/archaius-core-0.7.6.jar
deleted file mode 100644
index 58182d1..0000000
--- a/mes-processes/mes-plcSend/target/lib/archaius-core-0.7.6.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/aspectjweaver-1.9.4.jar b/mes-processes/mes-plcSend/target/lib/aspectjweaver-1.9.4.jar
deleted file mode 100644
index 00ad7a8..0000000
--- a/mes-processes/mes-plcSend/target/lib/aspectjweaver-1.9.4.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/bcpkix-jdk15on-1.60.jar b/mes-processes/mes-plcSend/target/lib/bcpkix-jdk15on-1.60.jar
deleted file mode 100644
index 87ce8b4..0000000
--- a/mes-processes/mes-plcSend/target/lib/bcpkix-jdk15on-1.60.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/bcpkix-jdk18on-1.75.jar b/mes-processes/mes-plcSend/target/lib/bcpkix-jdk18on-1.75.jar
deleted file mode 100644
index 24f2f70..0000000
--- a/mes-processes/mes-plcSend/target/lib/bcpkix-jdk18on-1.75.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/bcprov-jdk15on-1.60.jar b/mes-processes/mes-plcSend/target/lib/bcprov-jdk15on-1.60.jar
deleted file mode 100644
index 5be567c..0000000
--- a/mes-processes/mes-plcSend/target/lib/bcprov-jdk15on-1.60.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/bcprov-jdk18on-1.75.jar b/mes-processes/mes-plcSend/target/lib/bcprov-jdk18on-1.75.jar
deleted file mode 100644
index e88367c..0000000
--- a/mes-processes/mes-plcSend/target/lib/bcprov-jdk18on-1.75.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/bcutil-jdk18on-1.75.jar b/mes-processes/mes-plcSend/target/lib/bcutil-jdk18on-1.75.jar
deleted file mode 100644
index 48111b8..0000000
--- a/mes-processes/mes-plcSend/target/lib/bcutil-jdk18on-1.75.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/byte-buddy-1.9.16.jar b/mes-processes/mes-plcSend/target/lib/byte-buddy-1.9.16.jar
deleted file mode 100644
index 200eaf2..0000000
--- a/mes-processes/mes-plcSend/target/lib/byte-buddy-1.9.16.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/classgraph-4.1.7.jar b/mes-processes/mes-plcSend/target/lib/classgraph-4.1.7.jar
deleted file mode 100644
index 41bd4a2..0000000
--- a/mes-processes/mes-plcSend/target/lib/classgraph-4.1.7.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/classmate-1.4.0.jar b/mes-processes/mes-plcSend/target/lib/classmate-1.4.0.jar
deleted file mode 100644
index e53587e..0000000
--- a/mes-processes/mes-plcSend/target/lib/classmate-1.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-codec-1.11.jar b/mes-processes/mes-plcSend/target/lib/commons-codec-1.11.jar
deleted file mode 100644
index 2245120..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-codec-1.11.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-collections-3.2.2.jar b/mes-processes/mes-plcSend/target/lib/commons-collections-3.2.2.jar
deleted file mode 100644
index fa5df82..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-collections-3.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-collections4-4.4.jar b/mes-processes/mes-plcSend/target/lib/commons-collections4-4.4.jar
deleted file mode 100644
index da06c3e..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-collections4-4.4.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-compress-1.19.jar b/mes-processes/mes-plcSend/target/lib/commons-compress-1.19.jar
deleted file mode 100644
index 5c9f52a..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-compress-1.19.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-configuration-1.8.jar b/mes-processes/mes-plcSend/target/lib/commons-configuration-1.8.jar
deleted file mode 100644
index ae9ae99..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-configuration-1.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-csv-1.8.jar b/mes-processes/mes-plcSend/target/lib/commons-csv-1.8.jar
deleted file mode 100644
index 127c5a2..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-csv-1.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-fileupload-1.4.jar b/mes-processes/mes-plcSend/target/lib/commons-fileupload-1.4.jar
deleted file mode 100644
index e25a6bc..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-fileupload-1.4.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-io-2.2.jar b/mes-processes/mes-plcSend/target/lib/commons-io-2.2.jar
deleted file mode 100644
index 84ca565..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-io-2.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-lang-2.6.jar b/mes-processes/mes-plcSend/target/lib/commons-lang-2.6.jar
deleted file mode 100644
index 98467d3..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-lang-2.6.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-lang3-3.8.1.jar b/mes-processes/mes-plcSend/target/lib/commons-lang3-3.8.1.jar
deleted file mode 100644
index 2c65ce6..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-lang3-3.8.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-logging-1.2.jar b/mes-processes/mes-plcSend/target/lib/commons-logging-1.2.jar
deleted file mode 100644
index 93a3b9f..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-logging-1.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-math3-3.6.1.jar b/mes-processes/mes-plcSend/target/lib/commons-math3-3.6.1.jar
deleted file mode 100644
index 0ff582c..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-math3-3.6.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/commons-pool2-2.6.2.jar b/mes-processes/mes-plcSend/target/lib/commons-pool2-2.6.2.jar
deleted file mode 100644
index 4233f08..0000000
--- a/mes-processes/mes-plcSend/target/lib/commons-pool2-2.6.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/curvesapi-1.06.jar b/mes-processes/mes-plcSend/target/lib/curvesapi-1.06.jar
deleted file mode 100644
index 800ab9b..0000000
--- a/mes-processes/mes-plcSend/target/lib/curvesapi-1.06.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/druid-1.1.8.jar b/mes-processes/mes-plcSend/target/lib/druid-1.1.8.jar
deleted file mode 100644
index e01d8a4..0000000
--- a/mes-processes/mes-plcSend/target/lib/druid-1.1.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/dynamic-datasource-spring-boot-starter-3.3.1.jar b/mes-processes/mes-plcSend/target/lib/dynamic-datasource-spring-boot-starter-3.3.1.jar
deleted file mode 100644
index 5c29c3c..0000000
--- a/mes-processes/mes-plcSend/target/lib/dynamic-datasource-spring-boot-starter-3.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/easyexcel-3.1.3.jar b/mes-processes/mes-plcSend/target/lib/easyexcel-3.1.3.jar
deleted file mode 100644
index c3896dc..0000000
--- a/mes-processes/mes-plcSend/target/lib/easyexcel-3.1.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/easyexcel-core-3.1.3.jar b/mes-processes/mes-plcSend/target/lib/easyexcel-core-3.1.3.jar
deleted file mode 100644
index 6390d6f..0000000
--- a/mes-processes/mes-plcSend/target/lib/easyexcel-core-3.1.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/easyexcel-support-3.1.3.jar b/mes-processes/mes-plcSend/target/lib/easyexcel-support-3.1.3.jar
deleted file mode 100644
index c4fd21f..0000000
--- a/mes-processes/mes-plcSend/target/lib/easyexcel-support-3.1.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/ehcache-3.6.3.jar b/mes-processes/mes-plcSend/target/lib/ehcache-3.6.3.jar
deleted file mode 100644
index ba5a7a1..0000000
--- a/mes-processes/mes-plcSend/target/lib/ehcache-3.6.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/fastjson-1.2.33.jar b/mes-processes/mes-plcSend/target/lib/fastjson-1.2.33.jar
deleted file mode 100644
index 18df58f..0000000
--- a/mes-processes/mes-plcSend/target/lib/fastjson-1.2.33.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/feign-core-10.2.3.jar b/mes-processes/mes-plcSend/target/lib/feign-core-10.2.3.jar
deleted file mode 100644
index df97ad1..0000000
--- a/mes-processes/mes-plcSend/target/lib/feign-core-10.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/feign-form-3.8.0.jar b/mes-processes/mes-plcSend/target/lib/feign-form-3.8.0.jar
deleted file mode 100644
index 1ac7a32..0000000
--- a/mes-processes/mes-plcSend/target/lib/feign-form-3.8.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/feign-form-spring-3.8.0.jar b/mes-processes/mes-plcSend/target/lib/feign-form-spring-3.8.0.jar
deleted file mode 100644
index 2355737..0000000
--- a/mes-processes/mes-plcSend/target/lib/feign-form-spring-3.8.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/feign-hystrix-10.2.3.jar b/mes-processes/mes-plcSend/target/lib/feign-hystrix-10.2.3.jar
deleted file mode 100644
index 2d8774e..0000000
--- a/mes-processes/mes-plcSend/target/lib/feign-hystrix-10.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/feign-slf4j-10.2.3.jar b/mes-processes/mes-plcSend/target/lib/feign-slf4j-10.2.3.jar
deleted file mode 100644
index 6fbc13f..0000000
--- a/mes-processes/mes-plcSend/target/lib/feign-slf4j-10.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/freemarker-2.3.29.jar b/mes-processes/mes-plcSend/target/lib/freemarker-2.3.29.jar
deleted file mode 100644
index 1186653..0000000
--- a/mes-processes/mes-plcSend/target/lib/freemarker-2.3.29.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/guava-19.0.jar b/mes-processes/mes-plcSend/target/lib/guava-19.0.jar
deleted file mode 100644
index b175ca8..0000000
--- a/mes-processes/mes-plcSend/target/lib/guava-19.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/hibernate-validator-6.0.17.Final.jar b/mes-processes/mes-plcSend/target/lib/hibernate-validator-6.0.17.Final.jar
deleted file mode 100644
index 25376af..0000000
--- a/mes-processes/mes-plcSend/target/lib/hibernate-validator-6.0.17.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/httpclient-4.5.9.jar b/mes-processes/mes-plcSend/target/lib/httpclient-4.5.9.jar
deleted file mode 100644
index 83bc29d..0000000
--- a/mes-processes/mes-plcSend/target/lib/httpclient-4.5.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/httpcore-4.4.12.jar b/mes-processes/mes-plcSend/target/lib/httpcore-4.4.12.jar
deleted file mode 100644
index 1838672..0000000
--- a/mes-processes/mes-plcSend/target/lib/httpcore-4.4.12.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/hutool-all-5.4.0.jar b/mes-processes/mes-plcSend/target/lib/hutool-all-5.4.0.jar
deleted file mode 100644
index b3f257a..0000000
--- a/mes-processes/mes-plcSend/target/lib/hutool-all-5.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/hystrix-core-1.5.18.jar b/mes-processes/mes-plcSend/target/lib/hystrix-core-1.5.18.jar
deleted file mode 100644
index f8875b6..0000000
--- a/mes-processes/mes-plcSend/target/lib/hystrix-core-1.5.18.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/iot-communication-1.5.4.jar b/mes-processes/mes-plcSend/target/lib/iot-communication-1.5.4.jar
deleted file mode 100644
index 2daee14..0000000
--- a/mes-processes/mes-plcSend/target/lib/iot-communication-1.5.4.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/istack-commons-runtime-3.0.7.jar b/mes-processes/mes-plcSend/target/lib/istack-commons-runtime-3.0.7.jar
deleted file mode 100644
index 2fe5b82..0000000
--- a/mes-processes/mes-plcSend/target/lib/istack-commons-runtime-3.0.7.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jackson-annotations-2.9.0.jar b/mes-processes/mes-plcSend/target/lib/jackson-annotations-2.9.0.jar
deleted file mode 100644
index c602d75..0000000
--- a/mes-processes/mes-plcSend/target/lib/jackson-annotations-2.9.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jackson-core-2.9.9.jar b/mes-processes/mes-plcSend/target/lib/jackson-core-2.9.9.jar
deleted file mode 100644
index 02bd446..0000000
--- a/mes-processes/mes-plcSend/target/lib/jackson-core-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jackson-databind-2.9.9.3.jar b/mes-processes/mes-plcSend/target/lib/jackson-databind-2.9.9.3.jar
deleted file mode 100644
index 5bf4ba8..0000000
--- a/mes-processes/mes-plcSend/target/lib/jackson-databind-2.9.9.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jackson-datatype-jdk8-2.9.9.jar b/mes-processes/mes-plcSend/target/lib/jackson-datatype-jdk8-2.9.9.jar
deleted file mode 100644
index 43c87a6..0000000
--- a/mes-processes/mes-plcSend/target/lib/jackson-datatype-jdk8-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jackson-datatype-jsr310-2.9.9.jar b/mes-processes/mes-plcSend/target/lib/jackson-datatype-jsr310-2.9.9.jar
deleted file mode 100644
index 911c7b2..0000000
--- a/mes-processes/mes-plcSend/target/lib/jackson-datatype-jsr310-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jackson-module-parameter-names-2.9.9.jar b/mes-processes/mes-plcSend/target/lib/jackson-module-parameter-names-2.9.9.jar
deleted file mode 100644
index df19c2f..0000000
--- a/mes-processes/mes-plcSend/target/lib/jackson-module-parameter-names-2.9.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/javassist-3.25.0-GA.jar b/mes-processes/mes-plcSend/target/lib/javassist-3.25.0-GA.jar
deleted file mode 100644
index bf8cf7b..0000000
--- a/mes-processes/mes-plcSend/target/lib/javassist-3.25.0-GA.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/javax.activation-api-1.2.0.jar b/mes-processes/mes-plcSend/target/lib/javax.activation-api-1.2.0.jar
deleted file mode 100644
index 986c365..0000000
--- a/mes-processes/mes-plcSend/target/lib/javax.activation-api-1.2.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/javax.annotation-api-1.3.2.jar b/mes-processes/mes-plcSend/target/lib/javax.annotation-api-1.3.2.jar
deleted file mode 100644
index a8a470a..0000000
--- a/mes-processes/mes-plcSend/target/lib/javax.annotation-api-1.3.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/javax.inject-1.jar b/mes-processes/mes-plcSend/target/lib/javax.inject-1.jar
deleted file mode 100644
index b2a9d0b..0000000
--- a/mes-processes/mes-plcSend/target/lib/javax.inject-1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jaxb-api-2.3.1.jar b/mes-processes/mes-plcSend/target/lib/jaxb-api-2.3.1.jar
deleted file mode 100644
index 4565865..0000000
--- a/mes-processes/mes-plcSend/target/lib/jaxb-api-2.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jaxb-runtime-2.3.1.jar b/mes-processes/mes-plcSend/target/lib/jaxb-runtime-2.3.1.jar
deleted file mode 100644
index 0b9ef67..0000000
--- a/mes-processes/mes-plcSend/target/lib/jaxb-runtime-2.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jboss-logging-3.3.3.Final.jar b/mes-processes/mes-plcSend/target/lib/jboss-logging-3.3.3.Final.jar
deleted file mode 100644
index 91db418..0000000
--- a/mes-processes/mes-plcSend/target/lib/jboss-logging-3.3.3.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jedis-2.9.3.jar b/mes-processes/mes-plcSend/target/lib/jedis-2.9.3.jar
deleted file mode 100644
index c4006d3..0000000
--- a/mes-processes/mes-plcSend/target/lib/jedis-2.9.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jersey-apache-client4-1.19.1.jar b/mes-processes/mes-plcSend/target/lib/jersey-apache-client4-1.19.1.jar
deleted file mode 100644
index d88eab7..0000000
--- a/mes-processes/mes-plcSend/target/lib/jersey-apache-client4-1.19.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jersey-client-1.19.1.jar b/mes-processes/mes-plcSend/target/lib/jersey-client-1.19.1.jar
deleted file mode 100644
index 455a7f2..0000000
--- a/mes-processes/mes-plcSend/target/lib/jersey-client-1.19.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jersey-core-1.19.1.jar b/mes-processes/mes-plcSend/target/lib/jersey-core-1.19.1.jar
deleted file mode 100644
index 8e5185d..0000000
--- a/mes-processes/mes-plcSend/target/lib/jersey-core-1.19.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jjwt-0.9.0.jar b/mes-processes/mes-plcSend/target/lib/jjwt-0.9.0.jar
deleted file mode 100644
index d180465..0000000
--- a/mes-processes/mes-plcSend/target/lib/jjwt-0.9.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jsqlparser-3.2.jar b/mes-processes/mes-plcSend/target/lib/jsqlparser-3.2.jar
deleted file mode 100644
index 2ab3a0f..0000000
--- a/mes-processes/mes-plcSend/target/lib/jsqlparser-3.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jsr305-3.0.1.jar b/mes-processes/mes-plcSend/target/lib/jsr305-3.0.1.jar
deleted file mode 100644
index 021df89..0000000
--- a/mes-processes/mes-plcSend/target/lib/jsr305-3.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jsr311-api-1.1.1.jar b/mes-processes/mes-plcSend/target/lib/jsr311-api-1.1.1.jar
deleted file mode 100644
index ec8bc81..0000000
--- a/mes-processes/mes-plcSend/target/lib/jsr311-api-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/jul-to-slf4j-1.7.28.jar b/mes-processes/mes-plcSend/target/lib/jul-to-slf4j-1.7.28.jar
deleted file mode 100644
index 8dd4a00..0000000
--- a/mes-processes/mes-plcSend/target/lib/jul-to-slf4j-1.7.28.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/knife4j-annotations-2.0.9.jar b/mes-processes/mes-plcSend/target/lib/knife4j-annotations-2.0.9.jar
deleted file mode 100644
index 89b4e55..0000000
--- a/mes-processes/mes-plcSend/target/lib/knife4j-annotations-2.0.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/knife4j-core-2.0.9.jar b/mes-processes/mes-plcSend/target/lib/knife4j-core-2.0.9.jar
deleted file mode 100644
index ae1a88a..0000000
--- a/mes-processes/mes-plcSend/target/lib/knife4j-core-2.0.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/knife4j-spring-2.0.9.jar b/mes-processes/mes-plcSend/target/lib/knife4j-spring-2.0.9.jar
deleted file mode 100644
index 10d825f..0000000
--- a/mes-processes/mes-plcSend/target/lib/knife4j-spring-2.0.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/knife4j-spring-boot-autoconfigure-2.0.9.jar b/mes-processes/mes-plcSend/target/lib/knife4j-spring-boot-autoconfigure-2.0.9.jar
deleted file mode 100644
index 306f72d..0000000
--- a/mes-processes/mes-plcSend/target/lib/knife4j-spring-boot-autoconfigure-2.0.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/knife4j-spring-boot-starter-2.0.9.jar b/mes-processes/mes-plcSend/target/lib/knife4j-spring-boot-starter-2.0.9.jar
deleted file mode 100644
index 514a2c1..0000000
--- a/mes-processes/mes-plcSend/target/lib/knife4j-spring-boot-starter-2.0.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/knife4j-spring-ui-2.0.9.jar b/mes-processes/mes-plcSend/target/lib/knife4j-spring-ui-2.0.9.jar
deleted file mode 100644
index 8fb6706..0000000
--- a/mes-processes/mes-plcSend/target/lib/knife4j-spring-ui-2.0.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/liquibase-core-3.6.3.jar b/mes-processes/mes-plcSend/target/lib/liquibase-core-3.6.3.jar
deleted file mode 100644
index 1d1c340..0000000
--- a/mes-processes/mes-plcSend/target/lib/liquibase-core-3.6.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/log4j-api-2.11.2.jar b/mes-processes/mes-plcSend/target/lib/log4j-api-2.11.2.jar
deleted file mode 100644
index 809773c..0000000
--- a/mes-processes/mes-plcSend/target/lib/log4j-api-2.11.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/log4j-to-slf4j-2.11.2.jar b/mes-processes/mes-plcSend/target/lib/log4j-to-slf4j-2.11.2.jar
deleted file mode 100644
index 4bb1a00..0000000
--- a/mes-processes/mes-plcSend/target/lib/log4j-to-slf4j-2.11.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/logback-classic-1.2.3.jar b/mes-processes/mes-plcSend/target/lib/logback-classic-1.2.3.jar
deleted file mode 100644
index bed00c0..0000000
--- a/mes-processes/mes-plcSend/target/lib/logback-classic-1.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/logback-core-1.2.3.jar b/mes-processes/mes-plcSend/target/lib/logback-core-1.2.3.jar
deleted file mode 100644
index 487b395..0000000
--- a/mes-processes/mes-plcSend/target/lib/logback-core-1.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/lombok-1.18.8.jar b/mes-processes/mes-plcSend/target/lib/lombok-1.18.8.jar
deleted file mode 100644
index b1dd5a8..0000000
--- a/mes-processes/mes-plcSend/target/lib/lombok-1.18.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mapstruct-1.3.1.Final.jar b/mes-processes/mes-plcSend/target/lib/mapstruct-1.3.1.Final.jar
deleted file mode 100644
index 8d279ef..0000000
--- a/mes-processes/mes-plcSend/target/lib/mapstruct-1.3.1.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mes-rawGlassStorage-1.0.0.jar b/mes-processes/mes-plcSend/target/lib/mes-rawGlassStorage-1.0.0.jar
deleted file mode 100644
index f714e5a..0000000
--- a/mes-processes/mes-plcSend/target/lib/mes-rawGlassStorage-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/milo-spring-boot-starter-3.0.6.12.jar b/mes-processes/mes-plcSend/target/lib/milo-spring-boot-starter-3.0.6.12.jar
deleted file mode 100644
index 7e1ff66..0000000
--- a/mes-processes/mes-plcSend/target/lib/milo-spring-boot-starter-3.0.6.12.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/model-1.0.0.jar b/mes-processes/mes-plcSend/target/lib/model-1.0.0.jar
deleted file mode 100644
index 07bde22..0000000
--- a/mes-processes/mes-plcSend/target/lib/model-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mssql-jdbc-6.4.0.jre8.jar b/mes-processes/mes-plcSend/target/lib/mssql-jdbc-6.4.0.jre8.jar
deleted file mode 100644
index bd4cab8..0000000
--- a/mes-processes/mes-plcSend/target/lib/mssql-jdbc-6.4.0.jre8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-3.5.6.jar b/mes-processes/mes-plcSend/target/lib/mybatis-3.5.6.jar
deleted file mode 100644
index 1ee49ee..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-plus-3.3.1.jar b/mes-processes/mes-plcSend/target/lib/mybatis-plus-3.3.1.jar
deleted file mode 100644
index 02d02c7..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-plus-3.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-plus-annotation-3.4.1.jar b/mes-processes/mes-plcSend/target/lib/mybatis-plus-annotation-3.4.1.jar
deleted file mode 100644
index a1effad..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-plus-annotation-3.4.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-plus-boot-starter-3.3.1.jar b/mes-processes/mes-plcSend/target/lib/mybatis-plus-boot-starter-3.3.1.jar
deleted file mode 100644
index 8e2620a..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-plus-boot-starter-3.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-plus-core-3.4.1.jar b/mes-processes/mes-plcSend/target/lib/mybatis-plus-core-3.4.1.jar
deleted file mode 100644
index fb10236..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-plus-core-3.4.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-plus-extension-3.4.1.jar b/mes-processes/mes-plcSend/target/lib/mybatis-plus-extension-3.4.1.jar
deleted file mode 100644
index 2f865b8..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-plus-extension-3.4.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-plus-generator-3.4.1.jar b/mes-processes/mes-plcSend/target/lib/mybatis-plus-generator-3.4.1.jar
deleted file mode 100644
index 6cc8044..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-plus-generator-3.4.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mybatis-spring-2.0.5.jar b/mes-processes/mes-plcSend/target/lib/mybatis-spring-2.0.5.jar
deleted file mode 100644
index ca05cfb..0000000
--- a/mes-processes/mes-plcSend/target/lib/mybatis-spring-2.0.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/mysql-connector-java-8.0.17.jar b/mes-processes/mes-plcSend/target/lib/mysql-connector-java-8.0.17.jar
deleted file mode 100644
index 3eb044b..0000000
--- a/mes-processes/mes-plcSend/target/lib/mysql-connector-java-8.0.17.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/nacos-api-1.1.1.jar b/mes-processes/mes-plcSend/target/lib/nacos-api-1.1.1.jar
deleted file mode 100644
index c02de15..0000000
--- a/mes-processes/mes-plcSend/target/lib/nacos-api-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/nacos-client-1.1.1.jar b/mes-processes/mes-plcSend/target/lib/nacos-client-1.1.1.jar
deleted file mode 100644
index 0c1e74d..0000000
--- a/mes-processes/mes-plcSend/target/lib/nacos-client-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/nacos-common-1.1.1.jar b/mes-processes/mes-plcSend/target/lib/nacos-common-1.1.1.jar
deleted file mode 100644
index 27e41d7..0000000
--- a/mes-processes/mes-plcSend/target/lib/nacos-common-1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netflix-commons-util-0.3.0.jar b/mes-processes/mes-plcSend/target/lib/netflix-commons-util-0.3.0.jar
deleted file mode 100644
index ad881f3..0000000
--- a/mes-processes/mes-plcSend/target/lib/netflix-commons-util-0.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netflix-statistics-0.1.1.jar b/mes-processes/mes-plcSend/target/lib/netflix-statistics-0.1.1.jar
deleted file mode 100644
index e8f6d95..0000000
--- a/mes-processes/mes-plcSend/target/lib/netflix-statistics-0.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-buffer-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-buffer-4.1.39.Final.jar
deleted file mode 100644
index 8cc1936..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-buffer-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-channel-fsm-0.8.jar b/mes-processes/mes-plcSend/target/lib/netty-channel-fsm-0.8.jar
deleted file mode 100644
index 3111c38..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-channel-fsm-0.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-codec-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-codec-4.1.39.Final.jar
deleted file mode 100644
index 295a8bb..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-codec-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-codec-http-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-codec-http-4.1.39.Final.jar
deleted file mode 100644
index db5f31d..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-codec-http-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-common-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-common-4.1.39.Final.jar
deleted file mode 100644
index 2feecd9..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-common-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-handler-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-handler-4.1.39.Final.jar
deleted file mode 100644
index 1e294bc..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-handler-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-resolver-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-resolver-4.1.39.Final.jar
deleted file mode 100644
index 8c2ffc6..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-resolver-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/netty-transport-4.1.39.Final.jar b/mes-processes/mes-plcSend/target/lib/netty-transport-4.1.39.Final.jar
deleted file mode 100644
index f5029b9..0000000
--- a/mes-processes/mes-plcSend/target/lib/netty-transport-4.1.39.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/poi-4.1.2.jar b/mes-processes/mes-plcSend/target/lib/poi-4.1.2.jar
deleted file mode 100644
index 3803353..0000000
--- a/mes-processes/mes-plcSend/target/lib/poi-4.1.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/poi-ooxml-4.1.2.jar b/mes-processes/mes-plcSend/target/lib/poi-ooxml-4.1.2.jar
deleted file mode 100644
index 6038a51..0000000
--- a/mes-processes/mes-plcSend/target/lib/poi-ooxml-4.1.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/poi-ooxml-schemas-4.1.2.jar b/mes-processes/mes-plcSend/target/lib/poi-ooxml-schemas-4.1.2.jar
deleted file mode 100644
index 74d3cd5..0000000
--- a/mes-processes/mes-plcSend/target/lib/poi-ooxml-schemas-4.1.2.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/ribbon-2.3.0.jar b/mes-processes/mes-plcSend/target/lib/ribbon-2.3.0.jar
deleted file mode 100644
index 76cad0c..0000000
--- a/mes-processes/mes-plcSend/target/lib/ribbon-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/ribbon-core-2.3.0.jar b/mes-processes/mes-plcSend/target/lib/ribbon-core-2.3.0.jar
deleted file mode 100644
index 7e41f1a..0000000
--- a/mes-processes/mes-plcSend/target/lib/ribbon-core-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/ribbon-httpclient-2.3.0.jar b/mes-processes/mes-plcSend/target/lib/ribbon-httpclient-2.3.0.jar
deleted file mode 100644
index a3305ac..0000000
--- a/mes-processes/mes-plcSend/target/lib/ribbon-httpclient-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/ribbon-loadbalancer-2.3.0.jar b/mes-processes/mes-plcSend/target/lib/ribbon-loadbalancer-2.3.0.jar
deleted file mode 100644
index a179977..0000000
--- a/mes-processes/mes-plcSend/target/lib/ribbon-loadbalancer-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/ribbon-transport-2.3.0.jar b/mes-processes/mes-plcSend/target/lib/ribbon-transport-2.3.0.jar
deleted file mode 100644
index dfb7da4..0000000
--- a/mes-processes/mes-plcSend/target/lib/ribbon-transport-2.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/rxjava-1.3.8.jar b/mes-processes/mes-plcSend/target/lib/rxjava-1.3.8.jar
deleted file mode 100644
index 3b8b9e4..0000000
--- a/mes-processes/mes-plcSend/target/lib/rxjava-1.3.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/rxnetty-0.4.9.jar b/mes-processes/mes-plcSend/target/lib/rxnetty-0.4.9.jar
deleted file mode 100644
index ee2bdf6..0000000
--- a/mes-processes/mes-plcSend/target/lib/rxnetty-0.4.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/rxnetty-contexts-0.4.9.jar b/mes-processes/mes-plcSend/target/lib/rxnetty-contexts-0.4.9.jar
deleted file mode 100644
index 90edb47..0000000
--- a/mes-processes/mes-plcSend/target/lib/rxnetty-contexts-0.4.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/rxnetty-servo-0.4.9.jar b/mes-processes/mes-plcSend/target/lib/rxnetty-servo-0.4.9.jar
deleted file mode 100644
index 7899d18..0000000
--- a/mes-processes/mes-plcSend/target/lib/rxnetty-servo-0.4.9.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/screw-core-1.0.5.jar b/mes-processes/mes-plcSend/target/lib/screw-core-1.0.5.jar
deleted file mode 100644
index c81e6c0..0000000
--- a/mes-processes/mes-plcSend/target/lib/screw-core-1.0.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/sdk-client-0.6.12.jar b/mes-processes/mes-plcSend/target/lib/sdk-client-0.6.12.jar
deleted file mode 100644
index fb096bb..0000000
--- a/mes-processes/mes-plcSend/target/lib/sdk-client-0.6.12.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/sdk-core-0.6.12.jar b/mes-processes/mes-plcSend/target/lib/sdk-core-0.6.12.jar
deleted file mode 100644
index af64759..0000000
--- a/mes-processes/mes-plcSend/target/lib/sdk-core-0.6.12.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/serverBase-1.0.0.jar b/mes-processes/mes-plcSend/target/lib/serverBase-1.0.0.jar
deleted file mode 100644
index 99e279b..0000000
--- a/mes-processes/mes-plcSend/target/lib/serverBase-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/servo-core-0.12.21.jar b/mes-processes/mes-plcSend/target/lib/servo-core-0.12.21.jar
deleted file mode 100644
index 731431d..0000000
--- a/mes-processes/mes-plcSend/target/lib/servo-core-0.12.21.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/simpleclient-0.5.0.jar b/mes-processes/mes-plcSend/target/lib/simpleclient-0.5.0.jar
deleted file mode 100644
index c7a24c6..0000000
--- a/mes-processes/mes-plcSend/target/lib/simpleclient-0.5.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/slf4j-api-1.7.28.jar b/mes-processes/mes-plcSend/target/lib/slf4j-api-1.7.28.jar
deleted file mode 100644
index 94e7902..0000000
--- a/mes-processes/mes-plcSend/target/lib/slf4j-api-1.7.28.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/snakeyaml-1.23.jar b/mes-processes/mes-plcSend/target/lib/snakeyaml-1.23.jar
deleted file mode 100644
index adcef4f..0000000
--- a/mes-processes/mes-plcSend/target/lib/snakeyaml-1.23.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-aop-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-aop-5.1.9.RELEASE.jar
deleted file mode 100644
index 0110e7b..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-aop-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-beans-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-beans-5.1.9.RELEASE.jar
deleted file mode 100644
index fbae4d6..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-beans-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-2.1.8.RELEASE.jar
deleted file mode 100644
index 91cafab..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-autoconfigure-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-autoconfigure-2.1.8.RELEASE.jar
deleted file mode 100644
index 5f9c0b0..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-autoconfigure-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-2.1.8.RELEASE.jar
deleted file mode 100644
index 108ec36..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-aop-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-aop-2.1.8.RELEASE.jar
deleted file mode 100644
index 653d7e1..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-aop-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-data-redis-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-data-redis-2.1.8.RELEASE.jar
deleted file mode 100644
index cb11c3c..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-data-redis-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-jdbc-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-jdbc-2.1.8.RELEASE.jar
deleted file mode 100644
index 76eed16..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-jdbc-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-json-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-json-2.1.8.RELEASE.jar
deleted file mode 100644
index dd95ac9..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-json-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-logging-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-logging-2.1.8.RELEASE.jar
deleted file mode 100644
index b3e5089..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-logging-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-security-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-security-2.1.8.RELEASE.jar
deleted file mode 100644
index 59f4b13..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-security-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-tomcat-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-tomcat-2.1.8.RELEASE.jar
deleted file mode 100644
index 667552c..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-tomcat-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-web-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-web-2.1.8.RELEASE.jar
deleted file mode 100644
index bd0a01a..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-web-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-websocket-2.1.8.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-boot-starter-websocket-2.1.8.RELEASE.jar
deleted file mode 100644
index fa3da4e..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-boot-starter-websocket-2.1.8.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar
deleted file mode 100644
index d1c519d..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-commons-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-commons-2.1.3.RELEASE.jar
deleted file mode 100644
index 7d834de..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-commons-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-context-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-context-2.1.3.RELEASE.jar
deleted file mode 100644
index 1dc53b4..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-context-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-netflix-archaius-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-netflix-archaius-2.1.3.RELEASE.jar
deleted file mode 100644
index 2bacf11..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-netflix-archaius-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-netflix-ribbon-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-netflix-ribbon-2.1.3.RELEASE.jar
deleted file mode 100644
index 1094036..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-netflix-ribbon-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-openfeign-core-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-openfeign-core-2.1.3.RELEASE.jar
deleted file mode 100644
index b081ea3..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-openfeign-core-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-2.1.3.RELEASE.jar
deleted file mode 100644
index adc47b9..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-alibaba-nacos-discovery-2.1.0.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-alibaba-nacos-discovery-2.1.0.RELEASE.jar
deleted file mode 100644
index babe87f..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-alibaba-nacos-discovery-2.1.0.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-netflix-archaius-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-netflix-archaius-2.1.3.RELEASE.jar
deleted file mode 100644
index 203946c..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-netflix-archaius-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-netflix-ribbon-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-netflix-ribbon-2.1.3.RELEASE.jar
deleted file mode 100644
index 4a4df17..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-netflix-ribbon-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-openfeign-2.1.3.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-openfeign-2.1.3.RELEASE.jar
deleted file mode 100644
index 664999a..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-cloud-starter-openfeign-2.1.3.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-context-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-context-5.1.9.RELEASE.jar
deleted file mode 100644
index 3a5f4d0..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-context-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-context-support-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-context-support-5.1.9.RELEASE.jar
deleted file mode 100644
index dc6e76d..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-context-support-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-core-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-core-5.1.9.RELEASE.jar
deleted file mode 100644
index b6c0ea6..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-core-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-data-commons-2.1.10.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-data-commons-2.1.10.RELEASE.jar
deleted file mode 100644
index 0ec5e35..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-data-commons-2.1.10.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-data-keyvalue-2.1.10.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-data-keyvalue-2.1.10.RELEASE.jar
deleted file mode 100644
index a74ab85..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-data-keyvalue-2.1.10.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-data-redis-2.1.10.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-data-redis-2.1.10.RELEASE.jar
deleted file mode 100644
index f100cb9..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-data-redis-2.1.10.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-expression-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-expression-5.1.9.RELEASE.jar
deleted file mode 100644
index 2d04615..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-expression-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-jcl-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-jcl-5.1.9.RELEASE.jar
deleted file mode 100644
index f47ef26..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-jcl-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-jdbc-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-jdbc-5.1.9.RELEASE.jar
deleted file mode 100644
index 1452219..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-jdbc-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-messaging-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-messaging-5.1.9.RELEASE.jar
deleted file mode 100644
index a9f4ef6..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-messaging-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-oxm-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-oxm-5.1.9.RELEASE.jar
deleted file mode 100644
index 49e5ad3..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-oxm-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-plugin-core-2.0.0.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-plugin-core-2.0.0.RELEASE.jar
deleted file mode 100644
index ea8d833..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-plugin-core-2.0.0.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-plugin-metadata-1.2.0.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-plugin-metadata-1.2.0.RELEASE.jar
deleted file mode 100644
index 6eaa98c..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-plugin-metadata-1.2.0.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-security-config-5.1.6.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-security-config-5.1.6.RELEASE.jar
deleted file mode 100644
index 73d199a..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-security-config-5.1.6.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-security-core-5.1.6.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-security-core-5.1.6.RELEASE.jar
deleted file mode 100644
index 2c48921..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-security-core-5.1.6.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-security-crypto-5.1.6.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-security-crypto-5.1.6.RELEASE.jar
deleted file mode 100644
index 27f6201..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-security-crypto-5.1.6.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-security-rsa-1.0.7.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-security-rsa-1.0.7.RELEASE.jar
deleted file mode 100644
index 67996ea..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-security-rsa-1.0.7.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-security-web-5.1.6.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-security-web-5.1.6.RELEASE.jar
deleted file mode 100644
index fbc7fb5..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-security-web-5.1.6.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-tx-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-tx-5.1.9.RELEASE.jar
deleted file mode 100644
index c8c1b72..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-tx-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-web-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-web-5.1.9.RELEASE.jar
deleted file mode 100644
index 6f5e889..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-web-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-webmvc-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-webmvc-5.1.9.RELEASE.jar
deleted file mode 100644
index 09b6b95..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-webmvc-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/spring-websocket-5.1.9.RELEASE.jar b/mes-processes/mes-plcSend/target/lib/spring-websocket-5.1.9.RELEASE.jar
deleted file mode 100644
index e65de3f..0000000
--- a/mes-processes/mes-plcSend/target/lib/spring-websocket-5.1.9.RELEASE.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springSecurity-1.0.0.jar b/mes-processes/mes-plcSend/target/lib/springSecurity-1.0.0.jar
deleted file mode 100644
index 4d86e0c..0000000
--- a/mes-processes/mes-plcSend/target/lib/springSecurity-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-bean-validators-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-bean-validators-2.10.5.jar
deleted file mode 100644
index 3ab7359..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-bean-validators-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-core-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-core-2.10.5.jar
deleted file mode 100644
index 75d14d5..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-core-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-schema-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-schema-2.10.5.jar
deleted file mode 100644
index 9e400f7..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-schema-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-spi-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-spi-2.10.5.jar
deleted file mode 100644
index 2131def..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-spi-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-spring-web-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-spring-web-2.10.5.jar
deleted file mode 100644
index 0af829b..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-spring-web-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-spring-webmvc-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-spring-webmvc-2.10.5.jar
deleted file mode 100644
index 89703cd..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-spring-webmvc-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-swagger-common-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-swagger-common-2.10.5.jar
deleted file mode 100644
index 0b3172c..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-swagger-common-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/springfox-swagger2-2.10.5.jar b/mes-processes/mes-plcSend/target/lib/springfox-swagger2-2.10.5.jar
deleted file mode 100644
index 8d78e4c..0000000
--- a/mes-processes/mes-plcSend/target/lib/springfox-swagger2-2.10.5.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/stack-client-0.6.12.jar b/mes-processes/mes-plcSend/target/lib/stack-client-0.6.12.jar
deleted file mode 100644
index 61c671f..0000000
--- a/mes-processes/mes-plcSend/target/lib/stack-client-0.6.12.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/stack-core-0.6.12.jar b/mes-processes/mes-plcSend/target/lib/stack-core-0.6.12.jar
deleted file mode 100644
index d3f8712..0000000
--- a/mes-processes/mes-plcSend/target/lib/stack-core-0.6.12.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/stax-ex-1.8.jar b/mes-processes/mes-plcSend/target/lib/stax-ex-1.8.jar
deleted file mode 100644
index 5e60637..0000000
--- a/mes-processes/mes-plcSend/target/lib/stax-ex-1.8.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/strict-machine-0.6.jar b/mes-processes/mes-plcSend/target/lib/strict-machine-0.6.jar
deleted file mode 100644
index 02e5e16..0000000
--- a/mes-processes/mes-plcSend/target/lib/strict-machine-0.6.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/swagger-annotations-1.5.22.jar b/mes-processes/mes-plcSend/target/lib/swagger-annotations-1.5.22.jar
deleted file mode 100644
index bdd68c5..0000000
--- a/mes-processes/mes-plcSend/target/lib/swagger-annotations-1.5.22.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/swagger-models-1.5.22.jar b/mes-processes/mes-plcSend/target/lib/swagger-models-1.5.22.jar
deleted file mode 100644
index 831e340..0000000
--- a/mes-processes/mes-plcSend/target/lib/swagger-models-1.5.22.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/tomcat-embed-core-9.0.24.jar b/mes-processes/mes-plcSend/target/lib/tomcat-embed-core-9.0.24.jar
deleted file mode 100644
index 50e7252..0000000
--- a/mes-processes/mes-plcSend/target/lib/tomcat-embed-core-9.0.24.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/tomcat-embed-el-9.0.24.jar b/mes-processes/mes-plcSend/target/lib/tomcat-embed-el-9.0.24.jar
deleted file mode 100644
index 69793d0..0000000
--- a/mes-processes/mes-plcSend/target/lib/tomcat-embed-el-9.0.24.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/tomcat-embed-websocket-9.0.24.jar b/mes-processes/mes-plcSend/target/lib/tomcat-embed-websocket-9.0.24.jar
deleted file mode 100644
index dadb788..0000000
--- a/mes-processes/mes-plcSend/target/lib/tomcat-embed-websocket-9.0.24.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/txw2-2.3.1.jar b/mes-processes/mes-plcSend/target/lib/txw2-2.3.1.jar
deleted file mode 100644
index 75ed519..0000000
--- a/mes-processes/mes-plcSend/target/lib/txw2-2.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/validation-api-2.0.1.Final.jar b/mes-processes/mes-plcSend/target/lib/validation-api-2.0.1.Final.jar
deleted file mode 100644
index 2368e10..0000000
--- a/mes-processes/mes-plcSend/target/lib/validation-api-2.0.1.Final.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/velocity-engine-core-2.0.jar b/mes-processes/mes-plcSend/target/lib/velocity-engine-core-2.0.jar
deleted file mode 100644
index c48d660..0000000
--- a/mes-processes/mes-plcSend/target/lib/velocity-engine-core-2.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/lib/xmlbeans-3.1.0.jar b/mes-processes/mes-plcSend/target/lib/xmlbeans-3.1.0.jar
deleted file mode 100644
index 18e568f..0000000
--- a/mes-processes/mes-plcSend/target/lib/xmlbeans-3.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/maven-archiver/pom.properties b/mes-processes/mes-plcSend/target/maven-archiver/pom.properties
deleted file mode 100644
index 9c840cc..0000000
--- a/mes-processes/mes-plcSend/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=mes-plcSend
-groupId=com.mes
-version=1.0.0
diff --git a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 56bde35..0000000
--- a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-com\mes\entity\LoadJobData.class
-com\mes\PlcSendApplication.class
-com\mes\entity\RawStorageJobData.class
diff --git a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 7242eb1..0000000
--- a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\work\PlcTaskSend\mes-processes\mes-plcSend\src\main\java\com\mes\job\RawStoragePlcSendJob.java
-D:\work\PlcTaskSend\mes-processes\mes-plcSend\src\main\java\com\mes\PlcSendApplication.java
-D:\work\PlcTaskSend\mes-processes\mes-plcSend\src\main\java\com\mes\entity\LoadJobData.java
-D:\work\PlcTaskSend\mes-processes\mes-plcSend\src\main\java\com\mes\entity\RawStorageJobData.java
-D:\work\PlcTaskSend\mes-processes\mes-plcSend\src\main\java\com\mes\job\PlcSendJob.java
diff --git a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index e69de29..0000000
--- a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
diff --git a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000
--- a/mes-processes/mes-plcSend/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
diff --git a/mes-processes/mes-plcSend/target/mes-plcSend-1.0.0.jar b/mes-processes/mes-plcSend/target/mes-plcSend-1.0.0.jar
deleted file mode 100644
index 7a732b7..0000000
--- a/mes-processes/mes-plcSend/target/mes-plcSend-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/mes-processes/mes-plcSend/target/mes-plcSend-1.0.0.jar.original b/mes-processes/mes-plcSend/target/mes-plcSend-1.0.0.jar.original
deleted file mode 100644
index f3d31fa..0000000
--- a/mes-processes/mes-plcSend/target/mes-plcSend-1.0.0.jar.original
+++ /dev/null
Binary files differ
diff --git a/mes-web/src/views/plcTest/Test.vue b/mes-web/src/views/plcTest/Test.vue
index e58fd10..a2f3450 100644
--- a/mes-web/src/views/plcTest/Test.vue
+++ b/mes-web/src/views/plcTest/Test.vue
@@ -1,551 +1,899 @@
<template>
- <div class="auto-test-dashboard">
- <!-- 椤堕儴瀵艰埅鍖� -->
- <el-header class="header">
- <h1>MES鑷姩鍖栨祴璇曞钩鍙�</h1>
- <div class="header-actions">
- <el-button type="primary" @click="showModuleStatus">鏌ョ湅妯″潡鐘舵��</el-button>
- <el-button type="primary" @click="importTask">瀵煎叆娴嬭瘯浠诲姟</el-button>
- <el-button type="success" @click="startTest" :disabled="!isConfigReady">寮�濮嬫祴璇�</el-button>
- <el-button type="warning" @click="batchTest" :disabled="batchTasks.length === 0">鎵归噺娴嬭瘯</el-button>
- <el-button @click="resetAll">閲嶇疆閰嶇疆</el-button>
+ <div class="dashboard-container">
+ <div class="dashboard-header">
+ <div class="header-left">
+ <h2>MES娴嬭瘯绯荤粺</h2>
</div>
- </el-header>
-
- <!-- 涓讳綋鍐呭鍖� -->
- <el-container>
- <!-- 宸︿晶锛氭ā鍧楅厤缃笌瀛楁閫夋嫨 -->
- <el-aside width="320px" class="aside">
- <el-card class="config-card">
- <h3 class="section-title">妯″潡閰嶇疆</h3>
- <el-select v-model="selectedModule" @change="handleModuleChange" placeholder="閫夋嫨娴嬭瘯妯″潡" style="width: 100%">
- <el-option label="榫欓棬浠撳偍" value="gantryStorage"></el-option>
- <el-option label="涓婄墖妯″潡" value="upperModule"></el-option>
- <el-option label="绌挎浠撳偍" value="storageModule"></el-option>
- </el-select>
-
- <h3 class="section-title">鍗忚瀛楁閫夋嫨</h3>
- <el-checkbox-group v-model="checkedFields" class="field-checkbox-group">
- <el-checkbox v-for="field in allFields" :key="field.value" :label="field.value"
- :disabled="isSystemField(field.value)">
- {{ field.label }}
- </el-checkbox>
- </el-checkbox-group>
-
- <h3 class="section-title">娴嬭瘯鍙傛暟閰嶇疆</h3>
- <el-form :model="testParameters" label-width="120px" class="parameter-form">
- <el-form-item label="PlC鍦板潃">
- <el-input v-model="testParameters.plcAddress" :min="0" :max="100" size="small"></el-input>
+ <div class="header-right">
+ <el-button type="success" @click="startTest">
+ <i class="el-icon-play"></i> 寮�濮嬫祴璇�
+ </el-button>
+ <el-button type="warning" @click="stopTest">
+ <i class="el-icon-stop"></i> 鍋滄娴嬭瘯
+ </el-button>
+ </div>
+ </div>
+
+ <div class="dashboard-content">
+ <el-aside width="400px" class="config-aside">
+ <el-card class="config-section">
+ <h3><i class="el-icon-sitemap"></i> 椤圭洰閰嶇疆</h3>
+ <el-form label-width="100px" size="">
+ <el-form-item label="椤圭洰閫夋嫨">
+ <el-select v-model="selectedProject" placeholder="璇烽�夋嫨椤圭洰" @change="handleProjectChange" class="full-width">
+ <el-option
+ v-for="project in projectList"
+ :key="project.value"
+ :label="project.label"
+ :value="project.value">
+ </el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="DB鍧�">
- <el-input v-model="testParameters.dbAddress" :min="0" :max="100" size="small"></el-input>
- </el-form-item>
- <el-form-item label="浠诲姟閲嶈瘯娆℃暟">
- <el-input-number v-model="testParameters.retryCount" :min="0" :max="10" size="small"></el-input-number>
- </el-form-item>
- <el-form-item label="娴嬭瘯闂撮殧(ms)">
- <el-input-number v-model="testParameters.interval" :min="100" :max="10000" size="small"></el-input-number>
- </el-form-item>
- <el-form-item label="妯℃嫙鏁呴殰姒傜巼">
- <el-slider v-model="testParameters.failureRate" :min="0" :max="100" show-stops></el-slider>
+
+ <el-form-item label="妯″潡閫夋嫨">
+ <el-select v-model="selectedModule" placeholder="璇烽�夋嫨妯″潡" @change="handleModuleChange" class="full-width">
+ <el-option
+ v-for="module in availableModules"
+ :key="module"
+ :label="module"
+ :value="module">
+ </el-option>
+ </el-select>
</el-form-item>
</el-form>
-
- <div class="test-actions">
- <el-button type="primary" size="small" @click="saveCurrentConfig">淇濆瓨閰嶇疆</el-button>
- <el-button size="small" @click="loadConfig">鍔犺浇閰嶇疆</el-button>
+ </el-card>
+
+ <el-card class="config-section">
+ <h3><i class="el-icon-list"></i> 鍗忚瀛楁閰嶇疆</h3>
+ <div class="field-container">
+ <div class="field-header">
+ <span>瀛楁鍒楄〃</span>
+ <el-button type="text" size="small" icon="el-icon-plus" @click="addNewField" class="add-btn">娣诲姞瀛楁</el-button>
+ </div>
+ <div class="field-list">
+ <div v-for="field in allFields" :key="field.value" class="field-item">
+ <div class="field-info">
+ <el-checkbox v-model="checkedFields" :label="field.value">{{ field.label }}</el-checkbox>
+ </div>
+ <div class="field-address">
+ <span class="field-address-label">DB鍧楃储寮�:</span>
+ <el-input v-model="field.address" size="mini" placeholder="杈撳叆DB鍧楃储寮�" style="width: 100px;"></el-input>
+ </div>
+ <el-button v-if="!isSystemField(field.value)" type="text" size="mini" icon="el-icon-delete" class="remove-btn" @click="removeField(field.value)"></el-button>
+ </div>
+ </div>
+ </div>
+ </el-card>
+
+ <el-card class="config-section">
+ <h3><i class="el-icon-sliders"></i> 娴嬭瘯鍙傛暟閰嶇疆</h3>
+ <el-form :model="testParameters" label-width="100px" size="small">
+ <el-form-item label="PLC鍦板潃">
+ <el-input v-model="testParameters.plcAddress" placeholder="杈撳叆PLC鍦板潃"></el-input>
+ </el-form-item>
+ <el-form-item label="DB鍧�">
+ <el-input v-model="testParameters.dbAddress" placeholder="杈撳叆DB鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label="瓒呮椂鏃堕棿">
+ <el-input-number v-model="testParameters.timeout" :min="1" :max="60" controls-position="right"></el-input-number>
+ <span style="margin-left: 10px;">绉�</span>
+ </el-form-item>
+ <el-form-item label="閲嶈瘯娆℃暟">
+ <el-input-number v-model="testParameters.retryCount" :min="0" :max="10" controls-position="right"></el-input-number>
+ <span style="margin-left: 10px;">娆�</span>
+ </el-form-item>
+ </el-form>
+
+ <div style="margin-top: 15px; text-align: center;">
+ <el-button type="primary" @click="saveCurrentConfig">淇濆瓨閰嶇疆</el-button>
+ <el-button @click="resetConfig">閲嶇疆閰嶇疆</el-button>
</div>
</el-card>
</el-aside>
-
- <!-- 鍙充晶锛氫换鍔＄洃鎺т笌缁撴灉灞曠ず -->
- <el-main class="main">
- <!-- 鎵归噺娴嬭瘯閰嶇疆 -->
- <el-card class="batch-test-card" v-if="showBatchTestConfig">
- <h3 class="section-title">鎵归噺娴嬭瘯閰嶇疆</h3>
- <el-table :data="batchTasks" style="width: 100%">
- <el-table-column prop="module" label="妯″潡" width="120"></el-table-column>
- <el-table-column prop="start" label="璧峰浣嶇疆" width="100"></el-table-column>
- <el-table-column prop="target" label="鐩爣浣嶇疆" width="100"></el-table-column>
- <el-table-column prop="retryCount" label="閲嶈瘯娆℃暟" width="100"></el-table-column>
- <el-table-column label="鎿嶄綔" width="80">
- <template #default="scope">
- <el-button type="danger" size="mini" @click="removeBatchTask(scope.$index)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <div class="batch-actions">
- <el-button type="primary" size="small" @click="addCurrentToBatch">娣诲姞褰撳墠閰嶇疆</el-button>
- <el-button type="success" size="small" @click="startBatchTest">鎵ц鎵归噺娴嬭瘯</el-button>
+
+ <el-main class="monitor-main">
+ <div class="monitor-section">
+ <div class="section-header">
+ <h3><i class="el-icon-monitor"></i> 浠诲姟鐩戞帶</h3>
+ <div class="section-actions">
+ <el-button type="primary" size="small" @click="showBatchTestDialog">
+ <i class="el-icon-files"></i> 鎵归噺娴嬭瘯
+ </el-button>
+ <el-button type="success" size="small" @click="showImportDialog">
+ <i class="el-icon-upload2"></i> 瀵煎叆浠诲姟
+ </el-button>
+ <el-button size="small" @click="refreshTasks">
+ <i class="el-icon-refresh"></i> 鍒锋柊
+ </el-button>
+ </div>
</div>
- </el-card>
-
- <!-- 浠诲姟娴佽浆鏃堕棿绾� -->
- <div class="timeline-section">
- <h3 class="section-title">浠诲姟娴佽浆鐩戞祴</h3>
- <div class="timeline-container" v-if="runningTasks.length > 0">
- <el-timeline v-for="(task, index) in runningTasks" :key="index" class="task-timeline">
- <el-timeline-item v-for="(event, eventIndex) in task.timeline" :key="eventIndex" :timestamp="event.time"
- :type="event.status" :color="getStatusColor(event.status)" :icon="getEventIcon(event.status)">
- {{ event.desc }}
- </el-timeline-item>
- </el-timeline>
+
+ <div class="task-container">
+ <h4>褰撳墠浠诲姟</h4>
+ <div v-if="currentTasks.length === 0" class="empty-state">
+ <div class="empty-icon"><i class="el-icon-clipboard"></i></div>
+ <div class="empty-text">鏆傛棤浠诲姟</div>
+ </div>
+ <div v-else class="task-list">
+ <div v-for="task in currentTasks" :key="task.id" class="task-item" @click="showTaskDetail(task)">
+ <div class="task-info">
+ <span class="task-id">{{ task.id }}</span>
+ <span class="task-module">{{ task.module }}</span>
+ <span class="task-project">{{ task.project }}</span>
+ </div>
+ <el-tag :type="getStatusType(task.status)">{{ task.status }}</el-tag>
+ </div>
+ </div>
</div>
- <div class="empty-state" v-else>
- <el-empty description="鏆傛棤杩愯涓殑浠诲姟" />
+
+ <div class="result-container">
+ <h4>娴嬭瘯缁撴灉缁熻</h4>
+ <div class="result-stats">
+ <div class="stat-item">
+ <div class="stat-number">{{ testStats.total }}</div>
+ <div class="stat-label">鎬绘祴璇曟暟</div>
+ </div>
+ <div class="stat-item">
+ <div class="stat-number pass">{{ testStats.passed }}</div>
+ <div class="stat-label">閫氳繃</div>
+ </div>
+ <div class="stat-item">
+ <div class="stat-number fail">{{ testStats.failed }}</div>
+ <div class="stat-label">澶辫触</div>
+ </div>
+ <div class="stat-item">
+ <div class="stat-number">{{ testStats.running }}</div>
+ <div class="stat-label">杩涜涓�</div>
+ </div>
+ </div>
</div>
- </div>
-
- <!-- 娴嬭瘯缁撴灉缁熻 -->
- <div class="result-section mt-20">
- <h3 class="section-title">娴嬭瘯缁撴灉缁熻</h3>
- <el-row :gutter="20">
- <el-col :span="6">
- <el-card class="result-card">
- <div class="result-item">
- <span class="label">鎬讳换鍔℃暟</span>
- <span class="value">{{ taskCount.total }}</span>
- </div>
- </el-card>
- </el-col>
- <el-col :span="6">
- <el-card class="result-card">
- <div class="result-item">
- <span class="label">閫氳繃鏁�</span>
- <span class="value success">{{ taskCount.pass }}</span>
- </div>
- </el-card>
- </el-col>
- <el-col :span="6">
- <el-card class="result-card">
- <div class="result-item">
- <span class="label">澶辫触鏁�</span>
- <span class="value error">{{ taskCount.fail }}</span>
- </div>
- </el-card>
- </el-col>
- <el-col :span="6">
- <el-card class="result-card">
- <div class="result-item">
- <span class="label">閫氳繃鐜�</span>
- <span class="value"
- :class="{ success: taskCount.total > 0 && taskCount.pass / taskCount.total > 0.9, error: taskCount.total > 0 && taskCount.pass / taskCount.total < 0.5 }">
- {{ calculatePassRate() }}%
- </span>
- </div>
- </el-card>
- </el-col>
- </el-row>
-
- <div class="result-table-container">
- <el-table :data="testResults" style="width: 100%" border>
- <el-table-column prop="module" label="妯″潡"></el-table-column>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�"></el-table-column>
- <el-table-column prop="endTime" label="缁撴潫鏃堕棿"></el-table-column>
- <el-table-column prop="status" label="鐘舵��" width="80">
- <template #default="scope">
- <el-tag :type="scope.row.status === '閫氳繃' ? 'success' : 'error'" size="small">
- {{ scope.row.status }}
- </el-tag>
+
+ <div class="result-list">
+ <h4>娴嬭瘯缁撴灉</h4>
+ <el-table
+ :data="testResults"
+ style="width: 100%"
+ border
+ stripe
+ :cell-style="{ padding: '8px 10px' }">
+ <el-table-column prop="id" label="浠诲姟ID" width="100"></el-table-column>
+ <el-table-column prop="project" label="椤圭洰" width="120"></el-table-column>
+ <el-table-column prop="module" label="妯″潡" width="120"></el-table-column>
+ <el-table-column prop="field" label="瀛楁" width="120"></el-table-column>
+ <el-table-column prop="status" label="鐘舵��" width="100">
+ <template slot-scope="scope">
+ <el-tag :type="getStatusType(scope.row.status)">{{ scope.row.status }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="duration" label="鑰楁椂(绉�)"></el-table-column>
- <el-table-column prop="retryCount" label="閲嶈瘯娆℃暟"></el-table-column>
- <el-table-column prop="errorMsg" label="閿欒淇℃伅" v-if="showErrorColumn"
- :show-overflow-tooltip="true"></el-table-column>
- <el-table-column label="鎿嶄綔" width="100">
- <template #default="scope">
- <el-button type="text" size="small" @click="viewTaskDetail(scope.row)">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" size="small" @click="retryTask(scope.row)">閲嶈瘯</el-button>
- </template>
- </el-table-column>
+ <el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="160"></el-table-column>
+ <el-table-column prop="duration" label="鑰楁椂" width="100"></el-table-column>
+ <el-table-column prop="result" label="缁撴灉"></el-table-column>
</el-table>
</div>
</div>
</el-main>
- </el-container>
-
- <!-- 瀵煎叆浠诲姟寮圭獥 -->
- <el-dialog title="瀵煎叆娴嬭瘯浠诲姟" v-model="importDialogVisible" width="50%">
- <el-upload class="upload-demo" action="#" :auto-upload="false" :on-change="handleFileChange"
- :before-upload="beforeFileUpload" drag>
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">鎷栨嫿鏂囦欢鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- <template #tip>
- <div class="el-upload__tip">浠呮敮鎸丒xcel/JSON鏍煎紡锛屽ぇ灏忎笉瓒呰繃5MB</div>
- </template>
- </el-upload>
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="importDialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="confirmImport">纭瀵煎叆</el-button>
- </div>
- </template>
- </el-dialog>
-
- <!-- 妯″潡鐘舵�佸脊绐� -->
- <el-dialog title="PLC妯″潡鐘舵��" v-model="statusDialogVisible" width="70%">
- <div class="status-container">
- <el-tabs v-model="activeStatusTab" @tab-click="handleStatusTabClick">
- <el-tab-pane label="榫欓棬浠撳偍" name="gantryStorage"></el-tab-pane>
- <el-tab-pane label="涓婄墖妯″潡" name="upperModule"></el-tab-pane>
- <el-tab-pane label="绌挎浠撳偍" name="storageModule"></el-tab-pane>
- </el-tabs>
- <el-table :data="statusTableData" style="width: 100%" border v-if="statusTableData.length > 0">
- <el-table-column prop="key" label="鍙傛暟鍚嶇О"></el-table-column>
- <el-table-column prop="value" label="褰撳墠鍊�"></el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿"></el-table-column>
- </el-table>
- <div v-else class="empty-status">
- <el-empty description="鏆傛棤鐘舵�佹暟鎹�" />
- </div>
- <div class="status-actions">
- <el-button type="primary" size="small" @click="refreshModuleStatus">鍒锋柊鐘舵��</el-button>
- <el-button type="warning" size="small" @click="resetModuleStatus">閲嶇疆妯″潡</el-button>
+ </div>
+
+ <!-- 鎵归噺娴嬭瘯寮圭獥 -->
+ <el-dialog title="鎵归噺娴嬭瘯" :visible.sync="batchTestDialogVisible" width="60%">
+ <div class="batch-test-container">
+ <el-form :model="batchTestForm" label-width="100px">
+ <el-form-item label="椤圭洰閫夋嫨">
+ <el-select v-model="batchTestForm.projectIds" multiple placeholder="璇烽�夋嫨椤圭洰" style="width: 100%">
+ <el-option
+ v-for="project in projectList"
+ :key="project.value"
+ :label="project.label"
+ :value="project.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="妯″潡閫夋嫨">
+ <el-checkbox-group v-model="batchTestForm.modules">
+ <el-checkbox v-for="module in availableModules" :key="module" :label="module">{{ module }}</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+
+ <el-form-item label="娴嬭瘯瀛楁">
+ <el-transfer
+ v-model="batchTestForm.selectedFields"
+ :data="allFields.map(field => ({key: field.value, label: field.label}))"
+ :titles="['鍙�夊瓧娈�', '宸查�夊瓧娈�']"
+ :props="{key: 'key', label: 'label'}">
+ </el-transfer>
+ </el-form-item>
+ </el-form>
+
+ <div class="batch-footer">
+ <el-button @click="batchTestDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="startBatchTest">寮�濮嬫壒閲忔祴璇�</el-button>
</div>
</div>
</el-dialog>
-
+
+ <!-- 浠诲姟瀵煎叆寮圭獥 -->
+ <el-dialog title="瀵煎叆浠诲姟" :visible.sync="importDialogVisible" width="50%">
+ <el-upload
+ class="upload-demo"
+ drag
+ action="/api/plcSend/test/import"
+ :on-success="handleImportSuccess"
+ :before-upload="beforeUpload">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip" slot="tip">鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10MB</div>
+ </el-upload>
+
+ <div class="import-footer">
+ <el-button @click="importDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="confirmImport">纭瀵煎叆</el-button>
+ </div>
+ </el-dialog>
+
<!-- 浠诲姟璇︽儏寮圭獥 -->
- <el-dialog title="浠诲姟璇︽儏" v-model="taskDetailVisible" width="60%">
- <div class="task-detail">
- <div class="detail-section">
- <h4>鍩烘湰淇℃伅</h4>
- <el-descriptions :column="2" :border="true">
- <el-descriptions-item label="浠诲姟ID">{{ currentTaskDetail.id }}</el-descriptions-item>
- <el-descriptions-item label="妯″潡">{{ currentTaskDetail.module }}</el-descriptions-item>
- <el-descriptions-item label="鐘舵��">{{ currentTaskDetail.status }}</el-descriptions-item>
- <el-descriptions-item label="鑰楁椂">{{ currentTaskDetail.duration }}绉�</el-descriptions-item>
- <el-descriptions-item label="寮�濮嬫椂闂�" :span="2">{{ currentTaskDetail.startTime }}</el-descriptions-item>
- <el-descriptions-item label="缁撴潫鏃堕棿" :span="2">{{ currentTaskDetail.endTime }}</el-descriptions-item>
- </el-descriptions>
- </div>
- <div class="detail-section">
- <h4>鎵ц鏃ュ織</h4>
+ <el-dialog title="浠诲姟璇︽儏" :visible.sync="taskDetailDialogVisible" width="60%">
+ <div class="task-detail-container" v-if="selectedTask">
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="浠诲姟ID">{{ selectedTask.id }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰">{{ selectedTask.project }}</el-descriptions-item>
+ <el-descriptions-item label="妯″潡">{{ selectedTask.module }}</el-descriptions-item>
+ <el-descriptions-item label="鐘舵��">
+ <el-tag :type="getStatusType(selectedTask.status)">{{ selectedTask.status }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="寮�濮嬫椂闂�">{{ selectedTask.startTime }}</el-descriptions-item>
+ <el-descriptions-item label="缁撴潫鏃堕棿">{{ selectedTask.endTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鑰楁椂">{{ selectedTask.duration || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鎵ц浜�">{{ selectedTask.operator || '-' }}</el-descriptions-item>
+ </el-descriptions>
+
+ <div class="task-timeline">
+ <h4>浠诲姟娴佽浆鏃堕棿绾�</h4>
<el-timeline>
- <el-timeline-item v-for="(event, index) in currentTaskDetail.timeline" :key="index" :timestamp="event.time"
- :type="event.status" :color="getStatusColor(event.status)">
- {{ event.desc }}
+ <el-timeline-item
+ v-for="(activity, index) in selectedTask.timeline"
+ :key="index"
+ :timestamp="activity.timestamp">
+ {{ activity.content }}
</el-timeline-item>
</el-timeline>
</div>
+ </div>
+ </el-dialog>
+
+ <!-- 妯″潡鐘舵�佸脊绐� -->
+ <el-dialog title="妯″潡鐘舵��" :visible.sync="moduleStatusDialogVisible" width="50%">
+ <div class="status-container">
+ <el-table
+ :data="moduleStatusData"
+ style="width: 100%"
+ border
+ stripe>
+ <el-table-column prop="module" label="妯″潡鍚嶇О"></el-table-column>
+ <el-table-column prop="status" label="鐘舵��" width="100">
+ <template slot-scope="scope">
+ <el-tag :type="getStatusType(scope.row.status)">{{ scope.row.status }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="lastUpdate" label="鏈�鍚庢洿鏂�"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="120">
+ <template slot-scope="scope">
+ <el-button size="mini" @click="checkModuleStatus(scope.row)">妫�鏌ョ姸鎬�</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
</el-dialog>
</div>
</template>
<script>
+// 鑴氭湰閮ㄥ垎淇濇寔涓嶅彉
+import axios from 'axios'
+import * as XLSX from 'xlsx'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
export default {
+ name: 'Test',
data() {
return {
- // 妯″潡閫夋嫨鍜屽瓧娈甸厤缃�
- selectedModule: 'gantryStorage',
- allFields: [
- { label: '鑱旀満鐘舵��', value: 'onlineStatus', isSystem: false },
- { label: 'PLC璇锋眰瀛�', value: 'plcRequest', isSystem: false },
- { label: 'PLC姹囨姤瀛�', value: 'plcReport', isSystem: false },
- { label: '瀹屾垚1A', value: 'complete1A', isSystem: false },
- { label: '瀹屾垚1B', value: 'complete1B', isSystem: false },
- { label: '浠诲姟鐘舵��', value: 'taskStatus', isSystem: true },
- { label: '绌挎杞�/澶╄溅浣嶇疆', value: 'shuttlePosition', isSystem: false },
- { label: '鍚哥洏/灏忚溅浣嶇疆', value: 'suctionPosition', isSystem: false },
- { label: 'MES浠诲姟鍙戦�佸瓧', value: 'mesSend', isSystem: true },
- { label: 'MES浠诲姟纭瀛�', value: 'mesConfirm', isSystem: true },
- { label: '璧峰', value: 'start', isSystem: true },
- { label: '鐩爣', value: 'target', isSystem: true },
- { label: '鐜荤拑鏁伴噺', value: 'glassCount', isSystem: false },
- { label: '1鍙疯竟璺�', value: 'edge1Margin', isSystem: false },
- { label: '1鍙烽暱杈�', value: 'edge1Long', isSystem: false },
- { label: '1鍙风煭杈�', value: 'edge1Short', isSystem: false },
- { label: '1鍙峰帤', value: 'edge1Thick', isSystem: false },
- { label: '2鍙疯竟璺�', value: 'edge2Margin', isSystem: false },
- { label: '2鍙烽暱杈�', value: 'edge2Long', isSystem: false },
- { label: '2鍙风煭杈�', value: 'edge2Short', isSystem: false },
- { label: '2鍙峰帤', value: 'edge2Thick', isSystem: false },
- { label: '鎶ヨ淇″彿', value: 'alarm', isSystem: true }
- ],
- checkedFields: [],
+ selectedProject: 'default', // 榛樿椤圭洰
+ selectedModule: '',
+ checkedFields: ['onlineState', 'plcRequest'],
+ projectList: [],
+ availableModules: ['gantryStorage', 'upperModule', 'storageModule'],
+ fieldDbIndexes: {},
+ allFields: [],
- // 娴嬭瘯鍙傛暟閰嶇疆
+ // 娴嬭瘯鍙傛暟
testParameters: {
- start: 1,
- target: 5,
- retryCount: 2,
+ plcAddress: '192.168.10.21',
+ dbAddress: 'DB38',
+ retryCount: 3,
interval: 1000,
- failureRate: 0
+ failureRate: 5,
+ timeout: 30
},
- // 鎵归噺娴嬭瘯鐩稿叧
- showBatchTestConfig: false,
+ // 鎵归噺娴嬭瘯
batchTasks: [],
+ showBatchTestConfig: false,
- // 浠诲姟鍜岀粨鏋�
+ // 浠诲姟鐩戞帶
runningTasks: [],
+ taskCount: {
+ total: 0,
+ pass: 0,
+ fail: 0
+ },
testResults: [],
- taskCount: { total: 0, pass: 0, fail: 0 },
// 寮圭獥鐘舵��
importDialogVisible: false,
- statusDialogVisible: false,
+ moduleStatusVisible: false,
taskDetailVisible: false,
- importFile: null,
+ currentTaskDetail: null,
- // 妯″潡鐘舵�佺浉鍏�
- activeStatusTab: 'gantryStorage',
- statusTableData: [],
+ // 鏂囦欢涓婁紶
+ uploadFile: null,
- // 褰撳墠浠诲姟璇︽儏
- currentTaskDetail: {},
+ // 瀹氭椂鍣�
+ statusTimer: null,
+ testTimer: null,
- // 鏄剧ず閿欒鍒�
+ // 绯荤粺瀛楁锛堜笉鍙彇娑堝嬀閫夛級
+ systemFields: ['onlineState', 'plcRequest', 'taskId'],
+
+ // 寮圭獥鐘舵��
+ batchTestDialogVisible: false,
+ taskDetailDialogVisible: false,
+ moduleStatusDialogVisible: false,
+
+ // 鎵归噺娴嬭瘯琛ㄥ崟
+ batchTestForm: {
+ projectIds: [],
+ modules: [],
+ selectedFields: []
+ },
+
+ // 浠诲姟鏁版嵁
+ currentTasks: [],
+ selectedTask: null,
+ testStats: {
+ total: 0,
+ passed: 0,
+ failed: 0,
+ running: 0
+ },
+ moduleStatusData: [],
+
+ // 閿欒淇℃伅鍒楁樉绀烘帶鍒�
showErrorColumn: false
};
},
-
computed: {
- // 鍒ゆ柇閰嶇疆鏄惁鍑嗗灏辩华
+ // 妫�鏌ラ厤缃槸鍚﹀噯澶囧氨缁�
isConfigReady() {
- return this.checkedFields.length > 0;
+ return this.selectedModule && this.checkedFields.length > 0;
}
},
-
mounted() {
- // 鍒濆鍖栨椂璁剧疆榛樿瀛楁
- this.setDefaultFieldsByModule(this.selectedModule);
- // 鍔犺浇鏈湴瀛樺偍鐨勯厤缃�
- this.loadLocalConfig();
+ // 椤甸潰鍔犺浇鏃惰幏鍙栭」鐩垪琛�
+ this.fetchProjectList();
+
+ // 鍔犺浇淇濆瓨鐨勯厤缃�
+ this.loadConfig();
+
+ // 鍚姩鐘舵�佺洃鎺�
+ this.startStatusMonitoring();
},
-
+ beforeUnmount() {
+ // 娓呯悊瀹氭椂鍣�
+ if (this.statusTimer) {
+ clearInterval(this.statusTimer);
+ }
+ if (this.testTimer) {
+ clearInterval(this.testTimer);
+ }
+ },
methods: {
- // 妯″潡鍒囨崲鏃惰缃粯璁ゅ瓧娈�
- handleModuleChange(module) {
- this.setDefaultFieldsByModule(module);
- },
-
- // 鏍规嵁妯″潡璁剧疆榛樿瀛楁
- setDefaultFieldsByModule(module) {
- if (module === 'gantryStorage') {
- this.checkedFields = this.allFields.map(field => field.value);
- } else if (module === 'shuttle') {
- this.checkedFields = [
- 'onlineStatus', 'plcRequest', 'plcReport',
- 'taskStatus', 'mesSend', 'mesConfirm',
- 'start', 'target', 'alarm'
- ];
- } else if (module === 'upperModule') {
- this.checkedFields = [
- 'onlineStatus', 'plcRequest', 'plcReport', 'taskStatus',
- 'mesSend', 'mesConfirm', 'start', 'target', 'alarm',
- 'complete1A', 'complete1B', 'glassCount'
- ];
- } else if (module === 'storageModule') {
- this.checkedFields = [
- 'onlineStatus', 'plcRequest', 'plcReport', 'taskStatus',
- 'mesSend', 'mesConfirm', 'start', 'target', 'alarm',
- 'shuttlePosition', 'suctionPosition'
- ];
+ // 鑾峰彇椤圭洰鍒楄〃
+ async fetchProjectList() {
+ try {
+ const response = await axios.get('/api/plcSend/address-mapping/list');
+ if (response.data && response.data.code === 200) {
+ this.projectList = response.data.data.map(item => ({
+ value: item.projectId,
+ label: item.projectName || item.projectId,
+ plcIp: item.plcIp,
+ dbArea: item.dbArea,
+ addressMapping: item.addressMapping,
+ remarks: item.remarks
+ }));
+
+ // 濡傛灉褰撳墠閫夋嫨鐨勯」鐩笉鍦ㄥ垪琛ㄤ腑锛岃缃负绗竴涓」鐩�
+ if (this.projectList.length > 0 && !this.projectList.find(p => p.value === this.selectedProject)) {
+ this.selectedProject = this.projectList[0].value;
+ this.handleProjectChange();
+ }
+ } else {
+ ElMessage.error('鑾峰彇椤圭洰鍒楄〃澶辫触');
+ }
+ } catch (error) {
+ console.error('鑾峰彇椤圭洰鍒楄〃澶辫触:', error);
+ ElMessage.error('鑾峰彇椤圭洰鍒楄〃澶辫触');
}
},
- // 鍒ゆ柇鏄惁涓虹郴缁熺骇蹇呴�夊瓧娈�
- isSystemField(fieldValue) {
- return this.allFields.find(item => item.value === fieldValue)?.isSystem || false;
- },
-
- // 瀵煎叆娴嬭瘯浠诲姟
- importTask() {
- this.importDialogVisible = true;
- },
-
- // 鏂囦欢涓婁紶鍓嶆鏌�
- beforeFileUpload(file) {
- const isExcel = file.type === 'application/vnd.ms-excel' || file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
- const isJson = file.type === 'application/json';
- const isLt5M = file.size / 1024 / 1024 < 5;
-
- if (!isExcel && !isJson) {
- this.$message.error('涓婁紶鏂囦欢鍙兘鏄� Excel 鎴� JSON 鏍煎紡!');
- return false;
- }
- if (!isLt5M) {
- this.$message.error('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 5MB!');
- return false;
- }
- return true;
- },
-
- // 鏂囦欢鏀瑰彉澶勭悊
- handleFileChange(file) {
- this.importFile = file.raw;
- },
-
- // 纭瀵煎叆
- confirmImport() {
- if (!this.importFile) {
- this.$message.warning('璇峰厛閫夋嫨鏂囦欢');
+ // 澶勭悊椤圭洰鍙樻洿
+ async handleProjectChange() {
+ // 纭繚projectList瀛樺湪涓斾笉鏄┖鏁扮粍
+ if (!this.projectList || this.projectList.length === 0) {
+ console.log('椤圭洰鍒楄〃鏈姞杞�');
return;
}
- // 妯℃嫙鏂囦欢瑙ｆ瀽閫昏緫
- const reader = new FileReader();
- reader.onload = (e) => {
- try {
- // 鏍规嵁鏂囦欢绫诲瀷瑙ｆ瀽
- if (this.importFile.name.endsWith('.json')) {
- const data = JSON.parse(e.target.result);
- if (data.batchTasks) {
- this.batchTasks = data.batchTasks;
- this.showBatchTestConfig = true;
- this.$message.success('鎵归噺娴嬭瘯浠诲姟瀵煎叆鎴愬姛');
- } else if (data.testParameters) {
- this.testParameters = data.testParameters;
- this.$message.success('娴嬭瘯鍙傛暟閰嶇疆瀵煎叆鎴愬姛');
+ const project = this.projectList.find(p => p.value === this.selectedProject);
+ if (project) {
+ // 鏇存柊PLC鍦板潃鍜孌B鍧�
+ this.testParameters.plcAddress = project.plcIp || 'null';
+ this.testParameters.dbAddress = project.dbArea || 'null';
+ this.selectedModule = project.remarks || 'null';
+
+ // 鑾峰彇瀹屾暣鐨勯」鐩厤缃紙鍖呭惈鍦板潃鏄犲皠锛�
+ if (this.selectedProject && this.selectedProject !== 'default') {
+ try {
+ const response = await axios.get(`/api/plcSend/address-mapping/project/config?projectId=${this.selectedProject}`);
+ if (response.data && response.data.code === 200 && response.data.data) {
+ const projectConfig = response.data.data;
+ // 浣跨敤瀹屾暣鐨勫湴鍧�鏄犲皠鏇存柊瀛楁閰嶇疆
+ if (projectConfig.addressMapping) {
+ this.updateFieldAddresses(projectConfig.addressMapping);
+ }
+ } else {
+ console.error('鑾峰彇椤圭洰閰嶇疆澶辫触:', response.data?.message);
+ // 鍥為��鍒颁娇鐢ㄩ」鐩垪琛ㄤ腑鐨勫湴鍧�鏄犲皠
+ if (project.addressMapping) {
+ try {
+ const addressMapping = JSON.parse(project.addressMapping);
+ this.updateFieldAddresses(addressMapping);
+ } catch (e) {
+ console.error('瑙ｆ瀽鍦板潃鏄犲皠澶辫触:', e);
+ }
+ }
}
- } else {
- // 瀵逛簬Excel鏂囦欢锛屽彲浠ヤ娇鐢▁lsx搴撹В鏋�
- this.$message.success('Excel鏂囦欢瀵煎叆鎴愬姛锛堝疄闄呴」鐩腑闇�瑕佹坊鍔犺В鏋愰�昏緫锛�');
+ } catch (error) {
+ console.error('鑾峰彇椤圭洰閰嶇疆澶辫触:', error);
+ // 鍥為��鍒颁娇鐢ㄩ」鐩垪琛ㄤ腑鐨勫湴鍧�鏄犲皠
+ if (project.addressMapping) {
+ try {
+ const addressMapping = JSON.parse(project.addressMapping);
+ this.updateFieldAddresses(addressMapping);
+ } catch (e) {
+ console.error('瑙ｆ瀽鍦板潃鏄犲皠澶辫触:', e);
+ }
+ }
}
- } catch (error) {
- this.$message.error('鏂囦欢瑙ｆ瀽澶辫触: ' + error.message);
+ } else {
+ // 瀵逛簬榛樿椤圭洰锛屼娇鐢ㄩ」鐩垪琛ㄤ腑鐨勫湴鍧�鏄犲皠
+ if (project.addressMapping) {
+ try {
+ const addressMapping = JSON.parse(project.addressMapping);
+ this.updateFieldAddresses(addressMapping);
+ } catch (e) {
+ console.error('瑙ｆ瀽鍦板潃鏄犲皠澶辫触:', e);
+ }
+ }
}
- };
- reader.readAsText(this.importFile);
+ } else {
+ console.log('鏈壘鍒伴�変腑鐨勯」鐩�:', this.selectedProject);
+ }
- this.importDialogVisible = false;
+ // 娓呯┖褰撳墠浠诲姟鐘舵��
+ this.runningTasks = [];
+ this.testResults = [];
+ this.updateTaskCount();
+ },
+
+ // 鏇存柊瀛楁鍦板潃
+ updateFieldAddresses(addressMapping) {
+ // 瀛楁鍚嶅埌涓枃鏍囩鐨勬槧灏勫叧绯�
+ const fieldLabels = {
+ 'onlineState': '鑱旀満鐘舵��',
+ 'plcRequest': 'PLC璇锋眰',
+ 'plcReport': 'PLC姹囨姤',
+ 'finishA': '瀹屾垚淇″彿A',
+ 'finishB': '瀹屾垚淇″彿B',
+ 'state': '璁惧鐘舵��',
+ 'onePosition': '涓�鍙蜂綅缃�',
+ 'twoPosition': '浜屽彿浣嶇疆',
+ 'mesSend': 'MES鍙戦��',
+ 'mesConfirm': 'MES纭',
+ 'start': '璧峰浣嶇疆',
+ 'target': '鐩爣浣嶇疆',
+ 'mesGlassCount': '鐜荤拑鏁伴噺',
+ 'rawMargin1': '鍘熺墖杈硅窛1',
+ 'mesWidth1': '鐜荤拑瀹藉害1',
+ 'mesHeight1': '鐜荤拑楂樺害1',
+ 'rawThickness1': '鐜荤拑鍘氬害1',
+ 'rawMargin2': '鍘熺墖杈硅窛2',
+ 'mesWidth2': '鐜荤拑瀹藉害2',
+ 'mesHeight2': '鐜荤拑楂樺害2',
+ 'rawThickness2': '鐜荤拑鍘氬害2',
+ 'alarmInfo': '鎶ヨ淇℃伅'
+ };
+
+ // 鏍规嵁addressMapping鍔ㄦ�佺敓鎴恆llFields鏁扮粍
+ const newFields = [];
+
+ // 閬嶅巻addressMapping锛岀敓鎴愭柊鐨勫瓧娈靛垪琛�
+ for (const [fieldName, address] of Object.entries(addressMapping)) {
+ newFields.push({
+ label: fieldLabels[fieldName] || fieldName, // 浣跨敤鏄犲皠鐨勪腑鏂囨爣绛撅紝濡傛灉娌℃湁鍒欎娇鐢ㄥ瓧娈靛悕
+ value: fieldName,
+ address: address
+ });
+ }
+
+ // 鏇存柊allFields
+ this.allFields = newFields;
+
+ // 濡傛灉鏄涓�娆″姞杞斤紝榛樿閫変腑绯荤粺鍏抽敭瀛楁
+ if (!this.checkedFields || this.checkedFields.length === 0 || this.checkedFields.includes('')) {
+ this.checkedFields = ['onlineState', 'plcRequest'];
+ }
+ },
+
+ // 澶勭悊妯″潡鍙樻洿
+ handleModuleChange() {
+ // 鏍规嵁妯″潡绫诲瀷璁剧疆榛樿瀛楁
+ if (this.selectedModule === 'gantryStorage') {
+ this.checkedFields = ['onlineState', 'plcRequest', 'taskId', 'startPos', 'targetPos', 'deviceStatus'];
+ } else if (this.selectedModule === 'upperModule') {
+ this.checkedFields = ['onlineState', 'plcRequest', 'taskId', 'runMode', 'errorCode', 'currentSpeed'];
+ } else if (this.selectedModule === 'storageModule') {
+ this.checkedFields = ['onlineState', 'plcRequest', 'taskId', 'currentPos', 'taskStatus', 'completion'];
+ }
+ },
+
+ // 鍒ゆ柇鏄惁涓虹郴缁熷瓧娈�
+ isSystemField(field) {
+ return this.systemFields.includes(field);
+ },
+
+ // 娣诲姞鏂板瓧娈�
+ addNewField() {
+ ElMessageBox.prompt('璇疯緭鍏ユ柊瀛楁鍚嶇О', '娣诲姞瀛楁', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputPattern: /^[a-zA-Z][a-zA-Z0-9_]*$/,
+ inputErrorMessage: '瀛楁鍚嶇О蹇呴』浠ュ瓧姣嶅紑澶达紝鍙兘鍖呭惈瀛楁瘝銆佹暟瀛楀拰涓嬪垝绾�'
+ }).then(({ value }) => {
+ // 妫�鏌ュ瓧娈垫槸鍚﹀凡瀛樺湪
+ if (this.allFields.find(f => f.value === value)) {
+ ElMessage.warning('瀛楁宸插瓨鍦�');
+ return;
+ }
+
+ // 娣诲姞鏂板瓧娈�
+ this.allFields.push({
+ label: value,
+ value: value,
+ address: 0,
+ system: false
+ });
+
+ ElMessage.success('瀛楁娣诲姞鎴愬姛');
+ }).catch(() => {
+ // 鐢ㄦ埛鍙栨秷
+ });
+ },
+
+ // 鍒犻櫎瀛楁
+ removeField(field) {
+ if (this.isSystemField(field)) {
+ ElMessage.warning('绯荤粺瀛楁涓嶈兘鍒犻櫎');
+ return;
+ }
+
+ ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ瓧娈� "${field}" 鍚楋紵`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ // 浠巃llFields涓Щ闄�
+ this.allFields = this.allFields.filter(f => f.value !== field);
+
+ // 浠巆heckedFields涓Щ闄�
+ this.checkedFields = this.checkedFields.filter(f => f !== field);
+
+ ElMessage.success('瀛楁鍒犻櫎鎴愬姛');
+ }).catch(() => {
+ // 鐢ㄦ埛鍙栨秷
+ });
+ },
+
+ // 鏇存柊瀛楁鍦板潃
+ updateFieldAddress(field, address) {
+ const fieldIndex = this.allFields.findIndex(f => f.value === field);
+ if (fieldIndex !== -1) {
+ this.allFields[fieldIndex].address = parseInt(address) || 0;
+ }
+ },
+
+ // 淇濆瓨褰撳墠閰嶇疆
+ async saveCurrentConfig() {
+ try {
+ // 鏋勫缓鍦板潃鏄犲皠JSON
+ const addressMapping = {};
+ this.allFields.forEach(field => {
+ if (field.address !== undefined) {
+ addressMapping[field.value] = field.address;
+ }
+ });
+
+ // 淇濆瓨鍒版湰鍦板瓨鍌�
+ localStorage.setItem('plcTestConfig', JSON.stringify({
+ selectedProject: this.selectedProject,
+ selectedModule: this.selectedModule,
+ checkedFields: this.checkedFields,
+ testParameters: this.testParameters,
+ allFields: this.allFields
+ }));
+
+ // 鍙湁褰搒electedProject涓嶆槸'default'鏃舵墠璋冪敤API
+ if (this.selectedProject && this.selectedProject !== 'default') {
+ // 鍑嗗鏇存柊鏁版嵁
+ const updateData = {
+ projectId: this.selectedProject,
+ plcIp: this.testParameters.plcAddress,
+ dbArea: this.testParameters.dbAddress,
+ addressMapping: JSON.stringify(addressMapping)
+ };
+
+ // 璋冪敤API鏇存柊閰嶇疆
+ const response = await axios.put(`/api/plcSend/address-mapping/project/${this.selectedProject}`, updateData);
+
+ if (response.data && response.data.code === 200) {
+ ElMessage.success('閰嶇疆淇濆瓨鎴愬姛');
+ } else {
+ ElMessage.error('閰嶇疆淇濆瓨澶辫触');
+ }
+ } else {
+ // 濡傛灉鏄粯璁ら」鐩紝鍙繚瀛樺埌鏈湴
+ ElMessage.success('閰嶇疆宸蹭繚瀛樺埌鏈湴');
+ }
+ } catch (error) {
+ console.error('淇濆瓨閰嶇疆澶辫触:', error);
+ ElMessage.error('閰嶇疆淇濆瓨澶辫触');
+ }
+ },
+
+ // 鍔犺浇閰嶇疆
+ loadConfig() {
+ const savedConfig = localStorage.getItem('plcTestConfig');
+ if (savedConfig) {
+ try {
+ const config = JSON.parse(savedConfig);
+ this.selectedProject = config.selectedProject || 'default';
+ this.selectedModule = config.selectedModule || 'gantryStorage';
+ this.checkedFields = config.checkedFields || ['onlineState', 'plcRequest', 'taskId'];
+ this.testParameters = { ...this.testParameters, ...config.testParameters };
+
+ if (config.allFields) {
+ this.allFields = config.allFields;
+ }
+ } catch (e) {
+ console.error('鍔犺浇閰嶇疆澶辫触:', e);
+ }
+ }
+ },
+
+ // 閲嶇疆閰嶇疆
+ resetAll() {
+ ElMessageBox.confirm('纭畾瑕侀噸缃墍鏈夐厤缃悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ // 閲嶇疆鏁版嵁
+ this.selectedProject = 'default';
+ this.selectedModule = 'gantryStorage';
+ this.checkedFields = ['onlineState', 'plcRequest', 'taskId'];
+ this.testParameters = {
+ plcAddress: '192.168.10.21',
+ dbAddress: 'DB38',
+ retryCount: 3,
+ interval: 1000,
+ failureRate: 5
+ };
+
+ // 娓呯┖浠诲姟
+ this.runningTasks = [];
+ this.testResults = [];
+ this.batchTasks = [];
+ this.updateTaskCount();
+
+ // 娓呴櫎鏈湴瀛樺偍
+ localStorage.removeItem('plcTestConfig');
+
+ ElMessage.success('閰嶇疆宸查噸缃�');
+ }).catch(() => {
+ // 鐢ㄦ埛鍙栨秷
+ });
},
// 寮�濮嬫祴璇�
- startTest() {
- const moduleMap = {
- gantryStorage: '榫欓棬浠撳偍',
- upperModule: '涓婄墖妯″潡',
- storageModule: '绌挎浠撳偍'
- };
- const moduleName = moduleMap[this.selectedModule];
+ async startTest() {
+ if (!this.isConfigReady) {
+ ElMessage.warning('璇峰厛瀹屾垚閰嶇疆');
+ return;
+ }
- // 鍒涘缓鏂颁换鍔�
- const taskId = Date.now();
- const task = {
- id: taskId,
- module: moduleName,
- moduleKey: this.selectedModule,
- startTime: new Date().toLocaleString(),
- timeline: [
- { time: new Date().toLocaleTimeString(), status: 'primary', desc: '娴嬭瘯浠诲姟鍚姩' },
- { time: new Date().toLocaleTimeString(), status: 'primary', desc: '寮�濮嬪垵濮嬪寲娴嬭瘯鐜' }
- ]
- };
-
- this.runningTasks.push(task);
- const startTime = Date.now();
-
- // 鍑嗗浠诲姟鏁版嵁
- const taskData = {
- // 鍩虹瀛楁
- mesSend: 1,
- mesConfirm: 0,
- plcRequest: 0,
- taskStatus: 0,
- // 鍔ㄦ�佸弬鏁�
- start: this.testParameters.start,
- target: this.testParameters.target
- };
-
- // 璋冪敤鍚庣API
- this.$axios.post(`/api/plc/operation/execute/${this.selectedModule}`, taskData)
- .then(response => {
- const result = response.data;
- const timeline = this.runningTasks.find(t => t.id === taskId).timeline;
+ try {
+ // 鏋勫缓娴嬭瘯鍙傛暟
+ const testParams = {
+ projectId: this.selectedProject,
+ module: this.selectedModule,
+ fields: this.checkedFields,
+ parameters: this.testParameters
+ };
+
+ // 璋冪敤娴嬭瘯API
+ const response = await axios.post(`/api/plcSend/test/execute/${this.selectedModule}`, testParams);
+
+ if (response.data && response.data.code === 200) {
+ const taskId = response.data.data.taskId;
- timeline.push({
- time: new Date().toLocaleTimeString(),
- status: 'success',
- desc: 'PLC璇锋眰鍙戦�佹垚鍔�'
+ // 娣诲姞鍒拌繍琛屼换鍔″垪琛�
+ this.runningTasks.push({
+ id: taskId,
+ module: this.selectedModule,
+ project: this.selectedProject,
+ status: 'running',
+ startTime: new Date().toLocaleTimeString(),
+ timeline: [
+ { time: new Date().toLocaleTimeString(), desc: '浠诲姟宸叉彁浜�', status: 'primary' }
+ ]
});
- // 妯℃嫙浠诲姟鎵ц锛堝疄闄呴」鐩腑鍙兘闇�瑕佽疆璇㈡垨WebSocket锛�
- setTimeout(() => {
- // 鏍规嵁閰嶇疆鐨勬晠闅滄鐜囨ā鎷熷け璐ユ儏鍐�
- const shouldFail = Math.random() * 100 < this.testParameters.failureRate;
+ ElMessage.success('娴嬭瘯浠诲姟宸叉彁浜�');
+
+ // 寮�濮嬬洃鎺т换鍔＄姸鎬�
+ this.monitorTask(taskId);
+ } else {
+ ElMessage.error('鎻愪氦娴嬭瘯浠诲姟澶辫触');
+ }
+ } catch (error) {
+ console.error('鎻愪氦娴嬭瘯浠诲姟澶辫触:', error);
+ ElMessage.error('鎻愪氦娴嬭瘯浠诲姟澶辫触');
+ }
+ },
+
+ // 鐩戞帶浠诲姟鐘舵��
+ async monitorTask(taskId) {
+ const checkStatus = async () => {
+ try {
+ const response = await axios.get(`/api/plcSend/test/status/${this.selectedModule}?taskId=${taskId}`);
+
+ if (response.data && response.data.code === 200) {
+ const taskData = response.data.data;
+ const taskIndex = this.runningTasks.findIndex(t => t.id === taskId);
- if (!shouldFail && result.success) {
- timeline.push({
+ if (taskIndex !== -1) {
+ // 鏇存柊浠诲姟鐘舵��
+ this.runningTasks[taskIndex].status = taskData.status;
+
+ // 娣诲姞鐘舵�佸彉鍖栦簨浠�
+ this.runningTasks[taskIndex].timeline.push({
time: new Date().toLocaleTimeString(),
- status: 'success',
- desc: '浠诲姟鎵ц瀹屾垚'
+ desc: `鐘舵�佹洿鏂�: ${taskData.status}`,
+ status: taskData.status === 'success' ? 'success' :
+ taskData.status === 'failed' ? 'danger' : 'primary'
});
- // 鏇存柊娴嬭瘯缁撴灉
- this.updateTestResults(taskId, moduleName, '閫氳繃', '', startTime, 0);
- } else {
- const errorMsg = '妯℃嫙鏁呴殰鍙戠敓';
- timeline.push({
- time: new Date().toLocaleTimeString(),
- status: 'error',
- desc: `浠诲姟鎵ц澶辫触: ${errorMsg}`
- });
-
- // 鏇存柊娴嬭瘯缁撴灉
- this.updateTestResults(taskId, moduleName, '澶辫触', errorMsg, startTime, 0);
+ // 濡傛灉浠诲姟瀹屾垚锛屾坊鍔犲埌缁撴灉鍒楄〃
+ if (taskData.status === 'success' || taskData.status === 'failed') {
+ this.testResults.push({
+ id: taskId,
+ module: this.selectedModule,
+ project: this.selectedProject,
+ startTime: this.runningTasks[taskIndex].startTime,
+ endTime: new Date().toLocaleTimeString(),
+ status: taskData.status === 'success' ? '閫氳繃' : '澶辫触',
+ duration: taskData.duration || 0,
+ retryCount: taskData.retryCount || 0,
+ errorMsg: taskData.errorMsg || ''
+ });
+
+ // 鏇存柊浠诲姟璁℃暟
+ this.updateTaskCount();
+
+ // 浠庤繍琛屼换鍔″垪琛ㄤ腑绉婚櫎
+ this.runningTasks.splice(taskIndex, 1);
+
+ // 鏄剧ず閿欒淇℃伅鍒楋紙濡傛灉鏈夐敊璇級
+ if (taskData.errorMsg) {
+ this.showErrorColumn = true;
+ }
+ } else {
+ // 缁х画鐩戞帶
+ setTimeout(checkStatus, 2000);
+ }
}
-
- // 浠庤繍琛屼换鍔″垪琛ㄤ腑绉婚櫎
- this.removeRunningTask(taskId);
- }, this.testParameters.interval);
- })
- .catch(error => {
- const timeline = this.runningTasks.find(t => t.id === taskId).timeline;
- timeline.push({
- time: new Date().toLocaleTimeString(),
- status: 'error',
- desc: `API璋冪敤澶辫触: ${error.message || '缃戠粶閿欒'}`
- });
-
- // 鏇存柊娴嬭瘯缁撴灉
- this.updateTestResults(taskId, moduleName, '澶辫触', error.message || '缃戠粶閿欒', startTime, 0);
-
- // 浠庤繍琛屼换鍔″垪琛ㄤ腑绉婚櫎
- this.removeRunningTask(taskId);
- });
+ }
+ } catch (error) {
+ console.error('鑾峰彇浠诲姟鐘舵�佸け璐�:', error);
+ }
+ };
+
+ // 寮�濮嬫鏌ョ姸鎬�
+ setTimeout(checkStatus, 1000);
},
// 鎵归噺娴嬭瘯
batchTest() {
- this.showBatchTestConfig = !this.showBatchTestConfig;
+ this.showBatchTestConfig = true;
},
// 娣诲姞褰撳墠閰嶇疆鍒版壒閲忎换鍔�
addCurrentToBatch() {
- const batchTask = {
- module: this.selectedModule,
- start: this.testParameters.start,
- target: this.testParameters.target,
- retryCount: this.testParameters.retryCount
- };
-
- this.batchTasks.push(batchTask);
- this.$message.success('宸叉坊鍔犲埌鎵归噺娴嬭瘯浠诲姟');
- },
-
- // 鎵ц鎵归噺娴嬭瘯
- startBatchTest() {
- if (this.batchTasks.length === 0) {
- this.$message.warning('璇峰厛娣诲姞鎵归噺娴嬭瘯浠诲姟');
+ if (!this.isConfigReady) {
+ ElMessage.warning('璇峰厛瀹屾垚閰嶇疆');
return;
}
- // 閫愪釜鎵ц鎵归噺浠诲姟
- this.batchTasks.forEach((task, index) => {
- setTimeout(() => {
- this.selectedModule = task.module;
- this.testParameters.start = task.start;
- this.testParameters.target = task.target;
- this.testParameters.retryCount = task.retryCount;
- this.startTest();
- }, index * (this.testParameters.interval + 1000));
+ this.batchTasks.push({
+ module: this.selectedModule,
+ project: this.selectedProject,
+ start: this.testParameters.startPos || 0,
+ target: this.testParameters.targetPos || 0,
+ retryCount: this.testParameters.retryCount
});
- this.$message.success(`鎵归噺娴嬭瘯宸插惎鍔紝鍏�${this.batchTasks.length}涓换鍔);
+ ElMessage.success('宸叉坊鍔犲埌鎵归噺浠诲姟鍒楄〃');
+ },
+
+ // 寮�濮嬫壒閲忔祴璇�
+ async startBatchTest() {
+ if (this.batchTasks.length === 0) {
+ ElMessage.warning('鎵归噺浠诲姟鍒楄〃涓虹┖');
+ return;
+ }
+
+ try {
+ // 璋冪敤鎵归噺娴嬭瘯API
+ const response = await axios.post('/api/plcSend/test/batch', {
+ tasks: this.batchTasks
+ });
+
+ if (response.data && response.data.code === 200) {
+ ElMessage.success('鎵归噺娴嬭瘯宸叉彁浜�');
+ this.showBatchTestConfig = false;
+
+ // 娣诲姞鍒拌繍琛屼换鍔″垪琛�
+ response.data.data.taskIds.forEach((taskId, index) => {
+ this.runningTasks.push({
+ id: taskId,
+ module: this.batchTasks[index].module,
+ project: this.batchTasks[index].project,
+ status: 'running',
+ startTime: new Date().toLocaleTimeString(),
+ timeline: [
+ { time: new Date().toLocaleTimeString(), desc: '鎵归噺浠诲姟宸叉彁浜�', status: 'primary' }
+ ]
+ });
+
+ // 鐩戞帶浠诲姟鐘舵��
+ this.monitorTask(taskId);
+ });
+ } else {
+ ElMessage.error('鎻愪氦鎵归噺娴嬭瘯澶辫触');
+ }
+ } catch (error) {
+ console.error('鎻愪氦鎵归噺娴嬭瘯澶辫触:', error);
+ ElMessage.error('鎻愪氦鎵归噺娴嬭瘯澶辫触');
+ }
},
// 绉婚櫎鎵归噺浠诲姟
@@ -553,175 +901,150 @@
this.batchTasks.splice(index, 1);
},
- // 鏇存柊娴嬭瘯缁撴灉
- updateTestResults(taskId, moduleName, status, errorMsg, startTime, retryCount) {
- const endTime = new Date();
- const duration = Math.round((endTime.getTime() - startTime) / 1000);
+ // 瀵煎叆浠诲姟
+ importTask() {
+ this.importDialogVisible = true;
+ },
+
+ // 澶勭悊鏂囦欢鍙樺寲
+ handleFileChange(file) {
+ this.uploadFile = file.raw;
+ },
+
+ // 鏂囦欢涓婁紶鍓嶆鏌�
+ beforeFileUpload(file) {
+ const isExcel = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
+ file.type === 'application/vnd.ms-excel';
+ const isJSON = file.type === 'application/json';
+ const isLt5M = file.size / 1024 / 1024 < 5;
- this.testResults.push({
- id: taskId,
- module: moduleName,
- startTime: new Date(startTime).toLocaleString(),
- endTime: endTime.toLocaleString(),
- status: status,
- duration: duration,
- retryCount: retryCount,
- errorMsg: errorMsg,
- timeline: this.runningTasks.find(t => t.id === taskId)?.timeline || []
- });
+ if (!isExcel && !isJSON) {
+ ElMessage.error('鍙兘涓婁紶Excel鎴朖SON鏍煎紡鏂囦欢!');
+ }
+ if (!isLt5M) {
+ ElMessage.error('鏂囦欢澶у皬涓嶈兘瓒呰繃5MB!');
+ }
+ return (isExcel || isJSON) && isLt5M;
+ },
+
+ // 纭瀵煎叆
+ async confirmImport() {
+ if (!this.uploadFile) {
+ ElMessage.warning('璇峰厛閫夋嫨鏂囦欢');
+ return;
+ }
- // 鏇存柊缁熻鏁版嵁
- this.taskCount.total++;
- if (status === '閫氳繃') {
- this.taskCount.pass++;
- } else {
- this.taskCount.fail++;
- this.showErrorColumn = true;
+ try {
+ const formData = new FormData();
+ formData.append('file', this.uploadFile);
+
+ const response = await axios.post('/api/plcSend/test/import', formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ });
+
+ if (response.data && response.data.code === 200) {
+ ElMessage.success('瀵煎叆鎴愬姛');
+ this.importDialogVisible = false;
+
+ // 娣诲姞瀵煎叆鐨勪换鍔″埌鎵归噺浠诲姟鍒楄〃
+ if (response.data.data && response.data.data.tasks) {
+ this.batchTasks = [...this.batchTasks, ...response.data.data.tasks];
+ }
+ } else {
+ ElMessage.error('瀵煎叆澶辫触');
+ }
+ } catch (error) {
+ console.error('瀵煎叆澶辫触:', error);
+ ElMessage.error('瀵煎叆澶辫触');
}
},
- // 浠庤繍琛屼换鍔″垪琛ㄤ腑绉婚櫎
- removeRunningTask(taskId) {
- const index = this.runningTasks.findIndex(t => t.id === taskId);
- if (index > -1) {
- this.runningTasks.splice(index, 1);
+ // 鏄剧ず浠诲姟璇︽儏
+ showTaskDetail(task) {
+ this.selectedTask = task;
+ this.taskDetailDialogVisible = true;
+ },
+
+ // 鏄剧ず鎵归噺娴嬭瘯寮圭獥
+ showBatchTestDialog() {
+ this.batchTestDialogVisible = true;
+ },
+
+ // 鏄剧ず瀵煎叆寮圭獥
+ showImportDialog() {
+ this.importDialogVisible = true;
+ },
+
+ // 澶勭悊瀵煎叆鎴愬姛
+ handleImportSuccess(response) {
+ if (response.data && response.data.code === 200) {
+ ElMessage.success('鏂囦欢涓婁紶鎴愬姛');
+ // 鍙互鍦ㄨ繖閲屽鐞嗕笂浼犳垚鍔熷悗鐨勯�昏緫
}
},
- // 閲嶇疆鎵�鏈夐厤缃�
- resetAll() {
- this.$confirm('纭畾瑕侀噸缃墍鏈夐厤缃悧锛熻繖灏嗘竻闄ゆ墍鏈夋祴璇曠粨鏋滃拰杩愯涓殑浠诲姟銆�', '鎻愮ず', {
+ // 鏂囦欢涓婁紶鍓嶆鏌�
+ beforeUpload(file) {
+ const isExcel = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
+ file.type === 'application/vnd.ms-excel';
+ const isJSON = file.type === 'application/json';
+ const isLt10M = file.size / 1024 / 1024 < 10;
+
+ if (!isExcel && !isJSON) {
+ ElMessage.error('鍙兘涓婁紶Excel鎴朖SON鏍煎紡鏂囦欢!');
+ return false;
+ }
+ if (!isLt10M) {
+ ElMessage.error('鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!');
+ return false;
+ }
+ return true;
+ },
+
+ // 鍙栨秷娴嬭瘯
+ stopTest() {
+ ElMessageBox.confirm('纭畾瑕佸仠姝㈠綋鍓嶆祴璇曞悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
- }).then(() => {
- this.checkedFields = [];
- this.runningTasks = [];
- this.testResults = [];
- this.taskCount = { total: 0, pass: 0, fail: 0 };
- this.showErrorColumn = false;
- this.setDefaultFieldsByModule(this.selectedModule);
- this.$message.success('鎵�鏈夐厤缃凡閲嶇疆');
- }).catch(() => {});
- },
-
- // 鑾峰彇鏃堕棿绾跨姸鎬侀鑹�
- getStatusColor(status) {
- const colorMap = {
- primary: 'blue',
- success: 'green',
- error: 'red',
- warning: 'orange'
- };
- return colorMap[status] || 'blue';
- },
-
- // 鑾峰彇浜嬩欢鍥炬爣
- getEventIcon(status) {
- const iconMap = {
- primary: 'el-icon-loading',
- success: 'el-icon-circle-check',
- error: 'el-icon-circle-close',
- warning: 'el-icon-warning'
- };
- return iconMap[status] || 'el-icon-information';
- },
-
- // 璁＄畻閫氳繃鐜�
- calculatePassRate() {
- if (this.taskCount.total === 0) return 0;
- return Math.round((this.taskCount.pass / this.taskCount.total) * 100);
- },
-
- // 淇濆瓨褰撳墠閰嶇疆
- saveCurrentConfig() {
- const config = {
- selectedModule: this.selectedModule,
- checkedFields: this.checkedFields,
- testParameters: this.testParameters
- };
-
- localStorage.setItem('plcTestConfig', JSON.stringify(config));
- this.$message.success('閰嶇疆宸蹭繚瀛�');
- },
-
- // 鍔犺浇鏈湴閰嶇疆
- loadLocalConfig() {
- const config = localStorage.getItem('plcTestConfig');
- if (config) {
+ }).then(async () => {
try {
- const parsedConfig = JSON.parse(config);
- this.selectedModule = parsedConfig.selectedModule || 'gantryStorage';
- this.checkedFields = parsedConfig.checkedFields || [];
- this.testParameters = parsedConfig.testParameters || this.testParameters;
- this.$message.success('閰嶇疆宸插姞杞�');
- } catch (error) {
- console.error('鍔犺浇閰嶇疆澶辫触:', error);
- }
- }
- },
-
- // 鎵嬪姩鍔犺浇閰嶇疆
- loadConfig() {
- this.loadLocalConfig();
- },
-
- // 鏄剧ず妯″潡鐘舵��
- showModuleStatus() {
- this.statusDialogVisible = true;
- this.refreshModuleStatus();
- },
-
- // 澶勭悊鐘舵�佹爣绛剧偣鍑�
- handleStatusTabClick(tab) {
- this.activeStatusTab = tab.name;
- this.refreshModuleStatus();
- },
-
- // 鍒锋柊妯″潡鐘舵��
- refreshModuleStatus() {
- this.$axios.get(`/api/plc/operation/status/${this.activeStatusTab}`)
- .then(response => {
- const statusData = response.data.data;
- this.statusTableData = [];
+ // 淇敼涓轰娇鐢ㄨ矾寰勫弬鏁扮殑鏂瑰紡璋冪敤API
+ const response = await axios.post(`/api/plcSend/test/stop/${this.selectedModule}`);
- if (statusData) {
- for (const [key, value] of Object.entries(statusData)) {
- this.statusTableData.push({
- key: this.getFieldLabel(key) || key,
- value: value,
- updateTime: new Date().toLocaleTimeString()
- });
- }
+ if (response.data && response.data.success) {
+ ElMessage.success('娴嬭瘯宸插仠姝�');
+ // 娓呯┖杩愯涓殑浠诲姟
+ this.runningTasks = [];
+ this.testStats.running = 0;
+ } else {
+ ElMessage.error('鍋滄娴嬭瘯澶辫触');
}
- })
- .catch(error => {
- this.$message.error('鑾峰彇妯″潡鐘舵�佸け璐�: ' + error.message);
- });
+ } catch (error) {
+ console.error('鍋滄娴嬭瘯澶辫触:', error);
+ ElMessage.error('鍋滄娴嬭瘯澶辫触');
+ }
+ }).catch(() => {
+ // 鐢ㄦ埛鍙栨秷
+ });
},
// 閲嶇疆妯″潡鐘舵��
- resetModuleStatus() {
- this.$confirm('纭畾瑕侀噸缃妯″潡鐘舵�佸悧锛�', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- this.$axios.post(`/api/plc/operation/reset/${this.activeStatusTab}`)
- .then(() => {
- this.$message.success('妯″潡鐘舵�佸凡閲嶇疆');
- this.refreshModuleStatus();
- })
- .catch(error => {
- this.$message.error('閲嶇疆妯″潡鐘舵�佸け璐�: ' + error.message);
- });
- }).catch(() => {});
- },
-
- // 鑾峰彇瀛楁鏍囩
- getFieldLabel(fieldValue) {
- const field = this.allFields.find(item => item.value === fieldValue);
- return field ? field.label : null;
+ async resetModuleStatus() {
+ try {
+ const response = await axios.post(`/api/plcSend/test/reset/${this.selectedModule}`);
+
+ if (response.data && response.data.code === 200) {
+ ElMessage.success('妯″潡鐘舵�佸凡閲嶇疆');
+ } else {
+ ElMessage.error('閲嶇疆妯″潡鐘舵�佸け璐�');
+ }
+ } catch (error) {
+ console.error('閲嶇疆妯″潡鐘舵�佸け璐�:', error);
+ ElMessage.error('閲嶇疆妯″潡鐘舵�佸け璐�');
+ }
},
// 鏌ョ湅浠诲姟璇︽儏
@@ -731,207 +1054,635 @@
},
// 閲嶈瘯浠诲姟
- retryTask(task) {
- // 濡傛灉浠诲姟鏈塵oduleKey瀛楁锛屼娇鐢ㄥ畠锛屽惁鍒欐牴鎹ā鍧楀悕绉版帹鏂�
- const moduleMap = {
- '榫欓棬浠撳偍': 'gantryStorage',
- '涓婄墖妯″潡': 'upperModule',
- '绌挎浠撳偍': 'storageModule'
+ async retryTask(task) {
+ try {
+ const response = await axios.post(`/api/plcSend/test/retry/${task.module}`, {
+ taskId: task.id,
+ projectId: task.project
+ });
+
+ if (response.data && response.data.code === 200) {
+ ElMessage.success('浠诲姟閲嶈瘯宸叉彁浜�');
+
+ // 娣诲姞鍒拌繍琛屼换鍔″垪琛�
+ this.runningTasks.push({
+ id: task.id,
+ module: task.module,
+ project: task.project,
+ status: 'running',
+ startTime: new Date().toLocaleTimeString(),
+ timeline: [
+ { time: new Date().toLocaleTimeString(), desc: '浠诲姟閲嶈瘯宸叉彁浜�', status: 'primary' }
+ ]
+ });
+
+ // 鐩戞帶浠诲姟鐘舵��
+ this.monitorTask(task.id);
+ } else {
+ ElMessage.error('浠诲姟閲嶈瘯澶辫触');
+ }
+ } catch (error) {
+ console.error('浠诲姟閲嶈瘯澶辫触:', error);
+ ElMessage.error('浠诲姟閲嶈瘯澶辫触');
+ }
+ },
+
+ // 鏇存柊浠诲姟璁℃暟
+ updateTaskCount() {
+ this.taskCount.total = this.testResults.length;
+ this.taskCount.pass = this.testResults.filter(r => r.status === '閫氳繃').length;
+ this.taskCount.fail = this.testResults.filter(r => r.status === '澶辫触').length;
+ },
+
+ // 璁＄畻閫氳繃鐜�
+ calculatePassRate() {
+ if (this.taskCount.total === 0) return 0;
+ return Math.round((this.taskCount.pass / this.taskCount.total) * 100);
+ },
+
+ // 鑾峰彇鐘舵�侀鑹�
+ getStatusColor(status) {
+ const colorMap = {
+ 'primary': '#409EFF',
+ 'success': '#67C23A',
+ 'warning': '#E6A23C',
+ 'danger': '#F56C6C',
+ 'info': '#909399'
};
-
- this.selectedModule = task.moduleKey || moduleMap[task.module] || 'gantryStorage';
-
- // 閲嶇疆瀛楁閫夋嫨
- this.setDefaultFieldsByModule(this.selectedModule);
-
- // 鍚姩娴嬭瘯
- this.startTest();
+ return colorMap[status] || '#409EFF';
+ },
+
+ // 鑾峰彇浜嬩欢鍥炬爣
+ getEventIcon(status) {
+ const iconMap = {
+ 'primary': 'el-icon-loading',
+ 'success': 'el-icon-circle-check',
+ 'warning': 'el-icon-warning',
+ 'danger': 'el-icon-circle-close',
+ 'info': 'el-icon-info'
+ };
+ return iconMap[status] || 'el-icon-info';
+ },
+
+ // 鍚姩鐘舵�佺洃鎺�
+ startStatusMonitoring() {
+ // 姣�30绉掑埛鏂颁竴娆＄姸鎬�
+ this.statusTimer = setInterval(() => {
+ this.refreshTasks();
+ this.refreshModuleStatus();
+ }, 30000);
+ },
+
+ // 鍒锋柊浠诲姟鍒楄〃
+ async refreshTasks() {
+ try {
+ // 鍚庣娌℃湁鐩存帴鎻愪緵鑾峰彇鎵�鏈変换鍔＄殑鎺ュ彛
+ // 杩欓噷浣跨敤鏈湴鏁版嵁妯℃嫙锛屽疄闄呭簲鐢ㄤ腑鍙兘闇�瑕佽皟鏁村疄鐜伴�昏緫
+ // 鎴栬�呭悗绔渶瑕佹柊澧炵浉搴旀帴鍙�
+ // const response = await axios.get('/api/plc/test/tasks');
+
+ // 浣跨敤妯℃嫙鏁版嵁
+ this.currentTasks = this.runningTasks;
+
+ // 鏇存柊浠诲姟缁熻
+ this.testStats.total = this.testResults.length;
+ this.testStats.passed = this.testResults.filter(r => r.status === '閫氳繃').length;
+ this.testStats.failed = this.testResults.filter(r => r.status === '澶辫触').length;
+ this.testStats.running = this.currentTasks.length;
+ } catch (error) {
+ console.error('鍒锋柊浠诲姟鍒楄〃澶辫触:', error);
+ }
+ },
+
+ // 鍒锋柊妯″潡鐘舵��
+ async refreshModuleStatus() {
+ try {
+ // 鍚庣娌℃湁鐩存帴鎻愪緵鑾峰彇鎵�鏈夋ā鍧楃姸鎬佺殑鎺ュ彛
+ // 杩欓噷浣跨敤鏈湴鏁版嵁妯℃嫙锛屽疄闄呭簲鐢ㄤ腑鍙兘闇�瑕佽皟鏁村疄鐜伴�昏緫
+ // 鎴栬�呭悗绔渶瑕佹柊澧炵浉搴旀帴鍙�
+ // const response = await axios.get('/api/plc/test/modules/status');
+
+ // 浣跨敤妯℃嫙鏁版嵁淇濇寔鐣岄潰姝ｅ父宸ヤ綔
+ if (!this.moduleStatusData || this.moduleStatusData.length === 0) {
+ // 濡傛灉娌℃湁鏁版嵁锛屽垵濮嬪寲涓�浜涙ā鎷熸ā鍧�
+ this.moduleStatusData = [
+ { module: 'gantryStorage', status: 'idle', lastUpdate: new Date().toLocaleTimeString() },
+ { module: 'upperModule', status: 'idle', lastUpdate: new Date().toLocaleTimeString() },
+ { module: 'storageModule', status: 'idle', lastUpdate: new Date().toLocaleTimeString() }
+ ];
+ } else {
+ // 鏇存柊鐜版湁妯″潡鐨勬椂闂存埑
+ this.moduleStatusData.forEach(module => {
+ module.lastUpdate = new Date().toLocaleTimeString();
+ });
+ }
+ } catch (error) {
+ console.error('鍒锋柊妯″潡鐘舵�佸け璐�:', error);
+ }
+ },
+
+ // 妫�鏌ユā鍧楃姸鎬�
+ async checkModuleStatus(module) {
+ try {
+ // 淇敼涓轰娇鐢ㄥ悗绔彁渚涚殑readPlcStatus鎺ュ彛
+ const response = await axios.get(`/api/plcSend/test/status?projectId=${module.module}`);
+
+ // 鐢变簬鎺ュ彛杩斿洖鐨勬槸PlcBaseData瀵硅薄鑰岄潪鐩存帴鐨勭姸鎬佷俊鎭紝闇�瑕佽繘琛岄�傞厤
+ const index = this.moduleStatusData.findIndex(m => m.module === module.module);
+ if (index !== -1) {
+ // 鍋囪onlineState瀛楁琛ㄧず妯″潡鏄惁鍦ㄧ嚎
+ const status = response.data ? 'online' : 'offline';
+
+ this.moduleStatusData[index] = {
+ ...this.moduleStatusData[index],
+ status: status,
+ lastUpdate: new Date().toLocaleTimeString(),
+ details: response.data || {}
+ };
+
+ ElMessage.success('妯″潡鐘舵�佹洿鏂版垚鍔�');
+ }
+ } catch (error) {
+ console.error('妫�鏌ユā鍧楃姸鎬佸け璐�:', error);
+ ElMessage.error('妫�鏌ユā鍧楃姸鎬佸け璐�');
+ }
+ },
+
+ // 鑾峰彇鐘舵�佺被鍨�
+ getStatusType(status) {
+ const statusMap = {
+ 'running': 'warning',
+ 'success': 'success',
+ '閫氳繃': 'success',
+ 'failed': 'danger',
+ '澶辫触': 'danger',
+ 'online': 'success',
+ 'offline': 'danger',
+ 'idle': 'info'
+ };
+ return statusMap[status] || 'primary';
+ },
+
+ // 閲嶇疆閰嶇疆
+ resetConfig() {
+ ElMessageBox.confirm('纭畾瑕侀噸缃墍鏈夐厤缃悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.resetAll();
+ }).catch(() => {
+ // 鐢ㄦ埛鍙栨秷
+ });
}
}
};
</script>
<style scoped>
-.auto-test-dashboard {
+.dashboard-container {
height: 100vh;
display: flex;
flex-direction: column;
background-color: #f5f7fa;
+ overflow: hidden;
}
-.header {
+.dashboard-header {
+ background-color: #2c3e50;
+ color: white;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 20px;
- background-color: #fff;
- border-bottom: 1px solid #eaecef;
- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.08);
+ height: 60px;
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+ flex-shrink: 0;
}
-.header h1 {
- font-size: 20px;
- font-weight: 600;
- color: #303133;
-}
-
-.header-actions {
+.header-left h2 {
+ margin: 0;
+ font-size: 1.4rem;
+ font-weight: 500;
display: flex;
- gap: 10px;
+ align-items: center;
}
-.aside {
- background-color: #f5f7fa;
- border-right: 1px solid #eaecef;
- padding: 15px;
- overflow-y: auto;
+.header-left h2::before {
+ content: "鈿欙笍";
+ margin-right: 10px;
}
-.main {
- padding: 20px;
- overflow: auto;
- flex: 1;
-}
-
-.mt-20 {
- margin-top: 20px;
-}
-
-.config-card, .batch-test-card, .timeline-section, .result-section {
- background-color: #fff;
- border-radius: 4px;
- padding: 20px;
- box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
- margin-bottom: 20px;
-}
-
-.section-title {
- font-size: 16px;
- font-weight: 600;
- color: #303133;
- margin-bottom: 15px;
- padding-bottom: 10px;
- border-bottom: 1px solid #ebeef5;
-}
-
-.field-checkbox-group {
- max-height: 200px;
- overflow-y: auto;
- padding: 5px 0;
-}
-
-.field-checkbox-group .el-checkbox {
- margin-bottom: 8px;
- display: block;
-}
-
-.parameter-form {
- margin-top: 15px;
-}
-
-.parameter-form .el-form-item {
- margin-bottom: 15px;
-}
-
-.test-actions, .batch-actions {
+.header-right {
display: flex;
- gap: 10px;
- margin-top: 20px;
+ gap: 12px;
}
-.batch-actions {
- justify-content: flex-end;
+.header-right .el-button {
+ transition: all 0.2s ease;
}
-.timeline-container {
- max-height: 400px;
- overflow-y: auto;
-}
-
-.task-timeline {
- margin-bottom: 20px;
- padding-bottom: 20px;
- border-bottom: 1px dashed #ebeef5;
-}
-
-.task-timeline:last-child {
- border-bottom: none;
- margin-bottom: 0;
- padding-bottom: 0;
-}
-
-.result-card {
- text-align: center;
- transition: all 0.3s;
-}
-
-.result-card:hover {
+.header-right .el-button:hover {
transform: translateY(-2px);
- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
}
-.result-item {
+.dashboard-content {
+ display: flex;
+ flex: 1;
+ overflow: hidden;
+ padding: 15px;
+ gap: 15px;
+}
+
+.config-aside {
+ background-color: white;
+ border-radius: 8px;
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+ padding: 15px;
+ width: 400px;
+ flex-shrink: 0;
+ overflow-y: auto;
+}
+
+.monitor-main {
+ background-color: white;
+ border-radius: 8px;
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+ padding: 20px;
+ flex: 1;
+ overflow-y: auto;
+}
+
+.config-section {
+ margin-bottom: 20px;
+ border-radius: 6px;
+ border: none;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+ transition: all 0.2s ease;
+}
+
+.config-section:hover {
+ box-shadow: 0 3px 10px rgba(0, 0, 0, 0.08);
+}
+
+.config-section h3 {
+ margin-top: 0;
+ margin-bottom: 15px;
+ font-size: 16px;
+ color: #303133;
+ border-bottom: 1px solid #f0f0f0;
+ padding-bottom: 10px;
+ display: flex;
+ align-items: center;
+}
+
+.config-section h3 i {
+ margin-right: 8px;
+ color: #409EFF;
+}
+
+.full-width {
+ width: 100%;
+ margin-bottom: 10px;
+}
+
+.monitor-section {
+ height: 100%;
+}
+
+.section-header {
display: flex;
justify-content: space-between;
align-items: center;
- padding: 10px 0;
+ margin-bottom: 20px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #f0f0f0;
}
-.label {
+.section-header h3 {
+ margin: 0;
+ font-size: 18px;
+ color: #303133;
+ display: flex;
+ align-items: center;
+}
+
+.section-header h3 i {
+ margin-right: 8px;
+ color: #409EFF;
+}
+
+.section-actions {
+ display: flex;
+ gap: 10px;
+}
+
+.section-actions .el-button {
+ transition: all 0.2s ease;
+}
+
+.section-actions .el-button:hover {
+ transform: translateY(-2px);
+}
+
+.task-container, .result-container, .result-list {
+ margin-bottom: 25px;
+}
+
+.task-container h4, .result-container h4, .result-list h4 {
+ margin-bottom: 15px;
+ font-size: 16px;
+ color: #606266;
+ font-weight: 500;
+ display: flex;
+ align-items: center;
+}
+
+.task-container h4::before,
+.result-container h4::before,
+.result-list h4::before {
+ content: "";
+ display: inline-block;
+ width: 4px;
+ height: 16px;
+ background-color: #409EFF;
+ margin-right: 8px;
+ border-radius: 2px;
+}
+
+.task-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 15px;
+}
+
+.task-item {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 12px 15px;
+ background-color: #f9fafc;
+ border-radius: 6px;
+ border-left: 4px solid #409EFF;
+ width: calc(50% - 7.5px);
+ box-sizing: border-box;
+ cursor: pointer;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+ transition: all 0.2s ease;
+}
+
+.task-item:hover {
+ background-color: #ecf5ff;
+ transform: translateY(-2px);
+ box-shadow: 0 3px 10px rgba(0, 0, 0, 0.1);
+}
+
+.task-info {
+ display: flex;
+ align-items: center;
+ gap: 15px;
+ flex-wrap: wrap;
+}
+
+.task-id {
+ font-weight: 500;
+ color: #303133;
+ min-width: 60px;
+}
+
+.task-module, .task-project {
color: #606266;
font-size: 14px;
+ background-color: rgba(144, 147, 153, 0.1);
+ padding: 2px 8px;
+ border-radius: 4px;
}
-.value {
+.result-stats {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 15px;
+ gap: 15px;
+}
+
+.stat-item {
+ text-align: center;
+ padding: 20px 15px;
+ background-color: #f9fafc;
+ border-radius: 6px;
+ flex: 1;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+ transition: all 0.2s ease;
+}
+
+.stat-item:hover {
+ transform: translateY(-3px);
+ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.stat-number {
+ font-size: 28px;
font-weight: 600;
- font-size: 18px;
+ margin-bottom: 8px;
+ transition: all 0.3s ease;
}
-.success {
- color: #67c23a;
+.stat-item:hover .stat-number {
+ transform: scale(1.05);
}
-.error {
- color: #f56c6c;
+.stat-number.pass {
+ color: #67C23A;
}
-.result-table-container {
- margin-top: 20px;
+.stat-number.fail {
+ color: #F56C6C;
+}
+
+.stat-label {
+ font-size: 14px;
+ color: #909399;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
}
.empty-state {
- padding: 40px 0;
text-align: center;
+ padding: 40px 20px;
+ color: #909399;
+ background-color: #f9fafc;
+ border-radius: 6px;
}
-.status-container {
+.empty-icon {
+ font-size: 48px;
+ margin-bottom: 15px;
+ color: #dcdfe6;
+}
+
+.empty-text {
+ font-size: 16px;
+}
+
+/* 瀛楁绠＄悊鏍峰紡 */
+.field-container {
+ max-height: 300px;
+ overflow-y: auto;
+ border: 1px solid #f0f0f0;
+ border-radius: 6px;
+}
+
+.field-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 10px 15px;
+ background-color: #f5f7fa;
+ border-bottom: 1px solid #f0f0f0;
+ font-weight: 500;
+}
+
+.add-btn {
+ color: #409EFF;
+ transition: all 0.2s;
+}
+
+.add-btn:hover {
+ color: #66b1ff;
+ background-color: rgba(64, 158, 255, 0.1);
+}
+
+.field-list {
+ padding: 10px;
+}
+
+.field-item {
+ display: flex;
+ align-items: center;
+ padding: 10px 8px;
+ border-bottom: 1px solid #f5f5f5;
+ transition: background-color 0.2s;
+}
+
+.field-item:last-child {
+ border-bottom: none;
+}
+
+.field-item:hover {
+ background-color: #f9fafc;
+}
+
+.field-address {
+ display: flex;
+ align-items: center;
+ margin-left: auto;
+ margin-right: 10px;
+}
+
+.field-address-label {
+ width: 70px;
+ text-align: right;
+ margin-right: 8px;
+ font-size: 12px;
+ color: #909399;
+}
+
+.remove-btn {
+ color: #ff4949;
+ opacity: 0.7;
+ transition: all 0.2s;
+}
+
+.remove-btn:hover {
+ color: #ff4949;
+ opacity: 1;
+ background-color: rgba(255, 73, 73, 0.1);
+}
+
+/* 鎵归噺娴嬭瘯寮圭獥鏍峰紡 */
+.batch-test-container {
max-height: 500px;
overflow-y: auto;
}
-.status-actions {
- display: flex;
- gap: 10px;
+.batch-actions {
+ margin-bottom: 15px;
+}
+
+.batch-footer {
margin-top: 20px;
- justify-content: flex-end;
+ text-align: right;
}
-.task-detail {
- max-height: 500px;
+/* 浠诲姟瀵煎叆寮圭獥鏍峰紡 */
+.import-footer {
+ margin-top: 20px;
+ text-align: right;
+}
+
+/* 浠诲姟璇︽儏寮圭獥鏍峰紡 */
+.task-detail-container {
+ max-height: 600px;
overflow-y: auto;
+ padding: 10px 0;
}
-.detail-section {
- margin-bottom: 20px;
+.task-timeline {
+ margin-top: 20px;
+ border-top: 1px solid #f0f0f0;
+ padding-top: 15px;
}
-.detail-section h4 {
- margin-bottom: 10px;
- color: #303133;
+.task-timeline h4 {
+ margin-bottom: 15px;
+ font-size: 16px;
+ color: #606266;
}
-.dialog-footer {
- display: flex;
- justify-content: flex-end;
+/* 鐘舵�佸脊绐楁牱寮� */
+.status-container {
+ min-height: 200px;
+}
+
+/* 琛ㄦ牸鏍峰紡浼樺寲 */
+.el-table {
+ border-radius: 6px;
+ overflow: hidden;
+}
+
+.el-table th {
+ background-color: #f5f7fa;
+ font-weight: 500;
+}
+
+.el-table--border th,
+.el-table--border td {
+ border-right: 1px solid #f0f0f0;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+ background-color: #f0f0f0;
+}
+
+/* 婊氬姩鏉＄編鍖� */
+::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+}
+
+::-webkit-scrollbar-track {
+ background: #f1f1f1;
+ border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb {
+ background: #dcdfe6;
+ border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background: #c0c4cc;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0