From ecb4007518d3b3fb658dcd3fdcf3d87083874bdf Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 23 四月 2024 19:11:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java | 5 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 28 ++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java | 5 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 30 +++--
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java | 46 ---------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 4
/dev/null | 17 ---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 25 +++-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/com/mes/downworkstation/service/DownWorkstationServiceTest.java | 9 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java | 19 ++-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java | 48 ---------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 33 ++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 9 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java | 4
19 files changed, 139 insertions(+), 156 deletions(-)
diff --git a/UnLoadGlassModule/MES-Module.iml b/UnLoadGlassModule/MES-Module.iml
deleted file mode 100644
index debbce9..0000000
--- a/UnLoadGlassModule/MES-Module.iml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- <facet type="jpa" name="JPA">
- <configuration>
- <setting name="validation-enabled" value="true" />
- <setting name="provider-name" value="Hibernate" />
- <datasource-mapping>
- <factory-entry name="entityManagerFactory" />
- </datasource-mapping>
- <naming-strategy-map />
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Java EE 6-Java EE 6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.10" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.10" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.1" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.33" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.56" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.56" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.56" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.3.1" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.1.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.33" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.20" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.5.9" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.5.9" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.5.9" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.5.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.7" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.7" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
- <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.9.0" level="project" />
- <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.9.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.15" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter-test:2.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-test-autoconfigure:2.3.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.10.3" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
- <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.19.0" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.5.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
- <orderEntry type="library" name="Maven: com.github.xingshuangs:iot-communication:1.4.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.13.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:5.2.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.13.0" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.24.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.08" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.36.Final" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.5.9" level="project" />
- <orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
- <orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.33" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
- <orderEntry type="library" name="Maven: org.javassist:javassist:3.27.0-GA" level="project" />
- <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
- <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.3.Final" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.5" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.5.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.15" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.15" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/UnLoadGlassModule/effective-pom.xml b/UnLoadGlassModule/effective-pom.xml
deleted file mode 100644
index 45bbca4..0000000
--- a/UnLoadGlassModule/effective-pom.xml
+++ /dev/null
@@ -1,6646 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Generated by Maven Help Plugin on 2024-02-23T16:16:53+08:00 -->
-<!-- See: http://maven.apache.org/plugins/maven-help-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Effective POM for project -->
-<!-- 'com.MES-Module:MES-Module:jar:0.0.1-SNAPSHOT' -->
-<!-- -->
-<!-- ====================================================================== -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.9</version>
- <relativePath />
- </parent>
- <groupId>com.MES-Module</groupId>
- <artifactId>MES-Module</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>MES-Module</name>
- <description>project for Spring Boot</description>
- <url>https://spring.io/projects/spring-boot/MES-Module</url>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
- <developers>
- <developer>
- <name>Pivotal</name>
- <email>info@pivotal.io</email>
- <organization>Pivotal Software, Inc.</organization>
- <organizationUrl>https://www.spring.io</organizationUrl>
- </developer>
- </developers>
- <scm>
- <url>https://github.com/spring-projects/spring-boot/MES-Module</url>
- </scm>
- <properties>
- <activemq.version>5.16.3</activemq.version>
- <antlr2.version>2.7.7</antlr2.version>
- <appengine-sdk.version>1.9.93</appengine-sdk.version>
- <artemis.version>2.17.0</artemis.version>
- <aspectj.version>1.9.7</aspectj.version>
- <assertj.version>3.19.0</assertj.version>
- <atomikos.version>4.0.6</atomikos.version>
- <awaitility.version>4.0.3</awaitility.version>
- <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
- <byte-buddy.version>1.10.22</byte-buddy.version>
- <caffeine.version>2.9.3</caffeine.version>
- <cassandra-driver.version>4.11.3</cassandra-driver.version>
- <classmate.version>1.5.1</classmate.version>
- <commons-codec.version>1.15</commons-codec.version>
- <commons-dbcp2.version>2.8.0</commons-dbcp2.version>
- <commons-lang3.version>3.12.0</commons-lang3.version>
- <commons-pool.version>1.6</commons-pool.version>
- <commons-pool2.version>2.9.0</commons-pool2.version>
- <couchbase-client.version>3.1.7</couchbase-client.version>
- <db2-jdbc.version>11.5.7.0</db2-jdbc.version>
- <dependency-management-plugin.version>1.0.11.RELEASE</dependency-management-plugin.version>
- <derby.version>10.14.2.0</derby.version>
- <dropwizard-metrics.version>4.1.29</dropwizard-metrics.version>
- <ehcache.version>2.10.9.2</ehcache.version>
- <ehcache3.version>3.9.9</ehcache3.version>
- <elasticsearch.version>7.12.1</elasticsearch.version>
- <embedded-mongo.version>3.0.0</embedded-mongo.version>
- <flyway.version>7.7.3</flyway.version>
- <freemarker.version>2.3.31</freemarker.version>
- <git-commit-id-plugin.version>4.0.5</git-commit-id-plugin.version>
- <glassfish-el.version>3.0.4</glassfish-el.version>
- <glassfish-jaxb.version>2.3.5</glassfish-jaxb.version>
- <glassfish-jstl.version>1.2.6</glassfish-jstl.version>
- <groovy.version>3.0.9</groovy.version>
- <gson.version>2.8.9</gson.version>
- <h2.version>1.4.200</h2.version>
- <hamcrest.version>2.2</hamcrest.version>
- <hazelcast-hibernate5.version>2.2.1</hazelcast-hibernate5.version>
- <hazelcast.version>4.1.8</hazelcast.version>
- <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
- <hibernate.version>5.4.33</hibernate.version>
- <hikaricp.version>4.0.3</hikaricp.version>
- <hsqldb.version>2.5.2</hsqldb.version>
- <htmlunit.version>2.49.1</htmlunit.version>
- <httpasyncclient.version>4.1.5</httpasyncclient.version>
- <httpclient.version>4.5.13</httpclient.version>
- <httpclient5.version>5.0.4</httpclient5.version>
- <httpcore.version>4.4.15</httpcore.version>
- <httpcore5.version>5.1.3</httpcore5.version>
- <infinispan.version>12.1.11.Final</infinispan.version>
- <influxdb-java.version>2.21</influxdb-java.version>
- <jackson-bom.version>2.12.6</jackson-bom.version>
- <jakarta-activation.version>1.2.2</jakarta-activation.version>
- <jakarta-annotation.version>1.3.5</jakarta-annotation.version>
- <jakarta-jms.version>2.0.3</jakarta-jms.version>
- <jakarta-json-bind.version>1.0.2</jakarta-json-bind.version>
- <jakarta-json.version>1.1.6</jakarta-json.version>
- <jakarta-mail.version>1.6.7</jakarta-mail.version>
- <jakarta-management.version>1.1.4</jakarta-management.version>
- <jakarta-persistence.version>2.2.3</jakarta-persistence.version>
- <jakarta-servlet-jsp-jstl.version>1.2.7</jakarta-servlet-jsp-jstl.version>
- <jakarta-servlet.version>4.0.4</jakarta-servlet.version>
- <jakarta-transaction.version>1.3.3</jakarta-transaction.version>
- <jakarta-validation.version>2.0.2</jakarta-validation.version>
- <jakarta-websocket.version>1.1.2</jakarta-websocket.version>
- <jakarta-ws-rs.version>2.1.6</jakarta-ws-rs.version>
- <jakarta-xml-bind.version>2.3.3</jakarta-xml-bind.version>
- <jakarta-xml-soap.version>1.4.2</jakarta-xml-soap.version>
- <jakarta-xml-ws.version>2.3.3</jakarta-xml-ws.version>
- <janino.version>3.1.6</janino.version>
- <java.version>1.8</java.version>
- <javax-activation.version>1.2.0</javax-activation.version>
- <javax-annotation.version>1.3.2</javax-annotation.version>
- <javax-cache.version>1.1.1</javax-cache.version>
- <javax-jaxb.version>2.3.1</javax-jaxb.version>
- <javax-jaxws.version>2.3.1</javax-jaxws.version>
- <javax-jms.version>2.0.1</javax-jms.version>
- <javax-json.version>1.1.4</javax-json.version>
- <javax-jsonb.version>1.0</javax-jsonb.version>
- <javax-mail.version>1.6.2</javax-mail.version>
- <javax-money.version>1.1</javax-money.version>
- <javax-persistence.version>2.2</javax-persistence.version>
- <javax-transaction.version>1.3</javax-transaction.version>
- <javax-validation.version>2.0.1.Final</javax-validation.version>
- <javax-websocket.version>1.1</javax-websocket.version>
- <jaxen.version>1.2.0</jaxen.version>
- <jaybird.version>4.0.5.java8</jaybird.version>
- <jboss-logging.version>3.4.3.Final</jboss-logging.version>
- <jboss-transaction-spi.version>7.6.1.Final</jboss-transaction-spi.version>
- <jdom2.version>2.0.6.1</jdom2.version>
- <jedis.version>3.6.3</jedis.version>
- <jersey.version>2.33</jersey.version>
- <jetty-el.version>9.0.52</jetty-el.version>
- <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
- <jetty-reactive-httpclient.version>1.1.10</jetty-reactive-httpclient.version>
- <jetty.version>9.4.44.v20210927</jetty.version>
- <jmustache.version>1.15</jmustache.version>
- <johnzon.version>1.2.15</johnzon.version>
- <jolokia.version>1.6.2</jolokia.version>
- <jooq.version>3.14.15</jooq.version>
- <json-path.version>2.5.0</json-path.version>
- <json-smart.version>2.4.7</json-smart.version>
- <jsonassert.version>1.5.0</jsonassert.version>
- <jstl.version>1.2</jstl.version>
- <jtds.version>1.3.1</jtds.version>
- <junit-jupiter.version>5.7.2</junit-jupiter.version>
- <junit.version>4.13.2</junit.version>
- <kafka.version>2.7.2</kafka.version>
- <kotlin-coroutines.version>1.5.2</kotlin-coroutines.version>
- <kotlin.version>1.5.32</kotlin.version>
- <lettuce.version>6.1.6.RELEASE</lettuce.version>
- <liquibase.version>4.3.5</liquibase.version>
- <log4j2.version>2.17.1</log4j2.version>
- <logback.version>1.2.10</logback.version>
- <lombok.version>1.18.22</lombok.version>
- <mariadb.version>2.7.5</mariadb.version>
- <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
- <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
- <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
- <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
- <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
- <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
- <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
- <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
- <maven-help-plugin.version>3.2.0</maven-help-plugin.version>
- <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
- <maven-invoker-plugin.version>3.2.2</maven-invoker-plugin.version>
- <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
- <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
- <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
- <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
- <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
- <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
- <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <micrometer.version>1.7.8</micrometer.version>
- <mimepull.version>1.9.15</mimepull.version>
- <mockito.version>3.9.0</mockito.version>
- <mongodb.version>4.2.3</mongodb.version>
- <mssql-jdbc.version>9.2.1.jre8</mssql-jdbc.version>
- <mysql.version>8.0.28</mysql.version>
- <nekohtml.version>1.9.22</nekohtml.version>
- <neo4j-java-driver.version>4.2.8</neo4j-java-driver.version>
- <netty-tcnative.version>2.0.47.Final</netty-tcnative.version>
- <netty.version>4.1.73.Final</netty.version>
- <nimbus-jose-jwt.version>9.10.1</nimbus-jose-jwt.version>
- <oauth2-oidc-sdk.version>9.9.1</oauth2-oidc-sdk.version>
- <ojdbc.version>19.3.0.0</ojdbc.version>
- <okhttp3.version>3.14.9</okhttp3.version>
- <oracle-database.version>21.1.0.0</oracle-database.version>
- <pooled-jms.version>1.2.3</pooled-jms.version>
- <postgresql.version>42.2.24</postgresql.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <prometheus-pushgateway.version>0.10.0</prometheus-pushgateway.version>
- <quartz.version>2.3.2</quartz.version>
- <querydsl.version>4.4.0</querydsl.version>
- <r2dbc-bom.version>Arabba-SR12</r2dbc-bom.version>
- <rabbit-amqp-client.version>5.12.0</rabbit-amqp-client.version>
- <reactive-streams.version>1.0.3</reactive-streams.version>
- <reactor-bom.version>2020.0.15</reactor-bom.version>
- <resource.delimiter>@</resource.delimiter>
- <rest-assured.version>4.3.3</rest-assured.version>
- <rsocket.version>1.1.1</rsocket.version>
- <rxjava-adapter.version>1.2.1</rxjava-adapter.version>
- <rxjava.version>1.3.8</rxjava.version>
- <rxjava2.version>2.2.21</rxjava2.version>
- <saaj-impl.version>1.5.3</saaj-impl.version>
- <selenium-htmlunit.version>2.49.1</selenium-htmlunit.version>
- <selenium.version>3.141.59</selenium.version>
- <sendgrid.version>4.7.6</sendgrid.version>
- <servlet-api.version>4.0.1</servlet-api.version>
- <slf4j.version>1.7.33</slf4j.version>
- <snakeyaml.version>1.28</snakeyaml.version>
- <solr.version>8.8.2</solr.version>
- <spring-amqp.version>2.3.14</spring-amqp.version>
- <spring-batch.version>4.3.4</spring-batch.version>
- <spring-data-bom.version>2021.0.8</spring-data-bom.version>
- <spring-framework.version>5.3.15</spring-framework.version>
- <spring-hateoas.version>1.3.7</spring-hateoas.version>
- <spring-integration.version>5.5.8</spring-integration.version>
- <spring-kafka.version>2.7.10</spring-kafka.version>
- <spring-ldap.version>2.3.5.RELEASE</spring-ldap.version>
- <spring-restdocs.version>2.0.6.RELEASE</spring-restdocs.version>
- <spring-retry.version>1.3.1</spring-retry.version>
- <spring-security.version>5.5.4</spring-security.version>
- <spring-session-bom.version>2021.0.4</spring-session-bom.version>
- <spring-ws.version>3.1.2</spring-ws.version>
- <sqlite-jdbc.version>3.34.0</sqlite-jdbc.version>
- <sun-mail.version>1.6.7</sun-mail.version>
- <thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
- <thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
- <thymeleaf-extras-springsecurity.version>3.0.4.RELEASE</thymeleaf-extras-springsecurity.version>
- <thymeleaf-layout-dialect.version>2.5.3</thymeleaf-layout-dialect.version>
- <thymeleaf.version>3.0.14.RELEASE</thymeleaf.version>
- <tomcat.version>9.0.56</tomcat.version>
- <unboundid-ldapsdk.version>4.0.14</unboundid-ldapsdk.version>
- <undertow.version>2.2.14.Final</undertow.version>
- <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
- <webjars-hal-browser.version>3325375</webjars-hal-browser.version>
- <webjars-locator-core.version>0.46</webjars-locator-core.version>
- <wsdl4j.version>1.6.3</wsdl4j.version>
- <xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
- <xmlunit2.version>2.8.4</xmlunit2.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-amqp</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-blueprint</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-camel</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-console</artifactId>
- <version>5.16.3</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-http</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jaas</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jms-pool</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-karaf</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-leveldb-store</artifactId>
- <version>5.16.3</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-log4j-appender</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-mqtt</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-generator</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-osgi</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-partition</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-run</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-runtime-config</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-shiro</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-spring</artifactId>
- <version>5.16.3</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-stomp</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web</artifactId>
- <version>5.16.3</version>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- </dependency>
- <dependency>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-api-1.0-sdk</artifactId>
- <version>1.9.93</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-amqp-protocol</artifactId>
- <version>2.17.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-commons</artifactId>
- <version>2.17.0</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-core-client</artifactId>
- <version>2.17.0</version>
- <exclusions>
- <exclusion>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client</artifactId>
- <version>2.17.0</version>
- <exclusions>
- <exclusion>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-server</artifactId>
- <version>2.17.0</version>
- <exclusions>
- <exclusion>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-journal</artifactId>
- <version>2.17.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-selector</artifactId>
- <version>2.17.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-server</artifactId>
- <version>2.17.0</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-service-extensions</artifactId>
- <version>2.17.0</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.9.7</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjtools</artifactId>
- <version>1.9.7</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.9.7</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.19.0</version>
- </dependency>
- <dependency>
- <groupId>com.atomikos</groupId>
- <artifactId>transactions-jdbc</artifactId>
- <version>4.0.6</version>
- </dependency>
- <dependency>
- <groupId>com.atomikos</groupId>
- <artifactId>transactions-jms</artifactId>
- <version>4.0.6</version>
- </dependency>
- <dependency>
- <groupId>com.atomikos</groupId>
- <artifactId>transactions-jta</artifactId>
- <version>4.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility-groovy</artifactId>
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility-kotlin</artifactId>
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility-scala</artifactId>
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- <version>1.10.22</version>
- </dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy-agent</artifactId>
- <version>1.10.22</version>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- <version>2.9.3</version>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>guava</artifactId>
- <version>2.9.3</version>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>jcache</artifactId>
- <version>2.9.3</version>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>simulator</artifactId>
- <version>2.9.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-core</artifactId>
- <version>4.11.3</version>
- <exclusions>
- <exclusion>
- <artifactId>jcl-over-slf4j</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>classmate</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>2.8.0</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
- <groupId>com.couchbase.client</groupId>
- <artifactId>java-client</artifactId>
- <version>3.1.7</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.db2</groupId>
- <artifactId>jcc</artifactId>
- <version>11.5.7.0</version>
- </dependency>
- <dependency>
- <groupId>io.spring.gradle</groupId>
- <artifactId>dependency-management-plugin</artifactId>
- <version>1.0.11.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>10.14.2.0</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>2.10.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>3.9.9</version>
- </dependency>
- <dependency>
- <groupId>org.ehcache</groupId>
- <artifactId>ehcache-clustered</artifactId>
- <version>3.9.9</version>
- </dependency>
- <dependency>
- <groupId>org.ehcache</groupId>
- <artifactId>ehcache-transactions</artifactId>
- <version>3.9.9</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>7.12.1</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>transport</artifactId>
- <version>7.12.1</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>7.12.1</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client-sniffer</artifactId>
- <version>7.12.1</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>7.12.1</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.distribution.integ-test-zip</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>7.12.1</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.plugin</groupId>
- <artifactId>transport-netty4-client</artifactId>
- <version>7.12.1</version>
- </dependency>
- <dependency>
- <groupId>de.flapdoodle.embed</groupId>
- <artifactId>de.flapdoodle.embed.mongo</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.flywaydb</groupId>
- <artifactId>flyway-core</artifactId>
- <version>7.7.3</version>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.31</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.el</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>codemodel</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>codemodel-annotation-compiler</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>txw2</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>txwc2</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>xsom</artifactId>
- <version>2.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp.jstl</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.4.200</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>com.hazelcast</groupId>
- <artifactId>hazelcast</artifactId>
- <version>4.1.8</version>
- </dependency>
- <dependency>
- <groupId>com.hazelcast</groupId>
- <artifactId>hazelcast-spring</artifactId>
- <version>4.1.8</version>
- </dependency>
- <dependency>
- <groupId>com.hazelcast</groupId>
- <artifactId>hazelcast-hibernate52</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.hazelcast</groupId>
- <artifactId>hazelcast-hibernate53</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-envers</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-hikaricp</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-java8</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jcache</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jpamodelgen</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-micrometer</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-proxool</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-spatial</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-vibur</artifactId>
- <version>5.4.33</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>6.2.0.Final</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator-annotation-processor</artifactId>
- <version>6.2.0.Final</version>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.5.2</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.49.1</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.1.5</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-win</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>5.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5-cache</artifactId>
- <version>5.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5-fluent</artifactId>
- <version>5.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5-win</artifactId>
- <version>5.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-nio</artifactId>
- <version>4.4.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.core5</groupId>
- <artifactId>httpcore5</artifactId>
- <version>5.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.core5</groupId>
- <artifactId>httpcore5-h2</artifactId>
- <version>5.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.core5</groupId>
- <artifactId>httpcore5-reactive</artifactId>
- <version>5.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.influxdb</groupId>
- <artifactId>influxdb-java</artifactId>
- <version>2.21</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>jakarta.jms</groupId>
- <artifactId>jakarta.jms-api</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- <version>1.1.6</version>
- </dependency>
- <dependency>
- <groupId>jakarta.json.bind</groupId>
- <artifactId>jakarta.json.bind-api</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- <version>1.6.7</version>
- </dependency>
- <dependency>
- <groupId>jakarta.management.j2ee</groupId>
- <artifactId>jakarta.management.j2ee-api</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>4.0.4</version>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet.jsp.jstl</groupId>
- <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- <version>1.2.7</version>
- </dependency>
- <dependency>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
- <version>1.3.3</version>
- </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.websocket</groupId>
- <artifactId>jakarta.websocket-api</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>commons-compiler</artifactId>
- <version>3.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>commons-compiler-jdk</artifactId>
- <version>3.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <version>3.1.6</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>javax.jms-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>javax.money</groupId>
- <artifactId>money-api</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.1.Final</version>
- </dependency>
- <dependency>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.firebirdsql.jdbc</groupId>
- <artifactId>jaybird</artifactId>
- <version>4.0.5.java8</version>
- </dependency>
- <dependency>
- <groupId>org.firebirdsql.jdbc</groupId>
- <artifactId>jaybird-jdk18</artifactId>
- <version>4.0.5.java8</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>3.4.3.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <version>7.6.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>2.0.6.1</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>3.6.3</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jasper</groupId>
- <artifactId>apache-el</artifactId>
- <version>9.0.52</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>2.2.0.v201112011158</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-reactive-httpclient</artifactId>
- <version>1.1.10</version>
- </dependency>
- <dependency>
- <groupId>com.samskivert</groupId>
- <artifactId>jmustache</artifactId>
- <version>1.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb-extras</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonschema</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-mapper</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-websocket</artifactId>
- <version>1.2.15</version>
- </dependency>
- <dependency>
- <groupId>org.jolokia</groupId>
- <artifactId>jolokia-core</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>jooq</artifactId>
- <version>3.14.15</version>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>jooq-codegen</artifactId>
- <version>3.14.15</version>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>jooq-kotlin</artifactId>
- <version>3.14.15</version>
- </dependency>
- <dependency>
- <groupId>org.jooq</groupId>
- <artifactId>jooq-meta</artifactId>
- <version>3.14.15</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path-assert</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>2.4.7</version>
- </dependency>
- <dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>connect-api</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>connect-basic-auth-extension</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>connect-file</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>connect-json</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>connect-runtime</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>connect-transforms</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-log4j-appender</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-streams</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-streams-scala_2.12</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-streams-scala_2.13</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-streams-test-utils</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-tools</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.12</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.13</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>io.lettuce</groupId>
- <artifactId>lettuce-core</artifactId>
- <version>6.1.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-core</artifactId>
- <version>4.3.5</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-access</artifactId>
- <version>1.2.10</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.10</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>1.2.10</version>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.22</version>
- </dependency>
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <version>2.7.5</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-stackdriver</artifactId>
- <version>1.7.8</version>
- <exclusions>
- <exclusion>
- <artifactId>javax.annotation-api</artifactId>
- <groupId>javax.annotation</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jvnet.mimepull</groupId>
- <artifactId>mimepull</artifactId>
- <version>1.9.15</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- <version>3.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <version>3.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>bson</artifactId>
- <version>4.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver-core</artifactId>
- <version>4.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver-legacy</artifactId>
- <version>4.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver-reactivestreams</artifactId>
- <version>4.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver-sync</artifactId>
- <version>4.2.3</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>9.2.1.jre8</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.28</version>
- <exclusions>
- <exclusion>
- <artifactId>protobuf-java</artifactId>
- <groupId>com.google.protobuf</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.22</version>
- </dependency>
- <dependency>
- <groupId>org.neo4j.driver</groupId>
- <artifactId>neo4j-java-driver</artifactId>
- <version>4.2.8</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative</artifactId>
- <version>2.0.47.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.47.Final</version>
- </dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>oauth2-oidc-sdk</artifactId>
- <version>9.9.1</version>
- </dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>9.10.1</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>dms</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc10</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc10_g</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc10dms</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc10dms_g</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc8</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc8_g</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc8dms</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ojdbc8dms_g</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ons</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>oraclepki</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>orai18n</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>osdt_cert</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>osdt_core</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>simplefan</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>ucp</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>xdb</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.ojdbc</groupId>
- <artifactId>xmlparserv2</artifactId>
- <version>19.3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>logging-interceptor</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okcurl</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp-dnsoverhttps</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp-sse</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp-testing-support</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp-tls</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp-urlconnection</artifactId>
- <version>3.14.9</version>
- </dependency>
- <dependency>
- <groupId>org.messaginghub</groupId>
- <artifactId>pooled-jms</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.2.24</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.3.2</version>
- <exclusions>
- <exclusion>
- <artifactId>c3p0</artifactId>
- <groupId>com.mchange</groupId>
- </exclusion>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>com.zaxxer</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-apt</artifactId>
- <version>4.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-collections</artifactId>
- <version>4.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-core</artifactId>
- <version>4.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-jpa</artifactId>
- <version>4.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.querydsl</groupId>
- <artifactId>querydsl-mongodb</artifactId>
- <version>4.4.0</version>
- <exclusions>
- <exclusion>
- <artifactId>mongo-java-driver</artifactId>
- <groupId>org.mongodb</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>5.12.0</version>
- </dependency>
- <dependency>
- <groupId>org.reactivestreams</groupId>
- <artifactId>reactive-streams</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>json-path</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>json-schema-validator</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>scala-support</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>spring-mock-mvc</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>spring-web-test-client</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>xml-path</artifactId>
- <version>4.3.3</version>
- </dependency>
- <dependency>
- <groupId>io.reactivex</groupId>
- <artifactId>rxjava</artifactId>
- <version>1.3.8</version>
- </dependency>
- <dependency>
- <groupId>io.reactivex</groupId>
- <artifactId>rxjava-reactive-streams</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>io.reactivex.rxjava2</groupId>
- <artifactId>rxjava</artifactId>
- <version>2.2.21</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-test</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-test-autoconfigure</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-actuator</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-actuator-autoconfigure</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure-processor</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-buildpack-platform</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-metadata</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-jarmode-layertools</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-loader</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-loader-tools</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-properties-migrator</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-activemq</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-amqp</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-artemis</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-batch</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-cassandra</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-cassandra-reactive</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-couchbase</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-couchbase-reactive</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jdbc</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-ldap</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-mongodb</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-r2dbc</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-neo4j</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-rest</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-freemarker</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-groovy-templates</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-hateoas</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-integration</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jdbc</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jersey</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jooq</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-json</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jta-atomikos</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-mail</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-mustache</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-oauth2-client</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-quartz</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-reactor-netty</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-rsocket</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-undertow</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-webflux</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web-services</artifactId>
- <version>2.5.9</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-chrome-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-edge-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-firefox-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-ie-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-opera-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-remote-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-safari-driver</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-support</artifactId>
- <version>3.141.59</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>htmlunit-driver</artifactId>
- <version>2.49.1</version>
- </dependency>
- <dependency>
- <groupId>com.sendgrid</groupId>
- <artifactId>sendgrid-java</artifactId>
- <version>4.7.6</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.28</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-analysis-extras</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-analytics</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-cell</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-dataimporthandler</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-dataimporthandler-extras</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-langid</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-ltr</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>8.8.2</version>
- <exclusions>
- <exclusion>
- <artifactId>jcl-over-slf4j</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-velocity</artifactId>
- <version>8.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.amqp</groupId>
- <artifactId>spring-amqp</artifactId>
- <version>2.3.14</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.amqp</groupId>
- <artifactId>spring-rabbit</artifactId>
- <version>2.3.14</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.amqp</groupId>
- <artifactId>spring-rabbit-junit</artifactId>
- <version>2.3.14</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.amqp</groupId>
- <artifactId>spring-rabbit-test</artifactId>
- <version>2.3.14</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-core</artifactId>
- <version>4.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-infrastructure</artifactId>
- <version>4.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-integration</artifactId>
- <version>4.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-test</artifactId>
- <version>4.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.hateoas</groupId>
- <artifactId>spring-hateoas</artifactId>
- <version>1.3.7</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.kafka</groupId>
- <artifactId>spring-kafka</artifactId>
- <version>2.7.10</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.kafka</groupId>
- <artifactId>spring-kafka-test</artifactId>
- <version>2.7.10</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
- <version>2.3.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core-tiger</artifactId>
- <version>2.3.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-ldif-batch</artifactId>
- <version>2.3.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-ldif-core</artifactId>
- <version>2.3.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-odm</artifactId>
- <version>2.3.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-test</artifactId>
- <version>2.3.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.restdocs</groupId>
- <artifactId>spring-restdocs-asciidoctor</artifactId>
- <version>2.0.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.restdocs</groupId>
- <artifactId>spring-restdocs-core</artifactId>
- <version>2.0.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.restdocs</groupId>
- <artifactId>spring-restdocs-mockmvc</artifactId>
- <version>2.0.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.restdocs</groupId>
- <artifactId>spring-restdocs-restassured</artifactId>
- <version>2.0.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.restdocs</groupId>
- <artifactId>spring-restdocs-webtestclient</artifactId>
- <version>2.0.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.retry</groupId>
- <artifactId>spring-retry</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-security</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-support</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-test</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-xml</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.34.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>1.6.7</version>
- </dependency>
- <dependency>
- <groupId>org.thymeleaf</groupId>
- <artifactId>thymeleaf</artifactId>
- <version>3.0.14.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.thymeleaf</groupId>
- <artifactId>thymeleaf-spring5</artifactId>
- <version>3.0.14.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>com.github.mxab.thymeleaf.extras</groupId>
- <artifactId>thymeleaf-extras-data-attribute</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.thymeleaf.extras</groupId>
- <artifactId>thymeleaf-extras-java8time</artifactId>
- <version>3.0.4.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.thymeleaf.extras</groupId>
- <artifactId>thymeleaf-extras-springsecurity5</artifactId>
- <version>3.0.4.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>nz.net.ultraq.thymeleaf</groupId>
- <artifactId>thymeleaf-layout-dialect</artifactId>
- <version>2.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-el</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-websocket</artifactId>
- <version>9.0.56</version>
- </dependency>
- <dependency>
- <groupId>com.unboundid</groupId>
- <artifactId>unboundid-ldapsdk</artifactId>
- <version>4.0.14</version>
- </dependency>
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-core</artifactId>
- <version>2.2.14.Final</version>
- </dependency>
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
- <version>2.2.14.Final</version>
- </dependency>
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-websockets-jsr</artifactId>
- <version>2.2.14.Final</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>hal-browser</artifactId>
- <version>3325375</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>webjars-locator-core</artifactId>
- <version>0.46</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-assertj</artifactId>
- <version>2.8.4</version>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <version>2.8.4</version>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-legacy</artifactId>
- <version>2.8.4</version>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <version>2.8.4</version>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-placeholders</artifactId>
- <version>2.8.4</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-core-shaded</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-mapper-processor</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-mapper-runtime</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-query-builder</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-test-infra</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-metrics-micrometer</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-metrics-microprofile</artifactId>
- <version>4.11.3</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>native-protocol</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-shaded-guava</artifactId>
- <version>25.1-jre-graal-sub-1</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-annotation</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-caffeine</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-collectd</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-ehcache</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-graphite</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-healthchecks</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-httpclient</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-httpasyncclient</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jcache</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jdbi</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jdbi3</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jersey2</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jetty9</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jmx</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-json</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-log4j2</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-logback</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-servlet</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-servlets</artifactId>
- <version>4.1.29</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-astbuilder</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-bsf</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-cli-commons</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-cli-picocli</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-console</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-datetime</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-dateutil</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-docgenerator</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-groovydoc</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-groovysh</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-jaxb</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-jmx</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-jsr223</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-macro</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-nio</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-servlet</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-sql</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-swing</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test-junit5</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-testng</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-yaml</artifactId>
- <version>3.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-api</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-jdbc</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-jpa</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-remote</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-rocksdb</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cdi-common</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cdi-embedded</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cdi-remote</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-checkstyle</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cli-client</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-client-hotrod</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-client-rest</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-key-value-store-client</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-clustered-counter</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-clustered-lock</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-commons</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-commons-test</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-component-annotations</artifactId>
- <version>12.1.11.Final</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-component-processor</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-jboss-marshalling</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-extended-statistics</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-hibernate-cache-commons</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-hibernate-cache-spi</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-hibernate-cache-v51</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-hibernate-cache-v53</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-jcache-commons</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-jcache</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-jcache-remote</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-console</artifactId>
- <version>0.14.3.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-marshaller-kryo</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-marshaller-kryo-bundle</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-marshaller-protostuff</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-marshaller-protostuff-bundle</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-multimap</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-objectfilter</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-persistence-soft-index</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-query-core</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-query</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-query-dsl</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-remote-query-client</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-remote-query-server</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-scripting</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-core</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-hotrod</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-memcached</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-rest</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-router</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-runtime</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-testdriver-core</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-testdriver-junit4</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-testdriver-junit5</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring5-common</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring5-embedded</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring5-remote</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring-boot-starter-embedded</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-spring-boot-starter-remote</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-tasks</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-tasks-api</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-tools</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-anchored-keys</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan.protostream</groupId>
- <artifactId>protostream</artifactId>
- <version>4.4.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan.protostream</groupId>
- <artifactId>protostream-types</artifactId>
- <version>4.4.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan.protostream</groupId>
- <artifactId>protostream-processor</artifactId>
- <version>4.4.1.Final</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cloudevents-integration</artifactId>
- <version>12.1.11.Final</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-avro</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-csv</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-ion</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-properties</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-protobuf</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-smile</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-toml</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-eclipse-collections</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-guava</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hibernate3</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hibernate4</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hibernate5</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hppc</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jakarta-jsonp</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jaxrs</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jaxrs</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-joda</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-joda-money</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-json-org</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr353</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-pcollections</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-cbor-provider</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-cbor-provider</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-smile-provider</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-smile-provider</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-xml-provider</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-xml-provider</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-yaml-provider</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-yaml-provider</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jr</groupId>
- <artifactId>jackson-jr-all</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jr</groupId>
- <artifactId>jackson-jr-annotation-support</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jr</groupId>
- <artifactId>jackson-jr-objects</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jr</groupId>
- <artifactId>jackson-jr-retrofit2</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jr</groupId>
- <artifactId>jackson-jr-stree</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-afterburner</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-blackbird</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-guice</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.12.6</version>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jsonSchema</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-kotlin</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-mrbean</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-osgi</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-parameter-names</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-paranamer</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.11</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.12</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.13</artifactId>
- <version>2.12.6</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.bundles</groupId>
- <artifactId>jaxrs-ri</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-apache-connector</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-helidon-connector</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-grizzly-connector</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-jetty-connector</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-jdk-connector</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-netty-connector</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-jetty-http</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-grizzly2-http</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-grizzly2-servlet</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-jetty-servlet</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-jdk-http</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-netty-http</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-simple-http</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers.glassfish</groupId>
- <artifactId>jersey-gf-ejb</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-entity-filtering</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-metainf-services</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.microprofile</groupId>
- <artifactId>jersey-mp-config</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc-bean-validation</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc-freemarker</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc-jsp</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc-mustache</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-proxy-client</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-servlet-portability</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-spring4</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-spring5</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-declarative-linking</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-wadl-doclet</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-weld2-se</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-cdi1x</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-cdi1x-transaction</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-cdi1x-validation</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-cdi1x-servlet</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.cdi</groupId>
- <artifactId>jersey-cdi1x-ban-custom-hk2-binding</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.rx</groupId>
- <artifactId>jersey-rx-client-guava</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.rx</groupId>
- <artifactId>jersey-rx-client-rxjava</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.rx</groupId>
- <artifactId>jersey-rx-client-rxjava2</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.microprofile</groupId>
- <artifactId>jersey-mp-rest-client</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-jaxb</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jettison</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-processing</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-binding</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-kryo</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-moxy</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-multipart</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-sse</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.security</groupId>
- <artifactId>oauth1-client</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.security</groupId>
- <artifactId>oauth1-server</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.security</groupId>
- <artifactId>oauth1-signature</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.security</groupId>
- <artifactId>oauth2-client</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-cdi2-se</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-bundle</artifactId>
- <version>2.33</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-external</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-inmemory</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-jdk-http</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-simple</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-jetty</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-util</artifactId>
- <version>2.33</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jsp</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jstl</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-java-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-java-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-openjdk8-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-openjdk8-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-conscrypt-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-conscrypt-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-ant</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-deploy</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-distribution</artifactId>
- <version>9.4.44.v20210927</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-distribution</artifactId>
- <version>9.4.44.v20210927</version>
- <type>tar.gz</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.fcgi</groupId>
- <artifactId>fcgi-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.fcgi</groupId>
- <artifactId>fcgi-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.gcloud</groupId>
- <artifactId>jetty-gcloud-session-manager</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-home</artifactId>
- <version>9.4.44.v20210927</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-home</artifactId>
- <version>9.4.44.v20210927</version>
- <type>tar.gz</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-common</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-hpack</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-http-client-transport</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http-spi</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>infinispan-common</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>infinispan-remote-query</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>infinispan-embedded-query</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-hazelcast</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jaas</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jaspi</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jndi</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.memcached</groupId>
- <artifactId>jetty-memcached-sessions</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-nosql</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.osgi</groupId>
- <artifactId>jetty-osgi-boot</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.osgi</groupId>
- <artifactId>jetty-osgi-boot-jsp</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.osgi</groupId>
- <artifactId>jetty-osgi-boot-warurl</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.osgi</groupId>
- <artifactId>jetty-httpservice</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-proxy</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-quickstart</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-rewrite</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-openid</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-spring</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-unixsocket</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-client-impl</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-server-impl</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-api</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-common</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-xml</artifactId>
- <version>9.4.44.v20210927</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>5.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-migrationsupport</artifactId>
- <version>5.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>5.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-commons</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-console</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-engine</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-jfr</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-reporting</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-runner</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-suite-api</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-testkit</artifactId>
- <version>1.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>5.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk7</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk8</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-js</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-common</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-reflect</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-osgi-bundle</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-junit</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-junit5</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-testng</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-js</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-common</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test-annotations-common</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-main-kts</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-script-runtime</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-script-util</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-scripting-common</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-scripting-jvm</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-scripting-jvm-host</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-scripting-ide-services</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-compiler</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-compiler-embeddable</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-daemon-client</artifactId>
- <version>1.5.32</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-android</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-core-jvm</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-core</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-debug</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-guava</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-javafx</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-jdk8</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-jdk9</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-play-services</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-reactive</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-reactor</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-rx2</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-rx3</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-slf4j</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-swing</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlinx</groupId>
- <artifactId>kotlinx-coroutines-test</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-template-json</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-flume-ng</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-taglib</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jmx-gui</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j18-impl</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-appserver</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-web</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-couchdb</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-mongodb4</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-mongodb3</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-cassandra</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jpa</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-iostreams</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jpl</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-liquibase</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-docker</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-kubernetes</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-boot</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-cloud-config-client</artifactId>
- <version>2.17.1</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-jersey2</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-appoptics</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-atlas</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-azure-monitor</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-cloudwatch</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-cloudwatch2</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-datadog</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-dynatrace</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-elastic</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-ganglia</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-graphite</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-health</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-humio</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-influx</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-jmx</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-kairos</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-new-relic</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-opentsdb</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-signalfx</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-statsd</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-wavefront</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-test</artifactId>
- <version>1.7.8</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-dns</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-haproxy</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-memcache</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-mqtt</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-redis</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-smtp</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-stomp</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-xml</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-dev-tools</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-rxtx</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-sctp</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-udt</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-example</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-classes-macos</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
- <version>4.1.73.Final</version>
- <classifier>osx-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
- <version>4.1.73.Final</version>
- <classifier>osx-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.73.Final</version>
- <classifier>linux-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.73.Final</version>
- <classifier>linux-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.73.Final</version>
- <classifier>osx-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.73.Final</version>
- <classifier>osx-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-classes-epoll</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.73.Final</version>
- <classifier>linux-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.73.Final</version>
- <classifier>linux-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-classes-kqueue</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <version>4.1.73.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <version>4.1.73.Final</version>
- <classifier>osx-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <version>4.1.73.Final</version>
- <classifier>osx-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-classes</artifactId>
- <version>2.0.46.Final</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative</artifactId>
- <version>2.0.46.Final</version>
- <classifier>linux-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative</artifactId>
- <version>2.0.46.Final</version>
- <classifier>linux-x86_64-fedora</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative</artifactId>
- <version>2.0.46.Final</version>
- <classifier>linux-aarch_64-fedora</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative</artifactId>
- <version>2.0.46.Final</version>
- <classifier>osx-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.46.Final</version>
- <classifier>linux-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.46.Final</version>
- <classifier>linux-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.46.Final</version>
- <classifier>osx-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.46.Final</version>
- <classifier>osx-aarch_64</classifier>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.46.Final</version>
- <classifier>windows-x86_64</classifier>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc11</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ucp</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>rsi</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.security</groupId>
- <artifactId>oraclepki</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.security</groupId>
- <artifactId>osdt_core</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.security</groupId>
- <artifactId>osdt_cert</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.ha</groupId>
- <artifactId>simplefan</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.ha</groupId>
- <artifactId>ons</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.nls</groupId>
- <artifactId>orai18n</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.xml</groupId>
- <artifactId>xdb</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.xml</groupId>
- <artifactId>xmlparserv2</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc11_g</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc8_g</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc8dms_g</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc11dms_g</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.observability</groupId>
- <artifactId>dms</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.observability</groupId>
- <artifactId>ojdbc11dms</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.observability</groupId>
- <artifactId>ojdbc8dms</artifactId>
- <version>21.1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc11-production</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8-production</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.observability</groupId>
- <artifactId>ojdbc8-observability</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.observability</groupId>
- <artifactId>ojdbc11-observability</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc8-debug</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc11-debug</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc8-observability-debug</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.jdbc.debug</groupId>
- <artifactId>ojdbc11-observability-debug</artifactId>
- <version>21.1.0.0</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_common</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_caffeine</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_dropwizard</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_graphite_bridge</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_hibernate</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_guava</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_hotspot</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_httpserver</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_log4j</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_log4j2</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_logback</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_pushgateway</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_servlet</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_spring_web</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_spring_boot</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_jetty</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_jetty_jdk8</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_vertx</artifactId>
- <version>0.10.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.cloud</groupId>
- <artifactId>cloud-spanner-r2dbc</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>com.oracle.database.r2dbc</groupId>
- <artifactId>oracle-r2dbc</artifactId>
- <version>0.1.0</version>
- </dependency>
- <dependency>
- <groupId>io.r2dbc</groupId>
- <artifactId>r2dbc-h2</artifactId>
- <version>0.8.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.mariadb</groupId>
- <artifactId>r2dbc-mariadb</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>io.r2dbc</groupId>
- <artifactId>r2dbc-mssql</artifactId>
- <version>0.8.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>dev.miku</groupId>
- <artifactId>r2dbc-mysql</artifactId>
- <version>0.8.2.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>io.r2dbc</groupId>
- <artifactId>r2dbc-postgresql</artifactId>
- <version>0.8.11.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>io.r2dbc</groupId>
- <artifactId>r2dbc-pool</artifactId>
- <version>0.8.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>io.r2dbc</groupId>
- <artifactId>r2dbc-proxy</artifactId>
- <version>0.8.8.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>io.r2dbc</groupId>
- <artifactId>r2dbc-spi</artifactId>
- <version>0.8.6.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-core</artifactId>
- <version>3.4.14</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-test</artifactId>
- <version>3.4.14</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-tools</artifactId>
- <version>3.4.14</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.addons</groupId>
- <artifactId>reactor-extra</artifactId>
- <version>3.4.6</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.addons</groupId>
- <artifactId>reactor-adapter</artifactId>
- <version>3.4.6</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty</artifactId>
- <version>1.0.15</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-core</artifactId>
- <version>1.0.15</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http</artifactId>
- <version>1.0.15</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty-http-brave</artifactId>
- <version>1.0.15</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.addons</groupId>
- <artifactId>reactor-pool</artifactId>
- <version>0.2.7</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.kafka</groupId>
- <artifactId>reactor-kafka</artifactId>
- <version>1.3.9</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.rabbitmq</groupId>
- <artifactId>reactor-rabbitmq</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.kotlin</groupId>
- <artifactId>reactor-kotlin-extensions</artifactId>
- <version>1.1.5</version>
- </dependency>
- <dependency>
- <groupId>io.rsocket</groupId>
- <artifactId>rsocket-core</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>io.rsocket</groupId>
- <artifactId>rsocket-load-balancer</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>io.rsocket</groupId>
- <artifactId>rsocket-micrometer</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>io.rsocket</groupId>
- <artifactId>rsocket-test</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>io.rsocket</groupId>
- <artifactId>rsocket-transport-local</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>io.rsocket</groupId>
- <artifactId>rsocket-transport-netty</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-cassandra</artifactId>
- <version>3.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-commons</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-couchbase</artifactId>
- <version>4.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-elasticsearch</artifactId>
- <version>4.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-geode</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jdbc</artifactId>
- <version>2.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-relational</artifactId>
- <version>2.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jpa</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-mongodb</artifactId>
- <version>3.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-neo4j</artifactId>
- <version>6.1.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-r2dbc</artifactId>
- <version>1.3.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-redis</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-rest-webmvc</artifactId>
- <version>3.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-rest-core</artifactId>
- <version>3.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-rest-hal-explorer</artifactId>
- <version>3.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-keyvalue</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-envers</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-ldap</artifactId>
- <version>2.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aspects</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-indexer</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-instrument</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jcl</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-messaging</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-r2dbc</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webflux</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-websocket</artifactId>
- <version>5.3.15</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-amqp</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-core</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-event</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-feed</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-file</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-ftp</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-gemfire</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-groovy</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-http</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-ip</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-jdbc</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-jms</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-jmx</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-jpa</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-kafka</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-mail</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-mongodb</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-mqtt</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-r2dbc</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-redis</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-rmi</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-rsocket</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-scripting</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-security</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-sftp</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-stomp</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-stream</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-syslog</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-test</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-test-support</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-webflux</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-websocket</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-ws</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-xml</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-xmpp</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-zeromq</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-zookeeper</artifactId>
- <version>5.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-acl</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-aspects</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-cas</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-crypto</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-data</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-ldap</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-messaging</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-client</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-resource-server</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-openid</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-remoting</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-rsocket</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-saml2-service-provider</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-taglibs</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-test</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>5.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-jdbc</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-data-geode</artifactId>
- <version>2.5.5</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-hazelcast</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-data-mongodb</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-core</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-data-redis</artifactId>
- <version>2.5.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>2.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.3.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.70</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-commons</artifactId>
- <version>2.3.1.RELEASE</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.20</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>protobuf-java</artifactId>
- <groupId>com.google.protobuf</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.22</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>2.5.9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter-test</artifactId>
- <version>2.3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>3.10.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.19.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>5.4.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.5.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.20</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.github.xingshuangs</groupId>
- <artifactId>iot-communication</artifactId>
- <version>1.4.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- <version>2.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.36.Final</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>nexus-aliyun</id>
- <name>nexus-aliyun</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- </repository>
- <repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>central</id>
- <name>Central Repository</name>
- <url>https://repo.maven.apache.org/maven2</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- </pluginRepository>
- <pluginRepository>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>central</id>
- <name>Central Repository</name>
- <url>https://repo.maven.apache.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
- <build>
- <sourceDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\src\main\java</sourceDirectory>
- <scriptSourceDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\src\main\scripts</scriptSourceDirectory>
- <testSourceDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\src\test\java</testSourceDirectory>
- <outputDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\classes</outputDirectory>
- <testOutputDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\test-classes</testOutputDirectory>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>d:\Code\HangZhouMes\UnLoadGlassModule\src\main\resources</directory>
- <includes>
- <include>**/application*.yml</include>
- <include>**/application*.yaml</include>
- <include>**/application*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>d:\Code\HangZhouMes\UnLoadGlassModule\src\main\resources</directory>
- <excludes>
- <exclude>**/application*.yml</exclude>
- <exclude>**/application*.yaml</exclude>
- <exclude>**/application*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>d:\Code\HangZhouMes\UnLoadGlassModule\src\test\resources</directory>
- </testResource>
- </testResources>
- <directory>d:\Code\HangZhouMes\UnLoadGlassModule\target</directory>
- <finalName>MES-Module-0.0.1-SNAPSHOT</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.flywaydb</groupId>
- <artifactId>flyway-maven-plugin</artifactId>
- <version>7.7.3</version>
- </plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>4.0.5</version>
- <executions>
- <execution>
- <goals>
- <goal>revision</goal>
- </goals>
- <configuration>
- <verbose>true</verbose>
- <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>d:\Code\HangZhouMes\UnLoadGlassModule\target\classes/git.properties</generateGitPropertiesFilename>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <verbose>true</verbose>
- <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>d:\Code\HangZhouMes\UnLoadGlassModule\target\classes/git.properties</generateGitPropertiesFilename>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-maven-plugin</artifactId>
- <version>1.2.15</version>
- </plugin>
- <plugin>
- <groupId>org.jooq</groupId>
- <artifactId>jooq-codegen-maven</artifactId>
- <version>3.14.15</version>
- </plugin>
- <plugin>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-maven-plugin</artifactId>
- <version>1.5.32</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <jvmTarget>1.8</jvmTarget>
- <javaParameters>true</javaParameters>
- </configuration>
- </execution>
- <execution>
- <id>test-compile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>test-compile</goal>
- </goals>
- <configuration>
- <jvmTarget>1.8</jvmTarget>
- <javaParameters>true</javaParameters>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <jvmTarget>1.8</jvmTarget>
- <javaParameters>true</javaParameters>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-maven-plugin</artifactId>
- <version>4.3.5</version>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <parameters>true</parameters>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.2</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <classesDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\classes</classesDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <classesDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\classes</classesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-help-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.2</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>${start-class}</mainClass>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <propertiesEncoding>UTF-8</propertiesEncoding>
- <delimiters>
- <delimiter>@</delimiter>
- </delimiters>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring.handlers</resource>
- </transformer>
- <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
- <resource>META-INF/spring.factories</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring.schemas</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>${start-class}</mainClass>
- </transformer>
- </transformers>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.5.9</version>
- </dependency>
- </dependencies>
- <configuration>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>${start-class}</mainClass>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.5.9</version>
- <executions>
- <execution>
- <id>repackage</id>
- <goals>
- <goal>repackage</goal>
- </goals>
- <configuration>
- <mainClass>${start-class}</mainClass>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <mainClass>${start-class}</mainClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.5.9</version>
- <executions>
- <execution>
- <id>repackage</id>
- <goals>
- <goal>repackage</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
- <mainClass>${start-class}</mainClass>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
- <mainClass>${start-class}</mainClass>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>default-clean</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>default-testResources</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>testResources</goal>
- </goals>
- <configuration>
- <propertiesEncoding>UTF-8</propertiesEncoding>
- <delimiters>
- <delimiter>@</delimiter>
- </delimiters>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- </configuration>
- </execution>
- <execution>
- <id>default-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- <configuration>
- <propertiesEncoding>UTF-8</propertiesEncoding>
- <delimiters>
- <delimiter>@</delimiter>
- </delimiters>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <propertiesEncoding>UTF-8</propertiesEncoding>
- <delimiters>
- <delimiter>@</delimiter>
- </delimiters>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.2</version>
- <executions>
- <execution>
- <id>default-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>${start-class}</mainClass>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifest>
- <mainClass>${start-class}</mainClass>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <parameters>true</parameters>
- </configuration>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <parameters>true</parameters>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <parameters>true</parameters>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <executions>
- <execution>
- <id>default-install</id>
- <phase>install</phase>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <executions>
- <execution>
- <id>default-deploy</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- <executions>
- <execution>
- <id>default-site</id>
- <phase>site</phase>
- <goals>
- <goal>site</goal>
- </goals>
- <configuration>
- <outputDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\site</outputDirectory>
- <reportPlugins>
- <reportPlugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </reportPlugin>
- </reportPlugins>
- </configuration>
- </execution>
- <execution>
- <id>default-deploy</id>
- <phase>site-deploy</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <outputDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\site</outputDirectory>
- <reportPlugins>
- <reportPlugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </reportPlugin>
- </reportPlugins>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\site</outputDirectory>
- <reportPlugins>
- <reportPlugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </reportPlugin>
- </reportPlugins>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <outputDirectory>d:\Code\HangZhouMes\UnLoadGlassModule\target\site</outputDirectory>
- </reporting>
-</project>
diff --git a/UnLoadGlassModule/mockPLCData.properties b/UnLoadGlassModule/mockPLCData.properties
deleted file mode 100644
index 56514ef..0000000
--- a/UnLoadGlassModule/mockPLCData.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Mock S7 PLC Data
-#Wed Mar 27 10:21:54 CST 2024
-DB4.0.0=false
-DB4.1.1=false
-DB4.1.0=false
-DB4.0.7=false
-DB4.0.6=false
-DB4.0.5=true
-DB4.0.4=true
-DB4.0.3=true
-DB4.0.2=true
-DB4.0.1=true
-DB101.0=1
diff --git a/UnLoadGlassModule/pom.xml b/UnLoadGlassModule/pom.xml
deleted file mode 100644
index 66013a9..0000000
--- a/UnLoadGlassModule/pom.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.9</version>
- <relativePath/> <!-- lookup parent from repository -->
- </parent>
- <groupId>com.MES-Module</groupId>
- <artifactId>MES-UnLoadGlassModule</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>MES-UnLoadGlassModule</name>
- <description>project for Spring Boot</description>
- <properties>
- <java.version>1.8</java.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.70</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-commons</artifactId>
- <version>2.3.1.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.20</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter-test</artifactId>
- <version>2.3.1</version>
- <scope>test</scope>
- </dependency>
- <!--jwt 椤圭洰鐢熸垚token-->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>3.10.3</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- </dependency>
- <!--hutool java楠岃瘉鏂规硶绫�-->
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>5.4.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.1</version>
- </dependency>
-
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.5.1</version>
- </dependency>
-
-<!-- SwaggerUi-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.20</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.xingshuangs</groupId>
- <artifactId>iot-communication</artifactId>
- <version>1.4.2</version>
- </dependency>
- <!-- spring cache 鏁版嵁缂撳瓨 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- </dependency>
-
- <!-- rabbitmq -->
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>5.13.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-amqp</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.12.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.13.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.13.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.13.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.xingshuangs</groupId>
- <artifactId>iot-communication</artifactId>
- <version>1.4.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>5.2.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>5.2.4</version>
- </dependency>
-
- <!--websocket-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-starter-websocket</artifactId>-->
-<!-- </dependency>-->
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>4.1.36.Final</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <repositories>
- <repository>
- <id>nexus-aliyun</id>
- <name>nexus-aliyun</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-</project>
diff --git a/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java b/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java
deleted file mode 100644
index c438a67..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes;
-
-import com.mes.tools.WebSocketServer;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@SpringBootApplication
-@EnableCaching
-@EnableTransactionManagement
-public class MesApplication {
- public static void main(String[] args) {
- SpringApplication springApplication = new SpringApplication(MesApplication.class);
- ConfigurableApplicationContext applicationContext = springApplication.run(args);
- WebSocketServer.setApplicationContext(applicationContext);
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/CacheUtil.java b/UnLoadGlassModule/src/main/java/com/mes/common/CacheUtil.java
deleted file mode 100644
index df5af14..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/CacheUtil.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.common;
-
-import com.mes.controller.dto.UserDTO;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CacheUtil {
- @Cacheable(value="users", key="#id")
- public UserDTO getCacheData(String id){
- return null;
- }
-
- @Cacheable(value="users", key="#userDTO.getUserId()")
- public UserDTO setCacheData(UserDTO userDTO){
-
- return userDTO;
- }
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/Constants.java b/UnLoadGlassModule/src/main/java/com/mes/common/Constants.java
deleted file mode 100644
index 9e591db..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/Constants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mes.common;
-
-/**
- * 瀹氫箟涓�浜涘父閲忚繘琛屼娇鐢�
- */
-public interface Constants {
- String Code_500="500";//绯荤粺閿欒
- String Code_401="401";//鏉冮檺涓嶈冻
- String Code_400="400";//
- String Code_200="200";//鎴愬姛
- String Code_600="600";//鍏朵粬闂
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLC.java b/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLC.java
deleted file mode 100644
index 86d7a0b..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLC.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.mes.common.PlcTools;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 妯℃嫙S7 PLC鐨勭畝鍗曞疄鐜帮紝鐢ㄤ簬娴嬭瘯鍜屽紑鍙戦樁娈�
- */
-public class MockS7PLC {
- // 浣跨敤Map妯℃嫙PLC鐨勫唴瀛樺瓨鍌紝閿槸鍦板潃锛屽�兼槸瀛樺偍鐨勬暟鎹�
- private Map<String, byte[]> memory = new HashMap<>();
-
- private static volatile MockS7PLC instance; // 鍗曚緥瀹炰緥
- public static MockS7PLC getInstance() {
- if (instance == null) {
- synchronized (MockS7PLC.class) {
- if (instance == null)
- instance = new MockS7PLC();
- }
- }
- return instance;
- }
- /**
- * 妯℃嫙鍐欏叆涓�涓垨澶氫釜瀛楄妭鍒版寚瀹氬湴鍧�
- *
- * @param address 鍦板潃
- * @param data 瑕佸啓鍏ョ殑鏁版嵁
- */
- public void writeByte(String address, byte[] data) {
- memory.put(address, data);
- }
-
- /**
- * 妯℃嫙浠庢寚瀹氬湴鍧�璇诲彇涓�瀹氭暟閲忕殑瀛楄妭
- *
- * @param address 鍦板潃
- * @param count 瑕佽鍙栫殑瀛楄妭鏁�
- * @return 璇诲彇鍒扮殑鏁版嵁
- */
- public byte[] readByte(String address, int count) {
- byte[] bytes = memory.getOrDefault(address, new byte[0]);
-
- if (count >= 0 && count <= bytes.length) {
- byte[] result = new byte[count];
- System.arraycopy(bytes, 0, result, 0, count);
- return result;
- } else {
- // 濡傛灉璇锋眰鐨勫瓧鑺傛暟瓒呭嚭浜嗗疄闄呭彲鐢ㄧ殑瀛楄妭鏁帮紝鍒欒繑鍥炲叏閮ㄥ彲鐢ㄧ殑瀛楄妭
- return bytes;
- }
- }
-
-
- /**
- * 妯℃嫙鍐欏叆涓�涓�16浣嶆暣鏁板埌鎸囧畾鍦板潃
- *
- * @param address 鍦板潃
- * @param data 瑕佸啓鍏ョ殑鏁版嵁
- */
- public void writeInt16(String address, short data) {
- memory.put(address, new byte[]{(byte) (data >> 8), (byte) data});
- }
-
- /**
- * 妯℃嫙浠庢寚瀹氬湴鍧�璇诲彇涓�涓�16浣嶆暣鏁�
- *
- * @param address 鍦板潃
- * @return 璇诲彇鍒扮殑鏁版嵁
- */
- public short readInt16(String address) {
- byte[] data = memory.getOrDefault(address, new byte[]{0, 0});
- return (short) ((data[0] << 8) | (data[1] & 0xFF));
- }
-
- /**
- * 妯℃嫙鍐欏叆涓�涓竷灏斿�煎埌鎸囧畾鍦板潃
- *
- * @param address 鍦板潃
- * @param data 瑕佸啓鍏ョ殑鏁版嵁
- */
- public void writeBoolean(String address, boolean data) {
- memory.put(address, new byte[]{(byte) (data ? 1 : 0)});
- }
-
- /**
- * 妯℃嫙浠庢寚瀹氬湴鍧�璇诲彇涓�涓竷灏斿��
- *
- * @param address 鍦板潃
- * @return 璇诲彇鍒扮殑鏁版嵁
- */
- public boolean readBoolean(String address) {
- return memory.getOrDefault(address, new byte[]{0})[0] != 0;
- }
-
- // 鏍规嵁闇�瑕侊紝鎮ㄥ彲浠ユ坊鍔犳洿澶氭ā鎷烶LC鎿嶄綔鐨勬柟娉�
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLCtwo.java b/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLCtwo.java
deleted file mode 100644
index 2d0905d..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLCtwo.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.mes.common.PlcTools;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class MockS7PLCtwo {
- private static volatile MockS7PLCtwo instance; // 鍗曚緥瀹炰緥
- private ConcurrentHashMap<String, String> memory = new ConcurrentHashMap<>();
- private String storageFilePath = "mockPLCData.properties";
-
- // 绉佹湁鍖栨瀯閫犲嚱鏁�
- private MockS7PLCtwo() {
- // 鍦ㄦ瀯閫犲嚱鏁颁腑灏濊瘯鍔犺浇鐜版湁鐨勬ā鎷熸暟鎹�
- try (FileInputStream fis = new FileInputStream(storageFilePath)) {
- Properties properties = new Properties();
- properties.load(fis);
- properties.forEach((key, value) -> memory.put(String.valueOf(key), String.valueOf(value)));
- } catch (IOException e) {
- System.out.println("娌℃湁鎵惧埌鐜版湁鐨勬ā鎷熸暟鎹枃浠讹紝灏嗗垱寤轰竴涓柊鐨勩��");
- }
- }
-
- // 鍏叡闈欐�佹柟娉曡幏鍙栫被鐨勫敮涓�瀹炰緥
- public static MockS7PLCtwo getInstance() {
- if (instance == null) {
- synchronized (MockS7PLCtwo.class) {
- if (instance == null)
- instance = new MockS7PLCtwo();
- }
- }
- return instance;
- }
-
- // 淇敼鍐欏叆鏂规硶浠ユ寔涔呭寲鏁版嵁
- public void writeByte(String address, byte[] data) {
- memory.put(address, new String(data, StandardCharsets.ISO_8859_1));
- saveMemory();
- }
-
- // 淇敼璇诲彇鏂规硶浠ヤ粠鎸佷箙鍖栫殑鏁版嵁涓鍙�
- public byte[] readByte(String address,int count) {
- String value = memory.getOrDefault(address, "");
- byte[] bytes = value.getBytes(StandardCharsets.ISO_8859_1);
- if (count >= 0 && count <= bytes.length) {
- byte[] result = new byte[count];
- System.arraycopy(bytes, 0, result, 0, count);
- return result;
- } else {
- // 濡傛灉璇锋眰鐨勫瓧鑺傛暟瓒呭嚭浜嗗疄闄呭彲鐢ㄧ殑瀛楄妭鏁帮紝鍒欒繑鍥炲叏閮ㄥ彲鐢ㄧ殑瀛楄妭
- return bytes;
- }
- }
-
-
-
-
-
-
- public void writeInt16(String address, short data) {
- memory.put(address, Short.toString(data));
- saveMemory();
- }
-
- public Short readInt16(String address) {
- String value = memory.get(address);
- return value != null ? Short.parseShort(value) : null;
- }
-
- public void writeBoolean(String address, boolean data) {
- memory.put(address, Boolean.toString(data));
- saveMemory();
- }
-
- public Boolean readBoolean(String address) {
- String value = memory.get(address);
- return value != null ? Boolean.parseBoolean(value) : null;
- }
-
- public void writeString(String address, String data) {
- memory.put(address, data);
- saveMemory();
- }
-
- public String readString(String address) {
- return memory.getOrDefault(address, "");
- }
-
- public void writeTime(String address, long data) {
- memory.put(address, Long.toString(data));
- saveMemory();
- }
-
- public Long readTime(String address) {
- String value = memory.get(address);
- return value != null ? Long.parseLong(value) : null;
- }
-
- // 娣诲姞涓�涓柟娉曟潵淇濆瓨鏁版嵁鍒版枃浠�
- private void saveMemory() {
- Properties properties = new Properties();
- properties.putAll(memory);
- try (FileOutputStream fos = new FileOutputStream(storageFilePath)) {
- properties.store(fos, "Mock S7 PLC Data");
- } catch (IOException e) {
- System.out.println("淇濆瓨妯℃嫙鏁版嵁澶辫触锛�" + e.getMessage());
- }
- }
-
- // 杩炵画鍐欏叆澶氫釜Word
- public void writeword(String address, List<Short> data) {
- for (int i = 0; i < data.size(); i++) {
- String addr = calculateAddress(address, i * 2); // 鍋囪姣忎釜word鍗犱袱涓湴鍧�鍗曚綅
- memory.put(addr, Short.toString(data.get(i)));
-
- }
- saveMemory();
- }
-
- // 涓嶈繛缁湴鍧�word鍐欏叆澶氫釜Word
- public void WriteWords(List<String> addresses, List<Short> datas) {
- if (addresses.size() != datas.size()) {
- throw new IllegalArgumentException("鍦板潃鍒楄〃鍜屾暟鎹垪琛ㄧ殑澶у皬蹇呴』鐩稿悓銆�");
- }
-
- for (int i = 0; i < addresses.size(); i++) {
- String addr = addresses.get(i);
- short data = datas.get(i);
- // 鍋囪杩欓噷浣跨敤鍐呭瓨鏄犲皠鏉ユā鎷烶LC鍐欏叆鎿嶄綔
- memory.put(addr, Short.toString(data));
- }
- saveMemory(); // 鍦ㄦ墍鏈夋暟鎹啓鍏ュ悗淇濆瓨鏇存敼
- }
-
- // 杩炵画璇诲彇澶氫釜Word
- public List<Short> readwords(String address, int count) {
- List<Short> result = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- String addr = calculateAddress(address, i * 2); // 鍚屼笂锛屾瘡涓獁ord鍗犱袱涓湴鍧�鍗曚綅
-
- //System.out.println(addr);
-
- String value = memory.get(addr);
- if (value != null) {
- result.add(Short.parseShort(value));
- } else {
- result.add(null); // 鎴栬�呰�冭檻鎶涘嚭寮傚父鎴栧叾浠栭敊璇鐞�
- }
- }
- return result;
- }
-
-
- public List<Short> ReadWords(List<String> addresses) {
- List<Short> datas = new ArrayList<>();
-
- for (String addr : addresses) {
- // 浠庡唴瀛樻槧灏勪腑鑾峰彇鏁版嵁
- String dataStr = memory.get(addr);
-
- // 灏嗗瓧绗︿覆杞崲鎴恠hort绫诲瀷锛屽苟娣诲姞鍒扮粨鏋滃垪琛ㄤ腑
- // 杩欓噷鍋囪鏁版嵁宸茬粡浠ラ�傚綋鐨勬柟寮忓瓨鍌紙渚嬪锛屼綔涓虹煭鏁村瀷鐨勫瓧绗︿覆琛ㄧず锛�
- // 濡傛灉璇诲彇鐨勬暟鎹负绌烘垨杞崲澶辫触锛屼綘鍙兘闇�瑕佸鐞嗚繖浜涙儏鍐�
- try {
- short data = Short.parseShort(dataStr);
- datas.add(data);
- } catch (NumberFormatException e) {
- System.err.println("璇诲彇鍦板潃 " + addr + " 鐨勬暟鎹椂鍑洪敊: " + e.getMessage());
-
- }
- }
-
- return datas;
- }
-
-
-
-
-
- // 杩炵画鍐欏叆澶氫釜Bit
- public void writebits(String address, List<Boolean> data) {
- for (int i = 0; i < data.size(); i++) {
- String addr = calculateAddress(address, i); // 鍋囪姣忎釜bit鍗犱竴涓湴鍧�鍗曚綅
- memory.put(addr, Boolean.toString(data.get(i)));
- }
- saveMemory();
- }
-
-//bit鍒嗘暎鍦板潃璇诲彇
- public List<Boolean> readBits(List<String> addresses) {
- List<Boolean> results = new ArrayList<>();
- for (String address : addresses) {
- // 瀵逛簬姣忎釜鍦板潃锛岀洿鎺ヤ娇鐢� calculateAddress 鏉ュ鐞嗗彲鑳界殑浣嶅亸绉�
- // 杩欓噷鍋囪 calculateAddress 宸茬粡瓒冲鏅鸿兘浠ュ鐞嗗崟涓綅鐨勫亸绉�
- // 鐢变簬鎴戜滑鏄�愪釜璇诲彇锛屾瘡娆″亸绉婚噺閮芥槸0
- String addr = calculateAddress(address, 0);
- String value = memory.get(addr);
- if (value != null) {
- results.add(Boolean.parseBoolean(value));
- } else {
- // 濡傛灉鍦板潃瀵瑰簲鐨勫�间笉瀛樺湪浜庡唴瀛樹腑锛屽彲浠ラ�夋嫨娣诲姞 null 鎴栨姏鍑哄紓甯�
- // 杩欓噷閫夋嫨娣诲姞 null锛屼絾鍦ㄥ疄闄呭簲鐢ㄤ腑搴旀牴鎹叿浣撻渶姹傚喅瀹�
- results.add(null);
- }
- }
- return results;
- }
-
- // 杩炵画璇诲彇澶氫釜Bit
- public List<Boolean> readbits(String address, int count) {
- List<Boolean> result = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- String addr = calculateAddress(address, i); // 鍚屼笂锛屾瘡涓猙it鍗犱竴涓湴鍧�鍗曚綅
- String value = memory.get(addr);
- if (value != null) {
- result.add(Boolean.parseBoolean(value));
- } else {
- result.add(null); // 鎴栬�呰�冭檻鎶涘嚭寮傚父鎴栧叾浠栭敊璇鐞�
- }
- }
- return result;
- }
-
- // 璁＄畻杩炵画鍦板潃
-// private String calculateAddress(String baseAddress, int offset) {
-// // 鏀寔甯﹀瓧姣嶇殑鍦板潃鏍煎紡
-// Pattern pattern = Pattern.compile("(\\D*)(\\d+)");
-// Matcher matcher = pattern.matcher(baseAddress);
-// if (matcher.find()) {
-// String prefix = matcher.group(1);
-// int address = Integer.parseInt(matcher.group(2));
-// return prefix + (address + offset);
-// } else {
-// throw new IllegalArgumentException("Invalid address format: " + baseAddress);
-// }
-// }
-
- private String calculateAddress(String baseAddress, int offset) {
- // 鍒嗗壊鍦板潃涓烘暟鎹潡銆佸瓧鍋忕Щ鍜屼綅鍋忕Щ锛堝鏋滄湁锛�
- Pattern pattern = Pattern.compile("(DB\\d+)\\.(\\d+)(?:\\.(\\d+))?");
- Matcher matcher = pattern.matcher(baseAddress);
- if (matcher.find()) {
- String dbNumber = matcher.group(1); // 鏁版嵁鍧楃紪鍙凤紝濡� "DB100"
- int wordOffset = Integer.parseInt(matcher.group(2)); // 瀛楀亸绉�
- String bitOffsetStr = matcher.group(3); // 浣嶅亸绉伙紝鍙兘涓虹┖
-
- if (bitOffsetStr != null) {
- // 瀛樺湪浣嶅亸绉伙紝杩涜浣嶆搷浣�
- int bitOffset = Integer.parseInt(bitOffsetStr);
- int totalBitOffset = bitOffset + offset;
- // 璁＄畻鏂扮殑瀛楀亸绉诲拰浣嶅亸绉�
- int newWordOffset = wordOffset + (totalBitOffset / 8);
- int newBitOffset = totalBitOffset % 8;
- return String.format("%s.%d.%d", dbNumber, newWordOffset, newBitOffset);
- } else {
- // 浠呭瓨鍦ㄥ瓧鍋忕Щ锛岃繘琛屽瓧鎿嶄綔
- // 娉ㄦ剰锛氬亣璁炬瘡涓瓧鍗犵敤2涓瓧鑺�
- int newWordOffset = wordOffset + (offset );
- return String.format("%s.%d", dbNumber, newWordOffset);
- }
- } else {
- throw new IllegalArgumentException("Invalid address format: " + baseAddress);
- }
- }
-
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java b/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
deleted file mode 100644
index f3c1215..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
+++ /dev/null
@@ -1,469 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.MultiAddressWrite;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.google.common.primitives.Bytes;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-public class S7control {
-
- S7PLC s7PLC; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.1"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7control instance = null;
-
- private S7control() {
- if (s7PLC == null)
- s7PLC = new S7PLC(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7control getinstance() {
- if (instance == null) {
- synchronized (S7control.class) {
- if (instance == null)
- instance = new S7control();
- }
- }
- return instance;
- }
-
- /**
- * 鍏抽棴瑗块棬瀛恠7閫氳杩炴帴
- */
- public void CloseS7client() {
- if (s7PLC == null)
- s7PLC.close();
- s7PLC.checkConnected();
- }
-
- /**
- * s7閫氳杩炴帴鐘舵��
- */
- public boolean CheckConnected() {
- return s7PLC.checkConnected();
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓獁ord
- *
- * @param address 鍦板潃
- * @param data word鐨勫��
- */
- public void WriteWord(String address, short data) {
- if (s7PLC==null)
- {
- return;
- }
- s7PLC.writeInt16(address, data);
- }
-
- /**
- * 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜word
- *
- * @param address 鍦板潃
- * @param datas word鐨勫��
- */
- public void WriteWord(String address, List<Short> datas) {
- if (s7PLC==null)
- return;
- // s7PLC.write(address, data);
- List<String> addresslist = GetAddressList(address, datas.size(), 16);
- MultiAddressWrite addressWrite = new MultiAddressWrite();
- for (int i = 0; i < datas.size(); i++) {
- addressWrite.addInt16(addresslist.get(i), datas.get(i));
- }
- s7PLC.writeMultiData(addressWrite);
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜word
- *
- * @param address 鍦板潃
- * @param datas word鐨勫��
- */
-
-
-
-
-
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓狟it
- *
- * @param address 鍦板潃
- * @param data Bit鐨勫��
- */
- public void WriteBit(String address, Boolean data) {
- if (s7PLC==null)
- return;
- s7PLC.writeBoolean(address, data);
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜bit
- *
- * @param address 鍦板潃
- * @param datas bit鐨勫��
- */
- public void WriteBit(List<String> address, List<Boolean> datas) {
- if (s7PLC==null)
- return;
- // s7PLC.write(address, data);
-
- MultiAddressWrite addressWrite = new MultiAddressWrite();
- for (int i = 0; i < address.size(); i++) {
- addressWrite.addBoolean(address.get(i), datas.get(i));
- }
- s7PLC.writeMultiData(addressWrite);
- }
-
- /**
- * 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜bit
- *
- * @param address 鍦板潃
- * @param datas word鐨勫��
- */
- public void WriteBit(String address, List<Boolean> datas) {
- if (s7PLC==null)
- return;
- // s7PLC.write(address, data);
- List<String> addresslist = GetAddressList(address, datas.size(), 1);
- MultiAddressWrite addressWrite = new MultiAddressWrite();
- for (int i = 0; i < datas.size(); i++) {
- addressWrite.addBoolean(addresslist.get(i), datas.get(i));
- }
- s7PLC.writeMultiData(addressWrite);
- }
- /**
- * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜byte
- *
- * @param address 鍦板潃
- * @param datas byte鐨勫��
- */
- public void WriteByte(String address, byte[] datas) {
- if (s7PLC==null)
- return;
- // s7PLC.write(address, data);
- s7PLC.writeByte(address, datas);
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
- *
- * @param address 鍦板潃
- * @return 缁撴灉
- */
- public List<Short> ReadWord(List<String> address) {
- if (s7PLC == null)
- return null;
-
- try {
- return s7PLC.readInt16(address);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- return null;
- }
- }
-
-
-
-
- private int getIndexFromAddress(String address) {
-
- // 鍙互瑙ｆ瀽鍑哄湴鍧�涓殑鏁板瓧閮ㄥ垎锛屽苟杞崲涓烘暣鏁�
- return 0;
- }
-
- private String getAddressFromIndex(int index) {
-
- // 鏁存暟杞崲涓哄湴鍧�鏍煎紡鐨勫瓧绗︿覆
- return "";
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
- *
- * @param address 鍦板潃
- * @param count 杩炵画璇诲灏戜釜word
- * @return 缁撴灉
- */
- public List<Short> ReadWord(String address, int count) {
- if (s7PLC == null)
- return null;
-
- List<String> addresslist = GetAddressList(address, count, 16);
- try {
- return s7PLC.readInt16(addresslist);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
-
- return null;
- }
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 璇诲彇byte缁撴灉闆�
- *
- * @param address 鍦板潃
- * @param count 杩炵画璇诲灏戜釜byte
- * @return 缁撴灉
- */
- public byte[] ReadByte(String address, int count) {
- if (s7PLC==null)
- return null;
- // List<String> addresslist = GetAddressList(address, count, 16);
-
- try {
- return s7PLC.readByte(address, count);
- }catch (Exception e) {
- // 澶勭悊寮傚父
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- return null;
- }
-
- }
-
- /**
- * 鎸夋寚瀹氱殑鍦板潃 鎸塨it浣� 0 flase 1 true 璇诲彇缁撴灉
- *
- * @param addresslist 鍦板潃闆�
- * @return Boolean缁撴灉
- */
- public List<Boolean> ReadBits(List<String> addresslist) {
- if (s7PLC==null)
- return null;
- return s7PLC.readBoolean(addresslist);
- }
-//璇诲彇涓嶈繛缁湴鍧�bit
-public List<Boolean> readBits(List<String> addressList) {
- if (s7PLC == null || addressList.isEmpty()) {
- return null;
- }
-
- List<Boolean> values = new ArrayList<>();
- for (String address : addressList) {
- try {
- boolean value = s7PLC.readBoolean(address);
- values.add(value);
- } catch (Exception e) {
- // 澶勭悊寮傚父
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- }
- }
-
- return values;
-}
-
-
-//璇诲彇String
-public List<String> readStrings(List<String> addressList) {
- if (s7PLC == null) {
- return null;
- }
- List<String> result = new ArrayList<>();
- for (String address : addressList) {
- try {
- byte[] bytes = s7PLC.readByte(address, 14);
- if (bytes != null) {
- String str = new String(bytes, StandardCharsets.UTF_8);
- result.add(str);
- }
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- result.add(null);
- }
- }
-
- return result;
-}
-
-
-
-
-
- public List<String> readStringsandword(List<String> addressList) {
- if (s7PLC == null) {
- return null;
- }
- List<String> result = new ArrayList<>();
- for (String address : addressList) {
- try {
- if (address.contains("-")) {
- address = address.substring(0, address.indexOf("-"));
-
- byte[] bytes = s7PLC.readByte(address, 14);
- if (bytes != null) {
- String str = new String(bytes, StandardCharsets.UTF_8);
- result.add(str);
- }
-
- } else {
- Short value = s7PLC.readInt16(address);
- result.add(value.toString());
-
- }
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- result.add(null);
- }
- }
-
- return result;
- }
-
-
-
-//涓嶈繛缁湴鍧�鍐欏叆Word
- public void WriteWord(List<String> address, List<Short> datas) {
- if (s7PLC == null)
- return;
-
- for (int i = 0; i < address.size(); i++) {
- String addr = address.get(i);
- short data = datas.get(i);
-
- if (addr.contains("-")) {
- outmesid(String.valueOf(data),addr); // 鍗曠嫭澶勭悊甯︾牬鎶樺彿鐨勫湴鍧�
- } else {
- s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
- }
- }
- }
-
-
-
-//瀛楃涓插啓鍏�
- public void outmesid(String data, String addr) {
-// System.out.println("outmesid: " + data);
- List<Byte> glassidlist = new ArrayList<>();
- String[] parts = addr.split("-");
- if (parts.length == 2) {
- addr = parts[0]; // 鍙繚鐣� "-" 鍓嶉潰鐨勯儴鍒�
- }
- for (char iditem : data.toCharArray()) {
- glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
- }
- byte[] bytes = Bytes.toArray(glassidlist);
- S7control.getinstance().WriteByte(addr, bytes);
- }
-
-//璇诲彇涓嶈繛缁瓀ord
- public List<Short> readWords(List<String> addresses) {
- if (s7PLC == null) {
- return null;
- }
-
- List<Short> data = new ArrayList<>();
-
- for (String address : addresses) {
- try {
-
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(address);
- data.add(value);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
-
- }
-
- }
- return data;
- }
-
-//璇诲彇鏃堕棿
-public Long readtime(String address) {
- if (s7PLC == null)
- return null;
- try {
- return s7PLC.readTime(address);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- return null;
- }
-}
-
-
- public void writetime(String address, long datas) {
- if (s7PLC == null)
- return;
-
-
- s7PLC.writeTime(address, datas); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
- }
-
-
-
-
-
- private int extractAddressNumber(String address) {
- String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
- return Integer.parseInt(numberStr);
- }
-
-
- /**
- * 浠庢寚瀹氱殑鍦板潃寮�濮� 杩炵画鎸塨it浣嶈鍙�
- *
- * @param address 鍦板潃
- * @param count 闀垮害
- * @return Boolean缁撴灉
- */
- public List<Boolean> ReadBits(String address, int count) {
- if (s7PLC == null)
- return null;
- List<String> addresslist = GetAddressList(address, count, 1);
- try {
- return s7PLC.readBoolean(addresslist);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- return null;
- }
-
- };
-
-
- public void writeString(String addr,String data) {
- s7PLC.writeString(addr,data);
- }
-
-
-
- private List<String> GetAddressList(String address, int count, int addedbit) {
- List<String> addresslist = new ArrayList<String>();
-
- String[] stringdatas = address.trim().split("\\.");
- if (stringdatas.length < 2 || !address.startsWith("DB"))
- return null;
- int dbwindex = 0;
- int bitindex = 0;
- if (stringdatas.length == 2) {
- dbwindex = Integer.parseInt(stringdatas[1]);
- } else if (stringdatas.length == 3) {
- dbwindex = Integer.parseInt(stringdatas[1]);
- bitindex = Integer.parseInt(stringdatas[2]);
- } else
- return null;
-
- addresslist.add(address);
- for (int i = 0; i < count-1; i++) {
-
- int bitcurrent = bitindex + addedbit;
- if (bitcurrent > 7) {
- dbwindex += bitcurrent / 8;
- bitindex = 0;
- } else
- bitindex = bitcurrent;
-
- String endstr=stringdatas.length==3?"." + bitindex:"";
- addresslist.add(stringdatas[0] + "." + dbwindex + endstr);
- }
- return addresslist;
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/RabbitMQUtils.java b/UnLoadGlassModule/src/main/java/com/mes/common/RabbitMQUtils.java
deleted file mode 100644
index f381270..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/RabbitMQUtils.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.mes.common;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.rabbitmq.client.*;
-
-import java.util.*;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-
-public class RabbitMQUtils {
- // ObjectMapper瀵硅薄锛岀敤浜庡簭鍒楀寲鍜屽弽搴忓垪鍖朖SON
- private static ObjectMapper objectMapper = new ObjectMapper();
- private static String host = "10.153.19.150"; // RabbitMQ 涓绘満鍚�
- private static Map<String, Object> args = new HashMap<>(); // 闃熷垪鍙傛暟
-
- static {
- // 璁剧疆闃熷垪鍙傛暟
- args.put("x-max-length-bytes", 1024 * 1024);
- }
-
- // private static Map<String, Object> args = new HashMap<>();
-// args.put("x-max-length-bytes",1024 * 1024);
- // 鍙戦�佹秷鎭埌 RabbitMQ 闃熷垪涓�
- public String sendMessage(String message, String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鍙戦�佹秷鎭�
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, args);
-
- // 鍙戝竷娑堟伅鍒伴槦鍒�
- channel.basicPublish("", queueName, null, message.getBytes("UTF-8"));
- System.out.println(" [x] Sent '" + message + "' to queue '" + queueName + "'");
- }
-
- return message;
- }
-
-
- // 浠� RabbitMQ 闃熷垪涓帴鏀舵秷鎭�
- public String receiveMessage(String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- // 鍒涘缓闃诲闃熷垪
- BlockingQueue<String> messageQueue = new ArrayBlockingQueue<>(1);
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鎺ユ敹娑堟伅
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, args);
-
- // 璁剧疆娑堟伅鎺ユ敹鍥炶皟
- DeliverCallback deliverCallback = (consumerTag, delivery) -> {
- String receivedMessage = new String(delivery.getBody(), "UTF-8");
- // System.out.println(" [x] Received '" + receivedMessage + "'");
-
- // 灏嗘帴鏀跺埌鐨勬秷鎭斁鍏ラ樆濉為槦鍒�
- try {
- messageQueue.put(receivedMessage);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- };
-
- // 娑堣垂闃熷垪涓殑娑堟伅
- channel.basicConsume(queueName, true, deliverCallback, consumerTag -> {
-
- });
-
- // 闃诲骞剁瓑寰呰幏鍙栨秷鎭�
- return messageQueue.take();
- }
- }
-
-
-//娑堣垂娑堟伅
- public List<String> readMessages(String queueName,boolean is) throws Exception {
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
- List<String> messages = new ArrayList<>();
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- boolean autoAck = false;
-
- GetResponse response = channel.basicGet(queueName, autoAck);
- if (response != null) {
- String message = new String(response.getBody(), "UTF-8");
- messages.add(message);
- // 鎵嬪姩纭娑堟伅澶勭悊瀹屾垚
- if(is){
- long deliveryTag = response.getEnvelope().getDeliveryTag();
- channel.basicAck(deliveryTag, false);
- }
-
- }
- }
-
- return messages;
- }
-
-
-//鎺ユ敹闃熷垪涓墍鏈夋秷鎭紝涓嶆秷璐�
- public static List<String> browseMessages(String queueName) throws Exception {
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
- List<String> messages = new ArrayList<>();
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- channel.queueDeclare(queueName, false, false, false, args);
- // 鑾峰彇闃熷垪涓殑娑堟伅
- GetResponse response;
- while ((response = channel.basicGet(queueName, false)) != null) {
- String message = new String(response.getBody(), "UTF-8");
- messages.add(message);
- }
- }
- return messages;
- }
-
-
-
- private static Set<String> sentMessageIds = new HashSet<>();
-//鏍规嵁id鍙戦�佹秷鎭�
- public static boolean sendMessageWithId(String queueName, String message, String messageId) throws Exception {
- if (sentMessageIds.contains(messageId)) {
- System.err.println("Message with ID " + messageId + " has already been sent.");
- return false; // 娑堟伅閲嶅锛屽彂閫佸け璐�
- }
-
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) {
- channel.queueDeclare(queueName, false, false, false, args);
-
- AMQP.BasicProperties properties = new AMQP.BasicProperties.Builder()
- .messageId(messageId)
- .build();
-
- channel.basicPublish("", queueName, properties, message.getBytes("UTF-8"));
- System.out.println("Sent message with ID: " + messageId);
-
- sentMessageIds.add(messageId); // 灏� messageId 娣诲姞鍒板凡鍙戦�侀泦鍚堜腑
-
- return true; // 娑堟伅鎴愬姛鍙戦��
- } catch (Exception e) {
- System.err.println("Failed to send message: " + e.getMessage());
- return false; // 娑堟伅鍙戦�佸け璐�
- }
- }
-//鏍规嵁id娑堣垂娑堟伅
-public static String consumeMessageById(String messageId, String queueName) throws Exception {
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) {
- channel.queueDeclare(queueName, false, false, false, args);
-
- GetResponse response;
- boolean found = false;
-
- while ((response = channel.basicGet(queueName, false)) != null) {
- String receivedMessage = new String(response.getBody(), "UTF-8");
- if (response.getProps().getMessageId().equals(messageId)) {
- long deliveryTag = response.getEnvelope().getDeliveryTag();
- channel.basicAck(deliveryTag, false);
- System.out.println("Selected message: " + messageId + " " + receivedMessage);
- return receivedMessage;
- } else {
- // 鏈壘鍒版寚瀹氭秷鎭紝缁х画鏌ユ壘
- channel.basicReject(response.getEnvelope().getDeliveryTag(), false);
- }
- }
-
- return "Specified message not found in the queue.";
- }
-}
-
-//娑堣垂鎸囧畾娑堟伅
- public static String consumeSelectedMessage(int messageToConsume, String queueName) throws Exception {
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) {
- channel.queueDeclare(queueName, false, false, false, args);
-
- for (int i = 0; i < messageToConsume; i++) {
- GetResponse response = channel.basicGet(queueName, false);
- if (response == null) {
- return "Queue does not have enough messages.";
- }
-// long deliveryTag = response.getEnvelope().getDeliveryTag();
-// channel.basicAck(deliveryTag, false);
- }
-
- GetResponse selectedResponse = channel.basicGet(queueName, false);
- if (selectedResponse != null) {
- byte[] body = selectedResponse.getBody();
- String selectedMessage = new String(body, "UTF-8");
- long deliveryTag = selectedResponse.getEnvelope().getDeliveryTag();
- channel.basicAck(deliveryTag, false);
- return selectedMessage;
- } else {
- return "Specified message not found in the queue.";
- }
- }
- }
-
- // 鍙戦�� JSON 娑堟伅鍒伴槦鍒�
- public static boolean sendJsonMessage(Object message, String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鍙戦�� JSON 娑堟伅
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, args);
-
- // 灏嗗璞¤浆鎹负 JSON 瀛楃涓�
- String jsonMessage = objectMapper.writeValueAsString(message);
-
- // 鍙戝竷 JSON 娑堟伅鍒伴槦鍒�
- channel.basicPublish("", queueName, null, jsonMessage.getBytes());
- System.out.println(" [x] Sent JSON message: '" + jsonMessage + "' to queue '" + queueName + "'");
-
- return true; // 鍙戦�佹秷鎭垚鍔�
- } catch (Exception e) {
- e.printStackTrace();
- return false; // 鍙戦�佹秷鎭け璐�
- }
- }
-
- // 鎺ユ敹 JSON 娑堟伅骞惰浆鎹负瀵硅薄
- public static <T> T receiveJsonMessage(Class<T> valueType, String queueName) throws Exception {
- // 鍒涘缓杩炴帴宸ュ巶骞惰缃富鏈哄悕
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(host);
-
- // 浣跨敤 try-with-resources 璇彞鍒涘缓杩炴帴鍜岄�氶亾锛屽苟鎺ユ敹 JSON 娑堟伅
- try (Connection connection = factory.newConnection();
- Channel channel = connection.createChannel()) {
- // 澹版槑闃熷垪
- channel.queueDeclare(queueName, false, false, false, args);
-
- // 鑾峰彇闃熷垪涓殑娑堟伅
- GetResponse response = channel.basicGet(queueName, true);
- if (response != null) {
- byte[] body = response.getBody();
- String jsonMessage = new String(body, "UTF-8");
- System.out.println(" [x] Received JSON message: '" + jsonMessage + "' from queue '" + queueName + "'");
-
- // 灏� JSON 娑堟伅杞崲涓哄璞�
- return objectMapper.readValue(jsonMessage, valueType);
- } else {
- return null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- return null; // 鎺ユ敹娑堟伅澶辫触
- }
- }
-
-}
-
-// RabbitMQUtils.sendMessage("Hello, world!", "module_queue");
-//RabbitMQUtils.receiveMessage("module_queue");
-//RabbitMQUtils.sendJsonMessage(someObject, "another_queue");
-//RabbitMQUtils.receiveJsonMessage(SomeClass.class, "another_queue");
-// 闇�瑕佸皢 someObject 鏇挎崲涓轰綘瑕佸彂閫佺殑瀵硅薄锛屽苟灏� SomeClass 鏇挎崲涓轰綘瑕佹帴鏀跺苟杞崲鐨勫璞＄被鍨嬨��
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/Result.java b/UnLoadGlassModule/src/main/java/com/mes/common/Result.java
deleted file mode 100644
index 654546b..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/Result.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common;
-//杩斿洖缁撴灉鍖呰绫�
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Result {
- private String code;
- private String msg;
- private Object data;
-
- public static Result seccess(){
- return new Result(Constants.Code_200,"",null);
- }
- public static Result seccess(Object data){
- return new Result(Constants.Code_200,"",data);
- }
-
- public static Result error(String code ,String msg){
- return new Result(code,msg,null);
- }
- public static Result error(){
- return new Result(Constants.Code_500,"鏈嶅姟鍣ㄥ彂鐢熷紓甯�",null);
- }
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java b/UnLoadGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
deleted file mode 100644
index 43104f9..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mes.common.interceptor;
-
-import cn.hutool.core.util.StrUtil;
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.JWTVerifier;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.exceptions.JWTVerificationException;
-import com.mes.common.CacheUtil;
-import com.mes.common.Constants;
-import com.mes.controller.dto.UserDTO;
-import com.mes.exception.ServiceException;
-import com.mes.service.userInfo.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Component
-public class JwtInterceptor implements HandlerInterceptor {
-
- @Autowired
- private UserService userService;
- @Autowired
- private CacheUtil cacheUtil;
-
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- //return HandlerInterceptor.super.preHandle(request, response, handler);
- /*String token=request.getHeader("token");
- if(!(handler instanceof HandlerMethod)){
- return true;
- }
-
- if(StrUtil.isBlank(token)){
- throw new ServiceException(Constants.Code_401,"鏃爐oken,閲嶆柊鐧婚檰");
- }
- String userId;
- try{
- userId = JWT.decode(token).getAudience().get(0);
- }catch (Exception e){
- throw new ServiceException(Constants.Code_500,"token鏍煎紡閿欒");
- }
-
- UserDTO getUserDTO = cacheUtil.getCacheData(userId);
-
- if(getUserDTO != null && !getUserDTO.getToken().equals(token)){
- throw new ServiceException(Constants.Code_600,"鐢ㄦ埛鍦ㄥ叾浠栦綅缃櫥闄�");
- }
-
-
- String password=userService.getUserByID(userId).toLowerCase();
- //鐢ㄦ埛瀵嗙爜鍔犵楠岃瘉
- JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(password)).build();
- try {
- jwtVerifier.verify(token);
- } catch (JWTVerificationException e) {
- throw new ServiceException(Constants.Code_401,"token楠岃瘉澶辫触,璇烽噸鏂扮櫥闄�");
- }*/
- return true;
- }
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java b/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
deleted file mode 100644
index ab753f3..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mes.config;
-
-import com.mes.service.PLCAutoMes;
-import com.mes.service.Plchome;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-@Component
-@Order(1)
-
-public class AppRunnerConfig implements ApplicationRunner {
-
- @Override
- public void run(ApplicationArguments args) throws Exception {
- // TODO Auto-generated method stub
- //
- System.out.println("鍚姩瀹屾垚");
-
-
-
-
- // new PlcHold().start();
- new PLCAutoMes().start();
-
- new Plchome().start();
- // new PlcLayout().start();
- // new Plcalarm().start();
-
- // new Plcsign().start();
-
- // new Plcstate().start();
- // new PlcPositioning1().start();
-
- // new PlcParameter2().start();
- // new PLCAutomaticParameterSetting().start();
-
- // new PlcManualonePosition().start();
- // new PlcManualonePosition2().start();
- // new PlcServoManualone().start();
- // new PLCManualJog().start();
- // new Plclog().start();
-
- // new PlcInteractionState().start();
- //new PlcParameter1Review().start();
- //new PLCAutomaticParameterSettingReview2().start();
-
- // new PLCManualJogReview().start();
- }
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/config/InterceptorConfig.java b/UnLoadGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
deleted file mode 100644
index 43bfcc7..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.config;
-
-import com.mes.common.interceptor.JwtInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-
-@Configuration
-
-public class InterceptorConfig implements WebMvcConfigurer {
- @Resource
- private JwtInterceptor jwtInterceptor;
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(jwtInterceptor)
- .addPathPatterns("/**")
- .excludePathPatterns("/user/login",
- "/user/register",
- "/swagger-resources/**"
- ,"/webjars/**"
- ,"/v2/**"
- ,"/swagger-ui.html/**"
- ,"/swagger-ui.html#/**");
- }
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/config/MyCorsConfig.java b/UnLoadGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
deleted file mode 100644
index 9cb413e..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-@Configuration(proxyBeanMethods = false)
-public class MyCorsConfig {
- @Bean
- public WebMvcConfigurer corsConfigurer() {
- return new WebMvcConfigurer() {
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**");
- }
- };
- }
-
-
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java b/UnLoadGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
deleted file mode 100644
index d14faae..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.config;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.springframework.context.annotation.Bean;
-
-public class MybatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));//濡傛灉閰嶇疆澶氫釜鎻掍欢,鍒囪鍒嗛〉鏈�鍚庢坊鍔�
- //interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); 濡傛灉鏈夊鏁版嵁婧愬彲浠ヤ笉閰嶅叿浣撶被鍨� 鍚﹀垯閮藉缓璁厤涓婂叿浣撶殑DbType
- return interceptor;
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/config/SwaggerConfig.java b/UnLoadGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
deleted file mode 100644
index 7ccbf7e..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.mes.config;
-import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static springfox.documentation.builders.PathSelectors.regex;
-
-@Configuration
-@EnableSwagger2 //寮�鍚疭wagger2
-public class SwaggerConfig {
-
- //閰嶇疆浜哠wagger鐨凞ocket鐨刡ean瀹炰緥
- @Bean
- public Docket docket(){
- return new Docket(DocumentationType.SWAGGER_2)
- .apiInfo(apiInfo())
- .select()
- //鍔犱簡ApiOperation娉ㄨВ鐨勭被锛屾墠鐢熸垚鎺ュ彛鏂囨。
- .apis(RequestHandlerSelectors.basePackage("com.mes.controller"))
- //鍖呬笅鐨勭被锛屾墠鐢熸垚鎺ュ彛鏂囨。
- .paths(PathSelectors.any())
- .build()
- .securitySchemes(securitySchemes())
- .securityContexts(securityContexts());
-
- }
-
-
- /**
- * 閰嶇疆璁よ瘉妯″紡
- * @return
- */
- private List<ApiKey> securitySchemes() {
- List<ApiKey> arrayList = new ArrayList<>();
- arrayList.add( new ApiKey("token", "token", "header"));
- return arrayList;
- }
-
- /**
- * 閰嶇疆璁よ瘉涓婁笅鏂�
- */
- private List<SecurityContext> securityContexts() {
- List<SecurityContext> securityContexts = new ArrayList<>();
- securityContexts.add(SecurityContext.builder().securityReferences(defaultAuth())
- //杩囨护瑕侀獙璇佺殑璺緞
- .forPaths(PathSelectors.regex("^(?!auth).*$"))
- .build());
- return securityContexts;
- }
-
- private List<SecurityReference> defaultAuth() {
- AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
- AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
- authorizationScopes[0] = authorizationScope;
- List<SecurityReference> securityReferences = new ArrayList<>();
- //楠岃瘉澧炲姞锛堟湁璁稿鏁欑▼璇存槑涓繖涓湴鏂规槸Authorization,瀵艰嚧涓嶈兘甯﹀叆鍏ㄥ眬token锛屽洜涓簊ecuritySchemes()鏂规硶涓環eader鍐欏叆token锛屾墍浠ヨ繖涓湴鏂规垜鏀逛负token灏卞彲浠ヤ簡锛�
- securityReferences.add(new SecurityReference("token", authorizationScopes));
- return securityReferences;
- }
- //閰嶇疆Swagger淇℃伅 = apiInfo
- private ApiInfo apiInfo(){
- //浣滆�呬俊鎭�
- Contact contact = new Contact("閮瓂j", "", "");
- return new ApiInfo(
- "NorthGlass-ERP 鎺ュ彛鏂囨。", //title
- "閮瓂j", //description
- "1.0", //version
- "urn:tos",
- contact,
- "Apache 2.0",
- "http://www.apache.org/licenses/LICENSE-2.0",
- new ArrayList());
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/config/WebSocketConfig.java b/UnLoadGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
deleted file mode 100644
index 1902638..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * @author HFL
- * @date 2022/5/16 14:49
- * 閰嶇疆绫�
- */
-//@Configuration
-public class WebSocketConfig {
-
- //@Bean
-// public ServerEndpointExporter serverEndpointExporter(){
-// return new ServerEndpointExporter();
-// }
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java
deleted file mode 100644
index 01870af..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mes.controller;
-
-import com.mes.entity.DownGlassInfo;
-import com.mes.service.DownGlassInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/downGlassInfo")
-public class DownGlassInfoController {
-
- @Autowired
- private DownGlassInfoService downGlassInfoService;
-
- /**
- * @param id
- * @return
- * // 鑾峰彇鎸囧畾ID鐨凞ownGlassInfo淇℃伅
- */
-
- @GetMapping("/{id}")
- public DownGlassInfo getDownGlassInfoById(@PathVariable Integer id) {
- return downGlassInfoService.getDownGlassInfoById(id);
- }
-
-
-
-// @GetMapping("/messages")
-// public String getMessages() throws IOException, TimeoutException {
-// List<String> messages = new ArrayList<>();
-// try {
-// messages = RabbitMQUtils.browseMessages("hangzhou2");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return messages.toString(); // 杩斿洖娑堟伅鍒楄〃鐨勫瓧绗︿覆琛ㄧず褰㈠紡
-// }
-
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java
deleted file mode 100644
index 46f7085..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.mes.controller;
-
-import com.mes.entity.DownWorkstation;
-import com.mes.service.DownWorkstationService;
-import com.mes.service.GlassInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api/downWorkstation")
-public class DownWorkstationController {
-
- @Autowired
- private DownWorkstationService downWorkstationService;
- @Autowired
- private GlassInfoService glassInfoService;
-
- @GetMapping("/getone")
- public ResponseEntity<?> getOneDownWorkstations() {
- try {
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations();
- // 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
- Map<String, Object> responseData = new HashMap<>();
- responseData.put("code", 200);
- responseData.put("msg", "鎴愬姛");
- responseData.put("data", data);
- // 杩斿洖 ResponseEntity 瀵硅薄锛屽寘鍚搷搴旀暟鎹拰鐘舵�佺爜
- return ResponseEntity.ok(responseData);
- } catch (Exception e) {
- e.printStackTrace();
- // 濡傛灉鍑虹幇寮傚父锛岃繑鍥為敊璇俊鎭�
- Map<String, Object> errorResponse = new HashMap<>();
- errorResponse.put("code", 500);
- errorResponse.put("msg", "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- return ResponseEntity.status(500).body(errorResponse);
- }
- }
-
- @GetMapping("/gettwo")
- public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationService.gettwoDownWorkstations();
- }
- @GetMapping("/getflowCardId")
- public ResponseEntity<Map<String, Object>> getflowCardId() {
- Map<String, Object> responseData = new HashMap<>();
- try {
- List<Map<String, Object>> data = downWorkstationService.getflowCardId();
- responseData.put("code", 200);
- responseData.put("msg", "鎴愬姛");
- responseData.put("data", data);
- return ResponseEntity.ok(responseData);
- } catch (Exception e) {
- responseData.put("code", 500);
- responseData.put("msg", "澶辫触");
- responseData.put("data", null);
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseData);
- }
- }
-
-
-
-
- @PostMapping("/updateFlowCardId")
- public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
- // 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
- String flowCardId = (String) requestData.get("flowCardId");
- int workstationId = (int) requestData.get("workstationId");
-
- // 鏌ヨ瀵瑰簲 flowCardId 鐨勭幓鐠冧俊鎭�绘暟閲�
- int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
-
- // 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
- glassInfoService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
-
- // 鏋勫缓鍝嶅簲鏁版嵁
- Map<String, Object> responseData = new HashMap<>();
- responseData.put("message", "updated successfully");
- responseData.put("code", 200);
- // 杩斿洖澶勭悊缁撴灉
- return ResponseEntity.ok(responseData);
- }
-
-
- @PostMapping("/clear")
- public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
- // 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
- int workstationId = (int) requestData.get("workstationId");
-
- int totalWorkstations = downWorkstationService.getTotalQuantity(workstationId);
- int downWorkstations = downWorkstationService.getRacksNumber(workstationId);
-
-
- if (downWorkstations == totalWorkstations) {
- downWorkstationService.clearFlowCardId(workstationId);
- Map<String, Object> responseData = new HashMap<>();
- responseData.put("message", "cleared successfully");
- responseData.put("code", 200);
- // 杩斿洖澶勭悊缁撴灉
- return ResponseEntity.ok(responseData);
- }
- else {
- // 濡傛灉鎬绘暟閲忓拰钀芥灦鏁伴噺涓嶄竴鑷达紝杩斿洖閿欒鍝嶅簲
- Map<String, Object> errorResponse = new HashMap<>();
- errorResponse.put("message", "Total workstations count does not match down workstations count.");
- errorResponse.put("code", 400);
- return ResponseEntity.badRequest().body(errorResponse);
- }
-
-
- // 鏋勫缓鍝嶅簲鏁版嵁
-
- }
-
-
-
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java b/UnLoadGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
deleted file mode 100644
index 05a2545..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mes.controller.dto;
-
-import lombok.Data;
-@Data //鐢ㄤ簬鎺ュ彈鍓嶇鐧诲綍棰漸ser淇℃伅
-public class UserDTO {
- private String userId;
- private String pass;
- private String token;
- private String userName;
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
deleted file mode 100644
index 6eee09a..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mes.controller.userInfo;
-
-import com.mes.common.CacheUtil;
-import com.mes.common.Result;
-import com.mes.service.userInfo.SysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping("/menu")
-
-public class SysMenuController {
- @Autowired
- private CacheUtil cacheUtil;
- @Autowired
- private SysMenuService sysMenuService;
- @GetMapping
- public Result getMenu(){
- //MyChannelHandlerPool myChannelHandlerPool = new MyChannelHandlerPool();
- //myChannelHandlerPool.sendMsg("123");
- //MyChannelHandlerPool.channelGroup.writeAndFlush( new TextWebSocketFrame("123123"));
- return Result.seccess(sysMenuService.getMenu());
-
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
deleted file mode 100644
index e7247fe..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.controller.userInfo;
-
-import com.mes.common.Result;
-import com.mes.service.userInfo.SysMenuItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/menuItem")
-public class SysMenuItemController {
- @Autowired
- SysMenuItemService sysMenuItemService;
- @GetMapping
- public Result getMenuItem(){
- return Result.seccess(sysMenuItemService.getMenuItem());
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java b/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
deleted file mode 100644
index e3be9dc..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.mes.controller.userInfo;
-
-import com.mes.common.CacheUtil;
-import com.mes.common.Constants;
-import com.mes.common.Result;
-import com.mes.entity.userInfo.User;
-import com.mes.exception.ServiceException;
-import com.mes.mapper.userInfo.UserMapper;
-import com.mes.service.userInfo.UserService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-@RestController //娉ㄨВuser鎺у埗鍣紝鎸傝浇鍒皊pringboot褰撲腑
-@RequestMapping("/user") //娉ㄨВ鍓嶇寮傛璇锋眰濡傦細localhost锛�8080/user
-public class UserController {
- @Autowired
- private UserMapper userMapper;
- @Autowired
- private UserService userService;
- @Autowired
- private CacheUtil cacheUtil;
-
-
-
-
- @GetMapping
- public List<User> getUser(){
- System.out.println(cacheUtil.getCacheData("admin"));
- return userMapper.findAll();
- }
- //@ApiOperation("鐧诲綍")
- // @PostMapping("/login")
-// public Result login(@RequestBody UserDTO userDTO){
-// //UserDTO getUserCacheDTO = cacheUtil.getCacheData(userDTO.getUserId());
-// userService.deleteCache(userDTO.getUserId());
-// UserDTO getUserDTO=userService.login(userDTO);
-// if(getUserDTO!=null){
-// return Result.seccess(userDTO);
-// }else{
-// throw new ServiceException(Constants.Code_600,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
-// }
-// }
- @ApiOperation("娉ㄥ唽")
- @PostMapping("/register")
- public Result register(@RequestBody User user){
- User getUser= userService.register(user);
- if(getUser == null){
- throw new ServiceException(Constants.Code_500,"娉ㄥ唽澶辫触");
- }else {
- return Result.seccess(getUser);
- }
-
- //return
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/DownGlassInfo.java b/UnLoadGlassModule/src/main/java/com/mes/entity/DownGlassInfo.java
deleted file mode 100644
index 206e72d..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/DownGlassInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data
-public class DownGlassInfo {
-
- @TableId(type = IdType.AUTO)
- private Integer id; // 涓嬬墖鐜荤拑淇℃伅琛╥d
-
- private String flowCardId; // 娴佺▼鍗″彿
- private Integer sequence; // 椤哄簭
- private Double width; // 瀹�
- private Double height; // 楂�
- private Double thickness; // 鍘氬害
- private String filmsid;//鑶滅郴
-
-
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCage.java b/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCage.java
deleted file mode 100644
index d917446..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCage.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mes.entity;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
- import com.baomidou.mybatisplus.annotation.TableId;
- import lombok.Data;
-
-@Data
-public class DownStorageCage {
-
- @TableId(type = IdType.AUTO)
- private int id; // 涓嬬墖鍓嶇悊鐗囩琛╥d
- private int deviceId; // 璁惧id
- private String slot; // 鏍呮牸鍙�
- private String enableState; // 鍚敤鐘舵��
- private int remainWidth; // 鍓╀綑
-
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java b/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java
deleted file mode 100644
index 4f631dc..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-/**
- * 涓嬬墖鍓嶇悊鐗囩鏄庣粏瀹炰綋绫�
- */
-/**
- * 涓嬬墖鍓嶇悊鐗囩鏄庣粏瀹炰綋绫�
- * @author SNG-012
- */
-@Data
-public class DownStorageCageDetails {
-
- @TableId(type = IdType.AUTO)
- /**
- * 涓嬬墖鍓嶇悊鐗囩鏄庣粏琛╥d
- */
- private int id;
-
- /**
- * 璁惧id
- */
- private int deviceId;
-
- /**
- * 鏍呮牸鍙�
- */
- private int slot;
-
- /**
- * 鐜荤拑id
- */
- private int glassId;
-
- /**
- * 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
- */
- private int sequence;
-
- /**
- * 娴佺▼鍗″彿
- */
- private String flowCardId;
-
- /**
- * 鑶滅郴id
- */
- private int filmsid;
- /**
- * 鐜荤拑绫诲瀷
- */
- private int glassType;
-
- /**
- * 瀹�
- */
- private double width;
-
- /**
- * 楂�
- */
- private double height;
-
- /**
- * 鍘氬害
- */
- private double thickness;
-
- /**
- * 閽㈠寲鐗堝浘id
- */
- private int temperingFeedSequence;
-
- /**
- * 閽㈠寲鐗堝浘鐗囧簭
- */
- private int temperingLayoutId;
-
- /**
- * 鐘舵��
- */
- private int state;
-
- /**
- * 鐜荤拑闂撮殭
- */
- private int gap;
-}
-
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java b/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
deleted file mode 100644
index 3c15a9d..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data
-public class DownWorkstation {
-
- /**
- * // 涓嬬墖宸ヤ綅琛�
- */
- @TableId(type = IdType.AUTO)
- private int id;
-
- /**
- * // 宸ヤ綅id
- */
- private Integer workstationId;
-
- /**
- * // 娴佺▼鍗″彿
- */
- private String flowCardId;
-
- /**
- * // 璁惧id
- */
- private Integer deviceId;
-
- /**
- * // 鍚敤鐘舵��
- */
- private Integer enableState;
-
-
-
- /**
- * // 宸ヤ綔鐘舵��
- */
- private Integer workState;
-
- /**
- * // 宸茶惤鏋舵暟閲�
- */
- @TableField(value = "racks_number")
- private int racksnumber;
-
- /**
- * // 鎬绘暟閲�
- */
- @TableField(value = "total_quantity")
- private Integer totalquantity;
-
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java b/UnLoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
deleted file mode 100644
index 6cf60bd..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`edg_storage_cage_details`")
-public class EdgStorageCageDetails {
- @TableId(type = IdType.AUTO)
- private Integer id;//纾ㄨ竟鍓嶇悊鐗囩璇︽儏琛╥d
- private Integer deviceid;//璁惧id
- private Integer slot;//鏍呮牸鍙�
- private Integer glassid;//鐜荤拑id
- private Integer sequence;//灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
- private String flowcardid;//娴佺▼鍗″彿
- private Integer glasstype;//鐜荤拑绫诲瀷
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Double edgwidth;//纾ㄥ墠瀹�
- private Double edgheight;//纾ㄥ墠楂�
- private Integer temperinglayoutid;//閽㈠寲鐗堝浘id
- private Integer temperingfeedsequence;//閽㈠寲鐗堝浘鐗囧簭
- private Integer patternsequence;//鍘熺墖椤哄簭
- private Integer state;//鐘舵��
- private Integer gap;//鐜荤拑闂撮殭
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java b/UnLoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java
deleted file mode 100644
index 4a46f60..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigInteger;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`glass_info`")
-public class GlassInfo {
- @TableId(type = IdType.AUTO)
- private BigInteger id;//鐜荤拑淇℃伅琛╥d
- private String flowcardid;//娴佺▼鍗�
- private Integer glasstype;//娴佺▼鍗＄幓鐠冪被鍨�
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Integer filmsid;//鑶滅郴
- private Double edgwidth;//纾ㄥ墠瀹�
- private Double edgheight;//纾ㄥ墠楂�
- private Integer ismultiple;//鏄惁閰嶇墖
- private Double maxwidth;//閰嶇墖鏈�澶у
- private Double maxheight;//閰嶇墖鏈�澶ч珮
- private Integer ishorizontal;//閽㈠寲鏄惁鎺ュ彈妯斁
- private Integer patternsequence;//鍘熺墖椤哄簭
- private Integer temperinglayoutid;//閽㈠寲鐗堝浘id
- private Integer temperingfeedsequence;//閽㈠寲鐗堝浘鐗囧簭
- private Integer xcoordinate;//x鍧愭爣
- private Integer ycoordinate;//y鍧愭爣
- private Integer angle;//鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/TaskCache.java b/UnLoadGlassModule/src/main/java/com/mes/entity/TaskCache.java
deleted file mode 100644
index 3e02731..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/TaskCache.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-
-public class TaskCache {
- @TableId(type = IdType.AUTO)
- private int id;//id
- private String startCell;//璧峰
- private String endCell;//缁撴潫
- private String taskType;//绫诲瀷
- private double width;//瀹�
- private double height;//鎼�
- private String filmsId;//鑶滅郴
- private double thickness;//鍘氬害
- private String flowCardId;//娴佺▼鍗″彿
- private int taskStatus;//鐘舵��
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java b/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
deleted file mode 100644
index 686752f..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.mes.entity.device;
-
-public class PlcBitInfo {
-
- public PlcBitInfo(String startAddress) {
- this.startAddress = startAddress;
- }
- private String startAddress;
- // 鍙傛暟鏍囪瘑
- private String codeId;
-
- // 鍙傛暟鍚嶇О
- private String name;
-
- // 璇诲彇 鍙傛暟鍊�
- private Boolean value;
- // 鍙傛暟鍦板潃
- private int addressIndex;
-
- public String getCodeId() {
- return this.codeId;
- }
-
- public void setCodeId(String codeId) {
- this.codeId = codeId;
- }
-
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Boolean getValue() {
- return this.value;
- }
-
- public void setValue(Boolean value) {
- this.value = value;
- }
-
-
- public int getAddressIndex() {
- return this.addressIndex;
- }
- /**
- * 鑾峰彇鍦板潃
- *
- * @param index 绱㈠紩鍦板潃
- */
- public String getAddress(int index) {
- String[] stringdatas = this.startAddress.trim().split("\\.");
- if (stringdatas.length < 2 )
- return null;
- int dbwindex = 0;
- int bitindex = 0;
- if (stringdatas.length == 3) {
- dbwindex = Integer.parseInt(stringdatas[1]);
- bitindex = Integer.parseInt(stringdatas[2]);
- } else
- return null;
- dbwindex+=index/8;
- bitindex+=index%8;
- return stringdatas[0]+"."+dbwindex+"."+bitindex;
- }
-
-
-
-
- public void setAddressIndex(int addressindex) {
- this.addressIndex = addressindex;
- }
- }
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java b/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java
deleted file mode 100644
index 977a13c..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.mes.entity.device;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PlcBitObject {
-
- // 璇ユā鍧楁暟鎹被鍨嬶紝鏁版嵁璧峰浣嶇疆
- private String plcAddressBegin;
- // 鏁版嵁鍦板潃闀垮害锛氱涓�鍙傛暟鍒版渶鍚庝竴涓弬鏁扮殑闀垮害
- private int plcAddressLength;
- private ArrayList<PlcBitInfo> plcBitList;
-
- /**
- * @return 鏁版嵁鍖哄紑濮嬪湴鍧�
- */
- public String getPlcAddressBegin() {
- return plcAddressBegin;
- }
-
- /**
- * @param plcAddressBegin 璁剧疆鏁版嵁鍖哄紑濮嬪湴鍧�
- */
- public void setPlcAddressBegin(String plcAddressBegin) {
- this.plcAddressBegin = plcAddressBegin;
- }
-
- /**
- * @return 鏁版嵁鍖� 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
- */
- public int getPlcAddressLength() {
- return plcAddressLength;
- }
-
- /**
- * @return 璁剧疆锛氭暟鎹尯 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
- */
- public void setPlcAddressLength(int plcAddressLength) {
- this.plcAddressLength = plcAddressLength;
- }
-
- /**
- * @return 鑾峰彇鍙傛暟瀹炰緥闆嗗悎
- */
- public ArrayList<PlcBitInfo> getBitList() {
- return plcBitList;
- }
-
- /**
- * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- *
- * @param codeid 鍙傛暟鏍囪瘑
- * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- */
- public PlcBitInfo getPlcBit(String codeid) {
- if (plcBitList != null) {
- for (PlcBitInfo plcbitInfo : plcBitList) {
- if (plcbitInfo.getCodeId().equals(codeid))
- return plcbitInfo;
- }
- return null;
- } else
- return null;
- }
-
- /**
- * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- *
- * @param codeid 鍙傛暟鏍囪瘑
- * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- */
- public List<Boolean> getPlcBitValues(List<String> codeids) {
- List<Boolean> arrayList = new ArrayList<>();
- if (plcBitList != null) {
- Map<String, Boolean> resultMap = new LinkedHashMap<>(); // 浣跨敤 LinkedHashMap 淇濈暀鎻掑叆椤哄簭
- for (PlcBitInfo plcBitInfo : plcBitList) {
- if (codeids.contains(plcBitInfo.getCodeId().toString())) {
- resultMap.put(plcBitInfo.getCodeId().toString(), plcBitInfo.getValue());
- }
- }
- for (String codeId : codeids) { // 鎸夌収浼犲叆鍙傛暟鐨勯『搴忛亶鍘�
- Boolean value = resultMap.get(codeId);
- if (value != null) {
- arrayList.add(value);
- } else {
- arrayList.add(null); // 濡傛灉鎵句笉鍒板搴旂殑鍊硷紝娣诲姞 null
- }
- }
- }
- return arrayList;
- }
-
-
- public List<String> getAddressListByCodeId(List<String> codeIdList) {
- List<String> addressList = new ArrayList<>();
- for (String codeId : codeIdList) {
- for (PlcBitInfo plcBitInfo : plcBitList) {
- if (plcBitInfo.getCodeId().equals(codeId)) {
- int index = plcBitInfo.getAddressIndex();
- String address = plcBitInfo.getAddress(index);
- if (address != null) {
- addressList.add(address);
- }
- }
- }
- }
- return addressList;
- }
-
-
- /**
- * 娣诲姞鍙傛暟瀹炰緥
- *
- * @param param 鍙傛暟瀹炰緥
- */
- public void addPlcBit(PlcBitInfo param) {
- if (plcBitList != null)
- plcBitList.add(param);
- else {
- plcBitList = new ArrayList<PlcBitInfo>();
- plcBitList.add(param);
- }
- }
-
- /**
- * 鏍规嵁PLC杩斿洖鐨勬暟鎹� 缁欏弬鏁板疄渚嬭祴鍊�
- *
- * @param plcValueArray PLC璇诲彇鍥炴潵鐨刡yte绫诲瀷鏁版嵁闆嗗悎
- */
- public void setPlcBitList(List<Boolean> plcValueArray) {
- if (plcBitList != null) {
- for (PlcBitInfo plcbitInfo : plcBitList) {
- plcbitInfo.setValue(plcValueArray.get(plcbitInfo.getAddressIndex()));
- }
- }
- }
-
-
-
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java b/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java
deleted file mode 100644
index 4d41978..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.mes.entity.device;
-public class PlcParameterInfo {
- public PlcParameterInfo(String startAddress) {
- this.startAddress = startAddress;
- }
- private String startAddress;
- // 鍙傛暟鏍囪瘑
- private String codeId;
-
- // 鍙傛暟鍚嶇О
- private String name;
-
- // 璇诲彇 鍙傛暟鍊�
- private String value;
-
- // // 鍐欏叆 鍙傛暟鍊�
- // private String writeValue;
-
- // 鍙傛暟鍗曚綅
- private String unit;
-
- // 鍙傛暟鍊艰浆鎹㈢郴鏁�
- private int ratio;
-
- // 鍙傛暟鍦板潃
- private int addressIndex;
-
- // 鍙傛暟鍦板潃浣嶉暱搴�
- private int addressLength;
-
- public String getCodeId() {
- return this.codeId;
- }
-
- public void setCodeId(String codeId) {
- this.codeId = codeId;
- }
-
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return this.value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- // public String getWriteValue() {
- // return this.writeValue;
- // }
-
- // public void setWriteValue(String writeValue) {
- // this.writeValue = writeValue;
- // }
-
- public String getUnit() {
- return this.unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-
- public int getAddressIndex() {
- return this.addressIndex;
- }
-
- public void setAddressIndex(int addressindex) {
- this.addressIndex = addressindex;
- }
-
- public int getAddressLength() {
- return this.addressLength;
- }
-
- public void setAddressLength(int addresslength) {
- this.addressLength = addresslength;
- }
-
- public int getRatio() {
- return this.ratio;
- }
-
- public void setRatio(int ratio) {
- this.ratio = ratio;
- }
-
- /**
- * 鑾峰彇鍦板潃
- *
- * @param index 绱㈠紩鍦板潃
- */
- public String getAddress(int index) {
- String[] stringdatas = this.startAddress.trim().split("\\.");
- int addressLength=this.addressLength;
- if (addressLength < 2 ){
- return null;
- }
-
- if (addressLength == 2 ) {
- int wordindex = index;
-
- return stringdatas[0] + "." + wordindex;
- }
- if (addressLength == 14 ) {
- int wordindex = index;
- int newIndex = wordindex + 13;
- return stringdatas[0] + "." + wordindex +"-" + newIndex;
- }
- return null;
- }
-
- public int getPlcAddress() {
-
- return addressIndex;
- }
-
- public String getAddress() {
- return getAddress(this.addressIndex);
- }
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java b/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
deleted file mode 100644
index af3536c..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.mes.entity.device;
-
-import java.lang.reflect.Array;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PlcParameterObject {
-
- // 璇ユā鍧楁暟鎹被鍨嬶紝鏁版嵁璧峰浣嶇疆
- private String plcAddressBegin;
- // 鏁版嵁鍦板潃闀垮害锛氱涓�鍙傛暟鍒版渶鍚庝竴涓弬鏁扮殑闀垮害
- private int plcAddressLength;
- private ArrayList<PlcParameterInfo> plcParameterList;
-
-
-
- /**
- * @return 鏁版嵁鍖哄紑濮嬪湴鍧�
- */
- public String getPlcAddressBegin() {
- return plcAddressBegin;
- }
-
- /**
- * @param plcAddressBegin 璁剧疆鏁版嵁鍖哄紑濮嬪湴鍧�
- */
- public void setPlcAddressBegin(String plcAddressBegin) {
- this.plcAddressBegin = plcAddressBegin;
- }
-
- /**
- * @return 鏁版嵁鍖� 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
- */
- public int getPlcAddressLength() {
- return plcAddressLength;
- }
-
- /**
- * @return 璁剧疆锛氭暟鎹尯 璇诲彇鎵�鏈夋暟鎹墍闇�鐨勯暱搴︼紙浠yte绫诲瀷涓哄熀鍑嗭級
- */
- public void setPlcAddressLength(int plcAddressLength) {
- this.plcAddressLength = plcAddressLength;
- }
-
- /**
- * @return 鑾峰彇鍙傛暟瀹炰緥闆嗗悎
- */
- public ArrayList<PlcParameterInfo> getPlcParameterList() {
- return plcParameterList;
- }
-
- /**
- * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- *
- * @param codeid 鍙傛暟鏍囪瘑
- * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- */
- public PlcParameterInfo getPlcParameter(String codeid) {
- if (plcParameterList != null) {
- for (PlcParameterInfo plcParameterInfo : plcParameterList) {
- if (plcParameterInfo.getCodeId().equals(codeid))
- return plcParameterInfo;
- }
- return null;
- } else
- return null;
- }
-
-
-
- /**
- * 鏍规嵁鍙傛暟鏍囪瘑 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- *
- * @param codeids 鍙傛暟鏍囪瘑
- * @return 鑾峰彇鏌愪釜鍙傛暟瀹炰緥
- */
- public List<String> getPlcParameterValues(List<String> codeids) {
- List<String> arrayList = new ArrayList<>();
- if (plcParameterList != null) {
- Map<String, PlcParameterInfo> resultMap = new LinkedHashMap<>(); // 浣跨敤 LinkedHashMap 淇濈暀鎻掑叆椤哄簭
- for (PlcParameterInfo plcParameterInfo : plcParameterList) {
- if (codeids.contains(plcParameterInfo.getCodeId())) {
- resultMap.put(plcParameterInfo.getCodeId(), plcParameterInfo);
- }
- }
- for (String codeId : codeids) { // 鎸夌収浼犲叆鍙傛暟鐨勯『搴忛亶鍘�
- PlcParameterInfo plcParameterInfo = resultMap.get(codeId);
- if (plcParameterInfo != null) {
- arrayList.add(plcParameterInfo.getValue());
- } else {
- arrayList.add(null); // 濡傛灉鎵句笉鍒板搴旂殑鍊硷紝娣诲姞 null
- }
- }
- }
- return arrayList;
- }
-
-
- public List<String> getAddressListByCodeId(List<String> codeIdList) {
- List<String> addressList = new ArrayList<>();
- for (String codeId : codeIdList) {
- for (PlcParameterInfo plcParameterInfo : plcParameterList) {
- if (plcParameterInfo.getCodeId().equals(codeId)) {
- int index = plcParameterInfo.getAddressIndex();
- String address = plcParameterInfo.getAddress(index);
- if (address != null) {
- addressList.add(address);
- }
- }
- }
- }
- return addressList;
- }
-
-
-
-
-
-
- /**
- * 娣诲姞鍙傛暟瀹炰緥
- *
- * @param param 鍙傛暟瀹炰緥
- */
- public void addPlcParameter(PlcParameterInfo param) {
- if (plcParameterList != null)
- plcParameterList.add(param);
- else {
- plcParameterList = new ArrayList<PlcParameterInfo>();
- plcParameterList.add(param);
- }
- }
-
- /**
- * 鏍规嵁PLC杩斿洖鐨勬暟鎹� 缁欏弬鏁板疄渚嬭祴鍊�
- *
- * @param plcValueArray PLC璇诲彇鍥炴潵鐨刡yte绫诲瀷鏁版嵁闆嗗悎
- */
- public void setPlcParameterList(byte[] plcValueArray) {
- if (plcParameterList != null) {
-
- for (PlcParameterInfo plcParameterInfo : plcParameterList) {
-
- byte[] valueList = new byte[plcParameterInfo.getAddressLength()];
-
-// System.out.println(plcParameterInfo.getAddressLength());
-
- for (int i = 0; i < plcParameterInfo.getAddressLength(); i++) {
- Array.setByte(valueList, i, plcValueArray[plcParameterInfo.getAddressIndex() + i]);
-
- }
- if (plcParameterInfo.getAddressLength()==2) {
- plcParameterInfo.setValue(String.valueOf(byte2short(valueList)));
- }
- else if (plcParameterInfo.getAddressLength()==14) {
- plcParameterInfo.setValue((byteToHexString(valueList)));
- }
-
- else
- {
- String valuestr = new String(valueList);
- plcParameterInfo.setValue(valuestr);
- }
- }
- }
- }
- /**
- * short绫诲瀷杞琤yte[]
- *
- * @param s short绫诲瀷鍊�
- */
- public static byte[] short2byte(short s){
- byte[] b = new byte[2];
- for(int i = 0; i < 2; i++){
- int offset = 16 - (i+1)*8; //鍥犱负byte鍗�4涓瓧鑺傦紝鎵�浠ヨ璁＄畻鍋忕Щ閲�
- b[i] = (byte)((s >> offset)&0xff); //鎶�16浣嶅垎涓�2涓�8浣嶈繘琛屽垎鍒瓨鍌�
- }
- return b;
- }
- /**
- * byte[]绫诲瀷杞瑂hort
- *
- * @param b byte[]绫诲瀷鍊�
- */
- public static short byte2short(byte[] b){
- short l = 0;
- for (int i = 0; i < 2; i++) {
- l<<=8; //<<=鍜屾垜浠殑 +=鏄竴鏍风殑锛屾剰鎬濆氨鏄� l = l << 8
- l |= (b[i] & 0xff); //鍜屼笂闈篃鏄竴鏍风殑 l = l | (b[i]&0xff)
- }
- return l;
- }
-
- public static String byteToHexString(byte[] bytes) {
-
- String str = new String(bytes, StandardCharsets.UTF_8);
- return str;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java b/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
deleted file mode 100644
index d756660..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mes.entity.userInfo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data
-public class SysError {
- @TableId(type = IdType.AUTO)
- private String id;
- private String func;
- private String error;
- private String createTime;
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java b/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
deleted file mode 100644
index 5d0a881..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.entity.userInfo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data
-public class SysMenu {
- @TableId(type = IdType.AUTO)
- private String id;
- private String menuName;
- private String languageType;
- private String state;
- private String listSort;
- private String createTime;
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java b/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
deleted file mode 100644
index 9dc4f03..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.entity.userInfo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data
-public class SysMenuItem {
- @TableId(type = IdType.AUTO)
- private Integer id;
- private Integer menuID;
- private String itemName;
- private String url;
- private String languageType;
- private Integer state;
- private Integer listSort;
- private String createTime;
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/User.java b/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/User.java
deleted file mode 100644
index 216d340..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/User.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.entity.userInfo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-@Data //get涓巗et浠ｇ爜绠�鍐�
-public class User {
-
- @TableId(type = IdType.AUTO)
- private Integer id;
- private String loginName;
- private String passWord;
- private String userName;
- private String address;
- private String phone;
- private String createTime;
- private String updateTime;
- private Integer state;
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java b/UnLoadGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
deleted file mode 100644
index f4ee632..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mes.exception;
-
-import com.mes.common.Result;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@ControllerAdvice
-public class GlobalExceptionHandle {
- /**
- * 濡傛灉鏄痵erviceExcaption锛屽垯璋冪敤璇ユ柟娉�
- */
- @ExceptionHandler(ServiceException.class)
- @ResponseBody
- public Result handle(ServiceException se){
- return Result.error(se.getCode(),se.getMessage());
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/exception/ServiceException.java b/UnLoadGlassModule/src/main/java/com/mes/exception/ServiceException.java
deleted file mode 100644
index 92b6196..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/exception/ServiceException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mes.exception;
-
-import lombok.Getter;
-
-@Getter
-public class ServiceException extends RuntimeException {
- private String code;
- public ServiceException(String code, String msg){
- super(msg);
- this.code=code;
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java
deleted file mode 100644
index 0d213a7..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.DownGlassInfo;
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-@InterceptorIgnore(tenantLine = "true")
-@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
-public interface DownGlassInfoMapper extends BaseMapper<DownGlassInfo> {
-
- // 鏌ヨ涓嬬墖浠诲姟琛ㄤ腑鐘舵�佷负1鐨勪笅鐗囦俊鎭�
- @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;")
- List<DownGlassInfo> selectunloadingtaskstate();
-
- @Update("UPDATE down_glass_task SET task_stauts = 0 WHERE flow_card_id = #{flowCardId}")
- void updateTaskStateToZero(@Param("flowCardId") String flowCardId);
-
- @Select("SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId} LIMIT 1")
- Integer getMaxSequenceByFlowCardId(@Param("flowCardId") String flowCardId);
-
- @Delete("delete from down_glass_task where flow_card_id = #{flowCardId}")
- void deletetask(@Param("flowCardId") String flowCardId);
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageDetailsMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageDetailsMapper.java
deleted file mode 100644
index e48f35c..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageDetailsMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.DownStorageCageDetails;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-@InterceptorIgnore(tenantLine = "true")
-@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
-public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> {
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageMapper.java
deleted file mode 100644
index 5c67a01..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.DownStorageCage;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-@InterceptorIgnore(tenantLine = "true")
-@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
-public interface DownStorageCageMapper extends BaseMapper<DownStorageCage> {
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
deleted file mode 100644
index 3d00318..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.mes.mapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.DownGlassInfo;
-import com.mes.entity.DownWorkstation;
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-@Component
-@Repository
-@InterceptorIgnore(tenantLine = "true")
-public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> {
-//鏍规嵁宸ヤ綅ID鍜岃澶嘔D鏇存柊宸ヤ綅鐘舵��
- @Update("UPDATE down_workstation SET work_state = #{workState} " +
- "WHERE workstation_id = #{workstationId} AND device_id = #{deviceId}")
- void updateWorkStateByWorkstationIdAndDeviceId(@Param("workstationId") Integer workstationId,
- @Param("deviceId") Integer deviceId,
- @Param("workState") Integer workState);
-//宸ヤ綅ID鍒犻櫎淇℃伅
- @Delete("DELETE FROM down_workstation WHERE workstation_id = #{workstationId}")
- void deleteByWorkstationId(@Param("workstationId") Integer workstationId);
-
-//钀芥灦
- @Insert("INSERT INTO down_workstation (workstation_id, flow_card_id, device_id, enable_state, work_state) " +
- "VALUES (#{workstationId}, #{flowCardId}, #{deviceId}, #{enableState}, #{workState})")
- void insertDownWorkstation(DownWorkstation downWorkstation);
-
-//鏍规嵁璁惧ID鏌ヨ宸ヤ綅淇℃伅
- @Select("SELECT * FROM down_workstation WHERE device_id = #{deviceId}")
- List<DownWorkstation> selectByDeviceId(@Param("deviceId") Integer deviceId);
-//浠庢満姊版墜浠诲姟琛ㄦ煡璇㈢姸鎬佷负1鐨勬祦绋嬪崱鍙�
-// @Select("SELECT * FROM down_workstation_task WHERE state = 1")
-// List<DownWorkstation> selectdownWorkstationstate();
-//鏌ヨ宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
- @Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1")
- List<DownWorkstation> selectdownWorkstationstate();
-//鏇存柊钀芥灦鏁伴噺
- @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
- "WHERE flow_card_id = #{flowCardId}")
- void update_racks_number(@Param("flowCardId") String flowCardId,
- @Param("racksNumber") Integer racksNumber);
-
-//鎻掑叆鏈烘浠诲姟琛�
- @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
- "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
- void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
-
-//鏍规嵁宸ヤ綅id鏇存柊瀹炰綋绫绘帴鏀剁殑鏁版嵁
-@Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
-void updateFlowCardId(DownWorkstation downWorkstation);
-
-
-
-//婊℃灦鎷夎蛋锛屾竻绌轰俊鎭�
- @Update("UPDATE down_workstation SET width = null, height = null, flow_card_id = null WHERE workstation_id = #{workstationId}")
- void clearFlowCardId(DownWorkstation downWorkstation);
-
-
-
- @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
- void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
-
-
-@Select(" SELECT * FROM down_workstation WHERE workstation_id >= 1 AND workstation_id <= 5")
- List<DownWorkstation> getoneDownWorkstations();
-
-
- @Select(" SELECT * FROM down_workstation WHERE workstation_id >= 6 AND workstation_id <= 10")
- List<DownWorkstation> gettwoDownWorkstations();
-
-
-
- @Select("SELECT DISTINCT flowcard_id from glass_info")
- @ResultType(Map.class)
- List<Map<String, Object>> getflowCardId();
-
- @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
- void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
-
- // 鑾峰彇鎬绘暟閲�
- @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
- int getTotalQuantity(@Param("workstationId") int workstationId);
-
- // 鑾峰彇钀芥灦鏁伴噺
- @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
- int getRacksNumber(@Param("workstationId") int workstationId);
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java
deleted file mode 100644
index 9dcc0e6..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mes.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-@Mapper
-public interface GlassInfoMapper {
-
- @Select("SELECT COUNT(*) FROM glass_info WHERE flowcard_id = #{flowCardId}")
- int getGlassInfoCountByFlowCardId(@Param("flowCardId") String flowCardId);
-
- @Update("UPDATE down_workstation SET total_quantity = #{glassInfoCount},flow_card_id=#{flowCardId} WHERE workstation_id = #{workstationId}")
- int updateFlowCardIdAndCount(@Param("flowCardId") String flowCardId, @Param("glassInfoCount") int glassInfoCount,@Param("workstationId")int workstationId);
-
- // 杩欓噷鍙互娣诲姞鍏朵粬 SQL 璇彞
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
deleted file mode 100644
index beee154..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.mes.mapper;
-
-import com.mes.entity.DownStorageCageDetails;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.TaskCache;
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-
-@Mapper
-public interface SelectInfo {
- // 鐜荤拑淇℃伅 鎸塈D鏌ヨ
- @Select("select * from `glass_info` where id=#{id}")
- GlassInfo SelectGlassId(String id);
-
- // 閽㈠寲鎸夊伐绋嬫煡璇�
- // @Select("select * from `v_optimize_heat_layout` where project_no=#{projeceid} ")
-// List<Tempered> SelectTemperedTerritory(String projeceid);
-//
-// // 鍒囧壊鐗堝浘鎸夊伐绋嬫煡璇�
-// @Select("select * from optimize_detail where project_no=#{projeceid} ")
-// List<Map> SelectCutTerritory(String projeceid);
-//
-// // 鏌ヨ纾ㄨ竟淇℃伅
-// @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
-// List<Map> SelectEdgInfo(String EndCell);
-
- // 鏌ヨ绗煎瓙鍐呯┖闂�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
- List<DownStorageCageDetails> SelectCacheLeisure();
-
- // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot WHERE escd.slot IS NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectCacheOut();
-
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
- List<DownStorageCageDetails> SelectCachInfo();
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
- double width);
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
-
- // 鏌ヨ鍏ㄩ儴浠诲姟
- @Select("select * from down_glass_task")
- List<TaskCache> SelectCacheInfoAll();
-
- // 鏌ヨ杩涚墖浠诲姟
- @Select("select * from down_glass_task where task_type='1' and task_stauts='0'")
- List<TaskCache> SelectInputCacheInfo();
-
- // 鏌ヨ鍑虹墖浠诲姟
- @Select("select * from down_glass_task where task_type='2' and task_stauts='0'")
- List<TaskCache> SelectOutCacheInfo();
-
- // 鏌ヨ A06 鎴� A11 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- @Select("select * from down_glass_task where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
- GlassInfo SelectLastOutCacheInfo(String EndCell);
-
- // 淇敼绗煎瓙鍐呬俊鎭�
- @Update("update")
- Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
-
- // 娣诲姞涓嬬墖浠诲姟
- @Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)")
- Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId);
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
deleted file mode 100644
index ce86b42..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mes.mapper.userInfo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.userInfo.SysError;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface SysErrorMapper extends BaseMapper<SysError> {
- Boolean saveError(@Param("sysError")SysError sysError);
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
deleted file mode 100644
index bdb183e..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mes.mapper.userInfo;
-
-import com.mes.entity.userInfo.SysMenuItem;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-public interface SysMenuItemMapper {
- @Select("select * from sys_menu_item as a where a.state=1 order by a.listSort")
- List<SysMenuItem> findAll() ;
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
deleted file mode 100644
index 1c9baf4..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mes.mapper.userInfo;
-
-import com.mes.entity.userInfo.SysMenu;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-
-public interface SysMenuMapper {
- @Select("select a.id, a.menuName from sys_menu as a where a.state=1 order by a.listSort")
- List<SysMenu> findAll();
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
deleted file mode 100644
index ea43306..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mes.mapper.userInfo;
-
-
-import com.mes.entity.userInfo.User;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-
-public interface UserMapper {
- List<User> findAll();
-
- User findOne(Integer id);
- @Select("select user_name FROM `user` where login_name=#{LoginName}")
- User findOneLoginName(String LoginName);
- @Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ")
- int checkUser(@Param("userName") String userName,@Param("password") String password);
-
- @Select("select password FROM `user` where login_name=#{userId} ")
- String getUserByID(String userId);
-
-
- Boolean register(User user);
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
deleted file mode 100644
index 9197e0b..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.mes.service;
-
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.DownStorageCageDetails;
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.SelectInfo;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Data
-@Service
-public class DownGlassCacheLogic {
- @Autowired
- private SelectInfo selectInfo;
-
- /**
- * @param Number
- * //璇嗗埆閫昏緫 涓嶄氦浜�
- */
-
- public void identify(String Number){
- //鏌ヨ浠诲姟
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- String s=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
- boolean isexist=isExist(Number);
- if (isexist) {
- //瀛樺湪閫昏緫 1.娣诲姞淇℃伅 2.鍥炲PLC瀛樺湪
- //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- }else {
- //涓嶅瓨鍦ㄩ�昏緫 1.鍥炲PLC涓嶅瓨鍦�
- //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2);
- }
- }
- //涓嬬墖鍓嶇悊鐗�
- public static final String RESULT_IN = "1";
- public static final String RESULT_OUT = "2";
- public static final String RESULT_IN_OUT = "3";
-
- public void process() {
- String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
- String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
-
- // 杩涚墖璇锋眰
- if (RESULT_IN.equals(result)) {
- processInto(number);
- }
- // 鍑虹墖璇锋眰
- else if (RESULT_OUT.equals(result)) {
- processOut();
- }
- // 杩涘嚭鐗囪姹�
- else if (RESULT_IN_OUT.equals(result)) {
- // 鍏堝嚭鍚庤繘
- if (!processOut()) {
- processInto(number);
- }
- }
- }
-
-
- /**
- * @param Number
- * @return
- * //涓嬬墖鍓嶇悊鐗� 杩�
- */
-
- public boolean processInto(String Number){
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //瀛樺湪姝ょ幓鐠冪紪鍙�
- if(GlassInfo!=null){
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
- List<DownStorageCageDetails> list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
- //绌烘爡鏍煎彿
- if (list.size()==0) {
- list=selectInfo.SelectCacheLeisure();
- }
- //灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
- if(list.size()==0){
- list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth());
- }
- if(list.size()>0){
- //瀛樺湪绌烘牸
- //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
- //2.鍥炲 1杩涚墖
- DownStorageCageDetails item=list.get(0);
- selectInfo.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1",GlassInfo.getWidth(),GlassInfo.getHeight(),GlassInfo.getFilmsid(),GlassInfo.getThickness(),GlassInfo.getFlowcardid());
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- return true;
- }
-
- }else{
- // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
- }
- //杩斿洖缁撴灉
- return false;
- }
- //鐞嗙墖 鍑�
- public boolean processOut(){
- //鏌ヨ浠诲姟
- String G06=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
- String G11=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
- String G13=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- List<DownStorageCageDetails> list=selectInfo.SelectCacheOut();
- //鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
- boolean isOut=true;
- if (list.size()>0&&isOut) {
- DownStorageCageDetails item=list.get(0);
- //
- if(G06=="0"&&G11=="1"){
- //鍑哄埌 G06
-
- selectInfo.insertCacheTask(item.getGlassId()+"","0","06","2",item.getWidth(),item.getHeight(),item.getFilmsid(),item.getThickness(),item.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }else if(G06=="1"&&G11=="0"){
- //鍑哄埌 G11
-
- selectInfo.insertCacheTask(item.getGlassId()+"","0","11","2",item.getWidth(),item.getHeight(),item.getFilmsid(),item.getThickness(),item.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }else if(G06=="0"&&G11=="0"){
- //閮藉厑璁� G04/G05 涓婁竴鐗囨槸鍚﹀拰姝ょ墖鐜荤拑灏哄灏哄鐩稿悓
- String endcell="06";
- String SendEndcell="1";
- boolean If_=false;
- GlassInfo glassInfo06= selectInfo.SelectLastOutCacheInfo("06");
- GlassInfo glassInfo11= selectInfo.SelectLastOutCacheInfo("11");
- GlassInfo glassInfo13= selectInfo.SelectLastOutCacheInfo("13");
- if(glassInfo06!=null&&glassInfo11.getWidth()==item.getWidth()&&glassInfo06.getHeight()==item.getHeight()){
- endcell="11";
- SendEndcell="2";
- }else if(item.getHeight()>=3440&&item.getWidth()>=1440){
- //鍏朵粬鏉′欢浜哄伐澶勭悊
-
- }
-
- selectInfo.insertCacheTask(item.getGlassId()+"","0",endcell,"2",item.getWidth(),item.getHeight(),item.getFilmsid(),item.getThickness(),item.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
- }
- //杩斿洖缁撴灉
- return false;
- }
-
- /**
- * @param Number
- * //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
- */
-
- public void processMb(String Number){
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- if(GlassInfo!=null){
- //鍙戦�佷换鍔� ID 闀� 瀹� 鍘� 鍊掕 宸ヨ壓鍔熻兘绛�
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.22").getAddress(),"N10000");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.24").getAddress(), "1000");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.26").getAddress(),"800");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(),"60");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.30").getAddress(), "2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- }
- //杩斿洖缁撴灉
- }
-
-
- /**
- * @param Number
- * @return
- * 鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- */
- public boolean selectMessageId(String Number){
- //鏌ヨ鏄惁瀛樺湪
-
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- //杩斿洖 涓嶅瓨鍦�
- return false;
-
- }
- //杩斿洖 瀛樺湪
- return true;
- }
-
- /**
- * @param Number
- * @return
- * 鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- */
-
- public boolean deleteMessageId(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- //杩斿洖 涓嶅瓨鍦�
- return false;
- }
- //杩斿洖 瀛樺湪
- return true;
- }
-
-
-
- /**
- * @param Number
- * @return
- * //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
- */
- public boolean isExist(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- //杩斿洖 涓嶅瓨鍦�
- return false;
- }
- //杩斿洖 瀛樺湪
- return true;
- }
-
-}
-
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java
deleted file mode 100644
index 2cf4210..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mes.service;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.entity.DownGlassInfo;
-import com.mes.mapper.DownGlassInfoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("hangzhoumes")
-public class DownGlassInfoService {
-
- @Autowired
- private DownGlassInfoMapper downGlassInfoMapper;
-
-
- public DownGlassInfo getDownGlassInfoById(Integer id) {
- return downGlassInfoMapper.selectById(id);
- }
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
deleted file mode 100644
index a2f03a6..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.mes.service;
-
-import com.mes.entity.DownGlassInfo;
-import com.mes.entity.DownStorageCageDetails;
-import com.mes.entity.DownWorkstation;
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.DownGlassInfoMapper;
-import com.mes.mapper.DownWorkstationMapper;
-import com.mes.tools.WebSocketServer;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Data
-@Service
-public class DownGlassLogic {
-
- PlcParameterObject plcread = PLCAutoMes.PlcReadObject;
- /**
- * // 鏈烘鎵�1PLC璇锋眰瀛�
- */
- String robot1PLCrequestword = plcread.getPlcParameter("A01Position").getValue();
- /**
- * // 鏈烘鎵�2PLC璇锋眰瀛�
- */
- String robot2PLCrequestword = plcread.getPlcParameter("A01Position").getValue();
- /**
- * // 鐜荤拑id
- */
- String glassID = plcread.getPlcParameter("A01Position").getValue();
- String glasswidth = plcread.getPlcParameter("A01Position").getValue();
- String glassheight = plcread.getPlcParameter("A01Position").getValue();
- //
- String glassthickness = plcread.getPlcParameter("A01Position").getValue();
- String pLcwancheng = plcread.getPlcParameter("A01Position").getValue();
- @Autowired
- private DownWorkstationMapper downWorkstationMapper;
- private DownGlassInfo downGlassInfo;
- private DownWorkstation downWorkstation;
- private DownGlassInfoMapper downGlassInfoMapper;
- private DownGlassInfoService downGlassInfoService;
- /**
- * // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
- */
- private List<DownGlassInfo> glassList;
- /**
- * 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
- */
- private List<DownStorageCageDetails> cageDetailsList;
-
- /**
- * //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
- */
-
- public void insertdownglassinfo() {
-
-
- downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
- downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
- List<DownGlassInfo> taskdownGlassInf = downGlassInfoMapper.selectunloadingtaskstate();
-//
- if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
-
-//
-
-
- for (DownGlassInfo downGlassInfo : taskdownGlassInf) {
- // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬�
- DownGlassInfo newdownGlassInfo = new DownGlassInfo();
-
- newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId());
- Integer maxSequence = downGlassInfoMapper.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
- // 鍒濆鍖栭『搴忓瓧娈靛��
- int sequence = maxSequence != null ? maxSequence + 1 : 1;
-
- newdownGlassInfo.setWidth(downGlassInfo.getWidth());
- newdownGlassInfo.setHeight(downGlassInfo.getHeight());
- newdownGlassInfo.setThickness(downGlassInfo.getThickness());
- newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid());
- // 璁剧疆椤哄簭瀛楁鍊�
- newdownGlassInfo.setSequence(sequence);
-
- // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
- downGlassInfoMapper.insert(newdownGlassInfo);
- //鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛�
- downWorkstationMapper.insertdownWorkstationtask(newdownGlassInfo);
- //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
- downGlassInfoMapper.updateTaskStateToZero(downGlassInfo.getFlowCardId());
-
- sequence++; // 閫掑椤哄簭瀛楁鍊�
-
-
- }
- }
- }
-
-
- /**
- * //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗＄粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀
- */
-
- public void downWorkstation() {
-
-
- try {
- //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
- List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
- if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
- //锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- for (DownWorkstation downWorkstation : taskdownWorkstation) {
-
- //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
- downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
-
- //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
- downWorkstationMapper.update_task_state_to_zero(downWorkstation.getFlowCardId());
- //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- downGlassInfoMapper.deletetask(downWorkstation.getFlowCardId());
-
- }
- }
- } catch (Exception e) {
- // 鎵撳嵃寮傚父淇℃伅
- e.printStackTrace();
- // 鎴栬�呭彲浠ヨ繘琛屽叾浠栧紓甯稿鐞嗭紝姣斿璁板綍鏃ュ織鎴栬�呰繑鍥炵壒瀹氱殑閿欒淇℃伅
- }
-
-
- }
-
-
- /**
- * @param downWorkstation // 缁戝畾娴佺▼鍗″彿鏋跺瓙
- */
-
- public void bindingshelf(DownWorkstation downWorkstation) {
- downWorkstationMapper.updateFlowCardId(downWorkstation);
- }
-
-
- /**
- * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
- */
-
- public void clearFlowCardId(DownWorkstation downWorkstation) {
-
- downWorkstationMapper.clearFlowCardId(downWorkstation);
- }
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java
deleted file mode 100644
index 9dca11e..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mes.service;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.entity.DownWorkstation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-@DS("hangzhoumes")
-public class DownWorkstationService {
- @Autowired
- private com.mes.mapper.DownWorkstationMapper DownWorkstationMapper;
-
-
- public List<DownWorkstation> getoneDownWorkstations() {
-
- return DownWorkstationMapper.getoneDownWorkstations();
- }
-
- public List<DownWorkstation> gettwoDownWorkstations() {
-
- return DownWorkstationMapper.gettwoDownWorkstations();
- }
- public List<Map<String, Object>> getflowCardId() {
-
- return DownWorkstationMapper.getflowCardId();
- }
-
-
- public int getTotalQuantity(int workstationId) {
- // 鎵ц鑾峰彇鎬绘暟閲忕殑閫昏緫锛屽彲浠ユ槸鏁版嵁搴撴煡璇㈡垨鍏朵粬涓氬姟閫昏緫
- Integer totalQuantity = DownWorkstationMapper.getTotalQuantity(workstationId);
- return totalQuantity != null ? totalQuantity : 0;
- }
-
- public int getRacksNumber(int workstationId) {
- // 鎵ц鑾峰彇钀芥灦鏁伴噺鐨勯�昏緫锛屽彲浠ユ槸鏁版嵁搴撴煡璇㈡垨鍏朵粬涓氬姟閫昏緫
- Integer racksNumber = DownWorkstationMapper.getRacksNumber(workstationId);
- return racksNumber != null ? racksNumber : 0;
- }
-
- public void clearFlowCardId(int workstationId) {
- // 鎵ц娓呴櫎鎸囧畾宸ヤ綅ID鐨勬祦绋嬪崱淇℃伅鐨勯�昏緫锛屽彲浠ユ槸鏁版嵁搴撴搷浣滄垨鍏朵粬涓氬姟閫昏緫
- // 鍒ゆ柇濡傛灉钀芥灦鏁伴噺绛変簬鎬绘暟閲忔墽琛屾竻闄わ紝鍚﹀垯涓嶆墽琛�
- DownWorkstationMapper.clearFlowCardInfoByWorkstationId(workstationId);
- }
-
-
-
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java b/UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java
deleted file mode 100644
index 83ca461..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mes.service;
-
-import com.mes.mapper.GlassInfoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class GlassInfoService {
-
- @Autowired
- private GlassInfoMapper glassInfoMapper;
-
- public int getGlassInfoCountByFlowCardId(String flowCardId) {
- return glassInfoMapper.getGlassInfoCountByFlowCardId(flowCardId);
- }
-
- public void updateFlowCardIdAndCount(String flowCardId, int glassInfoCount,int workstationId) {
- // 璋冪敤 GlassInfoMapper 鐨� updateFlowCardIdAndCount 鏂规硶
- int rowsAffected = glassInfoMapper.updateFlowCardIdAndCount(flowCardId, glassInfoCount,workstationId);
- if (rowsAffected > 0) {
- System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忔垚鍔�");
- } else {
- System.out.println("鏇存柊鏋跺瓙涓婃祦绋嬪崱 ID 鍜屾暟閲忓け璐�");
- }
- }
-
- // 杩欓噷鍙互娣诲姞鍏朵粬涓氬姟閫昏緫鏂规硶
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java b/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java
deleted file mode 100644
index f33714f..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.service;
-
-import com.mes.common.RabbitMQUtils;
-
-public class ModuleA {
- private static String QUEUE_NAME = "hangzhou2";
- private static RabbitMQUtils receiver;
-
- public ModuleA(String QUEUENAME) {
- QUEUE_NAME = QUEUENAME;
- // 瀹炰緥鍖� RabbitMQUtils 瀵硅薄
- receiver = new RabbitMQUtils();
- }
-
- public static void main(String[] argv) throws Exception {
-// ModuleA moduleA = new ModuleA("hangzhou2"); // 瀹炰緥鍖� ModuleA 瀵硅薄
-// String message = "Your message to send666";
-// String messageId = "5"; // 娑堟伅ID
-// receiver.sendMessageWithId(QUEUE_NAME, message, messageId); // 璋冪敤 sendMessageWithId 鏂规硶鍙戦�佹秷鎭�
- RabbitMQUtils.sendMessageWithId("hangzhou2", "Hello RabbitMQ!", "1");
- RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "2");
- RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "3");
- RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "4");
- RabbitMQUtils.sendMessageWithId("hangzhou2", "Another message", "5");
- // receiver.sendMessageWithId("hangzhou2", "Yet another message", "1"); // 杩欐潯娑堟伅浼氭墦鍗伴噸澶嶆秷鎭殑閿欒淇℃伅
-
- }
-}
-
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java b/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java
deleted file mode 100644
index 6c0dfba..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.mes.service;
-
-import com.mes.common.RabbitMQUtils;
-
-import java.util.List;
-
-public class ModuleB {
- private final static String QUEUE_NAME = "hangzhou2";
-
- public static void main(String[] argv) throws Exception {
-
-
-
- RabbitMQUtils receiver = new RabbitMQUtils();
-
- try {
-
- //receiver.consumeMessageById("5",QUEUE_NAME);
-
- // String receivedMessage = receiver.consumeSelectedMessage(1,QUEUE_NAME);
- List<String> receivedMessage = RabbitMQUtils.browseMessages(QUEUE_NAME);
- System.out.println("Received message: " + receivedMessage);
- } catch (Exception e) {
- e.printStackTrace();
- }
-// // 鍒涘缓杩炴帴宸ュ巶
-// ConnectionFactory factory = new ConnectionFactory();
-// factory.setHost("10.153.19.150");
-// //factory.setHost("localhost");
-// try (Connection connection = factory.newConnection();
-// Channel channel = connection.createChannel()) {
-// // 澹版槑闃熷垪
-// Map<String, Object> args = new HashMap<>();
-// args.put("x-max-length-bytes",1024 * 1024);
-//// args.put("x-max-length",5000);
-// channel.queueDeclare(QUEUE_NAME, false, false, false, args);
-//
-// // 鍒涘缓娑堣垂鑰�
-// DeliverCallback deliverCallback = (consumerTag, delivery) -> {
-// String receivedMessage = new String(delivery.getBody(), "UTF-8");
-// System.out.println(" [x] Received '" + receivedMessage + "'");
-// };
-// // 寮�濮嬫秷璐规秷鎭�
-// channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> {
-// });
-// }
- }
-}
-
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/PLCAutoMes.java b/UnLoadGlassModule/src/main/java/com/mes/service/PLCAutoMes.java
deleted file mode 100644
index 66e4cc9..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/PLCAutoMes.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mes.service;
-
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.tools.InitUtil;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.mes.tools.InitUtil.readAndUpdateWordValues;
-
-public class PLCAutoMes extends Thread {
-
- // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- private Configuration config;
- private static InitUtil initUtil;
-
-
- // 鍗曚緥瀹炰緥
- private static PLCAutoMes instance;
- private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
- private static String PlcRead = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
- private static String Plcframe = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
-// private static String PlcParameter = PLCAutomaticParameterSettingReview2.class
-// .getResource("/JsonFile/PlcParameter.json").getPath();
-// private static String PlcSign = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json")
-// .getPath();
-// private static String PlcState = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json")
-// .getPath();
- private static String PlcAlarm = PLCAutoMes.class.getResource("/JsonFile/PlcAlarm.json").getPath();
- // private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
-
- // 璋冪敤initword鏂规硶
-
-//
- // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
- public static PlcParameterObject PlcMesObject = initUtil.initword(PlcMes);
- public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
- public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-
- // 绉佹湁鏋勯�犲嚱鏁�
- public PLCAutoMes() throws IOException {
-
- initUtil = new InitUtil();
- }
-
- // 鑾峰彇鍗曚緥瀹炰緥
- public static synchronized PLCAutoMes getInstance() throws IOException {
- if (instance == null) {
- instance = new PLCAutoMes();
- }
- return instance;
- }
-
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(100);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- // System.out.println(jsonFilePath);
-
- // readAndUpdateWordValues(PlcReadObject);
- readAndUpdateWordValues(PlcMesObject);
-// readAndUpdateWordValues(PlcframeObject);
- // readAndUpdateWordValues(PlcframeObject);
-
- // readAndUpdateWordValues(plcStateObject);
- // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
- // System.out.println(index);
- // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
- // System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
- List<String> addresses = new ArrayList<>();
- addresses.add("FeedID");
- addresses.add("AddStart");
- // System.out.println(addresses);
- // System.out.println(PlcMesObject.getPlcParameterValues(addresses));
- List<String> addresses2 = new ArrayList<>();
- addresses2.add("FeedID");
- addresses2.add("FeedCarStatus");
-
- // System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
-
- }
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/Plcaction.java b/UnLoadGlassModule/src/main/java/com/mes/service/Plcaction.java
deleted file mode 100644
index 4268c38..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/Plcaction.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.mes.service;
-
-import com.mes.common.PlcTools.MockS7PLCtwo;
-import com.mes.entity.DownGlassInfo;
-import com.mes.mapper.DownWorkstationMapper;
-import com.mes.tools.WebSocketServer;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class Plcaction extends Thread {
-
-
- @Autowired
- private DownWorkstationMapper downWorkstationMapper;
- private DownGlassInfo downGlassInfo; //
- private DownGlassInfoService downGlassInfoService;
- private int i =1; //
-
- //MockS7PLC mockS7PLC=new MockS7PLC();
- @Override
- public void run() {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- i++;
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- e.printStackTrace();
- }
- downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
- downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- int workstationId = 1;
- int deviceId = 2;
- int newWorkState = 9;
-
- downWorkstationMapper.updateWorkStateByWorkstationIdAndDeviceId(workstationId, deviceId, newWorkState);
- downGlassInfo = downGlassInfoService.getDownGlassInfoById(1); // 璁剧疆闇�瑕佹煡璇㈢殑id
-// System.out.println("Down Glass Info in new thread: "+i + downGlassInfo);
- Boolean[] value4 = { false, true, true, true, true, true, false, false, false,
- false};
- List<Boolean> booldata2 = new ArrayList<>(Arrays.asList(value4));
- // MockS7PLCtwo.getInstance().writeBoolean("DB1.DBX0.0", false);
- // MockS7PLCtwo.getInstance().writebits("DB4.0.0",booldata2);
-// 浠庣浉鍚岀殑鍦板潃璇诲彇甯冨皵鍊�
- boolean value = MockS7PLCtwo.getInstance().readBoolean("DB1.DBX0.0");
- Short[] values1 = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
- Short[] values2 = { 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
-
- List<Short> data = new ArrayList<>(Arrays.asList(values1));
- List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
- List<String> addresses3 = new ArrayList<>();
- addresses3.add("DB1.0.0");
- addresses3.add("DB1.0.3");
- addresses3.add("DB1.0.5");
- List<String> addresses = new ArrayList<>();
- addresses.add("DB100.0");
- addresses.add("DB100.2");
- addresses.add("DB100.4");
- addresses.add("DB100.6");
- addresses.add("DB100.26");
- addresses.add("DB100.28");
- addresses.add("DB100.30");
- addresses.add("DB100.32");
- addresses.add("DB100.34");
- addresses.add("DB100.36");
-
-
-
- List<String> addresses2 = new ArrayList<>();
- addresses2.add("DB101.0");
- addresses2.add("DB101.2");
- addresses2.add("DB101.4");
- addresses2.add("DB101.6");
- addresses2.add("DB101.8");
- addresses2.add("DB101.10");
- addresses2.add("DB101.12");
- addresses2.add("DB101.14");
- addresses2.add("DB101.16");
- addresses2.add("DB101.18");
-// mockPLC.writeword("DB100.2",data );
- MockS7PLCtwo.getInstance().WriteWords(addresses, data);
- MockS7PLCtwo.getInstance().WriteWords(addresses2, data2);
- //DB100.2,DB100.4,DB100.6,DB100.28,DB100.30,DB100.32,DB100.36,DB100.38,DB100.40
-
- List<Short> data5= MockS7PLCtwo.getInstance().readwords("DB104.0", 9);
- List<Short> data3= MockS7PLCtwo.getInstance().ReadWords(addresses);
- List<Boolean> data4= MockS7PLCtwo.getInstance().readbits("DB4.0.0",10);
-
- List<Boolean> data6= MockS7PLCtwo.getInstance().readBits(addresses3);
- // System.out.println("璇诲彇鐨勫竷灏斿��: " + value); // 搴旇杈撳嚭 true
- // System.out.println("璇诲彇鐨剋ord鍊�: " + data3);
- System.out.println("璇诲彇鐨剋ord鍊�: " + data4);
-// System.out.println("璇诲彇鐨刡it鍊�: " + data4);
-// System.out.println("璇诲彇鐨刡it鍊�: " + data6);
-
-
- // System.out.println("璇诲彇鐨剋ord鍊�: " + MockS7PLCtwo.getInstance().readInt16("DB5.0.0"));
- }
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java b/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
deleted file mode 100644
index 266169e..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mes.service;
-
-import cn.hutool.json.JSONObject;
-import com.mes.tools.WebSocketServer;
-import org.springframework.stereotype.Component;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import java.util.ArrayList;
-import java.util.function.Supplier;
-
-@Component
-public class Plchome extends Thread {
- private int i = 1;
- private static final Logger log = LogManager.getLogger(Plchome.class);
-
- private final Supplier<DownGlassLogic> plcServiceSupplier;
-
- public Plchome() {
- this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownGlassLogic.class);
- }
-
-
-
- @Override
- public void run() {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- i++;
- Thread.sleep(100);
- DownGlassLogic plcService = plcServiceSupplier.get();
- // plcService.performPlcActions();
- //plcService.unloadpush();
-
- //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
- plcService.insertdownglassinfo();
-
-
-
- //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑閭ｆ潯璁板綍鍒犳帀 宸ヤ綅琛ㄦ祦绋嬪崱缁戝畾浜嗘灦瀛�
- plcService.downWorkstation();
-
-
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- e.printStackTrace();
- }
-
- JSONObject jsonObject = new JSONObject();
- // System.out.println(arraylist6);
- jsonObject.append("data", 1);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
- log.info("鍑嗗鍚� WebSocket 鏈嶅姟鍣ㄥ彂閫佹秷鎭�: {}", jsonObject.toString());
- }}
-
- }
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/ServiceContextHolder.java b/UnLoadGlassModule/src/main/java/com/mes/service/ServiceContextHolder.java
deleted file mode 100644
index b05b2fd..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/ServiceContextHolder.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mes.service;
-
-public class ServiceContextHolder {
-
- private static final ThreadLocal<DownGlassInfoService> downGlassInfoServiceThreadLocal = new ThreadLocal<>();
-
- public static void setDownGlassInfoService(DownGlassInfoService service) {
- downGlassInfoServiceThreadLocal.set(service);
- }
-
- public static DownGlassInfoService getDownGlassInfoService() {
- return downGlassInfoServiceThreadLocal.get();
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/ThreadExample.java b/UnLoadGlassModule/src/main/java/com/mes/service/ThreadExample.java
deleted file mode 100644
index ef49205..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/ThreadExample.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mes.service;
-
-import com.mes.entity.DownGlassInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ThreadExample implements ApplicationRunner {
-
- @Autowired
- private DownGlassInfoService downGlassInfoService;
-
- @Override
- public void run(ApplicationArguments args) throws Exception {
- Thread thread = new Thread(() -> {
- DownGlassInfo downGlassInfo = downGlassInfoService.getDownGlassInfoById(1); // 璁剧疆闇�瑕佹煡璇㈢殑id
- System.out.println("Down Glass Info in new thread: " + downGlassInfo);
- });
- thread.start();
- }
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java b/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
deleted file mode 100644
index 9940470..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mes.service.userInfo;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.entity.userInfo.SysError;
-import com.mes.mapper.userInfo.SysErrorMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("hangzhoumes")
-public class SysErrorService {
- private final SysErrorMapper sysErrorMapper;
-
- public SysErrorService(SysErrorMapper sysErrorMapper) {
- this.sysErrorMapper = sysErrorMapper;
- }
-
- public void insert(SysError sysError) {
- sysErrorMapper.saveError(sysError);
- }
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java b/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
deleted file mode 100644
index ee38452..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.service.userInfo;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.entity.userInfo.SysMenuItem;
-import com.mes.mapper.userInfo.SysMenuItemMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@DS("hangzhoumes")
-public class SysMenuItemService {
- @Autowired
- SysMenuItemMapper sysMenuItemMapper;
- public List<SysMenuItem> getMenuItem() {
- return sysMenuItemMapper.findAll();
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java b/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
deleted file mode 100644
index 55f8fc6..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.service.userInfo;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.entity.userInfo.SysMenu;
-import com.mes.mapper.userInfo.SysMenuMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@DS("hangzhoumes")
-public class SysMenuService {
- @Autowired
- private SysMenuMapper sysMenuMapper;
-
- public List<SysMenu> getMenu(){
-
- return sysMenuMapper.findAll();
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java b/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
deleted file mode 100644
index e172f10..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mes.service.userInfo;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.controller.dto.UserDTO;
-import com.mes.entity.userInfo.User;
-import com.mes.mapper.userInfo.UserMapper;
-import com.mes.tools.TokenTools;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@DS("hangzhoumes")
-public class UserService {
-
- @Autowired
- private UserMapper userMapper;
-
-
- @Cacheable(value="users", key="#userDTO.getUserId()")
- public UserDTO login(UserDTO userDTO) {
-
- if(StrUtil.isBlank(userDTO.getUserId()) ||StrUtil.isBlank(userDTO.getPass())){
- return null;
- }else{
- int getUserCount=userMapper.checkUser(userDTO.getUserId(),userDTO.getPass());
- if(getUserCount==1){
- String token = TokenTools.getToken(userDTO.getUserId(),userDTO.getPass());
- userDTO.setToken(token);
- User user = userMapper.findOneLoginName(userDTO.getUserId());
- userDTO.setUserName(user.getUserName());
- return userDTO;
- }
- return null;
-
- }
- }
-
- @CacheEvict(value="users",key="#id",beforeInvocation=true)
- public String deleteCache(String id ) {
- //System.out.println("delete user by id: " + id);
- return null;
-
- }
-
- public String getUserByID(String userId){
- return userMapper.getUserByID(userId);
- }
-
- @Transactional
- public User register(User user) {
- User returnUser = new User();
- if(userMapper.register(user)){
- User getUser = userMapper.findOne(user.getId());
- returnUser.setUserName(getUser.getUserName());
- returnUser.setLoginName(getUser.getLoginName());
- }
- return returnUser;
- }
-}
-
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java b/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java
deleted file mode 100644
index 1f64390..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mes.tools;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-/**
- * @author SNG-012
- *
- * Configuration 绫荤敤浜庡姞杞介厤缃枃浠跺苟鎻愪緵璁块棶閰嶇疆椤圭殑鏂规硶銆�
- */
-public class Configuration {
-
- /**
- * // Properties 瀵硅薄锛岀敤浜庡瓨鍌ㄩ厤缃枃浠朵腑鐨勯敭鍊煎銆�
- */
- private Properties properties;
-
- /**
- * @param fileName
- * @throws IOException
- * // 鏋勯�犲嚱鏁帮紝鏍规嵁浼犲叆鐨勬枃浠跺悕鍔犺浇閰嶇疆鏂囦欢銆�
- */
-
- public Configuration(String fileName) throws IOException {
- // 浣跨敤绫诲姞杞藉櫒鑾峰彇璧勬簮鏂囦欢鐨勮緭鍏ユ祦銆�
- InputStream inputStream = getClass().getClassLoader().getResourceAsStream(fileName);
- // 濡傛灉杈撳叆娴佷负null锛岃〃绀烘湭鎵惧埌鏂囦欢锛屾姏鍑篎ileNotFoundException銆�
- if (inputStream == null) {
- throw new FileNotFoundException("Property file '" + fileName + "' not found in the classpath");
- }
- // 瀹炰緥鍖朠roperties瀵硅薄銆�
- properties = new Properties();
- // 浠庤緭鍏ユ祦鍔犺浇閰嶇疆椤广��
- properties.load(inputStream);
- }
-
- /**
- * @param key
- * @return
- * // 鏍规嵁閰嶇疆椤圭殑閿幏鍙栧叾瀵瑰簲鐨勫�笺��
- */
-
- public String getProperty(String key) {
- return properties.getProperty(key);
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java b/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
deleted file mode 100644
index e1ad35c..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.mes.tools;
-
-import com.google.gson.Gson;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-public class ExcelToJsonConverter {
-
- public static void main(String[] args) {
- String excelFilePath = "src/main/resources/JsonFile/alarm.xlsx";
- String sheetName = "Sheet1";
- int addressColumnIndex = 0;
- int nameColumnIndex = 1;
-
- //int unitColumnIndex = 2;
- String outputFilePath = "src/main/resources/JsonFile/PlcAlarm.json";
-
- try (Workbook workbook = new XSSFWorkbook(new FileInputStream(excelFilePath))) {
- Sheet sheet = workbook.getSheet(sheetName);
-
- List<LinkedHashMap<String, Object>> jsonList = new ArrayList<>();
-
- Iterator<Row> rowIterator = sheet.iterator();
- // Skip the header row
- if (rowIterator.hasNext()) {
- rowIterator.next();
- }
-
- int plcAddressLength = 0; // 璁板綍鎵�鏈� addressLenght 鐨勫拰
- int addressIndex = 0; // 鑷鐨勫湴鍧�绱㈠紩
- while (rowIterator.hasNext()) {
- Row row = rowIterator.next();
-
- Cell nameCell = row.getCell(nameColumnIndex);
- Cell addressCell = row.getCell(addressColumnIndex);
- // Cell unitCell = row.getCell(unitColumnIndex);
-
- String name = nameCell.getStringCellValue();
- String address = addressCell.getStringCellValue();
- // String unit = unitCell.getStringCellValue();
-
- // String addressIndex = extractAddressIndex(address);
-
- LinkedHashMap<String, Object> jsonObject = new LinkedHashMap<>();
- jsonObject.put("codeId", name);
- jsonObject.put("addressIndex", addressIndex);
-
- int addressLength = 0;
- if (address.contains("~")) {
- addressLength = 14;
- } else {
- addressLength = 2;
- }
- // jsonObject.put("addressLenght", String.valueOf(addressLength));
-
- //jsonObject.put("unit", unit);
-
- plcAddressLength += addressLength;
-
- jsonList.add(jsonObject);
- addressIndex++;
- }
-
- LinkedHashMap<String, Object> resultObject = new LinkedHashMap<>();
- resultObject.put("plcAddressBegin", "DB100.0");
- resultObject.put("plcAddressLenght", String.valueOf(plcAddressLength));
- // resultObject.put("dataType", "word");
- resultObject.put("dataType", "bit");
- resultObject.put("parameteInfor", jsonList);
-
- Gson gson = new Gson();
- String jsonOutput = gson.toJson(resultObject);
-
- try (FileWriter fileWriter = new FileWriter(outputFilePath)) {
- fileWriter.write(jsonOutput);
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
-
-
- private static String extractAddressIndex(String address) {
- // Assuming the address format is "DB103.DBW0" or "DB103.DBB100~DBB113"
- if (address.startsWith("DB") && address.contains(".DBW")) {
- int startIndex = address.indexOf(".DBW") + 4;
- int endIndex = address.length();
- return address.substring(startIndex, endIndex);
- } else if (address.startsWith("DB") && address.contains(".DBB")) {
- int startIndex2 = address.indexOf(".DBB") + 4;
- int endIndex2 = address.indexOf("~");
- return address.substring(startIndex2, endIndex2);
- }
- return "";
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/InitUtil.java b/UnLoadGlassModule/src/main/java/com/mes/tools/InitUtil.java
deleted file mode 100644
index 30d75ae..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/InitUtil.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.mes.tools;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import com.mes.entity.device.PlcBitInfo;
-import com.mes.entity.device.PlcBitObject;
-import com.mes.entity.device.PlcParameterInfo;
-import com.mes.entity.device.PlcParameterObject;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class InitUtil {
- //鍒濆鍖杦ord
- public static PlcParameterObject initword(String jsonFilePath) {
- try {
- FileReader fileReader = new FileReader(jsonFilePath);
- BufferedReader bufferedReader = new BufferedReader(fileReader);
-
- StringBuilder content = new StringBuilder();
- String line;
-
- while ((line = bufferedReader.readLine()) != null) {
- content.append(line);
- }
-
- bufferedReader.close();
- fileReader.close();
-
- JSONObject jsonfileobj = new JSONObject(content.toString());
- JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
- PlcParameterObject plcParameterObject = new PlcParameterObject();
- plcParameterObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
- plcParameterObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
-
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject parameterObj = jsonArray.getJSONObject(i);
- PlcParameterInfo plcParameterInfo = new PlcParameterInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
- String codeid = parameterObj.getStr("codeId");
- plcParameterInfo.setCodeId(codeid);
- plcParameterInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
- //plcParameterInfo.setRatio(Integer.valueOf(parameterObj.getStr("ratio")));
- plcParameterInfo.setAddressLength(Integer.valueOf(parameterObj.getStr("addressLenght")));
- plcParameterInfo.setUnit(parameterObj.getStr("unit"));
- plcParameterObject.addPlcParameter(plcParameterInfo);
- }
- // byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};
- // byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
- // plcParameterObject.setPlcParameterList(getplcvlues);
-
- return plcParameterObject;
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- //鍒濆鍖朾it
- public static PlcBitObject initbit(String jsonFilePath) {
- PlcBitObject plcBitObject = new PlcBitObject();
-
- try {
- FileReader fileReader = new FileReader(jsonFilePath);
- BufferedReader bufferedReader = new BufferedReader(fileReader);
-
- StringBuilder content = new StringBuilder();
- String line;
-
- while ((line = bufferedReader.readLine()) != null) {
- content.append(line);
- }
-
- bufferedReader.close();
- fileReader.close();
-
- JSONObject jsonfileobj = new JSONObject(content.toString());
- JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
- plcBitObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
- plcBitObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
-
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject parameterObj = jsonArray.getJSONObject(i);
-
- PlcBitInfo plcBitInfo = new PlcBitInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
- String codeid = parameterObj.getStr("codeId");
- plcBitInfo.setCodeId(codeid);
- plcBitInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
-
- plcBitObject.addPlcBit(plcBitInfo);
- }
- System.out.println("");
- } catch (IOException e) {
- e.printStackTrace();
- }
- //Boolean[] values1 = { false, true, true, true, false, false, true, false,
- // false, true ,true };
- // List<Boolean> getplcvlues = new ArrayList<>(Arrays.asList(values1));
-
-// List<Boolean> getplcvlues = S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
-// plcBitObject.setPlcBitList(getplcvlues);
- return plcBitObject;
- }
-
-//
- public static void readAndUpdateBitValues(PlcBitObject plcBitObject) {
-
- Boolean[] values1 = { false, true, true, true, false, false, true, false,
- false, true ,true };
- List<Boolean> getplcvlues = new ArrayList<>(Arrays.asList(values1));
- //List<Boolean> getplcvlues = S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
- plcBitObject.setPlcBitList(getplcvlues);
- }
-
-
- public static void readAndUpdateWordValues(PlcParameterObject plcParameterObject) {
-
- byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03,0x03};
- // byte[] getplcvlues = MockS7PLC.getInstance().readByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
- plcParameterObject.setPlcParameterList(getplcvlues);
- }
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/TokenTools.java b/UnLoadGlassModule/src/main/java/com/mes/tools/TokenTools.java
deleted file mode 100644
index 1cb6dc2..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/TokenTools.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.tools;
-
-import cn.hutool.core.date.DateUtil;
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.algorithms.Algorithm;
-
-import java.util.Date;
-
-public class TokenTools {
-
- /**
- * 鐢熸垚token
- * @return
- */
- public static String getToken(String userid,String sign){
- return JWT.create().withAudience(userid) // 灏� user id 淇濆瓨鍒� token 閲岄潰,浣滀负杞借嵎
- .withExpiresAt(DateUtil.offsetHour(new Date(), 24)) // 2灏忔椂鍚巘oken杩囨湡
- .sign(Algorithm.HMAC256(sign)); // 浠� password 浣滀负 token 鐨勫瘑閽�
-
- }
-}
diff --git a/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java b/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
deleted file mode 100644
index 13a3bde..0000000
--- a/UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.mes.tools;
-
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-@ServerEndpoint(value = "/api/talk/{username}")
-@Component("webSocketServer")
-public class WebSocketServer {
-
- // @Autowired
- // HomeMapper homeMapper;
-
- public static ConfigurableApplicationContext applicationContext;
-
- // 瑙ｅ喅鏃犳硶娉ㄥ叆mapper闂 //浣跨敤鏂规硶
- // homeMapper=WebSocketServer.applicationContext.getBean(HomeMapper.class);
- public static void setApplicationContext(ConfigurableApplicationContext configurableApplicationContext) {
- WebSocketServer.applicationContext = configurableApplicationContext;
- }
-
- private static final Logger log = LoggerFactory.getLogger(WebSocketServer.class);
- private List<String> messages;
- /**
- * 璁板綍褰撳墠鍦ㄧ嚎杩炴帴鏁�
- */
- public static final Map<String, ArrayList<WebSocketServer>> sessionMap = new ConcurrentHashMap<>();
-
- String username;
- Session session;
-
- public WebSocketServer() {
- this.messages = new ArrayList<>();
- }
-
- /**
- * 杩炴帴寤虹珛鎴愬姛璋冪敤鐨勬柟娉�
- */
- @OnOpen
- public void onOpen(Session session, @PathParam("username") String username) {
- this.username = username;
- this.session = session;
- List<WebSocketServer> webSocketServers = sessionMap.get(username);
- if (webSocketServers == null) {
- ArrayList<WebSocketServer> arrayListwebserver = new ArrayList<WebSocketServer>();
- arrayListwebserver.add(this);
- sessionMap.put(username, arrayListwebserver);
- } else {
- webSocketServers.add(this);
- }
-
- log.info("鏈夋柊鐢ㄦ埛鍔犲叆锛寀sername={}, 褰撳墠鍦ㄧ嚎浜烘暟涓猴細{}", username, sessionMap.get(username).size());
-
- // JSONObject result = new JSONObject();
- // JSONArray array = new JSONArray();
- // result.set("users", array);
- // for (Object key : sessionMap.keySet()) {
- // JSONObject jsonObject = new JSONObject();
- // jsonObject.set("username", key);
- // array.add(jsonObject);
- // }
-
- // sendAllMessage(JSONUtil.toJsonStr(result)); // 鍚庡彴鍙戦�佹秷鎭粰鎵�鏈夌殑瀹㈡埛绔�
- }
-
- /**
- * 杩炴帴鍏抽棴璋冪敤鐨勬柟娉�
- */
- @OnClose
- public void onClose(Session session, @PathParam("username") String username) {
- List<WebSocketServer> webSocketServers = sessionMap.get(username);
- ArrayList<WebSocketServer> arrayListwebserver = new ArrayList<WebSocketServer>();
- if (webSocketServers.size()>1) {
- for (WebSocketServer webSocketServer : webSocketServers) {
- if(webSocketServer!=this){
- arrayListwebserver.add(webSocketServer);
- }
- }
- sessionMap.put(username, arrayListwebserver);
- log.info("绉婚櫎username={}涓�鍚嶇敤鎴穝ession, {}鐨勫綋鍓嶅湪绾夸汉鏁颁负锛歿}", username, username, sessionMap.get(username).size());
- }else{
- sessionMap.remove(username);
- log.info("绉婚櫎username={}涓�鍚嶇敤鎴穝ession, {}杩炴帴鍏抽棴, 褰撳墠杩炴帴鏁颁负锛歿}", username, username, sessionMap.size());
- }
-
- }
-
- /**
- * 鏀跺埌瀹㈡埛绔秷鎭悗璋冪敤鐨勬柟娉�
- * 鍚庡彴鏀跺埌瀹㈡埛绔彂閫佽繃鏉ョ殑娑堟伅
- * onMessage 鏄竴涓秷鎭殑涓浆绔�
- * 鎺ュ彈 娴忚鍣ㄧ socket.send 鍙戦�佽繃鏉ョ殑 json鏁版嵁
- *
- * @param message 瀹㈡埛绔彂閫佽繃鏉ョ殑娑堟伅
- */
- @OnMessage
- public void onMessage(String message, Session session, @PathParam("username") String username) {
- log.info("鏈嶅姟绔敹鍒扮敤鎴穟sername={}鐨勬秷鎭�:{}", username, message);
- JSONObject obj = JSONUtil.parseObj(message);
- String text = obj.getStr("data");
-
- JSONObject jsonObject = new JSONObject();
- jsonObject.set("message", text);
- this.messages.add(text);
- this.sendMessage(jsonObject.toString()); // JSONUtil.toJsonStr(jsonObject)
-
- }
-
- @OnError
- public void onError(Session session, Throwable error) {
- log.error("鍙戠敓閿欒");
- error.printStackTrace();
- }
-
- /**
- * 鏈嶅姟绔彂閫佹秷鎭粰瀹㈡埛绔�
- */
- public void sendMessage(String message) {
- try {
- // log.info("鏈嶅姟绔粰瀹㈡埛绔痆{}]鍙戦�佹秷鎭瘂}", this.session.getId(), message);
- this.session.getBasicRemote().sendText(message);
- } catch (Exception e) {
- log.error("鏈嶅姟绔彂閫佹秷鎭粰瀹㈡埛绔け璐�", e);
- }
- }
-
- // /**
- // * 鏈嶅姟绔彂閫佹秷鎭粰鎵�鏈夊鎴风
- // */
- // public void sendAllMessage(String message) {
- // try {
- // for (WebSocketServer webSocketServer : sessionMap.values()) {
- // // log.info("鏈嶅姟绔粰瀹㈡埛绔痆{}]鍙戦�佹秷鎭瘂}", this.session.getId(), message);
- // webSocketServer.sendMessage(message);
- // }
- // } catch (Exception e) {
- // log.error("鏈嶅姟绔彂閫佹秷鎭粰瀹㈡埛绔け璐�", e);
- // }
- // }
-
- public List<String> getMessages() {
- return messages;
-
- }
-
- public void clearMessages() {
- messages.clear();
- }
-
-
-
-
-}
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcAlarm.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcAlarm.json
deleted file mode 100644
index a840092..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcAlarm.json
+++ /dev/null
@@ -1,371 +0,0 @@
-{
- "plcAddressBegin": "DB104.0.0",
- "plcAddressLenght": "91",
- "dataType": "bit",
- "parameteInfor": [
- {
- "codeId": "D01VFDerror",
- "addressIndex": 0
- },
- {
- "codeId": "D02VFDerror",
- "addressIndex": 1
- },
- {
- "codeId": "D03VFDerror",
- "addressIndex": 2
- },
- {
- "codeId": "D04VFDerror",
- "addressIndex": 3
- },
- {
- "codeId": "D05VFDerror",
- "addressIndex": 4
- },
- {
- "codeId": "D06VFDerror",
- "addressIndex": 5
- },
- {
- "codeId": "B01VFDerror",
- "addressIndex": 6
- },
- {
- "codeId": "B02VFDerror",
- "addressIndex": 7
- },
- {
- "codeId": "A01VFDerror",
- "addressIndex": 8
- },
- {
- "codeId": "A02VFDerror",
- "addressIndex": 9
- },
- {
- "codeId": "A01servoturnerror",
- "addressIndex": 10
- },
- {
- "codeId": "A02servoturnerror",
- "addressIndex": 11
- },
- {
- "codeId": "A01servotravelerror",
- "addressIndex": 12
- },
- {
- "codeId": "A02servotravelerror",
- "addressIndex": 13
- },
- {
- "codeId": "B01servotravelerror",
- "addressIndex": 14
- },
- {
- "codeId": "B02servotravelerror",
- "addressIndex": 15
- },
- {
- "codeId": "D01DECerror",
- "addressIndex": 16
- },
- {
- "codeId": "D01poserror",
- "addressIndex": 17
- },
- {
- "codeId": "D02DECerror",
- "addressIndex": 18
- },
- {
- "codeId": "D02poserror",
- "addressIndex": 19
- },
- {
- "codeId": "D03DECerror",
- "addressIndex": 20
- },
- {
- "codeId": "D03poserror",
- "addressIndex": 21
- },
- {
- "codeId": "D04DECerror",
- "addressIndex": 22
- },
- {
- "codeId": "D04poserror",
- "addressIndex": 23
- },
- {
- "codeId": "D05DECerror",
- "addressIndex": 24
- },
- {
- "codeId": "D05poserror",
- "addressIndex": 25
- },
- {
- "codeId": "D06DECerror",
- "addressIndex": 26
- },
- {
- "codeId": "D06poserror",
- "addressIndex": 27
- },
- {
- "codeId": "A01DECerror",
- "addressIndex": 28
- },
- {
- "codeId": "A01poserror",
- "addressIndex": 29
- },
- {
- "codeId": "A02DECerror",
- "addressIndex": 30
- },
- {
- "codeId": "A02poserror",
- "addressIndex": 31
- },
- {
- "codeId": "B01INDECerror",
- "addressIndex": 32
- },
- {
- "codeId": "B01INposerror",
- "addressIndex": 33
- },
- {
- "codeId": "B01OUTDECerror",
- "addressIndex": 34
- },
- {
- "codeId": "B01OUTposerror",
- "addressIndex": 35
- },
- {
- "codeId": "B02INDECerror",
- "addressIndex": 36
- },
- {
- "codeId": "B02INposerror",
- "addressIndex": 37
- },
- {
- "codeId": "B02OUTDECerror",
- "addressIndex": 38
- },
- {
- "codeId": "B02OUTposerror",
- "addressIndex": 39
- },
- {
- "codeId": "D01Scanglassexceedinglimit",
- "addressIndex": 40
- },
- {
- "codeId": "emergencystopalarm",
- "addressIndex": 41
- },
- {
- "codeId": "Moreglassthanknown",
- "addressIndex": 42
- },
- {
- "codeId": "lessglassthanknown",
- "addressIndex": 43
- },
- {
- "codeId": "D01conveyortimeoutalarm",
- "addressIndex": 44
- },
- {
- "codeId": "D02conveyortimeoutalarm",
- "addressIndex": 45
- },
- {
- "codeId": "D03conveyortimeoutalarm",
- "addressIndex": 46
- },
- {
- "codeId": "D04conveyortimeoutalarm",
- "addressIndex": 47
- },
- {
- "codeId": "D05conveyortimeoutalarm",
- "addressIndex": 48
- },
- {
- "codeId": "D06conveyortimeoutalarm",
- "addressIndex": 49
- },
- {
- "codeId": "A01conveyortimeoutalarm",
- "addressIndex": 50
- },
- {
- "codeId": "A02conveyortimeoutalarm",
- "addressIndex": 51
- },
- {
- "codeId": "B01conveyortimeoutalarm",
- "addressIndex": 52
- },
- {
- "codeId": "B02conveyortimeoutalarm",
- "addressIndex": 53
- },
- {
- "codeId": "A01conveyorLeftsafetyalarm",
- "addressIndex": 54
- },
- {
- "codeId": "A01conveyorrightsafetyalarm",
- "addressIndex": 55
- },
- {
- "codeId": "A02conveyorLeftsafetyalarm",
- "addressIndex": 56
- },
- {
- "codeId": "A02conveyorrightsafetyalarm",
- "addressIndex": 57
- },
- {
- "codeId": "1#buffersafetyalarm",
- "addressIndex": 58
- },
- {
- "codeId": "2#buffersafetyalarm",
- "addressIndex": 59
- },
- {
- "codeId": "3#buffersafetyalarm",
- "addressIndex": 60
- },
- {
- "codeId": "4#buffersafetyalarm",
- "addressIndex": 61
- },
- {
- "codeId": "A01.SRrightinposerror",
- "addressIndex": 62
- },
- {
- "codeId": "A02.SRleftinposerror",
- "addressIndex": 63
- },
- {
- "codeId": "B01.SRleftinposerror",
- "addressIndex": 64
- },
- {
- "codeId": "B01.SRleftdecerror",
- "addressIndex": 65
- },
- {
- "codeId": "B01.SRrightdecerror",
- "addressIndex": 66
- },
- {
- "codeId": "B01.SRrightinposerror",
- "addressIndex": 67
- },
- {
- "codeId": "B02.SRleftinposerror",
- "addressIndex": 68
- },
- {
- "codeId": "B02.SRleftdecerror",
- "addressIndex": 69
- },
- {
- "codeId": "B02.SRrightdecerror",
- "addressIndex": 70
- },
- {
- "codeId": "B02.SRrightinposerror",
- "addressIndex": 71
- },
- {
- "codeId": "A01servoturnhomed",
- "addressIndex": 72
- },
- {
- "codeId": "A02servoturnhomed",
- "addressIndex": 73
- },
- {
- "codeId": "A01servotravelhomed",
- "addressIndex": 74
- },
- {
- "codeId": "A02servotravelhomed",
- "addressIndex": 75
- },
- {
- "codeId": "B01servotravelhomed",
- "addressIndex": 76
- },
- {
- "codeId": "B02servotravelhomed",
- "addressIndex": 77
- },
- {
- "codeId": "resetDelay",
- "addressIndex": 78
- },
- {
- "codeId": "A01travelNegativelimit",
- "addressIndex": 79
- },
- {
- "codeId": "A01travelPositivelimit",
- "addressIndex": 80
- },
- {
- "codeId": "A01turnuplimit",
- "addressIndex": 81
- },
- {
- "codeId": "A01turndownlimit",
- "addressIndex": 82
- },
- {
- "codeId": "A02travelNegativelimit",
- "addressIndex": 83
- },
- {
- "codeId": "A02travelPositivelimit",
- "addressIndex": 84
- },
- {
- "codeId": "A02turnuplimit",
- "addressIndex": 85
- },
- {
- "codeId": "A02turndownlimit",
- "addressIndex": 86
- },
- {
- "codeId": "B01travelNegativelimit",
- "addressIndex": 87
- },
- {
- "codeId": "B01travelPositivelimit",
- "addressIndex": 88
- },
- {
- "codeId": "B02travelNegativelimit",
- "addressIndex": 89
- },
- {
- "codeId": "B02travelPositivelimit",
- "addressIndex": 90
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcMes.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcMes.json
deleted file mode 100644
index ab5d4cd..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcMes.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "plcAddressBegin":"DB105.0",
- "plcAddressLenght":"12",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "OutActivate",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "Addgoal",
- "addressIndex":"2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "AddLength",
- "addressIndex":"4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "AddWidth",
- "addressIndex":"6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "AddCount",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "OutStart",
- "addressIndex":"10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
-
- ]
-}
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcParameter.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcParameter.json
deleted file mode 100644
index afbe090..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcParameter.json
+++ /dev/null
@@ -1,610 +0,0 @@
-{
- "plcAddressBegin":"DB100.0",
- "plcAddressLenght":"198",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "conveyorVelocity(Max)",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "conveyorVelocity(AutoFAST)",
- "addressIndex":"2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "conveyorVelocity(AutoSLOW)",
- "addressIndex":"4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "conveyorVelocity(Manual)",
- "addressIndex":"6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TURNJOGVelocity",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TRAVELJOGVelocity",
- "addressIndex":"10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "B01B02TRAVELJOGVelocity",
- "addressIndex":"12",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TURNPOSVelocityAUTO",
- "addressIndex":"14",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01TURNPOSVelocitymanual",
- "addressIndex":"16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TRAVELPOSVelocityAUTO",
- "addressIndex":"18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01TRAVELPOSVelocitymanual",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "B01B02TRAVELPOSVelocityAUTO",
- "addressIndex":"22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "B01TRAVELPOSVelocitymanual",
- "addressIndex":"24",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02conveyorVelocity(Max)",
- "addressIndex":"26",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01A02conveyorVelocity(AutoFAST)",
- "addressIndex":"28",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01A02conveyorVelocity(AutoSLOW)",
- "addressIndex":"30",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(Manual)",
- "addressIndex":"32",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(Max)",
- "addressIndex":"34",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(AutoFAST)",
- "addressIndex":"36",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(AutoSLOW)",
- "addressIndex":"38",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(Manual)",
- "addressIndex":"40",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "gridspacing",
- "addressIndex":"42",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01Spliceaddresssetting",
- "addressIndex":"44",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02Spliceaddresssetting",
- "addressIndex":"46",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A011#gridaddress",
- "addressIndex":"48",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0122#gridaddress",
- "addressIndex":"50",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0143#gridaddress",
- "addressIndex":"52",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0164#gridaddress",
- "addressIndex":"54",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0185#gridaddress",
- "addressIndex":"56",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01106#gridaddress",
- "addressIndex":"58",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01127#gridaddress",
- "addressIndex":"60",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01148#gridaddress",
- "addressIndex":"62",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01169#gridaddress",
- "addressIndex":"64",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01190#gridaddress",
- "addressIndex":"66",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A021#gridaddress",
- "addressIndex":"68",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0222#gridaddress",
- "addressIndex":"70",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0243#gridaddress",
- "addressIndex":"72",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0264#gridaddress",
- "addressIndex":"74",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0285#gridaddress",
- "addressIndex":"76",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02106#gridaddress",
- "addressIndex":"78",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02127#gridaddress",
- "addressIndex":"80",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02148#gridaddress",
- "addressIndex":"82",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02169#gridaddress",
- "addressIndex":"84",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02190#gridaddress",
- "addressIndex":"86",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B011#gridaddress",
- "addressIndex":"88",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0122#gridaddress",
- "addressIndex":"90",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0143#gridaddress",
- "addressIndex":"92",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0164#gridaddress",
- "addressIndex":"94",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0185#gridaddress",
- "addressIndex":"96",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02106#gridaddress",
- "addressIndex":"98",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02127#gridaddress",
- "addressIndex":"100",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02148#gridaddress",
- "addressIndex":"102",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02169#gridaddress",
- "addressIndex":"104",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02190#gridaddress",
- "addressIndex":"106",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01Targetgrid(Manual)",
- "addressIndex":"108",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": " A02Targetgrid(Manual)",
- "addressIndex":"110",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "B01Targetgrid(Manual)",
- "addressIndex":"112",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "B02Targetgrid(Manual)",
- "addressIndex":"114",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A01turnTargetAngle(Manual)",
- "addressIndex":"116",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnTargetAngle(Manual)",
- "addressIndex":"118",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle1",
- "addressIndex":"120",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle2",
- "addressIndex":"122",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle3",
- "addressIndex":"124",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle4",
- "addressIndex":"126",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle1",
- "addressIndex":"128",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle2",
- "addressIndex":"130",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle3",
- "addressIndex":"132",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle4",
- "addressIndex":"134",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "Minimumglasslength",
- "addressIndex":"136",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Minimumglassheight",
- "addressIndex":"138",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Maximumglasslength",
- "addressIndex":"140",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Maximumglassheight",
- "addressIndex":"142",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A01cellsGlassNum",
- "addressIndex":"144",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A02cellsGlassNum",
- "addressIndex":"146",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A01ID",
- "addressIndex":"148",
- "addressLenght":"14",
- "ratio":"1"
-
- },
- {
- "codeId": "A02ID",
- "addressIndex":"162",
- "addressLenght":"14",
- "ratio":"1"
-
- },
- {
- "codeId": "A02TRAVELPOSVelocitymanual",
- "addressIndex":"176",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "B02TRAVELPOSVelocitymanual",
- "addressIndex":"178",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Startingpositionofthefeedca",
- "addressIndex":"180",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Targetpositionofthefeedcar",
- "addressIndex":"182",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Lengthofincomingglass",
- "addressIndex":"184",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Widthofincomingglass",
- "addressIndex":"186",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Startingpositionoftheexitcar",
- "addressIndex":"188",
- "addressLenght":"2",
- "ratio":"1"
-
- }, {
- "codeId": "Exitcartargetposition",
- "addressIndex":"190",
- "addressLenght":"2",
- "ratio":"1"
-
- }
- , {
- "codeId": "A02TURNPOSVelocitymanual",
- "addressIndex":"192",
- "addressLenght":"2",
- "ratio":"1"
-
- }
- , {
- "codeId": "A01delayTime",
- "addressIndex":"194",
- "addressLenght":"2",
- "ratio":"1"
-
- }
-
-
- ]
-}
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcRead.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcRead.json
deleted file mode 100644
index f3ebb33..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcRead.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
- "plcAddressBegin": "DB106.0",
- "plcAddressLenght": "66",
- "dataType": "word",
- "parameteInfor": [{
- "codeId": "A01Position",
- "addressIndex": "0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01FlipPosition",
- "addressIndex": "2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01QuestStartPosition",
- "addressIndex": "4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01EndPosition",
- "addressIndex": "6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "FeedCarStatus",
- "addressIndex": "8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02QuestOver",
- "addressIndex": "10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02Position",
- "addressIndex": "12",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02FlipPosition",
- "addressIndex": "14",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02QuestStartPosition",
- "addressIndex": "16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02EndPosition",
- "addressIndex": "18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "ExitCarStatus",
- "addressIndex": "20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02QuestOver",
- "addressIndex": "22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "FeedRequest",
- "addressIndex": "24",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "FeedID",
- "addressIndex": "26",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01Position",
- "addressIndex": "40",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01QuestPosition",
- "addressIndex": "42",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CurrentTaskMode",
- "addressIndex": "44",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CarStatus",
- "addressIndex": "46",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CarTaskStatus",
- "addressIndex": "48",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02Position",
- "addressIndex": "50",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CarCurrentTask",
- "addressIndex": "52",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CurrentTaskMode",
- "addressIndex": "54",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CarStatus",
- "addressIndex": "56",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CarSaskStatus",
- "addressIndex": "58",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CompleteTheReport",
- "addressIndex": "60",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CompleteTheReport",
- "addressIndex": "62",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "OutRequest",
- "addressIndex": "64",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcSign.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcSign.json
deleted file mode 100644
index 8f9295a..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcSign.json
+++ /dev/null
@@ -1,460 +0,0 @@
-{
- "plcAddressBegin": "DB102.0.0",
- "plcAddressLenght": "112",
- "dataType": "bit",
- "parameteInfor": [
- {
- "codeId": "D01.SRdec",
- "addressIndex": 0
- },
- {
- "codeId": "D01.SRinpos",
- "addressIndex": 1
- },
- {
- "codeId": "D02.SRdec",
- "addressIndex": 2
- },
- {
- "codeId": "D02.SRinpos",
- "addressIndex": 3
- },
- {
- "codeId": "D03.SRinto",
- "addressIndex": 4
- },
- {
- "codeId": "D03.SRdec",
- "addressIndex": 5
- },
- {
- "codeId": "D03.SRinpos",
- "addressIndex": 6
- },
- {
- "codeId": "D04.SRdec",
- "addressIndex": 7
- },
- {
- "codeId": "D04.SRinpos",
- "addressIndex": 8
- },
- {
- "codeId": "D05.SRdec",
- "addressIndex": 9
- },
- {
- "codeId": "D05.SRinpos",
- "addressIndex": 10
- },
- {
- "codeId": "D06.SRdec",
- "addressIndex": 11
- },
- {
- "codeId": "D06.SRinpos",
- "addressIndex": 12
- },
- {
- "codeId": "B01.SRindec",
- "addressIndex": 13
- },
- {
- "codeId": "B01.SRininpos",
- "addressIndex": 14
- },
- {
- "codeId": "B01.SRoutdec",
- "addressIndex": 15
- },
- {
- "codeId": "B01.SRoutinpos",
- "addressIndex": 16
- },
- {
- "codeId": "B01.SRturnon",
- "addressIndex": 17
- },
- {
- "codeId": "B01.SRturnoff",
- "addressIndex": 18
- },
- {
- "codeId": "B01.SRup",
- "addressIndex": 19
- },
- {
- "codeId": "B01.SRdown",
- "addressIndex": 20
- },
- {
- "codeId": "B02.SRoutdec",
- "addressIndex": 21
- },
- {
- "codeId": "B02.SRoutinpos",
- "addressIndex": 22
- },
- {
- "codeId": "B02.SRindec",
- "addressIndex": 23
- },
- {
- "codeId": "B02.SRininpos",
- "addressIndex": 24
- },
- {
- "codeId": "B02.SRturnon",
- "addressIndex": 25
- },
- {
- "codeId": "B02.SRturnoff",
- "addressIndex": 26
- },
- {
- "codeId": "B02.SRup",
- "addressIndex": 27
- },
- {
- "codeId": "B02.SRdown",
- "addressIndex": 28
- },
- {
- "codeId": "B01.SRinsafety",
- "addressIndex": 29
- },
- {
- "codeId": "B01.SRoutsafety",
- "addressIndex": 30
- },
- {
- "codeId": "B02.SRinsafety",
- "addressIndex": 31
- },
- {
- "codeId": "SB.start(+)",
- "addressIndex": 32
- },
- {
- "codeId": "SB.stop(-)",
- "addressIndex": 33
- },
- {
- "codeId": "SB.reset",
- "addressIndex": 34
- },
- {
- "codeId": "SB.auto/manul",
- "addressIndex": 35
- },
- {
- "codeId": "D01.SB.confirm",
- "addressIndex": 36
- },
- {
- "codeId": "SB.emg",
- "addressIndex": 37
- },
- {
- "codeId": "D01.SB.start",
- "addressIndex": 38
- },
- {
- "codeId": "D06.SB.start",
- "addressIndex": 39
- },
- {
- "codeId": "B02.SRoutsafety",
- "addressIndex": 40
- },
- {
- "codeId": "SafetyDoor.requset",
- "addressIndex": 41
- },
- {
- "codeId": "SafetyDoor.confirm",
- "addressIndex": 42
- },
- {
- "codeId": "SafetyDoor.reset",
- "addressIndex": 43
- },
- {
- "codeId": "Sspce",
- "addressIndex": 44
- },
- {
- "codeId": "Sspce",
- "addressIndex": 45
- },
- {
- "codeId": "Sspce",
- "addressIndex": 46
- },
- {
- "codeId": "Sspce",
- "addressIndex": 47
- },
- {
- "codeId": "A01.SRleftdec",
- "addressIndex": 48
- },
- {
- "codeId": "A01.SRleftinpos",
- "addressIndex": 49
- },
- {
- "codeId": "A01.SRleftsafety",
- "addressIndex": 50
- },
- {
- "codeId": "A01.SRrightdec",
- "addressIndex": 51
- },
- {
- "codeId": "A01.SRrightinpos",
- "addressIndex": 52
- },
- {
- "codeId": "A01.SRrightsafety",
- "addressIndex": 53
- },
- {
- "codeId": "A01.SRturnhome",
- "addressIndex": 54
- },
- {
- "codeId": "A01.SRturnup",
- "addressIndex": 55
- },
- {
- "codeId": "A01.SRturndown",
- "addressIndex": 56
- },
- {
- "codeId": "A01.SRtravelhome",
- "addressIndex": 57
- },
- {
- "codeId": "A01.SRtravelleftdec",
- "addressIndex": 58
- },
- {
- "codeId": "A01.SRtravelleftlimit",
- "addressIndex": 59
- },
- {
- "codeId": "A01.SRtravelrightdec",
- "addressIndex": 60
- },
- {
- "codeId": "A01.SRtravelrightlimit",
- "addressIndex": 61
- },
- {
- "codeId": "space",
- "addressIndex": 62
- },
- {
- "codeId": "space",
- "addressIndex": 63
- },
- {
- "codeId": "A02.SRleftdec",
- "addressIndex": 64
- },
- {
- "codeId": "A02.SRleftinpos",
- "addressIndex": 65
- },
- {
- "codeId": "A02.SRleftsafety",
- "addressIndex": 66
- },
- {
- "codeId": "A02.SRrightdec",
- "addressIndex": 67
- },
- {
- "codeId": "A02.SRrightinpos",
- "addressIndex": 68
- },
- {
- "codeId": "A02.SRrightsafety",
- "addressIndex": 69
- },
- {
- "codeId": "A02.SRturnhome",
- "addressIndex": 70
- },
- {
- "codeId": "A02.SRturnup",
- "addressIndex": 71
- },
- {
- "codeId": "A02.SRturndown",
- "addressIndex": 72
- },
- {
- "codeId": "A02.SRtravelhome",
- "addressIndex": 73
- },
- {
- "codeId": "A02.SRtravelleftdec",
- "addressIndex": 74
- },
- {
- "codeId": "A02.SRtravelleftlimit",
- "addressIndex": 75
- },
- {
- "codeId": "A02.SRtravelrightdec",
- "addressIndex": 76
- },
- {
- "codeId": "A02.SRtravelrightlimit",
- "addressIndex": 77
- },
- {
- "codeId": "space",
- "addressIndex": 78
- },
- {
- "codeId": "space",
- "addressIndex": 79
- },
- {
- "codeId": "B01.SRorigin",
- "addressIndex": 80
- },
- {
- "codeId": "B01.SRleftlimit",
- "addressIndex": 81
- },
- {
- "codeId": "B01.SRrightlimit",
- "addressIndex": 82
- },
- {
- "codeId": "B02.SRorigin",
- "addressIndex": 83
- },
- {
- "codeId": "B02.SRleftlimit",
- "addressIndex": 84
- },
- {
- "codeId": "B02.SRrightlimit",
- "addressIndex": 85
- },
- {
- "codeId": "space",
- "addressIndex": 86
- },
- {
- "codeId": "space",
- "addressIndex": 87
- },
- {
- "codeId": "LED.red",
- "addressIndex": 88
- },
- {
- "codeId": "LED.green",
- "addressIndex": 89
- },
- {
- "codeId": "LED.yellow",
- "addressIndex": 90
- },
- {
- "codeId": "D01.LED.green",
- "addressIndex": 91
- },
- {
- "codeId": "D06.LED.green",
- "addressIndex": 92
- },
- {
- "codeId": "B01.YV.turn",
- "addressIndex": 93
- },
- {
- "codeId": "B01.YV.updown",
- "addressIndex": 94
- },
- {
- "codeId": "B01.YV.gassing",
- "addressIndex": 95
- },
- {
- "codeId": "B02.YV.turn",
- "addressIndex": 96
- },
- {
- "codeId": "B02.YV.updown",
- "addressIndex": 97
- },
- {
- "codeId": "B02.YV.gassing",
- "addressIndex": 98
- },
- {
- "codeId": "SafetyDoor.Led",
- "addressIndex": 99
- },
- {
- "codeId": "SafetyDoor.open",
- "addressIndex": 100
- },
- {
- "codeId": "D01SB.confirm",
- "addressIndex": 101
- },
- {
- "codeId": "space",
- "addressIndex": 102
- },
- {
- "codeId": "space",
- "addressIndex": 103
- },
- {
- "codeId": "A01oilPump",
- "addressIndex": 104
- },
- {
- "codeId": "A01motorCtr",
- "addressIndex": 105
- },
- {
- "codeId": "space",
- "addressIndex": 106
- },
- {
- "codeId": "space",
- "addressIndex": 107
- },
- {
- "codeId": "A02oilPump",
- "addressIndex": 108
- },
- {
- "codeId": "A02motorCtr",
- "addressIndex": 109
- },
- {
- "codeId": "space",
- "addressIndex": 110
- },
- {
- "codeId": "space",
- "addressIndex": 111
- }
- ,
- {
- "codeId": "space",
- "addressIndex": 111
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcState.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcState.json
deleted file mode 100644
index dfdbaec..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcState.json
+++ /dev/null
@@ -1,285 +0,0 @@
-{
- "plcAddressBegin": "DB103.0",
- "plcAddressLenght": "258",
- "dataType": "word",
- "parameteInfor": [
- {
- "codeId": "D01.State",
- "addressIndex": "0",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D02.State",
- "addressIndex": "2",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01.State",
- "addressIndex": "4",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02.State",
- "addressIndex": "6",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01.State",
- "addressIndex": "8",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02.State",
- "addressIndex": "10",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D03.State",
- "addressIndex": "12",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D04.State",
- "addressIndex": "14",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D05.State",
- "addressIndex": "16",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D06.State",
- "addressIndex": "18",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01tavelActualPosition",
- "addressIndex": "20",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01turnActualangle",
- "addressIndex": "22",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02tavelActualPosition",
- "addressIndex": "24",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02turnActualangle",
- "addressIndex": "26",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01tavelActualPosition",
- "addressIndex": "28",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02tavelActualPosition",
- "addressIndex": "30",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01CurrentGrid",
- "addressIndex": "32",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02CurrentGrid",
- "addressIndex": "34",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01CurrentGrid",
- "addressIndex": "36",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01TargetGrid",
- "addressIndex": "38",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02CurrentGrid",
- "addressIndex": "40",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02TargetGrid",
- "addressIndex": "42",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D01ID",
- "addressIndex": "44",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D02ID",
- "addressIndex": "58",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D03ID",
- "addressIndex": "72",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D04ID",
- "addressIndex": "86",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D05ID",
- "addressIndex": "100",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D06ID",
- "addressIndex": "114",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A01ID1",
- "addressIndex": "128",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A01ID2",
- "addressIndex": "142",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A02ID1",
- "addressIndex": "156",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A02ID2",
- "addressIndex": "170",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B01ID1",
- "addressIndex": "184",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B01ID2",
- "addressIndex": "198",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B02ID1",
- "addressIndex": "212",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B02ID2",
- "addressIndex": "226",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A01conveyorFaultcodes",
- "addressIndex": "240",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01turnservoFaultcodes",
- "addressIndex": "242",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01travelservoFaultcodes",
- "addressIndex": "244",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02conveyorFaultcodes",
- "addressIndex": "246",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02turnservoFaultcodes",
- "addressIndex": "248",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02travelservoFaultcodes",
- "addressIndex": "250",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01travelservoFaultcodes",
- "addressIndex": "252",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02travelservoFaultcodes",
- "addressIndex": "254",
- "addressLenght": "2",
- "unit": ""
- }
- ,
- {
- "codeId": "Scanningguns",
- "addressIndex": "256",
- "addressLenght": "2",
- "unit": ""
- }
- ,
- {
- "codeId": "Frameid",
- "addressIndex": "270",
- "addressLenght": "2",
- "unit": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/PlcTest.json b/UnLoadGlassModule/src/main/resources/JsonFile/PlcTest.json
deleted file mode 100644
index 263c782..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/PlcTest.json
+++ /dev/null
@@ -1,378 +0,0 @@
-{
- "plcAddressBegin": "DB101.0.0",
- "plcAddressLenght": "93",
- "dataType": "bit",
- "parameteInfor": [
- {
- "codeId": "D01VFDconveyor",
- "addressIndex": 0
- },
- {
- "codeId": "D02VFDconveyor",
- "addressIndex": 1
- },
- {
- "codeId": "D03VFDconveyor",
- "addressIndex": 2
- },
- {
- "codeId": "D04VFDconveyor",
- "addressIndex": 3
- },
- {
- "codeId": "D05VFDconveyor",
- "addressIndex": 4
- },
- {
- "codeId": "D06VFDconveyor",
- "addressIndex": 5
- },
- {
- "codeId": "A01VFDconveyor",
- "addressIndex": 6
- },
- {
- "codeId": "A02VFDconveyor",
- "addressIndex": 7
- },
- {
- "codeId": "B01VFDconveyor",
- "addressIndex": 8
- },
- {
- "codeId": "B02VFDconveyor",
- "addressIndex": 9
- },
- {
- "codeId": "A01SERVETURN",
- "addressIndex": 10
- },
- {
- "codeId": "A02SERVETURN",
- "addressIndex": 11
- },
- {
- "codeId": "A01SERVETRAVEL",
- "addressIndex": 12
- },
- {
- "codeId": "A02SERVETRAVEL",
- "addressIndex": 13
- },
- {
- "codeId": "B01SERVETRAVEL",
- "addressIndex": 14
- },
- {
- "codeId": "B02SERVETRAVEL",
- "addressIndex": 15
- },
- {
- "codeId": "A01SERVETURNPOS",
- "addressIndex": 16
- },
- {
- "codeId": "A02SERVETURNPOS",
- "addressIndex": 17
- },
- {
- "codeId": "A01SERVETRAVELPOS",
- "addressIndex": 18
- },
- {
- "codeId": "A02SERVETRAVELPOS",
- "addressIndex": 19
- },
- {
- "codeId": "B01SERVETRAVELPOS",
- "addressIndex": 20
- },
- {
- "codeId": "B02SERVETRAVELPOS",
- "addressIndex": 21
- },
- {
- "codeId": "B01YVTURN",
- "addressIndex": 22
- },
- {
- "codeId": "B01YVUPDOWN",
- "addressIndex": 23
- },
- {
- "codeId": "B02YVTURN",
- "addressIndex": 24
- },
- {
- "codeId": "B02YVUPDOWN",
- "addressIndex": 25
- },
- {
- "codeId": "B01YVGassing",
- "addressIndex": 26
- },
- {
- "codeId": "B02YVGassing",
- "addressIndex": 27
- },
- {
- "codeId": "A01VFDconveyorreverse",
- "addressIndex": 28
- },
- {
- "codeId": "A02VFDconveyorreverse",
- "addressIndex": 29
- },
- {
- "codeId": "A01SERVETURNreset",
- "addressIndex": 30
- },
- {
- "codeId": "A01SERVETURNhome",
- "addressIndex": 31
- },
- {
- "codeId": "A01SERVETRAVELreset",
- "addressIndex": 32
- },
- {
- "codeId": "A02SERVETURNreset",
- "addressIndex": 33
- },
- {
- "codeId": "A02SERVETURNhome",
- "addressIndex": 34
- },
- {
- "codeId": "A02SERVETRAVELreset",
- "addressIndex": 35
- },
- {
- "codeId": "B01SERVETRAVELreset",
- "addressIndex": 36
- },
- {
- "codeId": "B01SERVETRAVELhome",
- "addressIndex": 37
- },
- {
- "codeId": "B02SERVETRAVELreset",
- "addressIndex": 38
- },
- {
- "codeId": "B02SERVETRAVELhome",
- "addressIndex": 39
- },
- {
- "codeId": "Manualstoragestartup",
- "addressIndex": 40
- },
- {
- "codeId": "Manualoutputstartup",
- "addressIndex": 41
- },
- {
- "codeId": "A01oilpump",
- "addressIndex": 42
- },
- {
- "codeId": "A02oilpump",
- "addressIndex": 43
- },
- {
- "codeId": "A01get1#gridaddress",
- "addressIndex": 44
- },
- {
- "codeId": "A01get22#gridaddress",
- "addressIndex": 45
- },
- {
- "codeId": "A01get43#gridaddress",
- "addressIndex": 46
- },
- {
- "codeId": "A01get64#gridaddress",
- "addressIndex": 47
- },
- {
- "codeId": "A01get85#gridaddress",
- "addressIndex": 48
- },
- {
- "codeId": "A01get106#gridaddress",
- "addressIndex": 49
- },
- {
- "codeId": "A01get127#gridaddress",
- "addressIndex": 50
- },
- {
- "codeId": "A01get148#gridaddress",
- "addressIndex": 51
- },
- {
- "codeId": "A01get169#gridaddress",
- "addressIndex": 52
- },
- {
- "codeId": "A02get190#gridaddress",
- "addressIndex": 53
- },
- {
- "codeId": "A02get1#gridaddress",
- "addressIndex": 54
- },
- {
- "codeId": "A02get22#gridaddress",
- "addressIndex": 55
- },
- {
- "codeId": "A02get43#gridaddress",
- "addressIndex": 56
- },
- {
- "codeId": "A02get64#gridaddress",
- "addressIndex": 57
- },
- {
- "codeId": "A02get85#gridaddress",
- "addressIndex": 58
- },
- {
- "codeId": "A02get106#gridaddress",
- "addressIndex": 59
- },
- {
- "codeId": "A02get127#gridaddress",
- "addressIndex": 60
- },
- {
- "codeId": "A02get148#gridaddress",
- "addressIndex": 61
- },
- {
- "codeId": "A02get169#gridaddress",
- "addressIndex": 62
- },
- {
- "codeId": "A02get190#gridaddress",
- "addressIndex": 63
- },
- {
- "codeId": "B01get1#gridaddress",
- "addressIndex": 64
- },
- {
- "codeId": "B01get22#gridaddress",
- "addressIndex": 65
- },
- {
- "codeId": "B01get43#gridaddress",
- "addressIndex": 66
- },
- {
- "codeId": "B01get64#gridaddress",
- "addressIndex": 67
- },
- {
- "codeId": "B01get85#gridaddress",
- "addressIndex": 68
- },
- {
- "codeId": "B02get106#gridaddress",
- "addressIndex": 69
- },
- {
- "codeId": "B02get127#gridaddress",
- "addressIndex": 70
- },
- {
- "codeId": "B02get148#gridaddress",
- "addressIndex": 71
- },
- {
- "codeId": "B02get169#gridaddress",
- "addressIndex": 72
- },
- {
- "codeId": "B02get190#gridaddress",
- "addressIndex": 73
- },
- {
- "codeId": "D01IDClean",
- "addressIndex": 74
- },
- {
- "codeId": "D02IDClean",
- "addressIndex": 75
- },
- {
- "codeId": "D03IDClean",
- "addressIndex": 76
- },
- {
- "codeId": "D04IDClean",
- "addressIndex": 77
- },
- {
- "codeId": "D05IDClean",
- "addressIndex": 78
- },
- {
- "codeId": "D06IDClean",
- "addressIndex": 79
- },
- {
- "codeId": "A01IDClean",
- "addressIndex": 80
- },
- {
- "codeId": "A02IDClean",
- "addressIndex": 81
- },
- {
- "codeId": "B01IDClean",
- "addressIndex": 82
- },
- {
- "codeId": "B02IDClean",
- "addressIndex": 83
- },
- {
- "codeId": "abort/resumeTasks",
- "addressIndex": 84
- },
- {
- "codeId": "A01SERVETRAVELhome",
- "addressIndex": 85
- },
- {
- "codeId": "A02SERVETRAVELhome",
- "addressIndex": 86
- },
- {
- "codeId": "A01A02travelHoming",
- "addressIndex": 87
- },
- {
- "codeId": "A01halfAutoSelect",
- "addressIndex": 88
- },
- {
- "codeId": "A02halfAutoSelect",
- "addressIndex": 89
- },
- {
- "codeId": "A02abortTasks",
- "addressIndex": 90
- },
- {
- "codeId": "emgHMI",
- "addressIndex": 91
- },
- {
- "codeId": "Scanningmethod",
- "addressIndex": 92
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/Plcframe.json b/UnLoadGlassModule/src/main/resources/JsonFile/Plcframe.json
deleted file mode 100644
index c270227..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/Plcframe.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "plcAddressBegin":"DB17.0",
- "plcAddressLenght":"40",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "E01id",
- "addressIndex":"0",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "E01Quest",
- "addressIndex":"16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "E01Reply",
- "addressIndex":"18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "J01Quest",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "J01id",
- "addressIndex":"22",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "J01TurnGo",
- "addressIndex":"38",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
-
-
- ]
-}
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/alarm.xlsx b/UnLoadGlassModule/src/main/resources/JsonFile/alarm.xlsx
deleted file mode 100644
index 50b26dc..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/alarm.xlsx
+++ /dev/null
Binary files differ
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/sign.xlsx b/UnLoadGlassModule/src/main/resources/JsonFile/sign.xlsx
deleted file mode 100644
index 3922301..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/sign.xlsx
+++ /dev/null
Binary files differ
diff --git a/UnLoadGlassModule/src/main/resources/JsonFile/test.xlsx b/UnLoadGlassModule/src/main/resources/JsonFile/test.xlsx
deleted file mode 100644
index 9862cf5..0000000
--- a/UnLoadGlassModule/src/main/resources/JsonFile/test.xlsx
+++ /dev/null
Binary files differ
diff --git a/UnLoadGlassModule/src/main/resources/application.yml b/UnLoadGlassModule/src/main/resources/application.yml
deleted file mode 100644
index 328e464..0000000
--- a/UnLoadGlassModule/src/main/resources/application.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-server:
- port: 8081
- servlet:
- context-path: /mesModuleTools
-
-spring:
- datasource:
- dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- hangzhoumes:
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
diff --git a/UnLoadGlassModule/src/test/java/com/mes/MesApplicationTests.java b/UnLoadGlassModule/src/test/java/com/mes/MesApplicationTests.java
deleted file mode 100644
index 59327a7..0000000
--- a/UnLoadGlassModule/src/test/java/com/mes/MesApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mes;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class MesApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcAlarm.json b/UnLoadGlassModule/target/classes/JsonFile/PlcAlarm.json
deleted file mode 100644
index a840092..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcAlarm.json
+++ /dev/null
@@ -1,371 +0,0 @@
-{
- "plcAddressBegin": "DB104.0.0",
- "plcAddressLenght": "91",
- "dataType": "bit",
- "parameteInfor": [
- {
- "codeId": "D01VFDerror",
- "addressIndex": 0
- },
- {
- "codeId": "D02VFDerror",
- "addressIndex": 1
- },
- {
- "codeId": "D03VFDerror",
- "addressIndex": 2
- },
- {
- "codeId": "D04VFDerror",
- "addressIndex": 3
- },
- {
- "codeId": "D05VFDerror",
- "addressIndex": 4
- },
- {
- "codeId": "D06VFDerror",
- "addressIndex": 5
- },
- {
- "codeId": "B01VFDerror",
- "addressIndex": 6
- },
- {
- "codeId": "B02VFDerror",
- "addressIndex": 7
- },
- {
- "codeId": "A01VFDerror",
- "addressIndex": 8
- },
- {
- "codeId": "A02VFDerror",
- "addressIndex": 9
- },
- {
- "codeId": "A01servoturnerror",
- "addressIndex": 10
- },
- {
- "codeId": "A02servoturnerror",
- "addressIndex": 11
- },
- {
- "codeId": "A01servotravelerror",
- "addressIndex": 12
- },
- {
- "codeId": "A02servotravelerror",
- "addressIndex": 13
- },
- {
- "codeId": "B01servotravelerror",
- "addressIndex": 14
- },
- {
- "codeId": "B02servotravelerror",
- "addressIndex": 15
- },
- {
- "codeId": "D01DECerror",
- "addressIndex": 16
- },
- {
- "codeId": "D01poserror",
- "addressIndex": 17
- },
- {
- "codeId": "D02DECerror",
- "addressIndex": 18
- },
- {
- "codeId": "D02poserror",
- "addressIndex": 19
- },
- {
- "codeId": "D03DECerror",
- "addressIndex": 20
- },
- {
- "codeId": "D03poserror",
- "addressIndex": 21
- },
- {
- "codeId": "D04DECerror",
- "addressIndex": 22
- },
- {
- "codeId": "D04poserror",
- "addressIndex": 23
- },
- {
- "codeId": "D05DECerror",
- "addressIndex": 24
- },
- {
- "codeId": "D05poserror",
- "addressIndex": 25
- },
- {
- "codeId": "D06DECerror",
- "addressIndex": 26
- },
- {
- "codeId": "D06poserror",
- "addressIndex": 27
- },
- {
- "codeId": "A01DECerror",
- "addressIndex": 28
- },
- {
- "codeId": "A01poserror",
- "addressIndex": 29
- },
- {
- "codeId": "A02DECerror",
- "addressIndex": 30
- },
- {
- "codeId": "A02poserror",
- "addressIndex": 31
- },
- {
- "codeId": "B01INDECerror",
- "addressIndex": 32
- },
- {
- "codeId": "B01INposerror",
- "addressIndex": 33
- },
- {
- "codeId": "B01OUTDECerror",
- "addressIndex": 34
- },
- {
- "codeId": "B01OUTposerror",
- "addressIndex": 35
- },
- {
- "codeId": "B02INDECerror",
- "addressIndex": 36
- },
- {
- "codeId": "B02INposerror",
- "addressIndex": 37
- },
- {
- "codeId": "B02OUTDECerror",
- "addressIndex": 38
- },
- {
- "codeId": "B02OUTposerror",
- "addressIndex": 39
- },
- {
- "codeId": "D01Scanglassexceedinglimit",
- "addressIndex": 40
- },
- {
- "codeId": "emergencystopalarm",
- "addressIndex": 41
- },
- {
- "codeId": "Moreglassthanknown",
- "addressIndex": 42
- },
- {
- "codeId": "lessglassthanknown",
- "addressIndex": 43
- },
- {
- "codeId": "D01conveyortimeoutalarm",
- "addressIndex": 44
- },
- {
- "codeId": "D02conveyortimeoutalarm",
- "addressIndex": 45
- },
- {
- "codeId": "D03conveyortimeoutalarm",
- "addressIndex": 46
- },
- {
- "codeId": "D04conveyortimeoutalarm",
- "addressIndex": 47
- },
- {
- "codeId": "D05conveyortimeoutalarm",
- "addressIndex": 48
- },
- {
- "codeId": "D06conveyortimeoutalarm",
- "addressIndex": 49
- },
- {
- "codeId": "A01conveyortimeoutalarm",
- "addressIndex": 50
- },
- {
- "codeId": "A02conveyortimeoutalarm",
- "addressIndex": 51
- },
- {
- "codeId": "B01conveyortimeoutalarm",
- "addressIndex": 52
- },
- {
- "codeId": "B02conveyortimeoutalarm",
- "addressIndex": 53
- },
- {
- "codeId": "A01conveyorLeftsafetyalarm",
- "addressIndex": 54
- },
- {
- "codeId": "A01conveyorrightsafetyalarm",
- "addressIndex": 55
- },
- {
- "codeId": "A02conveyorLeftsafetyalarm",
- "addressIndex": 56
- },
- {
- "codeId": "A02conveyorrightsafetyalarm",
- "addressIndex": 57
- },
- {
- "codeId": "1#buffersafetyalarm",
- "addressIndex": 58
- },
- {
- "codeId": "2#buffersafetyalarm",
- "addressIndex": 59
- },
- {
- "codeId": "3#buffersafetyalarm",
- "addressIndex": 60
- },
- {
- "codeId": "4#buffersafetyalarm",
- "addressIndex": 61
- },
- {
- "codeId": "A01.SRrightinposerror",
- "addressIndex": 62
- },
- {
- "codeId": "A02.SRleftinposerror",
- "addressIndex": 63
- },
- {
- "codeId": "B01.SRleftinposerror",
- "addressIndex": 64
- },
- {
- "codeId": "B01.SRleftdecerror",
- "addressIndex": 65
- },
- {
- "codeId": "B01.SRrightdecerror",
- "addressIndex": 66
- },
- {
- "codeId": "B01.SRrightinposerror",
- "addressIndex": 67
- },
- {
- "codeId": "B02.SRleftinposerror",
- "addressIndex": 68
- },
- {
- "codeId": "B02.SRleftdecerror",
- "addressIndex": 69
- },
- {
- "codeId": "B02.SRrightdecerror",
- "addressIndex": 70
- },
- {
- "codeId": "B02.SRrightinposerror",
- "addressIndex": 71
- },
- {
- "codeId": "A01servoturnhomed",
- "addressIndex": 72
- },
- {
- "codeId": "A02servoturnhomed",
- "addressIndex": 73
- },
- {
- "codeId": "A01servotravelhomed",
- "addressIndex": 74
- },
- {
- "codeId": "A02servotravelhomed",
- "addressIndex": 75
- },
- {
- "codeId": "B01servotravelhomed",
- "addressIndex": 76
- },
- {
- "codeId": "B02servotravelhomed",
- "addressIndex": 77
- },
- {
- "codeId": "resetDelay",
- "addressIndex": 78
- },
- {
- "codeId": "A01travelNegativelimit",
- "addressIndex": 79
- },
- {
- "codeId": "A01travelPositivelimit",
- "addressIndex": 80
- },
- {
- "codeId": "A01turnuplimit",
- "addressIndex": 81
- },
- {
- "codeId": "A01turndownlimit",
- "addressIndex": 82
- },
- {
- "codeId": "A02travelNegativelimit",
- "addressIndex": 83
- },
- {
- "codeId": "A02travelPositivelimit",
- "addressIndex": 84
- },
- {
- "codeId": "A02turnuplimit",
- "addressIndex": 85
- },
- {
- "codeId": "A02turndownlimit",
- "addressIndex": 86
- },
- {
- "codeId": "B01travelNegativelimit",
- "addressIndex": 87
- },
- {
- "codeId": "B01travelPositivelimit",
- "addressIndex": 88
- },
- {
- "codeId": "B02travelNegativelimit",
- "addressIndex": 89
- },
- {
- "codeId": "B02travelPositivelimit",
- "addressIndex": 90
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcMes.json b/UnLoadGlassModule/target/classes/JsonFile/PlcMes.json
deleted file mode 100644
index ab5d4cd..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcMes.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "plcAddressBegin":"DB105.0",
- "plcAddressLenght":"12",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "OutActivate",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "Addgoal",
- "addressIndex":"2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "AddLength",
- "addressIndex":"4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "AddWidth",
- "addressIndex":"6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "AddCount",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "OutStart",
- "addressIndex":"10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
-
- ]
-}
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcParameter.json b/UnLoadGlassModule/target/classes/JsonFile/PlcParameter.json
deleted file mode 100644
index afbe090..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcParameter.json
+++ /dev/null
@@ -1,610 +0,0 @@
-{
- "plcAddressBegin":"DB100.0",
- "plcAddressLenght":"198",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "conveyorVelocity(Max)",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "conveyorVelocity(AutoFAST)",
- "addressIndex":"2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "conveyorVelocity(AutoSLOW)",
- "addressIndex":"4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "conveyorVelocity(Manual)",
- "addressIndex":"6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TURNJOGVelocity",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TRAVELJOGVelocity",
- "addressIndex":"10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "B01B02TRAVELJOGVelocity",
- "addressIndex":"12",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TURNPOSVelocityAUTO",
- "addressIndex":"14",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01TURNPOSVelocitymanual",
- "addressIndex":"16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02TRAVELPOSVelocityAUTO",
- "addressIndex":"18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01TRAVELPOSVelocitymanual",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "B01B02TRAVELPOSVelocityAUTO",
- "addressIndex":"22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "B01TRAVELPOSVelocitymanual",
- "addressIndex":"24",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "A01A02conveyorVelocity(Max)",
- "addressIndex":"26",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01A02conveyorVelocity(AutoFAST)",
- "addressIndex":"28",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01A02conveyorVelocity(AutoSLOW)",
- "addressIndex":"30",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(Manual)",
- "addressIndex":"32",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(Max)",
- "addressIndex":"34",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(AutoFAST)",
- "addressIndex":"36",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(AutoSLOW)",
- "addressIndex":"38",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01B02conveyorVelocity(Manual)",
- "addressIndex":"40",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "gridspacing",
- "addressIndex":"42",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01Spliceaddresssetting",
- "addressIndex":"44",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02Spliceaddresssetting",
- "addressIndex":"46",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A011#gridaddress",
- "addressIndex":"48",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0122#gridaddress",
- "addressIndex":"50",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0143#gridaddress",
- "addressIndex":"52",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0164#gridaddress",
- "addressIndex":"54",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0185#gridaddress",
- "addressIndex":"56",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01106#gridaddress",
- "addressIndex":"58",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01127#gridaddress",
- "addressIndex":"60",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01148#gridaddress",
- "addressIndex":"62",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01169#gridaddress",
- "addressIndex":"64",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01190#gridaddress",
- "addressIndex":"66",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A021#gridaddress",
- "addressIndex":"68",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0222#gridaddress",
- "addressIndex":"70",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0243#gridaddress",
- "addressIndex":"72",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0264#gridaddress",
- "addressIndex":"74",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A0285#gridaddress",
- "addressIndex":"76",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02106#gridaddress",
- "addressIndex":"78",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02127#gridaddress",
- "addressIndex":"80",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02148#gridaddress",
- "addressIndex":"82",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02169#gridaddress",
- "addressIndex":"84",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A02190#gridaddress",
- "addressIndex":"86",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B011#gridaddress",
- "addressIndex":"88",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0122#gridaddress",
- "addressIndex":"90",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0143#gridaddress",
- "addressIndex":"92",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0164#gridaddress",
- "addressIndex":"94",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B0185#gridaddress",
- "addressIndex":"96",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02106#gridaddress",
- "addressIndex":"98",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02127#gridaddress",
- "addressIndex":"100",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02148#gridaddress",
- "addressIndex":"102",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02169#gridaddress",
- "addressIndex":"104",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "B02190#gridaddress",
- "addressIndex":"106",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm"
- },
- {
- "codeId": "A01Targetgrid(Manual)",
- "addressIndex":"108",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": " A02Targetgrid(Manual)",
- "addressIndex":"110",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "B01Targetgrid(Manual)",
- "addressIndex":"112",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "B02Targetgrid(Manual)",
- "addressIndex":"114",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A01turnTargetAngle(Manual)",
- "addressIndex":"116",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnTargetAngle(Manual)",
- "addressIndex":"118",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle1",
- "addressIndex":"120",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle2",
- "addressIndex":"122",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle3",
- "addressIndex":"124",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A01turnAngle4",
- "addressIndex":"126",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle1",
- "addressIndex":"128",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle2",
- "addressIndex":"130",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle3",
- "addressIndex":"132",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "A02turnAngle4",
- "addressIndex":"134",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"掳"
- },
- {
- "codeId": "Minimumglasslength",
- "addressIndex":"136",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Minimumglassheight",
- "addressIndex":"138",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Maximumglasslength",
- "addressIndex":"140",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Maximumglassheight",
- "addressIndex":"142",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A01cellsGlassNum",
- "addressIndex":"144",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A02cellsGlassNum",
- "addressIndex":"146",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "A01ID",
- "addressIndex":"148",
- "addressLenght":"14",
- "ratio":"1"
-
- },
- {
- "codeId": "A02ID",
- "addressIndex":"162",
- "addressLenght":"14",
- "ratio":"1"
-
- },
- {
- "codeId": "A02TRAVELPOSVelocitymanual",
- "addressIndex":"176",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "B02TRAVELPOSVelocitymanual",
- "addressIndex":"178",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Startingpositionofthefeedca",
- "addressIndex":"180",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Targetpositionofthefeedcar",
- "addressIndex":"182",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Lengthofincomingglass",
- "addressIndex":"184",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Widthofincomingglass",
- "addressIndex":"186",
- "addressLenght":"2",
- "ratio":"1"
-
- },
- {
- "codeId": "Startingpositionoftheexitcar",
- "addressIndex":"188",
- "addressLenght":"2",
- "ratio":"1"
-
- }, {
- "codeId": "Exitcartargetposition",
- "addressIndex":"190",
- "addressLenght":"2",
- "ratio":"1"
-
- }
- , {
- "codeId": "A02TURNPOSVelocitymanual",
- "addressIndex":"192",
- "addressLenght":"2",
- "ratio":"1"
-
- }
- , {
- "codeId": "A01delayTime",
- "addressIndex":"194",
- "addressLenght":"2",
- "ratio":"1"
-
- }
-
-
- ]
-}
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcRead.json b/UnLoadGlassModule/target/classes/JsonFile/PlcRead.json
deleted file mode 100644
index f3ebb33..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcRead.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
- "plcAddressBegin": "DB106.0",
- "plcAddressLenght": "66",
- "dataType": "word",
- "parameteInfor": [{
- "codeId": "A01Position",
- "addressIndex": "0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01FlipPosition",
- "addressIndex": "2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01QuestStartPosition",
- "addressIndex": "4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A01EndPosition",
- "addressIndex": "6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "FeedCarStatus",
- "addressIndex": "8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02QuestOver",
- "addressIndex": "10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02Position",
- "addressIndex": "12",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02FlipPosition",
- "addressIndex": "14",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02QuestStartPosition",
- "addressIndex": "16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02EndPosition",
- "addressIndex": "18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "ExitCarStatus",
- "addressIndex": "20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "A02QuestOver",
- "addressIndex": "22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "FeedRequest",
- "addressIndex": "24",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "FeedID",
- "addressIndex": "26",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01Position",
- "addressIndex": "40",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01QuestPosition",
- "addressIndex": "42",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CurrentTaskMode",
- "addressIndex": "44",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CarStatus",
- "addressIndex": "46",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CarTaskStatus",
- "addressIndex": "48",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02Position",
- "addressIndex": "50",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CarCurrentTask",
- "addressIndex": "52",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CurrentTaskMode",
- "addressIndex": "54",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CarStatus",
- "addressIndex": "56",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CarSaskStatus",
- "addressIndex": "58",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B01CompleteTheReport",
- "addressIndex": "60",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "B02CompleteTheReport",
- "addressIndex": "62",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "OutRequest",
- "addressIndex": "64",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcSign.json b/UnLoadGlassModule/target/classes/JsonFile/PlcSign.json
deleted file mode 100644
index 8f9295a..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcSign.json
+++ /dev/null
@@ -1,460 +0,0 @@
-{
- "plcAddressBegin": "DB102.0.0",
- "plcAddressLenght": "112",
- "dataType": "bit",
- "parameteInfor": [
- {
- "codeId": "D01.SRdec",
- "addressIndex": 0
- },
- {
- "codeId": "D01.SRinpos",
- "addressIndex": 1
- },
- {
- "codeId": "D02.SRdec",
- "addressIndex": 2
- },
- {
- "codeId": "D02.SRinpos",
- "addressIndex": 3
- },
- {
- "codeId": "D03.SRinto",
- "addressIndex": 4
- },
- {
- "codeId": "D03.SRdec",
- "addressIndex": 5
- },
- {
- "codeId": "D03.SRinpos",
- "addressIndex": 6
- },
- {
- "codeId": "D04.SRdec",
- "addressIndex": 7
- },
- {
- "codeId": "D04.SRinpos",
- "addressIndex": 8
- },
- {
- "codeId": "D05.SRdec",
- "addressIndex": 9
- },
- {
- "codeId": "D05.SRinpos",
- "addressIndex": 10
- },
- {
- "codeId": "D06.SRdec",
- "addressIndex": 11
- },
- {
- "codeId": "D06.SRinpos",
- "addressIndex": 12
- },
- {
- "codeId": "B01.SRindec",
- "addressIndex": 13
- },
- {
- "codeId": "B01.SRininpos",
- "addressIndex": 14
- },
- {
- "codeId": "B01.SRoutdec",
- "addressIndex": 15
- },
- {
- "codeId": "B01.SRoutinpos",
- "addressIndex": 16
- },
- {
- "codeId": "B01.SRturnon",
- "addressIndex": 17
- },
- {
- "codeId": "B01.SRturnoff",
- "addressIndex": 18
- },
- {
- "codeId": "B01.SRup",
- "addressIndex": 19
- },
- {
- "codeId": "B01.SRdown",
- "addressIndex": 20
- },
- {
- "codeId": "B02.SRoutdec",
- "addressIndex": 21
- },
- {
- "codeId": "B02.SRoutinpos",
- "addressIndex": 22
- },
- {
- "codeId": "B02.SRindec",
- "addressIndex": 23
- },
- {
- "codeId": "B02.SRininpos",
- "addressIndex": 24
- },
- {
- "codeId": "B02.SRturnon",
- "addressIndex": 25
- },
- {
- "codeId": "B02.SRturnoff",
- "addressIndex": 26
- },
- {
- "codeId": "B02.SRup",
- "addressIndex": 27
- },
- {
- "codeId": "B02.SRdown",
- "addressIndex": 28
- },
- {
- "codeId": "B01.SRinsafety",
- "addressIndex": 29
- },
- {
- "codeId": "B01.SRoutsafety",
- "addressIndex": 30
- },
- {
- "codeId": "B02.SRinsafety",
- "addressIndex": 31
- },
- {
- "codeId": "SB.start(+)",
- "addressIndex": 32
- },
- {
- "codeId": "SB.stop(-)",
- "addressIndex": 33
- },
- {
- "codeId": "SB.reset",
- "addressIndex": 34
- },
- {
- "codeId": "SB.auto/manul",
- "addressIndex": 35
- },
- {
- "codeId": "D01.SB.confirm",
- "addressIndex": 36
- },
- {
- "codeId": "SB.emg",
- "addressIndex": 37
- },
- {
- "codeId": "D01.SB.start",
- "addressIndex": 38
- },
- {
- "codeId": "D06.SB.start",
- "addressIndex": 39
- },
- {
- "codeId": "B02.SRoutsafety",
- "addressIndex": 40
- },
- {
- "codeId": "SafetyDoor.requset",
- "addressIndex": 41
- },
- {
- "codeId": "SafetyDoor.confirm",
- "addressIndex": 42
- },
- {
- "codeId": "SafetyDoor.reset",
- "addressIndex": 43
- },
- {
- "codeId": "Sspce",
- "addressIndex": 44
- },
- {
- "codeId": "Sspce",
- "addressIndex": 45
- },
- {
- "codeId": "Sspce",
- "addressIndex": 46
- },
- {
- "codeId": "Sspce",
- "addressIndex": 47
- },
- {
- "codeId": "A01.SRleftdec",
- "addressIndex": 48
- },
- {
- "codeId": "A01.SRleftinpos",
- "addressIndex": 49
- },
- {
- "codeId": "A01.SRleftsafety",
- "addressIndex": 50
- },
- {
- "codeId": "A01.SRrightdec",
- "addressIndex": 51
- },
- {
- "codeId": "A01.SRrightinpos",
- "addressIndex": 52
- },
- {
- "codeId": "A01.SRrightsafety",
- "addressIndex": 53
- },
- {
- "codeId": "A01.SRturnhome",
- "addressIndex": 54
- },
- {
- "codeId": "A01.SRturnup",
- "addressIndex": 55
- },
- {
- "codeId": "A01.SRturndown",
- "addressIndex": 56
- },
- {
- "codeId": "A01.SRtravelhome",
- "addressIndex": 57
- },
- {
- "codeId": "A01.SRtravelleftdec",
- "addressIndex": 58
- },
- {
- "codeId": "A01.SRtravelleftlimit",
- "addressIndex": 59
- },
- {
- "codeId": "A01.SRtravelrightdec",
- "addressIndex": 60
- },
- {
- "codeId": "A01.SRtravelrightlimit",
- "addressIndex": 61
- },
- {
- "codeId": "space",
- "addressIndex": 62
- },
- {
- "codeId": "space",
- "addressIndex": 63
- },
- {
- "codeId": "A02.SRleftdec",
- "addressIndex": 64
- },
- {
- "codeId": "A02.SRleftinpos",
- "addressIndex": 65
- },
- {
- "codeId": "A02.SRleftsafety",
- "addressIndex": 66
- },
- {
- "codeId": "A02.SRrightdec",
- "addressIndex": 67
- },
- {
- "codeId": "A02.SRrightinpos",
- "addressIndex": 68
- },
- {
- "codeId": "A02.SRrightsafety",
- "addressIndex": 69
- },
- {
- "codeId": "A02.SRturnhome",
- "addressIndex": 70
- },
- {
- "codeId": "A02.SRturnup",
- "addressIndex": 71
- },
- {
- "codeId": "A02.SRturndown",
- "addressIndex": 72
- },
- {
- "codeId": "A02.SRtravelhome",
- "addressIndex": 73
- },
- {
- "codeId": "A02.SRtravelleftdec",
- "addressIndex": 74
- },
- {
- "codeId": "A02.SRtravelleftlimit",
- "addressIndex": 75
- },
- {
- "codeId": "A02.SRtravelrightdec",
- "addressIndex": 76
- },
- {
- "codeId": "A02.SRtravelrightlimit",
- "addressIndex": 77
- },
- {
- "codeId": "space",
- "addressIndex": 78
- },
- {
- "codeId": "space",
- "addressIndex": 79
- },
- {
- "codeId": "B01.SRorigin",
- "addressIndex": 80
- },
- {
- "codeId": "B01.SRleftlimit",
- "addressIndex": 81
- },
- {
- "codeId": "B01.SRrightlimit",
- "addressIndex": 82
- },
- {
- "codeId": "B02.SRorigin",
- "addressIndex": 83
- },
- {
- "codeId": "B02.SRleftlimit",
- "addressIndex": 84
- },
- {
- "codeId": "B02.SRrightlimit",
- "addressIndex": 85
- },
- {
- "codeId": "space",
- "addressIndex": 86
- },
- {
- "codeId": "space",
- "addressIndex": 87
- },
- {
- "codeId": "LED.red",
- "addressIndex": 88
- },
- {
- "codeId": "LED.green",
- "addressIndex": 89
- },
- {
- "codeId": "LED.yellow",
- "addressIndex": 90
- },
- {
- "codeId": "D01.LED.green",
- "addressIndex": 91
- },
- {
- "codeId": "D06.LED.green",
- "addressIndex": 92
- },
- {
- "codeId": "B01.YV.turn",
- "addressIndex": 93
- },
- {
- "codeId": "B01.YV.updown",
- "addressIndex": 94
- },
- {
- "codeId": "B01.YV.gassing",
- "addressIndex": 95
- },
- {
- "codeId": "B02.YV.turn",
- "addressIndex": 96
- },
- {
- "codeId": "B02.YV.updown",
- "addressIndex": 97
- },
- {
- "codeId": "B02.YV.gassing",
- "addressIndex": 98
- },
- {
- "codeId": "SafetyDoor.Led",
- "addressIndex": 99
- },
- {
- "codeId": "SafetyDoor.open",
- "addressIndex": 100
- },
- {
- "codeId": "D01SB.confirm",
- "addressIndex": 101
- },
- {
- "codeId": "space",
- "addressIndex": 102
- },
- {
- "codeId": "space",
- "addressIndex": 103
- },
- {
- "codeId": "A01oilPump",
- "addressIndex": 104
- },
- {
- "codeId": "A01motorCtr",
- "addressIndex": 105
- },
- {
- "codeId": "space",
- "addressIndex": 106
- },
- {
- "codeId": "space",
- "addressIndex": 107
- },
- {
- "codeId": "A02oilPump",
- "addressIndex": 108
- },
- {
- "codeId": "A02motorCtr",
- "addressIndex": 109
- },
- {
- "codeId": "space",
- "addressIndex": 110
- },
- {
- "codeId": "space",
- "addressIndex": 111
- }
- ,
- {
- "codeId": "space",
- "addressIndex": 111
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcState.json b/UnLoadGlassModule/target/classes/JsonFile/PlcState.json
deleted file mode 100644
index dfdbaec..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcState.json
+++ /dev/null
@@ -1,285 +0,0 @@
-{
- "plcAddressBegin": "DB103.0",
- "plcAddressLenght": "258",
- "dataType": "word",
- "parameteInfor": [
- {
- "codeId": "D01.State",
- "addressIndex": "0",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D02.State",
- "addressIndex": "2",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01.State",
- "addressIndex": "4",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02.State",
- "addressIndex": "6",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01.State",
- "addressIndex": "8",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02.State",
- "addressIndex": "10",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D03.State",
- "addressIndex": "12",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D04.State",
- "addressIndex": "14",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D05.State",
- "addressIndex": "16",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D06.State",
- "addressIndex": "18",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01tavelActualPosition",
- "addressIndex": "20",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01turnActualangle",
- "addressIndex": "22",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02tavelActualPosition",
- "addressIndex": "24",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02turnActualangle",
- "addressIndex": "26",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01tavelActualPosition",
- "addressIndex": "28",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02tavelActualPosition",
- "addressIndex": "30",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01CurrentGrid",
- "addressIndex": "32",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02CurrentGrid",
- "addressIndex": "34",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01CurrentGrid",
- "addressIndex": "36",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01TargetGrid",
- "addressIndex": "38",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02CurrentGrid",
- "addressIndex": "40",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02TargetGrid",
- "addressIndex": "42",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "D01ID",
- "addressIndex": "44",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D02ID",
- "addressIndex": "58",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D03ID",
- "addressIndex": "72",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D04ID",
- "addressIndex": "86",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D05ID",
- "addressIndex": "100",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "D06ID",
- "addressIndex": "114",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A01ID1",
- "addressIndex": "128",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A01ID2",
- "addressIndex": "142",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A02ID1",
- "addressIndex": "156",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A02ID2",
- "addressIndex": "170",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B01ID1",
- "addressIndex": "184",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B01ID2",
- "addressIndex": "198",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B02ID1",
- "addressIndex": "212",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "B02ID2",
- "addressIndex": "226",
- "addressLenght": "14",
- "unit": ""
- },
- {
- "codeId": "A01conveyorFaultcodes",
- "addressIndex": "240",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01turnservoFaultcodes",
- "addressIndex": "242",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A01travelservoFaultcodes",
- "addressIndex": "244",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02conveyorFaultcodes",
- "addressIndex": "246",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02turnservoFaultcodes",
- "addressIndex": "248",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "A02travelservoFaultcodes",
- "addressIndex": "250",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B01travelservoFaultcodes",
- "addressIndex": "252",
- "addressLenght": "2",
- "unit": ""
- },
- {
- "codeId": "B02travelservoFaultcodes",
- "addressIndex": "254",
- "addressLenght": "2",
- "unit": ""
- }
- ,
- {
- "codeId": "Scanningguns",
- "addressIndex": "256",
- "addressLenght": "2",
- "unit": ""
- }
- ,
- {
- "codeId": "Frameid",
- "addressIndex": "270",
- "addressLenght": "2",
- "unit": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/target/classes/JsonFile/PlcTest.json b/UnLoadGlassModule/target/classes/JsonFile/PlcTest.json
deleted file mode 100644
index 263c782..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/PlcTest.json
+++ /dev/null
@@ -1,378 +0,0 @@
-{
- "plcAddressBegin": "DB101.0.0",
- "plcAddressLenght": "93",
- "dataType": "bit",
- "parameteInfor": [
- {
- "codeId": "D01VFDconveyor",
- "addressIndex": 0
- },
- {
- "codeId": "D02VFDconveyor",
- "addressIndex": 1
- },
- {
- "codeId": "D03VFDconveyor",
- "addressIndex": 2
- },
- {
- "codeId": "D04VFDconveyor",
- "addressIndex": 3
- },
- {
- "codeId": "D05VFDconveyor",
- "addressIndex": 4
- },
- {
- "codeId": "D06VFDconveyor",
- "addressIndex": 5
- },
- {
- "codeId": "A01VFDconveyor",
- "addressIndex": 6
- },
- {
- "codeId": "A02VFDconveyor",
- "addressIndex": 7
- },
- {
- "codeId": "B01VFDconveyor",
- "addressIndex": 8
- },
- {
- "codeId": "B02VFDconveyor",
- "addressIndex": 9
- },
- {
- "codeId": "A01SERVETURN",
- "addressIndex": 10
- },
- {
- "codeId": "A02SERVETURN",
- "addressIndex": 11
- },
- {
- "codeId": "A01SERVETRAVEL",
- "addressIndex": 12
- },
- {
- "codeId": "A02SERVETRAVEL",
- "addressIndex": 13
- },
- {
- "codeId": "B01SERVETRAVEL",
- "addressIndex": 14
- },
- {
- "codeId": "B02SERVETRAVEL",
- "addressIndex": 15
- },
- {
- "codeId": "A01SERVETURNPOS",
- "addressIndex": 16
- },
- {
- "codeId": "A02SERVETURNPOS",
- "addressIndex": 17
- },
- {
- "codeId": "A01SERVETRAVELPOS",
- "addressIndex": 18
- },
- {
- "codeId": "A02SERVETRAVELPOS",
- "addressIndex": 19
- },
- {
- "codeId": "B01SERVETRAVELPOS",
- "addressIndex": 20
- },
- {
- "codeId": "B02SERVETRAVELPOS",
- "addressIndex": 21
- },
- {
- "codeId": "B01YVTURN",
- "addressIndex": 22
- },
- {
- "codeId": "B01YVUPDOWN",
- "addressIndex": 23
- },
- {
- "codeId": "B02YVTURN",
- "addressIndex": 24
- },
- {
- "codeId": "B02YVUPDOWN",
- "addressIndex": 25
- },
- {
- "codeId": "B01YVGassing",
- "addressIndex": 26
- },
- {
- "codeId": "B02YVGassing",
- "addressIndex": 27
- },
- {
- "codeId": "A01VFDconveyorreverse",
- "addressIndex": 28
- },
- {
- "codeId": "A02VFDconveyorreverse",
- "addressIndex": 29
- },
- {
- "codeId": "A01SERVETURNreset",
- "addressIndex": 30
- },
- {
- "codeId": "A01SERVETURNhome",
- "addressIndex": 31
- },
- {
- "codeId": "A01SERVETRAVELreset",
- "addressIndex": 32
- },
- {
- "codeId": "A02SERVETURNreset",
- "addressIndex": 33
- },
- {
- "codeId": "A02SERVETURNhome",
- "addressIndex": 34
- },
- {
- "codeId": "A02SERVETRAVELreset",
- "addressIndex": 35
- },
- {
- "codeId": "B01SERVETRAVELreset",
- "addressIndex": 36
- },
- {
- "codeId": "B01SERVETRAVELhome",
- "addressIndex": 37
- },
- {
- "codeId": "B02SERVETRAVELreset",
- "addressIndex": 38
- },
- {
- "codeId": "B02SERVETRAVELhome",
- "addressIndex": 39
- },
- {
- "codeId": "Manualstoragestartup",
- "addressIndex": 40
- },
- {
- "codeId": "Manualoutputstartup",
- "addressIndex": 41
- },
- {
- "codeId": "A01oilpump",
- "addressIndex": 42
- },
- {
- "codeId": "A02oilpump",
- "addressIndex": 43
- },
- {
- "codeId": "A01get1#gridaddress",
- "addressIndex": 44
- },
- {
- "codeId": "A01get22#gridaddress",
- "addressIndex": 45
- },
- {
- "codeId": "A01get43#gridaddress",
- "addressIndex": 46
- },
- {
- "codeId": "A01get64#gridaddress",
- "addressIndex": 47
- },
- {
- "codeId": "A01get85#gridaddress",
- "addressIndex": 48
- },
- {
- "codeId": "A01get106#gridaddress",
- "addressIndex": 49
- },
- {
- "codeId": "A01get127#gridaddress",
- "addressIndex": 50
- },
- {
- "codeId": "A01get148#gridaddress",
- "addressIndex": 51
- },
- {
- "codeId": "A01get169#gridaddress",
- "addressIndex": 52
- },
- {
- "codeId": "A02get190#gridaddress",
- "addressIndex": 53
- },
- {
- "codeId": "A02get1#gridaddress",
- "addressIndex": 54
- },
- {
- "codeId": "A02get22#gridaddress",
- "addressIndex": 55
- },
- {
- "codeId": "A02get43#gridaddress",
- "addressIndex": 56
- },
- {
- "codeId": "A02get64#gridaddress",
- "addressIndex": 57
- },
- {
- "codeId": "A02get85#gridaddress",
- "addressIndex": 58
- },
- {
- "codeId": "A02get106#gridaddress",
- "addressIndex": 59
- },
- {
- "codeId": "A02get127#gridaddress",
- "addressIndex": 60
- },
- {
- "codeId": "A02get148#gridaddress",
- "addressIndex": 61
- },
- {
- "codeId": "A02get169#gridaddress",
- "addressIndex": 62
- },
- {
- "codeId": "A02get190#gridaddress",
- "addressIndex": 63
- },
- {
- "codeId": "B01get1#gridaddress",
- "addressIndex": 64
- },
- {
- "codeId": "B01get22#gridaddress",
- "addressIndex": 65
- },
- {
- "codeId": "B01get43#gridaddress",
- "addressIndex": 66
- },
- {
- "codeId": "B01get64#gridaddress",
- "addressIndex": 67
- },
- {
- "codeId": "B01get85#gridaddress",
- "addressIndex": 68
- },
- {
- "codeId": "B02get106#gridaddress",
- "addressIndex": 69
- },
- {
- "codeId": "B02get127#gridaddress",
- "addressIndex": 70
- },
- {
- "codeId": "B02get148#gridaddress",
- "addressIndex": 71
- },
- {
- "codeId": "B02get169#gridaddress",
- "addressIndex": 72
- },
- {
- "codeId": "B02get190#gridaddress",
- "addressIndex": 73
- },
- {
- "codeId": "D01IDClean",
- "addressIndex": 74
- },
- {
- "codeId": "D02IDClean",
- "addressIndex": 75
- },
- {
- "codeId": "D03IDClean",
- "addressIndex": 76
- },
- {
- "codeId": "D04IDClean",
- "addressIndex": 77
- },
- {
- "codeId": "D05IDClean",
- "addressIndex": 78
- },
- {
- "codeId": "D06IDClean",
- "addressIndex": 79
- },
- {
- "codeId": "A01IDClean",
- "addressIndex": 80
- },
- {
- "codeId": "A02IDClean",
- "addressIndex": 81
- },
- {
- "codeId": "B01IDClean",
- "addressIndex": 82
- },
- {
- "codeId": "B02IDClean",
- "addressIndex": 83
- },
- {
- "codeId": "abort/resumeTasks",
- "addressIndex": 84
- },
- {
- "codeId": "A01SERVETRAVELhome",
- "addressIndex": 85
- },
- {
- "codeId": "A02SERVETRAVELhome",
- "addressIndex": 86
- },
- {
- "codeId": "A01A02travelHoming",
- "addressIndex": 87
- },
- {
- "codeId": "A01halfAutoSelect",
- "addressIndex": 88
- },
- {
- "codeId": "A02halfAutoSelect",
- "addressIndex": 89
- },
- {
- "codeId": "A02abortTasks",
- "addressIndex": 90
- },
- {
- "codeId": "emgHMI",
- "addressIndex": 91
- },
- {
- "codeId": "Scanningmethod",
- "addressIndex": 92
- ]
-}
\ No newline at end of file
diff --git a/UnLoadGlassModule/target/classes/JsonFile/Plcframe.json b/UnLoadGlassModule/target/classes/JsonFile/Plcframe.json
deleted file mode 100644
index c270227..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/Plcframe.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "plcAddressBegin":"DB17.0",
- "plcAddressLenght":"40",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "E01id",
- "addressIndex":"0",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "E01Quest",
- "addressIndex":"16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "E01Reply",
- "addressIndex":"18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "J01Quest",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "J01id",
- "addressIndex":"22",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "J01TurnGo",
- "addressIndex":"38",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
-
-
- ]
-}
diff --git a/UnLoadGlassModule/target/classes/JsonFile/alarm.xlsx b/UnLoadGlassModule/target/classes/JsonFile/alarm.xlsx
deleted file mode 100644
index 50b26dc..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/alarm.xlsx
+++ /dev/null
Binary files differ
diff --git a/UnLoadGlassModule/target/classes/JsonFile/sign.xlsx b/UnLoadGlassModule/target/classes/JsonFile/sign.xlsx
deleted file mode 100644
index 3922301..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/sign.xlsx
+++ /dev/null
Binary files differ
diff --git a/UnLoadGlassModule/target/classes/JsonFile/test.xlsx b/UnLoadGlassModule/target/classes/JsonFile/test.xlsx
deleted file mode 100644
index 9862cf5..0000000
--- a/UnLoadGlassModule/target/classes/JsonFile/test.xlsx
+++ /dev/null
Binary files differ
diff --git a/UnLoadGlassModule/target/classes/application.yml b/UnLoadGlassModule/target/classes/application.yml
deleted file mode 100644
index 328e464..0000000
--- a/UnLoadGlassModule/target/classes/application.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-server:
- port: 8081
- servlet:
- context-path: /mesModuleTools
-
-spring:
- datasource:
- dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- hangzhoumes:
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
index e94af33..56b0c56 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
+import java.util.function.Supplier;
@Slf4j
public class Plcdownglass extends Thread {
@@ -27,9 +28,13 @@
@Autowired
private DownStorageCageService downStorageCageService;
@Autowired
- private DownWorkstationService downWorkstationService;
+ private DownWorkstationService downWorkstationService;
-
+// private final Supplier<DownWorkstationService> plcServiceSupplier;
+//
+// public Plcdownglass() {
+// this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+// }
@@ -39,10 +44,12 @@
JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(100);
-
- String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
- String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
-
+ downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+ downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
+ // String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
+// String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + "";
+ String result ="1";
+ String number ="1";
// 杩涚墖璇锋眰
if (RESULT_IN.equals(result)) {
downStorageCageService.processInto(number);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
index bd213d8..d2755ae 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
@@ -1,5 +1,6 @@
package com.mes.config;
+import com.mes.common.Plcdownglass;
import com.mes.common.Plchome;
import com.mes.device.PLCAutoMes;
import org.springframework.boot.ApplicationArguments;
@@ -18,7 +19,7 @@
//
System.out.println("鍚姩瀹屾垚");
-
+ //new Plcdownglass().start();
// new PLCAutoMes().start();
//
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
index 7450c30..d10f370 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
@@ -7,11 +7,6 @@
@Repository
public interface DownGlassInfoMapper extends BaseMapper<DownGlassInfo> {
-// @Select("SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId} LIMIT 1")
-// Integer getMaxSequenceByFlowCardId(@Param("flowCardId") String flowCardId);
-////
-// @Delete("delete from down_glass_task where flow_card_id = #{flowCardId}")
-// void deletetask(@Param("flowCardId") String flowCardId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
index 9ecb854..390db66 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
@@ -19,7 +19,7 @@
void updateTaskStateToZero(long id);
- void deleteTask(long id);
+ void deleteTask(String id);
DownGlassTask selectLastOutCacheInfo(String endCell);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index 78ebd5c..7c72877 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -39,9 +39,9 @@
}
@Override
- public void deleteTask(long id) {
+ public void deleteTask(String id) {
LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(DownGlassTask::getId, id);
+ queryWrapper.eq(DownGlassTask::getFlowCardId, id);
baseMapper.delete(queryWrapper);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
index 7418618..5f6b04d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
@@ -18,53 +18,5 @@
*/
@Mapper
public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> {
-//
-// @Select("select * from `glass_info` where id=#{id}")
-// GlassInfo SelectGlassId(String id);
- // 鏌ヨ绗煎瓙鍐呯┖闂�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
- List<DownStorageCageDetails> SelectCacheLeisure();
-
- // 鏌ヨ绗﹀悎宸ヤ綅鐨勫嚭鐗囩幓鐠�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN #{start} and #{end} order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectCacheOut(int start,int end);
-//SELECT* from (SELECT DISTINCT escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN 1 and 5 order by escd.tempering_layout_id,escd.tempering_feed_sequence) as cc ORDER BY cc.width desc
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
- List<DownStorageCageDetails> SelectCachInfo();
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null and escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
- double width);
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
- List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
-
-// // 鏌ヨ鍏ㄩ儴浠诲姟
-// @Select("select * from down_glass_task")
-// List<DownGlassTask> SelectCacheInfoAll();
-//
-// // 鏌ヨ杩涚墖浠诲姟
-// @Select("select * from down_glass_task where task_type='1' and task_stauts='0'")
-// List<DownGlassTask> SelectInputCacheInfo();
-//
-// // 鏌ヨ鍑虹墖浠诲姟
-// @Select("select * from down_glass_task where task_type='2' and task_stauts='0'")
-// List<DownGlassTask> SelectOutCacheInfo();
-
- // 鏌ヨ A06 鎴� A11 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
-// @Select("select * from down_glass_task where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
-// GlassInfo SelectLastOutCacheInfo(String EndCell);
-
- // 淇敼绗煎瓙鍐呬俊鎭�
-// @Update("update")
-// Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
-
- // 娣诲姞涓嬬墖浠诲姟
- @Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)")
- Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId);
-
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index c07e1dc..e91289e 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -219,6 +219,20 @@
+ public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) {
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(glassInfo.getId());
+ downGlassTask.setStartCell(startCell);
+ downGlassTask.setTaskType(taskType);
+ downGlassTask.setEndCell(endCell);
+ downGlassTask.setWidth(glassInfo.getWidth());
+ downGlassTask.setHeight(glassInfo.getHeight());
+ downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
+ downGlassTask.setThickness(glassInfo.getThickness());
+ downGlassTask.setFlowCardId(glassInfo.getFlowcardId());
+
+ return downGlassTask;
+ }
@@ -227,7 +241,7 @@
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
//鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
@@ -240,19 +254,11 @@
//selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
- DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(GlassInfo.getId());
- downGlassTask.setStartCell("0");
- downGlassTask.setTaskType("1");
- downGlassTask.setEndCell(item.getSlot()+"");
- downGlassTask.setWidth(GlassInfo.getWidth());
- downGlassTask.setHeight(GlassInfo.getHeight());
- downGlassTask.setFilmsid(GlassInfo.getFilmsid()+"");
- downGlassTask.setThickness(GlassInfo.getThickness());
- downGlassTask.setFlowCardId(GlassInfo.getFlowcardId());
+ DownGlassTask downGlassTask = createDownGlassTask(GlassInfo,"0",item.getSlot()+"","1");
+
downGlassTaskService.insertCacheTask(downGlassTask);
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
//瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
index adb87cf..0787b09 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
@@ -4,6 +4,10 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+//import javax.persistence.Id;
import java.io.Serializable;
@@ -25,6 +29,11 @@
* id
*/
@TableId(value = "id", type = IdType.AUTO)
+
+
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
index 29165dd..e25d9c8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
@@ -27,50 +27,4 @@
public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> {
- //鏌ヨ宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
- @Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1")
- List<DownWorkstation> selectdownWorkstationstate();
-
-
-// @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;")
-// List<DownGlassTask> selectunloadingtaskstate();
- //鏇存柊钀芥灦鏁伴噺
-// @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
-// "WHERE flow_card_id = #{flowCardId}")
-// void update_racks_number(@Param("flowCardId") String flowCardId,
-// @Param("racksNumber") Integer racksNumber);
-
- //鎻掑叆鏈烘浠诲姟琛�
-// @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
-// "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
-// void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
-
- //鏍规嵁宸ヤ綅id鏇存柊瀹炰綋绫绘帴鏀剁殑鏁版嵁
-// @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
-// void updateFlowCardId(DownWorkstation downWorkstation);
-
-
-// @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
-// void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
-
-
-// @Select("SELECT * FROM down_workstation WHERE workstation_id BETWEEN #{startId} AND #{endId}")
-// List<DownWorkstation> getDownWorkstationsInRange(@Param("startId") int startId, @Param("endId") int endId);
-
-
-// @Select("SELECT DISTINCT flowcard_id from glass_info")
-// @ResultType(Map.class)
-// List<Map<String, Object>> getflowCardId();
-
-// @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
-// void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
-
- // 鑾峰彇鎬绘暟閲�
-// @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
-// int getTotalQuantity(@Param("workstationId") int workstationId);
-
- // 鑾峰彇钀芥灦鏁伴噺
-// @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
-// int getRacksNumber(@Param("workstationId") int workstationId);
-
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
index b9209fc..3cdda74 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
@@ -1,5 +1,6 @@
package com.mes.downworkstation.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
@@ -14,6 +15,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@DS("salve_hangzhoumes")
public interface DownWorkstationTaskMapper extends BaseMapper<DownWorkstationTask> {
List<DownWorkstationTask> selectList();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
index 94a7f16..887f165 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
@@ -4,6 +4,8 @@
import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downworkstation.entity.DownWorkstationTask;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -16,4 +18,6 @@
void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
void updateTaskStateToZero(long Id);
+
+ List<DownWorkstationTask> getTaskState();
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index aa44374..d66fe52 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -32,7 +32,7 @@
@Autowired
private DownGlassTaskService downGlassTaskService;
-
+
@Autowired
private DownWorkstationTaskService downWorkstationTaskService;
@@ -117,6 +117,14 @@
+ public DownWorkstation selectByFlowCardId(String flowcardid) {
+ QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("flow_card_id", flowcardid);
+
+ return baseMapper.selectOne(queryWrapper);
+ }
+
+
@@ -159,7 +167,7 @@
Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
// 鍒濆鍖栭『搴忓瓧娈靛��
int sequence = maxSequence != null ? maxSequence + 1 : 1;
-
+// newdownGlassInfo.setId(downGlassInfo.getId());
newdownGlassInfo.setWidth(downGlassInfo.getWidth());
newdownGlassInfo.setHeight(downGlassInfo.getHeight());
newdownGlassInfo.setThickness(downGlassInfo.getThickness());
@@ -174,6 +182,8 @@
downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
//鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
+ //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
+ downGlassTaskService.deleteTask(downGlassInfo.getFlowCardId());
sequence++; // 閫掑椤哄簭瀛楁鍊�
@@ -186,17 +196,18 @@
try {
//鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
- List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
+ List<DownWorkstationTask> taskdownWorkstation = downWorkstationTaskService.getTaskState();
if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
//锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- for (DownWorkstation downWorkstation : taskdownWorkstation) {
+ for (DownWorkstationTask downWorkstation : taskdownWorkstation) {
//鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
- updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
+ DownWorkstation downWorkstation1 = selectByFlowCardId(downWorkstation.getFlowCardId());
+ updateracksnumber(downWorkstation.getFlowCardId(),downWorkstation1.getRacksnumber() + 1);
//鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
+ //鍒犻櫎鏈烘浠诲姟琛�
+ downWorkstationTaskService.removeById(downWorkstation.getId());
- //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- downGlassTaskService.deleteTask(downWorkstation.getId());
}
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
index 4c81b4e..1e67462 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
@@ -1,12 +1,16 @@
package com.mes.downworkstation.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationTaskService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -22,6 +26,12 @@
public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) {
DownWorkstationTask entity = new DownWorkstationTask();
+ // 鏌ヨ褰撳墠鏈�澶х殑 id 鍊�
+ Long maxId = getMaxId();
+ // 濡傛灉娌℃湁璁板綍锛屽垯灏� id 璁剧疆涓� 1锛涘惁鍒欙紝灏� id 璁剧疆涓哄綋鍓嶆渶澶� id 鍊煎姞 1
+ Long newId = (maxId == null) ? 1 : maxId + 1;
+
+ entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id
entity.setFlowCardId(downGlassInfo.getFlowCardId());
entity.setWidth(downGlassInfo.getWidth());
entity.setHeight(downGlassInfo.getHeight());
@@ -32,6 +42,29 @@
baseMapper.insert(entity);
}
+
+
+
+// 鏌ヨ鏈�澶х殑 ID
+ private Long getMaxId() {
+ QueryWrapper<DownWorkstationTask> wrapper = new QueryWrapper<>();
+ wrapper.select("MAX(id) as max_id");
+ List<Object> list = baseMapper.selectObjs(wrapper);
+ if (list != null && !list.isEmpty()) {
+ Object obj = list.get(0);
+ if (obj != null) {
+ return Long.parseLong(obj.toString());
+ }
+ }
+ // 濡傛灉娌℃湁鏌ヨ鍒扮粨鏋滐紝鍒欒繑鍥� 0
+ return 0L;
+ }
+ @Override
+ public List<DownWorkstationTask> getTaskState() {
+ QueryWrapper<DownWorkstationTask> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("state", 1);
+ return baseMapper.selectList(queryWrapper);
+ }
@Override
public void updateTaskStateToZero(long id) {
UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index dc023ed..9af1d08 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -1,6 +1,7 @@
package com.mes.glassinfo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -30,6 +31,7 @@
/**
* 娴佺▼鍗�
*/
+ @TableField("flow_card_Id")
private String flowcardId;
/**
@@ -120,7 +122,7 @@
/**
* 宸ョ▼鍙�
*/
- private Integer engineerId;
+ private String engineerId;
/**
* 鐢熶骇瑙勫垯id
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
index 7f5b32c..27d9263 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
@@ -16,10 +16,5 @@
public interface GlassInfoMapper extends BaseMapper<GlassInfo> {
-// @Select("SELECT COUNT(*) FROM glass_info WHERE flowcard_id = #{flowCardId}")
-// int getGlassInfoCountByFlowCardId(@Param("flowCardId") String flowCardId);
-
-// @Update("UPDATE down_workstation SET total_quantity = #{glassInfoCount},flow_card_id=#{flowCardId} WHERE workstation_id = #{workstationId}")
-// int updateFlowCardIdAndCount(@Param("flowCardId") String flowCardId, @Param("glassInfoCount") int glassInfoCount,@Param("workstationId")int workstationId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index 82dae46..d0ea64c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -47,7 +47,7 @@
@Override
public GlassInfo selectGlassId(String id) {
QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", id);
+ queryWrapper.eq("glass_id", id);
return baseMapper.selectOne(queryWrapper);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/com/mes/downworkstation/service/DownWorkstationServiceTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/com/mes/downworkstation/service/DownWorkstationServiceTest.java
new file mode 100644
index 0000000..ac7d50d
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/com/mes/downworkstation/service/DownWorkstationServiceTest.java
@@ -0,0 +1,9 @@
+package com.mes.downworkstation.service;
+
+import junit.framework.TestCase;
+
+public class DownWorkstationServiceTest extends TestCase {
+
+ public void testUpdateFlowCardIdAndCount() {
+ }
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index f64b4b3..a3074f4 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -4,6 +4,8 @@
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;
+import com.mes.downworkstation.service.DownWorkstationService;
+import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +29,8 @@
@Autowired
DownStorageCageServiceImpl downStorageCageServiceImpl;
+ @Autowired
+ DownWorkstationServiceImpl downWorkstationServiceImpl;
@Test
public void testFindPath() {
@@ -35,20 +39,36 @@
@Test
public void testCacheGlass() {
- List<Map> map= downStorageCageServiceImpl.getCacheInfo();
+ List<Map> map = downStorageCageServiceImpl.getCacheInfo();
log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
}
+
@Test
public void testselectCacheEmpty() {
- List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheLeisure();
+ List<DownStorageCageDetails> map = downStorageCageServiceImpl.getCacheLeisure();
log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
}
@Test
public void testgetCacheOut() {
- List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheOut(1,5);
+ List<DownStorageCageDetails> map = downStorageCageServiceImpl.getCacheOut(1, 5);
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗囷細{}", Arrays.asList(map));
}
-}
+
+ @Test
+ public void testupdateFlowCardIdAndCount() {
+ log.info("缁戝畾娴佺▼鍗″彿鍜屾暟閲�");
+ downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1);
+
+ }
+
+ @Test
+ public void testplc() {
+ log.info("娴嬭瘯");
+ downWorkstationServiceImpl.insertdownglassinfo();
+
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.8.0