From 44051709072ff59407c9ce4592abe15d76c6128d Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 19 四月 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java | 8
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 54 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 5
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageMapper.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 9
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 13
hangzhoumesParent/moduleService/LoadGlassModule/pom.xml | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java | 18
hangzhoumesParent/gateway/pom.xml | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java | 47 -
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 17
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 12
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java | 5
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 11
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 118 ++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 28
hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml | 7
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 3
hangzhoumesParent/moduleService/pom.xml | 11
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 27 +
hangzhoumesParent/moduleService/CacheGlassModule/pom.xml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 28 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java | 126 ++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java | 98 ++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 3
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 349 +++++++++++---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 12
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 25
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 6
hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml | 1
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 27
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java | 2
hangzhoumesParent/common/servicebase/pom.xml | 8
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 29
hangzhoumesParent/common/pom.xml | 11
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 8
hangzhoumesParent/pom.xml | 1
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 18
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 8
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 14
/dev/null | 20
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 12
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 18
hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml | 6
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeLayoutController.java | 2
hangzhoumesParent/common/springsecurity/pom.xml | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java | 6
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 33 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 41
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java | 20
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 22
64 files changed, 976 insertions(+), 414 deletions(-)
diff --git a/CacheVerticalGlassModule/.vs/CacheVerticalGlassModule/v16/.suo b/CacheVerticalGlassModule/.vs/CacheVerticalGlassModule/v16/.suo
deleted file mode 100644
index 83013ee..0000000
--- a/CacheVerticalGlassModule/.vs/CacheVerticalGlassModule/v16/.suo
+++ /dev/null
Binary files differ
diff --git a/CacheVerticalGlassModule/.vs/ProjectSettings.json b/CacheVerticalGlassModule/.vs/ProjectSettings.json
deleted file mode 100644
index f8b4888..0000000
--- a/CacheVerticalGlassModule/.vs/ProjectSettings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "CurrentProjectSetting": null
-}
\ No newline at end of file
diff --git a/CacheVerticalGlassModule/.vs/VSWorkspaceState.json b/CacheVerticalGlassModule/.vs/VSWorkspaceState.json
deleted file mode 100644
index 6b61141..0000000
--- a/CacheVerticalGlassModule/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "ExpandedNodes": [
- ""
- ],
- "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/CacheVerticalGlassModule/.vs/slnx.sqlite b/CacheVerticalGlassModule/.vs/slnx.sqlite
deleted file mode 100644
index 308d5b9..0000000
--- a/CacheVerticalGlassModule/.vs/slnx.sqlite
+++ /dev/null
Binary files differ
diff --git a/CacheVerticalGlassModule/pom.xml b/CacheVerticalGlassModule/pom.xml
deleted file mode 100644
index 721b5b5..0000000
--- a/CacheVerticalGlassModule/pom.xml
+++ /dev/null
@@ -1,177 +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-Module</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>MES-Module</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>
-
-<!--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>
-
- </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/CacheVerticalGlassModule/src/main/java/com/mes/MesApplication.java b/CacheVerticalGlassModule/src/main/java/com/mes/MesApplication.java
deleted file mode 100644
index fc44d4a..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/MesApplication.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mes;
-
-import com.mes.common.PlcTools.S7object;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.transaction.annotation.Transactional;
-
-//springboot 鍚姩鍏ュ彛
-@SpringBootApplication
-@EnableCaching
-@EnableTransactionManagement//浜嬪姟娉ㄨВ
-//@Transactional//鍦╯ervice閲岄潰鏈夊琛ㄦ搷浣滐紝寮�鍚簨鍔℃敞瑙�
-public class MesApplication {
- public static void main(String[] args) {
- SpringApplication.run(MesApplication.class, args);
- try {
- //new NettyServer(12345).start();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/common/CacheUtil.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/CacheUtil.java
deleted file mode 100644
index df5af14..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/common/Constants.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/Constants.java
deleted file mode 100644
index 9e591db..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcStorageCage.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcStorageCage.java
deleted file mode 100644
index bbd3ccd..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcStorageCage.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mes.common;
-
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.BigStorageCage;
-import com.mes.entity.BigStorageCageDetails;
-import com.mes.service.BigStorageCageService;
-
-public class PlcStorageCage extends Thread {
- private BigStorageCageService bigStorageCageService;
- private S7control s7control;
- public void run() {
- try {
- Thread.sleep(1000);
- String glassid="11111";
- String tempering_layout_id="123";
- String tempering_feed_sequence="123";
-
- //璇嗗埆鍙�
- //鑾峰彇璇嗗埆鍙拌姹�
- //鏍规嵁璇锋眰鐨勭幓鐠僫d浠庢秷鎭┖闂寸珯鑾峰彇鐜荤拑淇℃伅
-
- //妫�娴嬭瘑鍒彴鏄惁鏈夌幓鐠�
- //鏈夛細鍏佽娓呮礂鏈哄嚭鐗囦俊鍙峰叧闂�
- //鏃狅細鍏佽娓呮礂鏈哄嚭鐗囦俊鎭紑鍚�
-
- //鑾峰彇杩涚墖璇锋眰
- //鏈夎姹傛椂
- //鑾峰彇璇锋眰鐨勭幓鐠僫d
- //鏍规嵁鐜荤拑id鑾峰彇鐜荤拑淇℃伅鍒ゆ柇鏄惁涓庢秷鎭槦鍒椾竴鑷�
- //涓嶄竴鑷达細鏍囪鐜荤拑涓虹牬鎹�
- //涓�鑷达細
- //鑾峰彇绗煎唴杩涚墖渚х浉鍚屽悓閽㈠寲鐗堝浘鐨勭幓鐠冪墖搴�+1绛変簬褰撳墠鐜荤拑id閽㈠寲鐗囧簭鐨勬牸瀛�
-
- //灏嗘秷鎭槦鍒楃殑淇℃伅鏀惧叆瀹炰緥涓�
- BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
-
- bigStorageCageDetails.setGlassId("1111");
- bigStorageCageDetails.setTemperingLayoutId(123);
- bigStorageCageDetails.setTemperingFeedSequence(3);
- BigStorageCageDetails SlotInfo=bigStorageCageService.FeedGlass(bigStorageCageDetails);
-
- //鍙戦�佺粰plc
-
- //鍑虹墖璇锋眰
- //鑾峰彇褰撳墠
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
deleted file mode 100644
index 9cc9e37..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
+++ /dev/null
@@ -1,413 +0,0 @@
-package com.mes.common.PlcTools;
-
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-public class S7control {
-
- S7PLC s7PLC; // PLC閫氳绫诲疄渚�
-
- public S7control(EPlcType plcType, String ip, int port, int rack, int slot) {
- if (s7PLC == null)
- s7PLC = new S7PLC(plcType, ip, port,0,0);
- }
- /**
- * 鍏抽棴瑗块棬瀛恠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;
-}
-
-
-//涓嶈繛缁湴鍧�鍐欏叆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);
- 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;
- }
-
- };
-
-
-
- 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/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
deleted file mode 100644
index 16bd1de..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-
-public class S7object {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.1"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object instance = null;
-
- private S7object() {
- if (plccontrol == null)
- plccontrol = new S7control(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object getinstance() {
- if (instance == null) {
- synchronized (S7object.class) {
- if (instance == null)
- instance = new S7object();
- }
- }
- return instance;
- }
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
deleted file mode 100644
index 4ed72d6..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-
-public class S7object2 {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.2"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object2 instance = null;
-
- private S7object2() {
- if (plccontrol == null)
- plccontrol = new S7control(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object2 getinstance() {
- if (instance == null) {
- synchronized (S7object2.class) {
- if (instance == null)
- instance = new S7object2();
- }
- }
- return instance;
- }
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/common/Result.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/Result.java
deleted file mode 100644
index 654546b..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java b/CacheVerticalGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
deleted file mode 100644
index 43104f9..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java b/CacheVerticalGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
deleted file mode 100644
index 777123b..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.config;
-
-
-import com.mes.*;
-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("鍚姩瀹屾垚2");
-
-
- }
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/config/InterceptorConfig.java b/CacheVerticalGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
deleted file mode 100644
index 43bfcc7..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/config/MyCorsConfig.java b/CacheVerticalGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
deleted file mode 100644
index 9cb413e..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java b/CacheVerticalGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
deleted file mode 100644
index d14faae..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/config/SwaggerConfig.java b/CacheVerticalGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
deleted file mode 100644
index 7ccbf7e..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/config/WebSocketConfig.java b/CacheVerticalGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
deleted file mode 100644
index 1902638..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java b/CacheVerticalGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
deleted file mode 100644
index 05a2545..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java b/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
deleted file mode 100644
index 6eee09a..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java b/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
deleted file mode 100644
index e7247fe..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java b/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
deleted file mode 100644
index 9a8eea0..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
+++ /dev/null
@@ -1,58 +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.controller.dto.UserDTO;
-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/CacheVerticalGlassModule/src/main/java/com/mes/entity/BigStorageCage.java b/CacheVerticalGlassModule/src/main/java/com/mes/entity/BigStorageCage.java
deleted file mode 100644
index 20d0572..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/entity/BigStorageCage.java
+++ /dev/null
@@ -1,45 +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;
-
-/**
- * big_storage_cage澶х悊鐗囩琛ㄥ疄浣撶被
- */
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("big_storage_cage")
-public class BigStorageCage {
-
- /**
- * 涓婚敭锛岃嚜鍔ㄩ�掑
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 璁惧id
- */
- private Integer deviceId;
-
- /**
- * 鏍呮牸鍙�
- */
- private String slot;
-
- /**
- * 鍚敤鐘舵��
- */
- private String enableState;
-
- /**
- * 鍓╀綑瀹藉害
- */
- private Integer remainWidth;
-
- /**
- * 鐞嗙墖绗艰鎯�
- */
- private BigStorageCageDetails bigStorageCageDetail;
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java b/CacheVerticalGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java
deleted file mode 100644
index 6da257a..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java
+++ /dev/null
@@ -1,87 +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;
-
-/**
- * big_storage_cage_details澶х悊鐗囩璇︽儏琛ㄥ疄浣撶被
- */
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("big_storage_cage_details")
-public class BigStorageCageDetails {
- /**
- * 琛ㄤ富閿紝鑷姩閫掑
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 璁惧id
- */
- private Integer deviceId;
-
- /**
- * 鏍呮牸鍙�
- */
- private Integer slot;
-
- /**
- * 鐜荤拑id
- */
- private String glassId;
-
- /**
- * 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
- */
- private Integer sequence;
-
- /**
- * 娴佺▼鍗″彿
- */
- private String flowCardId;
-
- /**
- * 鐜荤拑绫诲瀷
- */
- private Integer glassType;
-
- /**
- * 瀹�
- */
- private Double width;
-
- /**
- * 楂�
- */
- private Double height;
-
- /**
- * 鍘氬害
- */
- private Double thickness;
-
- /**
- * 閽㈠寲鐗堝浘id
- */
- private Integer temperingLayoutId;
-
- /**
- * 閽㈠寲鐗堝浘鐗囧簭
- */
- private Integer temperingFeedSequence;
-
- /**
- * 鐘舵��
- */
- private Integer state;
-
- /**
- * 鐜荤拑闂撮殭
- */
- private Integer gap;
-
-
-
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java b/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
deleted file mode 100644
index d756660..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java b/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
deleted file mode 100644
index 5d0a881..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java b/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
deleted file mode 100644
index 9dc4f03..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/User.java b/CacheVerticalGlassModule/src/main/java/com/mes/entity/userInfo/User.java
deleted file mode 100644
index 216d340..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java b/CacheVerticalGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
deleted file mode 100644
index f4ee632..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/exception/ServiceException.java b/CacheVerticalGlassModule/src/main/java/com/mes/exception/ServiceException.java
deleted file mode 100644
index 92b6196..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/mapper/BigStorageCageMapper.java b/CacheVerticalGlassModule/src/main/java/com/mes/mapper/BigStorageCageMapper.java
deleted file mode 100644
index 1b70c97..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/mapper/BigStorageCageMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.repository.CrudRepository;
-
-import com.mes.entity.BigStorageCage;
-import com.mes.entity.BigStorageCageDetails;
-
-@Mapper
-public interface BigStorageCageMapper extends CrudRepository<BigStorageCage,Long>{
-// public class BigStorageCageMapper {
-
- BigStorageCageDetails SelectTemperingFeedSlot(@Param("bigStorageCageDetails") BigStorageCageDetails bigStorageCageDetails);
-
- BigStorageCageDetails SelectEmptyFeedSlot();
-
-
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java b/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
deleted file mode 100644
index ce86b42..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java b/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
deleted file mode 100644
index 0bf0923..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mes.mapper.userInfo;
-
-import com.mes.entity.userInfo.SysMenuItem;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SysMenuItemMapper {
-
- List<SysMenuItem> findAll() ;
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java b/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
deleted file mode 100644
index 1c9baf4..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
deleted file mode 100644
index a2bf58d..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.mapper.userInfo;
-
-
-import com.mes.controller.dto.UserDTO;
-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/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java b/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java
deleted file mode 100644
index 5c39505..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mes.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.mes.entity.*;
-import com.mes.mapper.BigStorageCageMapper;
-
-@Service
-public class BigStorageCageService {
-
- // private BigStorageCageMapper bigStorageCageMapper;
-
- // 鑾峰彇鐜荤拑瀛樻斁鏍煎瓙
- public BigStorageCageDetails FeedGlass(BigStorageCageDetails bigStorageCageDetails) {
- //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
- BigStorageCageDetails LayoutSlotInfo=bigStorageCageMapper.SelectTemperingFeedSlot(bigStorageCageDetails);
- //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
- if (LayoutSlotInfo!=null) {
- //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
- bigStorageCageDetails.setSlot(LayoutSlotInfo.getSlot());
- }else{
- //鑾峰彇涓嶅埌鏃讹細
-
- //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
- BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
- bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
- //鑾峰彇鍏朵粬绗兼牸瀛�-
-
- //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
-
- }
-
- UpdateRemainWidth(bigStorageCageDetails.getSlot());
- return bigStorageCageDetails;
- }
-
- //淇敼鏍煎瓙鍓╀綑瀹藉害
- private void UpdateRemainWidth(int Slot){
- //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
-
- //淇敼鏍煎瓙鍓╀綑瀹藉害
- BigStorageCageMapper.UpdateRemainWidth(Slot);
- }
-
-
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java b/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
deleted file mode 100644
index 004399b..0000000
--- a/CacheVerticalGlassModule/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("user_info")
-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/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java b/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
deleted file mode 100644
index 6efd838..0000000
--- a/CacheVerticalGlassModule/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("user_info")
-public class SysMenuItemService {
- @Autowired
- SysMenuItemMapper sysMenuItemMapper;
- public List<SysMenuItem> getMenuItem() {
- return sysMenuItemMapper.findAll();
- }
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java b/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
deleted file mode 100644
index 278b057..0000000
--- a/CacheVerticalGlassModule/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("user_info")
-public class SysMenuService {
- @Autowired
- private SysMenuMapper sysMenuMapper;
-
- public List<SysMenu> getMenu(){
-
- return sysMenuMapper.findAll();
- }
-}
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/UserService.java b/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
deleted file mode 100644
index 08fb8dd..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mes.service.userInfo;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.CacheUtil;
-import com.mes.common.Result;
-import com.mes.entity.userInfo.User;
-import com.mes.mapper.userInfo.UserMapper;
-import com.mes.controller.dto.UserDTO;
-import com.mes.tools.TokenTools;
-import org.apache.ibatis.jdbc.Null;
-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;
-
-import java.util.List;
-
-@Service
-@DS("user_info")
-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/CacheVerticalGlassModule/src/main/java/com/mes/tools/TokenTools.java b/CacheVerticalGlassModule/src/main/java/com/mes/tools/TokenTools.java
deleted file mode 100644
index 1cb6dc2..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/src/main/java/com/mes/tools/WebSocketServer.java b/CacheVerticalGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
deleted file mode 100644
index c14c54f..0000000
--- a/CacheVerticalGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.mes.tools;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
-
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-
-@ServerEndpoint(value = "/api/talk/{username}")
-@Component
-public class WebSocketServer {
-
- // @Autowired
- // HomeMapper homeMapper;
-
- 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/CacheVerticalGlassModule/src/main/resources/application.yml b/CacheVerticalGlassModule/src/main/resources/application.yml
deleted file mode 100644
index 887dcc8..0000000
--- a/CacheVerticalGlassModule/src/main/resources/application.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-server:
- port: 8080
- servlet:
- context-path: /mesModuleTools
-
-spring:
- datasource:
- dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- user_info:
- url: jdbc:mysql://10.153.19.150:3306/erp_user_info?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/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCage.xml b/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCage.xml
deleted file mode 100644
index 7e800ef..0000000
--- a/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCage.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.mess.mapper.BigStorageCageMapper">
- <!-- <resultMap id="BigStorageCage" type="com.example.mes.entity.BigStorageCage" >
- <id column="id" property="id"/>
- <result column="device_id" property="deviceId"/>
- <result column="slot" property="slot"/>
- <result column="enable_state" property="enableState"/>
- <result column="remain_width" property="remainWidth"/>
-
- <result column="glass_id" property="bigStorageCageDetail.glassId"/>
- <result column="sequence" property="bigStorageCageDetail.sequence"/>
- <result column="flow_card_id" property="bigStorageCageDetail.flowCardId"/>
- <result column="glass_type" property="bigStorageCageDetail.glassType"/>
- <result column="width" property="bigStorageCageDetail.width"/>
- <result column="height" property="bigStorageCageDetail.height"/>
- <result column="thickness" property="bigStorageCageDetail.thickness"/>
- <result column="tempering_layout_id" property="bigStorageCageDetail.temperingLayoutId"/>
- <result column="tempering_feed_sequence" property="bigStorageCageDetail.temperingFeedSequence"/>
- <result column="state" property="bigStorageCageDetail.state"/>
- <result column="gap" property="bigStorageCageDetail.gap"/>
- </resultMap>
-
- <resultMap id="BigStorageCageDetails" type="com.example.mes.entity.BigStorageCageDetails" >
- <id column="id" property="id"/>
- <result column="device_id" property="deviceId"/>
- <result column="slot" property="slot"/>
- <result column="glass_id" property="glassId"/>
- <result column="sequence" property="sequence"/>
- <result column="flow_card_id" property="flowCardId"/>
- <result column="glass_type" property="glassType"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="thickness" property="thickness"/>
- <result column="tempering_layout_id" property="temperingLayoutId"/>
- <result column="tempering_feed_sequence" property="temperingFeedSequence"/>
- <result column="state" property="state"/>
- <result column="gap" property="gap"/>
- </resultMap>
-
- <select id="SelectTemperingFeedSlot" resultMap="BigStorageCageDetails">
- select * from big_storage_cage bsc inner join big_storage_cage_details as bscd on bsc.slot=bscd.slot
- <where>
- and bscd.id=(select id from big_storage_cage_details where slot=bscd.slot
- and tempering_feed_sequence=#{bigStorageCageDetails.temperingFeedSequence}-1
- and bsc.remain_width>#{bigStorageCageDetails.width}
- ORDER BY sequence desc LIMIT 1)
- </where>
- </select>
-
- <select id="SelectStorageCageSummary" resultMap="BigStorageCageDetails">
- select min(case when bsc.remain_width=5000 then bsc.id else null end ) as id,bsc.device_id,
- min(case when bsc.remain_width=5000 then bsc.slot else null end ) as slot,
- count(distinct bscd.tempering_layout_id) as tempering_layout_ids
- from big_storage_cage bsc left join big_storage_cage_details bscd on bsc.slot=bscd.slot
- <where>
- and bsc.enable_state=0
- </where>
- group by bsc.device_id
- order by tempering_layout_ids,bsc.device_id limit 1
- </select> -->
-
-</mapper>
\ No newline at end of file
diff --git a/CacheVerticalGlassModule/src/test/java/com/mes/MesApplicationTests.java b/CacheVerticalGlassModule/src/test/java/com/mes/MesApplicationTests.java
deleted file mode 100644
index 59327a7..0000000
--- a/CacheVerticalGlassModule/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/CacheVerticalGlassModule/target/classes/application.yml b/CacheVerticalGlassModule/target/classes/application.yml
deleted file mode 100644
index d74069d..0000000
--- a/CacheVerticalGlassModule/target/classes/application.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-server:
- port: 8080
- servlet:
- context-path: /mesModuleTools
-
-spring:
- datasource:
- dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
- strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
- datasource:
- user_info:
- url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- sd:
- url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- mm:
- url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://10.153.19.150:3306/pp?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/CacheVerticalGlassModule/target/classes/mapper/BigStorageCage.xml b/CacheVerticalGlassModule/target/classes/mapper/BigStorageCage.xml
deleted file mode 100644
index 7e800ef..0000000
--- a/CacheVerticalGlassModule/target/classes/mapper/BigStorageCage.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.mess.mapper.BigStorageCageMapper">
- <!-- <resultMap id="BigStorageCage" type="com.example.mes.entity.BigStorageCage" >
- <id column="id" property="id"/>
- <result column="device_id" property="deviceId"/>
- <result column="slot" property="slot"/>
- <result column="enable_state" property="enableState"/>
- <result column="remain_width" property="remainWidth"/>
-
- <result column="glass_id" property="bigStorageCageDetail.glassId"/>
- <result column="sequence" property="bigStorageCageDetail.sequence"/>
- <result column="flow_card_id" property="bigStorageCageDetail.flowCardId"/>
- <result column="glass_type" property="bigStorageCageDetail.glassType"/>
- <result column="width" property="bigStorageCageDetail.width"/>
- <result column="height" property="bigStorageCageDetail.height"/>
- <result column="thickness" property="bigStorageCageDetail.thickness"/>
- <result column="tempering_layout_id" property="bigStorageCageDetail.temperingLayoutId"/>
- <result column="tempering_feed_sequence" property="bigStorageCageDetail.temperingFeedSequence"/>
- <result column="state" property="bigStorageCageDetail.state"/>
- <result column="gap" property="bigStorageCageDetail.gap"/>
- </resultMap>
-
- <resultMap id="BigStorageCageDetails" type="com.example.mes.entity.BigStorageCageDetails" >
- <id column="id" property="id"/>
- <result column="device_id" property="deviceId"/>
- <result column="slot" property="slot"/>
- <result column="glass_id" property="glassId"/>
- <result column="sequence" property="sequence"/>
- <result column="flow_card_id" property="flowCardId"/>
- <result column="glass_type" property="glassType"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
- <result column="thickness" property="thickness"/>
- <result column="tempering_layout_id" property="temperingLayoutId"/>
- <result column="tempering_feed_sequence" property="temperingFeedSequence"/>
- <result column="state" property="state"/>
- <result column="gap" property="gap"/>
- </resultMap>
-
- <select id="SelectTemperingFeedSlot" resultMap="BigStorageCageDetails">
- select * from big_storage_cage bsc inner join big_storage_cage_details as bscd on bsc.slot=bscd.slot
- <where>
- and bscd.id=(select id from big_storage_cage_details where slot=bscd.slot
- and tempering_feed_sequence=#{bigStorageCageDetails.temperingFeedSequence}-1
- and bsc.remain_width>#{bigStorageCageDetails.width}
- ORDER BY sequence desc LIMIT 1)
- </where>
- </select>
-
- <select id="SelectStorageCageSummary" resultMap="BigStorageCageDetails">
- select min(case when bsc.remain_width=5000 then bsc.id else null end ) as id,bsc.device_id,
- min(case when bsc.remain_width=5000 then bsc.slot else null end ) as slot,
- count(distinct bscd.tempering_layout_id) as tempering_layout_ids
- from big_storage_cage bsc left join big_storage_cage_details bscd on bsc.slot=bscd.slot
- <where>
- and bsc.enable_state=0
- </where>
- group by bsc.device_id
- order by tempering_layout_ids,bsc.device_id limit 1
- </select> -->
-
-</mapper>
\ No newline at end of file
diff --git a/LoadGlassModule/pom.xml b/LoadGlassModule/pom.xml
deleted file mode 100644
index 721b5b5..0000000
--- a/LoadGlassModule/pom.xml
+++ /dev/null
@@ -1,177 +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-Module</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>MES-Module</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>
-
-<!--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>
-
- </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/LoadGlassModule/src/main/java/com/mes/MesApplication.java b/LoadGlassModule/src/main/java/com/mes/MesApplication.java
deleted file mode 100644
index 0f26687..0000000
--- a/LoadGlassModule/src/main/java/com/mes/MesApplication.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mes;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-
-//springboot 鍚姩鍏ュ彛
-@SpringBootApplication
-@EnableCaching
-@EnableTransactionManagement//浜嬪姟娉ㄨВ
-//@Transactional//鍦╯ervice閲岄潰鏈夊琛ㄦ搷浣滐紝寮�鍚簨鍔℃敞瑙�
-public class MesApplication {
- public static void main(String[] args) {
- SpringApplication.run(MesApplication.class, args);
- try {
- //new NettyServer(12345).start();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/common/CacheUtil.java b/LoadGlassModule/src/main/java/com/mes/common/CacheUtil.java
deleted file mode 100644
index df5af14..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/common/Constants.java b/LoadGlassModule/src/main/java/com/mes/common/Constants.java
deleted file mode 100644
index 9e591db..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java b/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
deleted file mode 100644
index 8ffee41..0000000
--- a/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package com.mes.common.PlcTools;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.sql.Time;
-import java.util.ArrayList;
-import java.util.List;
-
-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 org.apache.ibatis.jdbc.Null;
-
-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 S7control(EPlcType plcType,String ip,int port,int a,int b) {
- if (s7PLC == null)
- s7PLC = new S7PLC(plcType, ip, port,a,b);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- 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;
- }
- }
- public byte[] Readbyte(String address, int count) {
- byte[] byt=new byte[count];
- int wordcount=((count%2==0)?count/2:count+1);
- List<Short> word=ReadWord(address,wordcount);
-
- return byt;
- }
- /**
- * 鎸夋寚瀹氱殑鍦板潃 璇诲彇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;
- }
-
- };
-
-
-
- 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;
- }
- public void writeString(String addr,String data) {
- s7PLC.writeString(addr,data);
- }
-
- public String readStrings(String addr) {
- return s7PLC.readString(addr);
- }
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java b/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
deleted file mode 100644
index 16bd1de..0000000
--- a/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-
-public class S7object {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.1"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object instance = null;
-
- private S7object() {
- if (plccontrol == null)
- plccontrol = new S7control(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object getinstance() {
- if (instance == null) {
- synchronized (S7object.class) {
- if (instance == null)
- instance = new S7object();
- }
- }
- return instance;
- }
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java b/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
deleted file mode 100644
index 4ed72d6..0000000
--- a/LoadGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-
-public class S7object2 {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.2"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object2 instance = null;
-
- private S7object2() {
- if (plccontrol == null)
- plccontrol = new S7control(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object2 getinstance() {
- if (instance == null) {
- synchronized (S7object2.class) {
- if (instance == null)
- instance = new S7object2();
- }
- }
- return instance;
- }
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/common/Result.java b/LoadGlassModule/src/main/java/com/mes/common/Result.java
deleted file mode 100644
index 654546b..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java b/LoadGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
deleted file mode 100644
index 43104f9..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java b/LoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
deleted file mode 100644
index 1e45c2c..0000000
--- a/LoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.config;
-
-
-import com.mes.*;
-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("鍚姩瀹屾垚");
-
-
- }
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/config/InterceptorConfig.java b/LoadGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
deleted file mode 100644
index 43bfcc7..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/config/MyCorsConfig.java b/LoadGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
deleted file mode 100644
index 9cb413e..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java b/LoadGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
deleted file mode 100644
index d14faae..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/config/SwaggerConfig.java b/LoadGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
deleted file mode 100644
index 7ccbf7e..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/config/WebSocketConfig.java b/LoadGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
deleted file mode 100644
index 1902638..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
deleted file mode 100644
index 94397d5..0000000
--- a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.mes.controller;
-import java.util.List;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.mes.common.Result;
-import com.mes.entity.UpWorkstation;
-import com.mes.service.LoadGlassService;
-
-
-@RestController
-@RequestMapping("/LoadGlass")
-
-// TidyUpGlassModule 閽㈠寲妯″潡
-public class LoadGlassController {
-
- @Autowired
- private LoadGlassService loadGlassService;
-
- @PostMapping("/SelectAll") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- @ResponseBody
- public Result SelectGlassInfo() {
- List<UpWorkstation> glass = loadGlassService.selectAll();
- System.out.println(glass);
- return Result.seccess(glass);
- }
-
- @PostMapping("/insertGlass") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
- @ResponseBody
- public void insertGlassinfo(@RequestBody UpWorkstation upwork) {
- loadGlassService.insertGlass(upwork);
-
- }
-
- @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
- @ResponseBody
- public void SelectCutTerritory(int upworkid) {
- loadGlassService.deleteGlass(upworkid);
- }
-
- @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
- @ResponseBody
- public void selectPriority() {
- boolean result = loadGlassService.isCanLoadGlass();
- if(result==true){
- loadGlassService.selectPriority();
- }
- }
-
-
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java b/LoadGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
deleted file mode 100644
index 05a2545..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java b/LoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
deleted file mode 100644
index aab8fb4..0000000
--- a/LoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
+++ /dev/null
@@ -1,26 +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(){
- //鑾峰彇缂撳瓨
- return Result.seccess(sysMenuService.getMenu());
-
- }
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java b/LoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
deleted file mode 100644
index e7247fe..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java b/LoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
deleted file mode 100644
index 9a8eea0..0000000
--- a/LoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
+++ /dev/null
@@ -1,58 +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.controller.dto.UserDTO;
-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/LoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java b/LoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java
deleted file mode 100644
index efd3847..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mes.entity;
-
-import java.math.BigInteger;
-
-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("`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/LoadGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java b/LoadGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java
deleted file mode 100644
index 461e04d..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java
+++ /dev/null
@@ -1,21 +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("`up_patten_usage`")
-public class UpPattenUsage {
- @TableId(type = IdType.AUTO)
- private Integer id;//鍘熺墖浣跨敤鎯呭喌琛╥d
- private Integer engineeringid;//宸ョ▼鍙�
- private Integer filmsid;//鑶滅郴id
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Integer layoutsequence;//鍘熺墖鐗堝浘鐗囧簭
- private Integer state;//鐘舵��
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/UpWorkstation.java b/LoadGlassModule/src/main/java/com/mes/entity/UpWorkstation.java
deleted file mode 100644
index 1f8cb3b..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/UpWorkstation.java
+++ /dev/null
@@ -1,23 +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("`up_workstation`")
-public class UpWorkstation {
- @TableId(type = IdType.AUTO)
- private Integer id;//涓婄墖宸ヤ綅琛╥d
- private Integer workstationid;//宸ヤ綅鍙�
- private Integer deviceid;//璁惧id
- private Integer enablestate;//鍚敤鐘舵��
- private Integer workstate;//宸ヤ綔鐘舵��
- private Double patternwidth;//鍘熺墖瀹�
- private Double patternheigth;//鍘熺墖楂�
- private Double patternthickness;//鍘熺墖鍘氬害
- private Integer filmsid;//鑶滅郴
- private Integer number;//鏁伴噺
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/device/InitUtil.java b/LoadGlassModule/src/main/java/com/mes/entity/device/InitUtil.java
deleted file mode 100644
index 6d59bd3..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/device/InitUtil.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.mes.entity.device;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.mes.common.PlcTools.S7control;
-
-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, 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);
- }
-
-
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java b/LoadGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java
deleted file mode 100644
index dcb707e..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.mes.entity.device;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import static com.mes.entity.device.InitUtil.readAndUpdateWordValues;
-public class PLCAutoMes extends Thread {
-
- // // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- // private Configuration config;
- private static InitUtil initUtil;
- // public static PlcParameterObject PlcMesObject;
- // public static PlcParameterObject PlcReadObject;
- // public static PlcParameterObject PlcframeObject;
-
- // // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
- // MessageHandler customS7Control = new MessageHandler();
-
- // 鍗曚緥瀹炰緥
- private static PLCAutoMes instance;
- // private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
- private static String PlcAlbania = PLCAutoMes.class.getResource("/JsonFile/PlcAlbania.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 PlcParameterObject plcParameterObject = initUtil.initword(PlcParameter);
- // public static PlcBitObject plcPlcTest = initUtil.initbit(PlcTest);
- // public static PlcBitObject plcBitObject = initUtil.initbit(PlcSign);
- // public static PlcParameterObject plcStateObject= initUtil.initword(PlcState);
- // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
- public static PlcParameterObject PlcMesObject = InitUtil.initword(PlcAlbania);
- // public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
- // public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-
- // 绉佹湁鏋勯�犲嚱鏁�
- public PLCAutoMes() throws IOException {
- //config = new Configuration("config.properties");
- 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/LoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java b/LoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
deleted file mode 100644
index 78846f9..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
+++ /dev/null
@@ -1,77 +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/LoadGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java b/LoadGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java
deleted file mode 100644
index 977a13c..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java b/LoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java
deleted file mode 100644
index b4a2051..0000000
--- a/LoadGlassModule/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 ;
- }
- return null;
- }
-
- public int getPlcAddress() {
-
- return addressIndex;
- }
- public String getAddress() {
- return getAddress(this.addressIndex);
- }
-}
\ No newline at end of file
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java b/LoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
deleted file mode 100644
index 5355db5..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
+++ /dev/null
@@ -1,202 +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/LoadGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java b/LoadGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
deleted file mode 100644
index d756660..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java b/LoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
deleted file mode 100644
index 5d0a881..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java b/LoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
deleted file mode 100644
index 9dc4f03..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/entity/userInfo/User.java b/LoadGlassModule/src/main/java/com/mes/entity/userInfo/User.java
deleted file mode 100644
index 216d340..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java b/LoadGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
deleted file mode 100644
index f4ee632..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/exception/ServiceException.java b/LoadGlassModule/src/main/java/com/mes/exception/ServiceException.java
deleted file mode 100644
index 92b6196..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
deleted file mode 100644
index cfcb251..0000000
--- a/LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mes.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.List;
-import org.apache.ibatis.annotations.*;
-import com.mes.entity.UpWorkstation;
-@Mapper
-public interface LoadGlassMapper extends BaseMapper<UpWorkstation> {
- //鏄剧ず鐩墠宸ヤ綅鐜荤拑淇℃伅
- @Select("SELECT * FROM up_workstation")
- List<UpWorkstation> selectALL();
- //鍒犻櫎宸ヤ綅鐨勭幓鐠冧俊鎭�
- @Update("UPDATE `hangzhoumes`.`up_workstation` SET `pattern_width` =NULL, `pattern_heigth` = NULL, `pattern_thickness` = NULL, `films_id` = NULL, `number` = NULL WHERE `workstation_id`=#{id}")
- void deleteGlass(int id );
- //澧炲姞涓婄墖淇℃伅
- @Update ("UPDATE `hangzhoumes`.`up_workstation` SET `pattern_width` = #{upwork.patternwidth}, `pattern_heigth` = #{upwork.patternheigth}, `pattern_thickness` =#{upwork.patternthickness}, `films_id` =#{upwork.filmsid}, `number` = #{upwork.number} WHERE `id` = #{upwork.workstationid}; ")
- void insertGlass(UpWorkstation upwork);
- //鏄惁鍙戣捣鍚哥墖
- @Select("SELECT * FROM up_workstation where workstation_id=#{id}")
- UpWorkstation selectAdd(int id);
- //鍒ゆ柇浼樺厛宸ヤ綅鍚哥墖
- @Select("select b.layout_sequence from up_workstation a left join up_patten_usage b on a.pattern_width=b.width and a.pattern_heigth=b.width and a.pattern_thickness=b.thickness where a.workstation_id=#{id}")
- int selectPriority(int id);
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
deleted file mode 100644
index ce86b42..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
deleted file mode 100644
index 4b42b5f..0000000
--- a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ /dev/null
@@ -1,16 +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.menuId,a.listSort;")
-
-
- List<SysMenuItem> findAll() ;
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
deleted file mode 100644
index 1c9baf4..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
deleted file mode 100644
index a2bf58d..0000000
--- a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.mapper.userInfo;
-
-
-import com.mes.controller.dto.UserDTO;
-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/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
deleted file mode 100644
index 95514e3..0000000
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mes.service;
-import java.util.List;
-import org.springframework.stereotype.Service;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.device.PlcParameterObject;
-
-import com.mes.entity.UpWorkstation;
-import com.mes.mapper.LoadGlassMapper;
-
-@Service
-public class LoadGlassService {
-
- private S7control s7control;
- private LoadGlassMapper LoadGlassMapper;
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
- public List<UpWorkstation> selectAll() {
- List<UpWorkstation> glassInfo= LoadGlassMapper.selectALL();
- return glassInfo;
- }
- //澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
- public void insertGlass(UpWorkstation upwork) {
- LoadGlassMapper.insertGlass(upwork);
- }
- //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
- public void deleteGlass(int id) {
- LoadGlassMapper.deleteGlass(id);
- }
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
- public boolean isCanLoadGlass() {
- String loadstate=plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- if(loadstate.equals("1")) {
- return true;
- }else{
- return false;
- }
-
- }
- //鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority() {
- int loadid1=LoadGlassMapper.selectPriority(1);
- int loadid2=LoadGlassMapper.selectPriority(2);
- //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
- if(loadid1>loadid2) {
- s7control.WriteWord("DB100.10", (short)2);
- }else if(loadid1==loadid2){
- //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
- int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
- if(glassnum1>glassnum2){
- s7control.WriteWord("DB100.10", (short)2);
- }else{
- s7control.WriteWord("DB100.10", (short)1);
- }
- }else{
- s7control.WriteWord("DB100.10", (short)1);
- }
- }
-
-
-
-
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
deleted file mode 100644
index 9940470..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
deleted file mode 100644
index ee38452..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
deleted file mode 100644
index 55f8fc6..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
deleted file mode 100644
index 0652226..0000000
--- a/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mes.service.userInfo;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.CacheUtil;
-import com.mes.common.Result;
-import com.mes.entity.userInfo.User;
-import com.mes.mapper.userInfo.UserMapper;
-import com.mes.controller.dto.UserDTO;
-import com.mes.tools.TokenTools;
-import org.apache.ibatis.jdbc.Null;
-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;
-
-import java.util.List;
-
-@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/LoadGlassModule/src/main/java/com/mes/tools/TokenTools.java b/LoadGlassModule/src/main/java/com/mes/tools/TokenTools.java
deleted file mode 100644
index 1cb6dc2..0000000
--- a/LoadGlassModule/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/LoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java b/LoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
deleted file mode 100644
index c14c54f..0000000
--- a/LoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.mes.tools;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
-
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-
-@ServerEndpoint(value = "/api/talk/{username}")
-@Component
-public class WebSocketServer {
-
- // @Autowired
- // HomeMapper homeMapper;
-
- 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/LoadGlassModule/src/main/resources/JsonFile/PlcAlbania.json b/LoadGlassModule/src/main/resources/JsonFile/PlcAlbania.json
deleted file mode 100644
index ab65b19..0000000
--- a/LoadGlassModule/src/main/resources/JsonFile/PlcAlbania.json
+++ /dev/null
@@ -1,414 +0,0 @@
-{
- "plcAddressBegin":"DB14.0",
- "plcAddressLenght":"208",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "PLCToMES",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "IDStatus1",
- "addressIndex":"2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "IDStatus2",
- "addressIndex":"4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "IDStatus3",
- "addressIndex":"6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "IDStatus4",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "IDStatus5",
- "addressIndex":"10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "IDStatus6",
- "addressIndex":"12",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "StautsID1",
- "addressIndex":"14",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID2",
- "addressIndex":"16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID3",
- "addressIndex":"18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID4",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID5",
- "addressIndex":"22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "StautsID6",
- "addressIndex":"24",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "GaToMES",
- "addressIndex":"26",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "Height",
- "addressIndex":"28",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "width",
- "addressIndex":"30",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "ExportTOMES1",
- "addressIndex":"32",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "ExportToMES2",
- "addressIndex":"34",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- } ,
- {
- "codeId": "MESToPLC",
- "addressIndex":"36",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- } ,
- {
- "codeId": "MESID1",
- "addressIndex":"38",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- } ,
- {
- "codeId": "MESID2",
- "addressIndex":"54",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID3",
- "addressIndex":"70",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID4",
- "addressIndex":"86",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID5",
- "addressIndex":"102",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID6",
- "addressIndex":"118",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESToPLCStart1",
- "addressIndex":"134",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStart2",
- "addressIndex":"136",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStart3",
- "addressIndex":"138",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,{
- "codeId": "MESToPLCStart4",
- "addressIndex":"140",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,{
- "codeId": "MESToPLCStart5",
- "addressIndex":"142",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,{
- "codeId": "MESToPLCStart6",
- "addressIndex":"144",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget1",
- "addressIndex":"146",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget2",
- "addressIndex":"148",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget3",
- "addressIndex":"150",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget4",
- "addressIndex":"152",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget5",
- "addressIndex":"154",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget6",
- "addressIndex":"156",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus1",
- "addressIndex":"158",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus2",
- "addressIndex":"160",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus3",
- "addressIndex":"162",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus4",
- "addressIndex":"164",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus5",
- "addressIndex":"166",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus6",
- "addressIndex":"168",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToGaStatus",
- "addressIndex":"170",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A01Err",
- "addressIndex":"172",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A02Err",
- "addressIndex":"174",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "B01Err",
- "addressIndex":"176",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C01Err",
- "addressIndex":"178",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C02Err",
- "addressIndex":"180",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "ErrSpace1",
- "addressIndex":"182",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "ErrSpace2",
- "addressIndex":"184",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "ErrSpace3",
- "addressIndex":"186",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "B01Position",
- "addressIndex":"188",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C01Position",
- "addressIndex":"190",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C02Position",
- "addressIndex":"192",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "DeviceState",
- "addressIndex":"194",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "AllFVRun",
- "addressIndex":"196",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A01State",
- "addressIndex":"198",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A02State",
- "addressIndex":"200",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "B01State",
- "addressIndex":"202",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C01State",
- "addressIndex":"204",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C02State",
- "addressIndex":"206",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ]
-}
diff --git a/LoadGlassModule/src/main/resources/application.yml b/LoadGlassModule/src/main/resources/application.yml
deleted file mode 100644
index 67844c9..0000000
--- a/LoadGlassModule/src/main/resources/application.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-server:
- port: 8080
- 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
diff --git a/LoadGlassModule/src/test/java/com/mes/MesApplicationTests.java b/LoadGlassModule/src/test/java/com/mes/MesApplicationTests.java
deleted file mode 100644
index 59327a7..0000000
--- a/LoadGlassModule/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/LoadGlassModule/target/classes/application.yml b/LoadGlassModule/target/classes/application.yml
deleted file mode 100644
index 67844c9..0000000
--- a/LoadGlassModule/target/classes/application.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-server:
- port: 8080
- 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
diff --git "a/TemperingGlassModule/MES-Module \0501\051.iml" "b/TemperingGlassModule/MES-Module \0501\051.iml"
deleted file mode 100644
index 9855791..0000000
--- "a/TemperingGlassModule/MES-Module \0501\051.iml"
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="MavenCustomPomFilePath">
- <option name="mavenPomFileUrl" value="file://$MODULE_DIR$/effective-pom.xml" />
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/../../../Documents/HangZhouMes/TemperingGlassModule/target/classes" />
- <output-test url="file://$MODULE_DIR$/../../../Documents/HangZhouMes/TemperingGlassModule/target/test-classes" />
- <exclude-output />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/TemperingGlassModule/MES-Module.iml b/TemperingGlassModule/MES-Module.iml
deleted file mode 100644
index 643a1de..0000000
--- a/TemperingGlassModule/MES-Module.iml
+++ /dev/null
@@ -1,124 +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 />
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/../../../Documents/HangZhouMes/TemperingGlassModule/target/classes" />
- <output-test url="file://$MODULE_DIR$/../../../Documents/HangZhouMes/TemperingGlassModule/target/test-classes" />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <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.apache.logging.log4j:log4j-api: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" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
- <orderEntry type="library" scope="TEST" 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: com.fasterxml.jackson.core:jackson-databind:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" />
- <orderEntry type="library" scope="RUNTIME" 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: io.netty:netty-all:4.1.36.Final" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/TemperingGlassModule/effective-pom.xml b/TemperingGlassModule/effective-pom.xml
deleted file mode 100644
index 281870f..0000000
--- a/TemperingGlassModule/effective-pom.xml
+++ /dev/null
@@ -1,6646 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Generated by Maven Help Plugin on 2024-02-23T14:31:06+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:\Documents\HangZhouMes\TemperingGlassModule\src\main\java</sourceDirectory>
- <scriptSourceDirectory>d:\Documents\HangZhouMes\TemperingGlassModule\src\main\scripts</scriptSourceDirectory>
- <testSourceDirectory>d:\Documents\HangZhouMes\TemperingGlassModule\src\test\java</testSourceDirectory>
- <outputDirectory>d:\Documents\HangZhouMes\TemperingGlassModule\target\classes</outputDirectory>
- <testOutputDirectory>d:\Documents\HangZhouMes\TemperingGlassModule\target\test-classes</testOutputDirectory>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>d:\Documents\HangZhouMes\TemperingGlassModule\src\main\resources</directory>
- <includes>
- <include>**/application*.yml</include>
- <include>**/application*.yaml</include>
- <include>**/application*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>d:\Documents\HangZhouMes\TemperingGlassModule\src\main\resources</directory>
- <excludes>
- <exclude>**/application*.yml</exclude>
- <exclude>**/application*.yaml</exclude>
- <exclude>**/application*.properties</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>d:\Documents\HangZhouMes\TemperingGlassModule\src\test\resources</directory>
- </testResource>
- </testResources>
- <directory>d:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\target\classes</classesDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <classesDirectory>d:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\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:\Documents\HangZhouMes\TemperingGlassModule\target\site</outputDirectory>
- </reporting>
-</project>
diff --git a/TemperingGlassModule/pom.xml b/TemperingGlassModule/pom.xml
deleted file mode 100644
index 721b5b5..0000000
--- a/TemperingGlassModule/pom.xml
+++ /dev/null
@@ -1,177 +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-Module</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>MES-Module</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>
-
-<!--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>
-
- </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/TemperingGlassModule/src/main/JsonFile/PlcAlbania.json b/TemperingGlassModule/src/main/JsonFile/PlcAlbania.json
deleted file mode 100644
index ab65b19..0000000
--- a/TemperingGlassModule/src/main/JsonFile/PlcAlbania.json
+++ /dev/null
@@ -1,414 +0,0 @@
-{
- "plcAddressBegin":"DB14.0",
- "plcAddressLenght":"208",
- "dataType":"word",
- "parameteInfor":[
- {
- "codeId": "PLCToMES",
- "addressIndex":"0",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "IDStatus1",
- "addressIndex":"2",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "IDStatus2",
- "addressIndex":"4",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"m/min"
- },
- {
- "codeId": "IDStatus3",
- "addressIndex":"6",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "IDStatus4",
- "addressIndex":"8",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "IDStatus5",
- "addressIndex":"10",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "IDStatus6",
- "addressIndex":"12",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "StautsID1",
- "addressIndex":"14",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID2",
- "addressIndex":"16",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID3",
- "addressIndex":"18",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID4",
- "addressIndex":"20",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "StautsID5",
- "addressIndex":"22",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "StautsID6",
- "addressIndex":"24",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "GaToMES",
- "addressIndex":"26",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "Height",
- "addressIndex":"28",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "width",
- "addressIndex":"30",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "ExportTOMES1",
- "addressIndex":"32",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,
- {
- "codeId": "ExportToMES2",
- "addressIndex":"34",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- } ,
- {
- "codeId": "MESToPLC",
- "addressIndex":"36",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- } ,
- {
- "codeId": "MESID1",
- "addressIndex":"38",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- } ,
- {
- "codeId": "MESID2",
- "addressIndex":"54",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID3",
- "addressIndex":"70",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID4",
- "addressIndex":"86",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID5",
- "addressIndex":"102",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESID6",
- "addressIndex":"118",
- "addressLenght":"14",
- "ratio":"1",
- "unit":"mm/S"
- },
- {
- "codeId": "MESToPLCStart1",
- "addressIndex":"134",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStart2",
- "addressIndex":"136",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStart3",
- "addressIndex":"138",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,{
- "codeId": "MESToPLCStart4",
- "addressIndex":"140",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,{
- "codeId": "MESToPLCStart5",
- "addressIndex":"142",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ,{
- "codeId": "MESToPLCStart6",
- "addressIndex":"144",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget1",
- "addressIndex":"146",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget2",
- "addressIndex":"148",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget3",
- "addressIndex":"150",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget4",
- "addressIndex":"152",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget5",
- "addressIndex":"154",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCTarget6",
- "addressIndex":"156",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus1",
- "addressIndex":"158",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus2",
- "addressIndex":"160",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus3",
- "addressIndex":"162",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus4",
- "addressIndex":"164",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus5",
- "addressIndex":"166",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToPLCStatus6",
- "addressIndex":"168",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "MESToGaStatus",
- "addressIndex":"170",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A01Err",
- "addressIndex":"172",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A02Err",
- "addressIndex":"174",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "B01Err",
- "addressIndex":"176",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C01Err",
- "addressIndex":"178",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C02Err",
- "addressIndex":"180",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "ErrSpace1",
- "addressIndex":"182",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "ErrSpace2",
- "addressIndex":"184",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "ErrSpace3",
- "addressIndex":"186",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "B01Position",
- "addressIndex":"188",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C01Position",
- "addressIndex":"190",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C02Position",
- "addressIndex":"192",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "DeviceState",
- "addressIndex":"194",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "AllFVRun",
- "addressIndex":"196",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A01State",
- "addressIndex":"198",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "A02State",
- "addressIndex":"200",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "B01State",
- "addressIndex":"202",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C01State",
- "addressIndex":"204",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- },{
- "codeId": "C02State",
- "addressIndex":"206",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
- ]
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/MesApplication.java b/TemperingGlassModule/src/main/java/com/mes/MesApplication.java
deleted file mode 100644
index 79565d5..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/MesApplication.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-//springboot 鍚姩鍏ュ彛
-@SpringBootApplication
-@EnableCaching
-@EnableTransactionManagement//浜嬪姟娉ㄨВ
-//@Transactional//鍦╯ervice閲岄潰鏈夊琛ㄦ搷浣滐紝寮�鍚簨鍔℃敞瑙�
-public class MesApplication {
- public static void main(String[] args) {
- SpringApplication.run(MesApplication.class, args);
- try {
- //new NettyServer(12345).start();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/common/CacheUtil.java b/TemperingGlassModule/src/main/java/com/mes/common/CacheUtil.java
deleted file mode 100644
index df5af14..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/common/Constants.java b/TemperingGlassModule/src/main/java/com/mes/common/Constants.java
deleted file mode 100644
index 9e591db..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java b/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
deleted file mode 100644
index 8ffee41..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package com.mes.common.PlcTools;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.sql.Time;
-import java.util.ArrayList;
-import java.util.List;
-
-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 org.apache.ibatis.jdbc.Null;
-
-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 S7control(EPlcType plcType,String ip,int port,int a,int b) {
- if (s7PLC == null)
- s7PLC = new S7PLC(plcType, ip, port,a,b);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- 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;
- }
- }
- public byte[] Readbyte(String address, int count) {
- byte[] byt=new byte[count];
- int wordcount=((count%2==0)?count/2:count+1);
- List<Short> word=ReadWord(address,wordcount);
-
- return byt;
- }
- /**
- * 鎸夋寚瀹氱殑鍦板潃 璇诲彇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;
- }
-
- };
-
-
-
- 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;
- }
- public void writeString(String addr,String data) {
- s7PLC.writeString(addr,data);
- }
-
- public String readStrings(String addr) {
- return s7PLC.readString(addr);
- }
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java b/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
deleted file mode 100644
index 16bd1de..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-
-public class S7object {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.1"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object instance = null;
-
- private S7object() {
- if (plccontrol == null)
- plccontrol = new S7control(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object getinstance() {
- if (instance == null) {
- synchronized (S7object.class) {
- if (instance == null)
- instance = new S7object();
- }
- }
- return instance;
- }
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java b/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
deleted file mode 100644
index 4ed72d6..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.common.PlcTools;
-
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-
-public class S7object2 {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.2"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object2 instance = null;
-
- private S7object2() {
- if (plccontrol == null)
- plccontrol = new S7control(plcType, ip, port,0,0);
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object2 getinstance() {
- if (instance == null) {
- synchronized (S7object2.class) {
- if (instance == null)
- instance = new S7object2();
- }
- }
- return instance;
- }
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/common/Result.java b/TemperingGlassModule/src/main/java/com/mes/common/Result.java
deleted file mode 100644
index 654546b..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java b/TemperingGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
deleted file mode 100644
index 43104f9..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java b/TemperingGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
deleted file mode 100644
index 703a863..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.config;
-
-
-import com.mes.*;
-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("鍚姩瀹屾垚Tempering");
-
-
- }
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/config/InterceptorConfig.java b/TemperingGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
deleted file mode 100644
index 43bfcc7..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/config/MyCorsConfig.java b/TemperingGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
deleted file mode 100644
index 9cb413e..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java b/TemperingGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
deleted file mode 100644
index d14faae..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/config/SwaggerConfig.java b/TemperingGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
deleted file mode 100644
index 7ccbf7e..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/config/WebSocketConfig.java b/TemperingGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
deleted file mode 100644
index 1902638..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java b/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
deleted file mode 100644
index 8fa7876..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mes.controller;
-import java.util.List;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.mes.common.Result;
-import com.mes.entity.Tempering;
-import com.mes.service.TemperingOverService;
-import com.mes.service.TemperingService;
-
-
-@RestController
-@RequestMapping("/Tempering")
-
-// TidyUpGlassModule 閽㈠寲妯″潡
-public class TemperingController {
-
- @Autowired
- private TemperingService temperingService;
-
- @Autowired
- private TemperingOverService temperingOverService;
-
- @GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
- @ResponseBody
- public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<Tempering> glass = temperingService.SelectWaitingGlass();
- System.out.println(glass);
- return Result.seccess(glass);
- }
-
- @GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
- @ResponseBody
- public Result SelectIntoGlass(String ProcessId) {
- List<Tempering> glass = temperingService.SelectIntoGlass();
- System.out.println(glass);
- return Result.seccess(glass);
- }
-
- @GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
- @ResponseBody
- public Result SelectOutGlass(String ProcessId) {
- List<Tempering> glass = temperingOverService.SelectOutGlass();
- System.out.println(glass);
- return Result.seccess(glass);
- }
-
-
-
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java b/TemperingGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
deleted file mode 100644
index 05a2545..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java b/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
deleted file mode 100644
index 6eee09a..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java b/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
deleted file mode 100644
index e7247fe..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java b/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
deleted file mode 100644
index 9a8eea0..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
+++ /dev/null
@@ -1,58 +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.controller.dto.UserDTO;
-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/TemperingGlassModule/src/main/java/com/mes/entity/Engineering.java b/TemperingGlassModule/src/main/java/com/mes/entity/Engineering.java
deleted file mode 100644
index 95eb3a0..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/Engineering.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.entity;
-
-import java.math.BigInteger;
-
-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("`engineering`")
-public class Engineering {
- @TableId(type = IdType.AUTO)
- private BigInteger id;//宸ョ▼琛╥d
- private Integer engineerid;//宸ョ▼鍙�
- private String engineername;//宸ョ▼鍚嶇О
- private Double avgavailability;//骞冲潎鍒╃敤鐜�
- private Double validavailability;//鏈夋晥鍒╃敤鐜�
- private Double lastavailability;//灏剧墖鍒╃敤鐜�
- private Integer state;//鐘舵��
- private Integer glasstotal;//灏忕墖鎬绘暟
- private Double glasstotalarea;//灏忕墖鎬婚潰绉�
- private Integer planpatterntotal;//璁″垝鍘熺墖鎬绘暟
- private Double planpatterntotalarea;//璁″垝鍘熺墖鎬婚潰绉�
- private Integer realitypatterntotal;//瀹為檯鍘熺墖鎬绘暟
- private Double realitypatterntotalarea;//瀹為檯鍘熺墖鎬婚潰绉�
- private Integer filmsid;//鑶滅郴id
- private String notes;//澶囨敞
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/GlassFilms.java b/TemperingGlassModule/src/main/java/com/mes/entity/GlassFilms.java
deleted file mode 100644
index a5d9044..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/GlassFilms.java
+++ /dev/null
@@ -1,17 +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("`glass_films`")
-public class GlassFilms {
- @TableId(type = IdType.AUTO)
- private Integer id;//鑶滅郴琛╥d
- private Integer films_id;//鑶滅郴id
- private String films_name;//鑶滅郴
-
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/GlassInfo.java b/TemperingGlassModule/src/main/java/com/mes/entity/GlassInfo.java
deleted file mode 100644
index efd3847..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/GlassInfo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mes.entity;
-
-import java.math.BigInteger;
-
-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("`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/TemperingGlassModule/src/main/java/com/mes/entity/Tempering.java b/TemperingGlassModule/src/main/java/com/mes/entity/Tempering.java
deleted file mode 100644
index 5b61dae..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/Tempering.java
+++ /dev/null
@@ -1,27 +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("`tempering_glass_info`")
-public class Tempering {
- @TableId(type = IdType.AUTO)
- private Integer id;//閽㈠寲灏忕墖淇℃伅琛╥d
- private String flowcard_id;//娴佺▼鍗�
- private Integer glass_type;//娴佺▼鍗＄幓鐠冪被鍨�
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Integer filmsid;//鑶滅郴
- private Integer ishorizontal;//閽㈠寲鏄惁鎺ュ彈妯斁
- private Integer tempering_layout_id;//閽㈠寲鐗堝浘id
- private Integer tempering_feed_sequence;//閽㈠寲鐗堝浘鐗囧簭
- private Integer x_coordinate;//x鍧愭爣
- private Integer y_coordinate;//y鍧愭爣
- private Integer angle;//鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
- private Integer state;//鐘舵��
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java b/TemperingGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java
deleted file mode 100644
index 461e04d..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java
+++ /dev/null
@@ -1,21 +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("`up_patten_usage`")
-public class UpPattenUsage {
- @TableId(type = IdType.AUTO)
- private Integer id;//鍘熺墖浣跨敤鎯呭喌琛╥d
- private Integer engineeringid;//宸ョ▼鍙�
- private Integer filmsid;//鑶滅郴id
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Integer layoutsequence;//鍘熺墖鐗堝浘鐗囧簭
- private Integer state;//鐘舵��
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/UpWorkstation.java b/TemperingGlassModule/src/main/java/com/mes/entity/UpWorkstation.java
deleted file mode 100644
index 1f8cb3b..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/UpWorkstation.java
+++ /dev/null
@@ -1,23 +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("`up_workstation`")
-public class UpWorkstation {
- @TableId(type = IdType.AUTO)
- private Integer id;//涓婄墖宸ヤ綅琛╥d
- private Integer workstationid;//宸ヤ綅鍙�
- private Integer deviceid;//璁惧id
- private Integer enablestate;//鍚敤鐘舵��
- private Integer workstate;//宸ヤ綔鐘舵��
- private Double patternwidth;//鍘熺墖瀹�
- private Double patternheigth;//鍘熺墖楂�
- private Double patternthickness;//鍘熺墖鍘氬害
- private Integer filmsid;//鑶滅郴
- private Integer number;//鏁伴噺
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/device/InitUtil.java b/TemperingGlassModule/src/main/java/com/mes/entity/device/InitUtil.java
deleted file mode 100644
index 6d59bd3..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/device/InitUtil.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.mes.entity.device;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.mes.common.PlcTools.S7control;
-
-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, 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);
- }
-
-
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java b/TemperingGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java
deleted file mode 100644
index dcb707e..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.mes.entity.device;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import static com.mes.entity.device.InitUtil.readAndUpdateWordValues;
-public class PLCAutoMes extends Thread {
-
- // // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
- // private Configuration config;
- private static InitUtil initUtil;
- // public static PlcParameterObject PlcMesObject;
- // public static PlcParameterObject PlcReadObject;
- // public static PlcParameterObject PlcframeObject;
-
- // // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
- // MessageHandler customS7Control = new MessageHandler();
-
- // 鍗曚緥瀹炰緥
- private static PLCAutoMes instance;
- // private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
- private static String PlcAlbania = PLCAutoMes.class.getResource("/JsonFile/PlcAlbania.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 PlcParameterObject plcParameterObject = initUtil.initword(PlcParameter);
- // public static PlcBitObject plcPlcTest = initUtil.initbit(PlcTest);
- // public static PlcBitObject plcBitObject = initUtil.initbit(PlcSign);
- // public static PlcParameterObject plcStateObject= initUtil.initword(PlcState);
- // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
- public static PlcParameterObject PlcMesObject = InitUtil.initword(PlcAlbania);
- // public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
- // public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-
- // 绉佹湁鏋勯�犲嚱鏁�
- public PLCAutoMes() throws IOException {
- //config = new Configuration("config.properties");
- 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/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java b/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
deleted file mode 100644
index 78846f9..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
+++ /dev/null
@@ -1,77 +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/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java b/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java
deleted file mode 100644
index 977a13c..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java b/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java
deleted file mode 100644
index b4a2051..0000000
--- a/TemperingGlassModule/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 ;
- }
- return null;
- }
-
- public int getPlcAddress() {
-
- return addressIndex;
- }
- public String getAddress() {
- return getAddress(this.addressIndex);
- }
-}
\ No newline at end of file
diff --git a/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java b/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
deleted file mode 100644
index 5355db5..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
+++ /dev/null
@@ -1,202 +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/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java b/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
deleted file mode 100644
index d756660..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java b/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
deleted file mode 100644
index 5d0a881..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java b/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
deleted file mode 100644
index 9dc4f03..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/User.java b/TemperingGlassModule/src/main/java/com/mes/entity/userInfo/User.java
deleted file mode 100644
index 216d340..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java b/TemperingGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
deleted file mode 100644
index f4ee632..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/exception/ServiceException.java b/TemperingGlassModule/src/main/java/com/mes/exception/ServiceException.java
deleted file mode 100644
index 92b6196..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
deleted file mode 100644
index 5ec7ed8..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mes.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.Tempering;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.*;
-
-@Mapper
-public interface TemperingMapper extends BaseMapper<Tempering> {
-
-
-//鏌ヨ璇ョ幓鐠冪殑灏哄鍜屽潗鏍�
-@Select("select *from glass_info where id=#{glassid};")
-GlassInfo SelectGlass(String glassid);
-//鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
-@Select("select count(*) from glass_info where id=#{glassid};")
-int SelectTempering(String glassid);
-//鏌ヨ绛夊緟涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
-@Select("select*from tempering_glass_info a left join (select flowcard_id,count(state)state from tempering_glass_info GROUP BY flowcard_id,state)b on a.flowcard_id=b.flowcard_id where b.state=2")
-List<Tempering> SelectWaitingGlass();
-//鏌ヨ杩涚倝涓殑閽㈠寲鐗堝浘鐜荤拑淇℃伅
-@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=1)b on a.flowcard_id=b.flowcard_id where b.state1=1")
-List<Tempering> SelectInGlass();
-//鏌ヨ閽㈠寲鍚庣殑閽㈠寲鐗堝浘淇℃伅
-@Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=2)b on a.flowcard_id=b.flowcard_id where b.state1=2")
-List <Tempering> SelectOutGlass();
-
-
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
deleted file mode 100644
index ce86b42..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
deleted file mode 100644
index 08baad9..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ /dev/null
@@ -1,14 +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/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
deleted file mode 100644
index 1c9baf4..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
deleted file mode 100644
index dc3b242..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mes.mapper.userInfo;
-
-
-import com.mes.controller.dto.UserDTO;
-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/TemperingGlassModule/src/main/java/com/mes/service/TemperingOverService.java b/TemperingGlassModule/src/main/java/com/mes/service/TemperingOverService.java
deleted file mode 100644
index 1cc1983..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/service/TemperingOverService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mes.service;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.Tempering;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.TemperingMapper;
-import java.util.List;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("glass_info")
-public class TemperingOverService {
-private final TemperingMapper temperingMapper;
- //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- public TemperingOverService(TemperingMapper temperingMapper) {
- this.temperingMapper = temperingMapper;
- }
- //鎺ユ敹鍑虹倝淇″彿鍜岀倝鍙�
- public String SelectOutSignal () {
-
- S7control.getinstance().WriteWord("鍑虹倝淇″彿", (short)1);
- return "GlassInfo";
- }
- //鍙戦�佺‘璁ゆ敹鍒颁俊鍙�
- public void OverSignal () {
- S7control.getinstance().WriteWord("纭瀛�", (short)1);
- }
- //鏄剧ず閽㈠寲鍑虹倝鍚庣殑鐗堝浘淇℃伅
- public List <Tempering> SelectOutGlass () {
- return temperingMapper.SelectOutGlass();
- }
-
-
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java b/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java
deleted file mode 100644
index 362d417..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mes.service;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.Tempering;
-import com.mes.mapper.TemperingMapper;
-import java.util.List;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("glass_info")
-public class TemperingService {
-
- private final TemperingMapper temperingMapper;
- private S7control s7control;
-
- public TemperingService(TemperingMapper temperingMapper) {
- this.temperingMapper = temperingMapper;
- }
- //鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
- public GlassInfo SelectOutGlass (String glassid) {
- GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
- return GlassInfo;
- }
- //鍙戦�佸潗鏍囦俊鎭�
- public void SendCoordinate (short glassX,short glassY) {
- s7control.WriteWord("DB100.10", glassX);
- s7control.WriteWord("DB100.10", glassY);
- }
- //鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
- public int SelectTempering (String glassid) {
- int tempering = temperingMapper.SelectTempering(glassid);
- if (tempering == 1) {
- return 1;
- }
- else {
- return 0;
- }
- }
- //鍙戦�佽繘鐐変俊鍙�
- public void SendIntoGlass (short start) {
- s7control.WriteWord("DB100.10", start);
- }
- //鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
- public void SendIntoGlass () {
- s7control.WriteWord("DB100.10", (short)1);
- }
- //鏄剧ず绛夊緟涓殑鐗堝浘
- public List <Tempering> SelectWaitingGlass () {
- List<Tempering> WaitingGlass = temperingMapper.SelectWaitingGlass();
- return WaitingGlass;
- }
- //鏄剧ず姝ｅ湪杩涚倝鐨勭増鍥�
- public List<Tempering> SelectIntoGlass () {
- List<Tempering> IntoGlass = temperingMapper.SelectInGlass();
- return IntoGlass;
- }
-}
diff --git a/TemperingGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java b/TemperingGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
deleted file mode 100644
index 9940470..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java b/TemperingGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
deleted file mode 100644
index ee38452..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java b/TemperingGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
deleted file mode 100644
index 55f8fc6..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/service/userInfo/UserService.java b/TemperingGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
deleted file mode 100644
index e172f10..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/tools/TokenTools.java b/TemperingGlassModule/src/main/java/com/mes/tools/TokenTools.java
deleted file mode 100644
index 1cb6dc2..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/src/main/java/com/mes/tools/WebSocketServer.java b/TemperingGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
deleted file mode 100644
index c14c54f..0000000
--- a/TemperingGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.mes.tools;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.stereotype.Component;
-
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-
-@ServerEndpoint(value = "/api/talk/{username}")
-@Component
-public class WebSocketServer {
-
- // @Autowired
- // HomeMapper homeMapper;
-
- 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/TemperingGlassModule/src/main/resources/application.yml b/TemperingGlassModule/src/main/resources/application.yml
deleted file mode 100644
index a85e82a..0000000
--- a/TemperingGlassModule/src/main/resources/application.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-server:
- port: 8080
- 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/TemperingGlassModule/src/test/java/com/mes/MesApplicationTests.java b/TemperingGlassModule/src/test/java/com/mes/MesApplicationTests.java
deleted file mode 100644
index 59327a7..0000000
--- a/TemperingGlassModule/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/TemperingGlassModule/target/MES-Module-0.0.1-SNAPSHOT.jar.original b/TemperingGlassModule/target/MES-Module-0.0.1-SNAPSHOT.jar.original
deleted file mode 100644
index 5562d4d..0000000
--- a/TemperingGlassModule/target/MES-Module-0.0.1-SNAPSHOT.jar.original
+++ /dev/null
Binary files differ
diff --git a/TemperingGlassModule/target/classes/application.yml b/TemperingGlassModule/target/classes/application.yml
deleted file mode 100644
index a85e82a..0000000
--- a/TemperingGlassModule/target/classes/application.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-server:
- port: 8080
- 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/TemperingGlassModule/target/maven-archiver/pom.properties b/TemperingGlassModule/target/maven-archiver/pom.properties
deleted file mode 100644
index f4d443d..0000000
--- a/TemperingGlassModule/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=MES-Module
-groupId=com.MES-Module
-version=0.0.1-SNAPSHOT
diff --git a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 8c9427b..0000000
--- a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,54 +0,0 @@
-com\mes\controller\OrderTestController.class
-com\mes\common\PlcTools\S7object2.class
-com\mes\MesApplication.class
-com\mes\controller\userInfo\SysMenuItemController.class
-com\mes\exception\ServiceException.class
-com\mes\entity\UpPattenUsage.class
-com\mes\service\userInfo\SysErrorService.class
-com\mes\config\MyCorsConfig$1.class
-com\mes\common\Result.class
-com\mes\entity\Engineering.class
-com\mes\common\PlcTools\S7control.class
-com\mes\entity\BigStorageCage.class
-com\mes\service\IOrderService.class
-com\mes\mapper\userInfo\UserMapper.class
-com\mes\common\Constants.class
-com\mes\entity\GlassFilms.class
-com\mes\entity\BigStorageCageDetails.class
-com\mes\entity\DownStorageCagedetails.class
-com\mes\mapper\userInfo\SysMenuItemMapper.class
-com\mes\controller\dto\UserDTO.class
-com\mes\common\CacheUtil.class
-com\mes\common\PlcTools\S7object.class
-com\mes\config\InterceptorConfig.class
-com\mes\service\userInfo\SysMenuItemService.class
-com\mes\entity\OrderTest.class
-com\mes\entity\UpWorkstation.class
-com\mes\entity\userInfo\SysMenuItem.class
-com\mes\entity\userInfo\User.class
-com\mes\config\MyCorsConfig.class
-com\mes\entity\GlassInfo.class
-com\mes\tools\TokenTools.class
-com\mes\service\impl\OrderServiceImpl.class
-com\mes\exception\GlobalExceptionHandle.class
-com\mes\service\userInfo\SysMenuService.class
-com\mes\tools\WebSocketServer.class
-com\mes\controller\userInfo\SysMenuController.class
-com\mes\entity\DownWorkstation.class
-com\mes\entity\userInfo\SysMenu.class
-com\mes\config\AppRunnerConfig.class
-com\mes\entity\DownStorageCage.class
-com\mes\config\MybatisPlusConfig.class
-com\mes\service\userInfo\UserService.class
-com\mes\entity\DownGlassInfo.class
-com\mes\entity\userInfo\SysError.class
-com\mes\entity\EdgStorageCage.class
-com\mes\config\WebSocketConfig.class
-com\mes\config\SwaggerConfig.class
-com\mes\controller\userInfo\UserController.class
-com\mes\mapper\userInfo\SysMenuMapper.class
-com\mes\entity\Tempering.class
-com\mes\mapper\OrderTestMapper.class
-com\mes\mapper\userInfo\SysErrorMapper.class
-com\mes\entity\EdgStorageCageDetails.class
-com\mes\common\interceptor\JwtInterceptor.class
diff --git a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 9a930c2..0000000
--- a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,53 +0,0 @@
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\Constants.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\UpPattenUsage.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\DownGlassInfo.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\interceptor\JwtInterceptor.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\Result.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\config\WebSocketConfig.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\mapper\userInfo\SysErrorMapper.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\mapper\userInfo\UserMapper.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\service\userInfo\UserService.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\mapper\userInfo\SysMenuMapper.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\PlcTools\S7object.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\PlcTools\S7object2.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\config\AppRunnerConfig.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\Tempering.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\config\InterceptorConfig.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\config\SwaggerConfig.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\UpWorkstation.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\userInfo\User.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\EdgStorageCageDetails.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\OrderTest.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\BigStorageCageDetails.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\controller\dto\UserDTO.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\controller\userInfo\UserController.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\service\userInfo\SysMenuItemService.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\service\impl\OrderServiceImpl.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\mapper\OrderTestMapper.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\tools\TokenTools.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\BigStorageCage.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\userInfo\SysError.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\PlcTools\S7control.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\EdgStorageCage.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\controller\userInfo\SysMenuController.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\Engineering.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\controller\OrderTestController.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\DownWorkstation.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\service\userInfo\SysMenuService.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\GlassInfo.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\service\userInfo\SysErrorService.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\MesApplication.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\DownStorageCage.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\exception\GlobalExceptionHandle.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\GlassFilms.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\config\MybatisPlusConfig.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\config\MyCorsConfig.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\controller\userInfo\SysMenuItemController.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\common\CacheUtil.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\tools\WebSocketServer.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\DownStorageCagedetails.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\userInfo\SysMenu.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\exception\ServiceException.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\entity\userInfo\SysMenuItem.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\mapper\userInfo\SysMenuItemMapper.java
-D:\xm4\HangZhouMes\TemperingGlassModule\src\main\java\com\mes\service\IOrderService.java
diff --git a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index 9c25a83..0000000
--- a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-com\mes\MesApplicationTests.class
diff --git a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index 5b92fc7..0000000
--- a/TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-D:\xm4\HangZhouMes\TemperingGlassModule\src\test\java\com\mes\MesApplicationTests.java
diff --git a/TemperingGlassModule/target/surefire-reports/TEST-com.mes.MesApplicationTests.xml b/TemperingGlassModule/target/surefire-reports/TEST-com.mes.MesApplicationTests.xml
deleted file mode 100644
index 4a1f5d8..0000000
--- a/TemperingGlassModule/target/surefire-reports/TEST-com.mes.MesApplicationTests.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.mes.MesApplicationTests" time="7.389" tests="1" errors="0" skipped="0" failures="0">
- <properties>
- <property name="sun.desktop" value="windows"/>
- <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="java.specification.version" value="1.8"/>
- <property name="sun.cpu.isalist" value="amd64"/>
- <property name="sun.jnu.encoding" value="GBK"/>
- <property name="java.class.path" value="D:\xm4\HangZhouMes\TemperingGlassModule\target\test-classes;D:\xm4\HangZhouMes\TemperingGlassModule\target\classes;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.5.9\spring-boot-starter-web-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter\2.5.9\spring-boot-starter-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot\2.5.9\spring-boot-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-logging\2.5.9\spring-boot-starter-logging-2.5.9.jar;C:\Users\SNG-012\.m2\repository\ch\qos\logback\logback-classic\1.2.10\logback-classic-1.2.10.jar;C:\Users\SNG-012\.m2\repository\ch\qos\logback\logback-core\1.2.10\logback-core-1.2.10.jar;C:\Users\SNG-012\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.17.1\log4j-to-slf4j-2.17.1.jar;C:\Users\SNG-012\.m2\repository\org\apache\logging\log4j\log4j-api\2.17.1\log4j-api-2.17.1.jar;C:\Users\SNG-012\.m2\repository\org\slf4j\jul-to-slf4j\1.7.33\jul-to-slf4j-1.7.33.jar;C:\Users\SNG-012\.m2\repository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;C:\Users\SNG-012\.m2\repository\org\yaml\snakeyaml\1.28\snakeyaml-1.28.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-json\2.5.9\spring-boot-starter-json-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.12.6\jackson-datatype-jdk8-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.12.6\jackson-datatype-jsr310-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.12.6\jackson-module-parameter-names-2.12.6.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\2.5.9\spring-boot-starter-tomcat-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\9.0.56\tomcat-embed-core-9.0.56.jar;C:\Users\SNG-012\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\9.0.56\tomcat-embed-el-9.0.56.jar;C:\Users\SNG-012\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.56\tomcat-embed-websocket-9.0.56.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-web\5.3.15\spring-web-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-webmvc\5.3.15\spring-webmvc-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-aop\5.3.15\spring-aop-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-context\5.3.15\spring-context-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-expression\5.3.15\spring-expression-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-starter\2.3.1\mybatis-spring-boot-starter-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\2.5.9\spring-boot-starter-jdbc-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\zaxxer\HikariCP\4.0.3\HikariCP-4.0.3.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-jdbc\5.3.15\spring-jdbc-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-autoconfigure\2.3.1\mybatis-spring-boot-autoconfigure-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\mybatis\3.5.13\mybatis-3.5.13.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\mybatis-spring\2.1.1\mybatis-spring-2.1.1.jar;C:\Users\SNG-012\.m2\repository\com\alibaba\fastjson\1.2.70\fastjson-1.2.70.jar;C:\Users\SNG-012\.m2\repository\org\springframework\data\spring-data-commons\2.3.1.RELEASE\spring-data-commons-2.3.1.RELEASE.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-core\5.3.15\spring-core-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-jcl\5.3.15\spring-jcl-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-beans\5.3.15\spring-beans-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\slf4j\slf4j-api\1.7.33\slf4j-api-1.7.33.jar;C:\Users\SNG-012\.m2\repository\mysql\mysql-connector-java\8.0.20\mysql-connector-java-8.0.20.jar;C:\Users\SNG-012\.m2\repository\org\projectlombok\lombok\1.18.22\lombok-1.18.22.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-test\2.5.9\spring-boot-starter-test-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-test\2.5.9\spring-boot-test-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\2.5.9\spring-boot-test-autoconfigure-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\jayway\jsonpath\json-path\2.5.0\json-path-2.5.0.jar;C:\Users\SNG-012\.m2\repository\net\minidev\json-smart\2.4.7\json-smart-2.4.7.jar;C:\Users\SNG-012\.m2\repository\net\minidev\accessors-smart\2.4.7\accessors-smart-2.4.7.jar;C:\Users\SNG-012\.m2\repository\org\ow2\asm\asm\9.1\asm-9.1.jar;C:\Users\SNG-012\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;C:\Users\SNG-012\.m2\repository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;C:\Users\SNG-012\.m2\repository\org\hamcrest\hamcrest\2.2\hamcrest-2.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter\5.7.2\junit-jupiter-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter-api\5.7.2\junit-jupiter-api-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;C:\Users\SNG-012\.m2\repository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;C:\Users\SNG-012\.m2\repository\org\junit\platform\junit-platform-commons\1.7.2\junit-platform-commons-1.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter-params\5.7.2\junit-jupiter-params-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter-engine\5.7.2\junit-jupiter-engine-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\platform\junit-platform-engine\1.7.2\junit-platform-engine-1.7.2.jar;C:\Users\SNG-012\.m2\repository\org\mockito\mockito-core\3.9.0\mockito-core-3.9.0.jar;C:\Users\SNG-012\.m2\repository\net\bytebuddy\byte-buddy\1.10.22\byte-buddy-1.10.22.jar;C:\Users\SNG-012\.m2\repository\net\bytebuddy\byte-buddy-agent\1.10.22\byte-buddy-agent-1.10.22.jar;C:\Users\SNG-012\.m2\repository\org\objenesis\objenesis\3.2\objenesis-3.2.jar;C:\Users\SNG-012\.m2\repository\org\mockito\mockito-junit-jupiter\3.9.0\mockito-junit-jupiter-3.9.0.jar;C:\Users\SNG-012\.m2\repository\org\skyscreamer\jsonassert\1.5.0\jsonassert-1.5.0.jar;C:\Users\SNG-012\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-test\5.3.15\spring-test-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\xmlunit\xmlunit-core\2.8.4\xmlunit-core-2.8.4.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-starter-test\2.3.1\mybatis-spring-boot-starter-test-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-test-autoconfigure\2.3.1\mybatis-spring-boot-test-autoconfigure-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-tx\5.3.15\spring-tx-5.3.15.jar;C:\Users\SNG-012\.m2\repository\com\auth0\java-jwt\3.10.3\java-jwt-3.10.3.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.12.6\jackson-databind-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.12.6\jackson-annotations-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.12.6\jackson-core-2.12.6.jar;C:\Users\SNG-012\.m2\repository\commons-codec\commons-codec\1.15\commons-codec-1.15.jar;C:\Users\SNG-012\.m2\repository\org\assertj\assertj-core\3.19.0\assertj-core-3.19.0.jar;C:\Users\SNG-012\.m2\repository\cn\hutool\hutool-all\5.4.0\hutool-all-5.4.0.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-boot-starter\3.5.1\mybatis-plus-boot-starter-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus\3.5.1\mybatis-plus-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-extension\3.5.1\mybatis-plus-extension-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-core\3.5.1\mybatis-plus-core-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-annotation\3.5.1\mybatis-plus-annotation-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\github\jsqlparser\jsqlparser\4.3\jsqlparser-4.3.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\2.5.9\spring-boot-autoconfigure-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\dynamic-datasource-spring-boot-starter\3.5.1\dynamic-datasource-spring-boot-starter-3.5.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-aop\2.5.9\spring-boot-starter-aop-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\aspectj\aspectjweaver\1.9.7\aspectjweaver-1.9.7.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-swagger2\2.9.2\springfox-swagger2-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\swagger\swagger-models\1.5.20\swagger-models-1.5.20.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-spi\2.9.2\springfox-spi-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-core\2.9.2\springfox-core-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-schema\2.9.2\springfox-schema-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-swagger-common\2.9.2\springfox-swagger-common-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-spring-web\2.9.2\springfox-spring-web-2.9.2.jar;C:\Users\SNG-012\.m2\repository\com\google\guava\guava\20.0\guava-20.0.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\plugin\spring-plugin-core\1.2.0.RELEASE\spring-plugin-core-1.2.0.RELEASE.jar;C:\Users\SNG-012\.m2\repository\org\springframework\plugin\spring-plugin-metadata\1.2.0.RELEASE\spring-plugin-metadata-1.2.0.RELEASE.jar;C:\Users\SNG-012\.m2\repository\org\mapstruct\mapstruct\1.2.0.Final\mapstruct-1.2.0.Final.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-swagger-ui\2.9.2\springfox-swagger-ui-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\swagger\swagger-annotations\1.5.20\swagger-annotations-1.5.20.jar;C:\Users\SNG-012\.m2\repository\com\github\xingshuangs\iot-communication\1.4.2\iot-communication-1.4.2.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-cache\2.5.9\spring-boot-starter-cache-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-context-support\5.3.15\spring-context-support-5.3.15.jar;C:\Users\SNG-012\.m2\repository\io\netty\netty-all\4.1.36.Final\netty-all-4.1.36.Final.jar;"/>
- <property name="java.vm.vendor" value="Oracle Corporation"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="user.variant" value=""/>
- <property name="java.vendor.url" value="http://java.oracle.com/"/>
- <property name="user.timezone" value="Asia/Shanghai"/>
- <property name="java.vm.specification.version" value="1.8"/>
- <property name="os.name" value="Windows 10"/>
- <property name="user.country" value="CN"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.8.0_121\jre\bin"/>
- <property name="sun.java.command" value="C:\Users\SNG-012\AppData\Local\Temp\surefire33896117267200105\surefirebooter1902636531692371884.jar C:\Users\SNG-012\AppData\Local\Temp\surefire33896117267200105 2024-03-07T11-50-56_835-jvmRun1 surefire967000318635874576tmp surefire_08363905452971083609tmp"/>
- <property name="surefire.test.class.path" value="D:\xm4\HangZhouMes\TemperingGlassModule\target\test-classes;D:\xm4\HangZhouMes\TemperingGlassModule\target\classes;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.5.9\spring-boot-starter-web-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter\2.5.9\spring-boot-starter-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot\2.5.9\spring-boot-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-logging\2.5.9\spring-boot-starter-logging-2.5.9.jar;C:\Users\SNG-012\.m2\repository\ch\qos\logback\logback-classic\1.2.10\logback-classic-1.2.10.jar;C:\Users\SNG-012\.m2\repository\ch\qos\logback\logback-core\1.2.10\logback-core-1.2.10.jar;C:\Users\SNG-012\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.17.1\log4j-to-slf4j-2.17.1.jar;C:\Users\SNG-012\.m2\repository\org\apache\logging\log4j\log4j-api\2.17.1\log4j-api-2.17.1.jar;C:\Users\SNG-012\.m2\repository\org\slf4j\jul-to-slf4j\1.7.33\jul-to-slf4j-1.7.33.jar;C:\Users\SNG-012\.m2\repository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;C:\Users\SNG-012\.m2\repository\org\yaml\snakeyaml\1.28\snakeyaml-1.28.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-json\2.5.9\spring-boot-starter-json-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.12.6\jackson-datatype-jdk8-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.12.6\jackson-datatype-jsr310-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.12.6\jackson-module-parameter-names-2.12.6.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\2.5.9\spring-boot-starter-tomcat-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\9.0.56\tomcat-embed-core-9.0.56.jar;C:\Users\SNG-012\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\9.0.56\tomcat-embed-el-9.0.56.jar;C:\Users\SNG-012\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.56\tomcat-embed-websocket-9.0.56.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-web\5.3.15\spring-web-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-webmvc\5.3.15\spring-webmvc-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-aop\5.3.15\spring-aop-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-context\5.3.15\spring-context-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-expression\5.3.15\spring-expression-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-starter\2.3.1\mybatis-spring-boot-starter-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\2.5.9\spring-boot-starter-jdbc-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\zaxxer\HikariCP\4.0.3\HikariCP-4.0.3.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-jdbc\5.3.15\spring-jdbc-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-autoconfigure\2.3.1\mybatis-spring-boot-autoconfigure-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\mybatis\3.5.13\mybatis-3.5.13.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\mybatis-spring\2.1.1\mybatis-spring-2.1.1.jar;C:\Users\SNG-012\.m2\repository\com\alibaba\fastjson\1.2.70\fastjson-1.2.70.jar;C:\Users\SNG-012\.m2\repository\org\springframework\data\spring-data-commons\2.3.1.RELEASE\spring-data-commons-2.3.1.RELEASE.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-core\5.3.15\spring-core-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-jcl\5.3.15\spring-jcl-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-beans\5.3.15\spring-beans-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\slf4j\slf4j-api\1.7.33\slf4j-api-1.7.33.jar;C:\Users\SNG-012\.m2\repository\mysql\mysql-connector-java\8.0.20\mysql-connector-java-8.0.20.jar;C:\Users\SNG-012\.m2\repository\org\projectlombok\lombok\1.18.22\lombok-1.18.22.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-test\2.5.9\spring-boot-starter-test-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-test\2.5.9\spring-boot-test-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\2.5.9\spring-boot-test-autoconfigure-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\jayway\jsonpath\json-path\2.5.0\json-path-2.5.0.jar;C:\Users\SNG-012\.m2\repository\net\minidev\json-smart\2.4.7\json-smart-2.4.7.jar;C:\Users\SNG-012\.m2\repository\net\minidev\accessors-smart\2.4.7\accessors-smart-2.4.7.jar;C:\Users\SNG-012\.m2\repository\org\ow2\asm\asm\9.1\asm-9.1.jar;C:\Users\SNG-012\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;C:\Users\SNG-012\.m2\repository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;C:\Users\SNG-012\.m2\repository\org\hamcrest\hamcrest\2.2\hamcrest-2.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter\5.7.2\junit-jupiter-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter-api\5.7.2\junit-jupiter-api-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;C:\Users\SNG-012\.m2\repository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;C:\Users\SNG-012\.m2\repository\org\junit\platform\junit-platform-commons\1.7.2\junit-platform-commons-1.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter-params\5.7.2\junit-jupiter-params-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\jupiter\junit-jupiter-engine\5.7.2\junit-jupiter-engine-5.7.2.jar;C:\Users\SNG-012\.m2\repository\org\junit\platform\junit-platform-engine\1.7.2\junit-platform-engine-1.7.2.jar;C:\Users\SNG-012\.m2\repository\org\mockito\mockito-core\3.9.0\mockito-core-3.9.0.jar;C:\Users\SNG-012\.m2\repository\net\bytebuddy\byte-buddy\1.10.22\byte-buddy-1.10.22.jar;C:\Users\SNG-012\.m2\repository\net\bytebuddy\byte-buddy-agent\1.10.22\byte-buddy-agent-1.10.22.jar;C:\Users\SNG-012\.m2\repository\org\objenesis\objenesis\3.2\objenesis-3.2.jar;C:\Users\SNG-012\.m2\repository\org\mockito\mockito-junit-jupiter\3.9.0\mockito-junit-jupiter-3.9.0.jar;C:\Users\SNG-012\.m2\repository\org\skyscreamer\jsonassert\1.5.0\jsonassert-1.5.0.jar;C:\Users\SNG-012\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-test\5.3.15\spring-test-5.3.15.jar;C:\Users\SNG-012\.m2\repository\org\xmlunit\xmlunit-core\2.8.4\xmlunit-core-2.8.4.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-starter-test\2.3.1\mybatis-spring-boot-starter-test-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\mybatis\spring\boot\mybatis-spring-boot-test-autoconfigure\2.3.1\mybatis-spring-boot-test-autoconfigure-2.3.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-tx\5.3.15\spring-tx-5.3.15.jar;C:\Users\SNG-012\.m2\repository\com\auth0\java-jwt\3.10.3\java-jwt-3.10.3.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.12.6\jackson-databind-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.12.6\jackson-annotations-2.12.6.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.12.6\jackson-core-2.12.6.jar;C:\Users\SNG-012\.m2\repository\commons-codec\commons-codec\1.15\commons-codec-1.15.jar;C:\Users\SNG-012\.m2\repository\org\assertj\assertj-core\3.19.0\assertj-core-3.19.0.jar;C:\Users\SNG-012\.m2\repository\cn\hutool\hutool-all\5.4.0\hutool-all-5.4.0.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-boot-starter\3.5.1\mybatis-plus-boot-starter-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus\3.5.1\mybatis-plus-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-extension\3.5.1\mybatis-plus-extension-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-core\3.5.1\mybatis-plus-core-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\mybatis-plus-annotation\3.5.1\mybatis-plus-annotation-3.5.1.jar;C:\Users\SNG-012\.m2\repository\com\github\jsqlparser\jsqlparser\4.3\jsqlparser-4.3.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\2.5.9\spring-boot-autoconfigure-2.5.9.jar;C:\Users\SNG-012\.m2\repository\com\baomidou\dynamic-datasource-spring-boot-starter\3.5.1\dynamic-datasource-spring-boot-starter-3.5.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-aop\2.5.9\spring-boot-starter-aop-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\aspectj\aspectjweaver\1.9.7\aspectjweaver-1.9.7.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-swagger2\2.9.2\springfox-swagger2-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\swagger\swagger-models\1.5.20\swagger-models-1.5.20.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-spi\2.9.2\springfox-spi-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-core\2.9.2\springfox-core-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-schema\2.9.2\springfox-schema-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-swagger-common\2.9.2\springfox-swagger-common-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-spring-web\2.9.2\springfox-spring-web-2.9.2.jar;C:\Users\SNG-012\.m2\repository\com\google\guava\guava\20.0\guava-20.0.jar;C:\Users\SNG-012\.m2\repository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;C:\Users\SNG-012\.m2\repository\org\springframework\plugin\spring-plugin-core\1.2.0.RELEASE\spring-plugin-core-1.2.0.RELEASE.jar;C:\Users\SNG-012\.m2\repository\org\springframework\plugin\spring-plugin-metadata\1.2.0.RELEASE\spring-plugin-metadata-1.2.0.RELEASE.jar;C:\Users\SNG-012\.m2\repository\org\mapstruct\mapstruct\1.2.0.Final\mapstruct-1.2.0.Final.jar;C:\Users\SNG-012\.m2\repository\io\springfox\springfox-swagger-ui\2.9.2\springfox-swagger-ui-2.9.2.jar;C:\Users\SNG-012\.m2\repository\io\swagger\swagger-annotations\1.5.20\swagger-annotations-1.5.20.jar;C:\Users\SNG-012\.m2\repository\com\github\xingshuangs\iot-communication\1.4.2\iot-communication-1.4.2.jar;C:\Users\SNG-012\.m2\repository\org\springframework\boot\spring-boot-starter-cache\2.5.9\spring-boot-starter-cache-2.5.9.jar;C:\Users\SNG-012\.m2\repository\org\springframework\spring-context-support\5.3.15\spring-context-support-5.3.15.jar;C:\Users\SNG-012\.m2\repository\io\netty\netty-all\4.1.36.Final\netty-all-4.1.36.Final.jar;"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="user.home" value="C:\Users\SNG-012"/>
- <property name="user.language" value="zh"/>
- <property name="java.specification.vendor" value="Oracle Corporation"/>
- <property name="java.home" value="C:\Program Files\Java\jdk1.8.0_121\jre"/>
- <property name="basedir" value="D:\xm4\HangZhouMes\TemperingGlassModule"/>
- <property name="file.separator" value="\"/>
- <property name="line.separator" value=" "/>
- <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/>
- <property name="surefire.real.class.path" value="C:\Users\SNG-012\AppData\Local\Temp\surefire33896117267200105\surefirebooter1902636531692371884.jar"/>
- <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.8.0_121\jre\lib\resources.jar;C:\Program Files\Java\jdk1.8.0_121\jre\lib\rt.jar;C:\Program Files\Java\jdk1.8.0_121\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.8.0_121\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.8.0_121\jre\lib\jce.jar;C:\Program Files\Java\jdk1.8.0_121\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.8.0_121\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.8.0_121\jre\classes"/>
- <property name="user.script" value=""/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
- <property name="java.runtime.version" value="1.8.0_121-b13"/>
- <property name="user.name" value="SNG-012"/>
- <property name="path.separator" value=";"/>
- <property name="os.version" value="10.0"/>
- <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.8.0_121\jre\lib\endorsed"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="file.encoding" value="GBK"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="localRepository" value="C:\Users\SNG-012\.m2\repository"/>
- <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
- <property name="java.io.tmpdir" value="C:\Users\SNG-012\AppData\Local\Temp\"/>
- <property name="idea.version" value="2021.1.3"/>
- <property name="java.version" value="1.8.0_121"/>
- <property name="user.dir" value="D:\xm4\HangZhouMes\TemperingGlassModule"/>
- <property name="os.arch" value="amd64"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
- <property name="sun.os.patch.level" value=""/>
- <property name="java.library.path" value="C:\Program Files\Java\jdk1.8.0_121\jre\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;D:\vm\bin\;D:\jdk17.0.8\bin;D:\apache-jmeter-5.4.1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:/benxiaohai/mysql8/mysql8/mysql8\bin;C:\Program Files\Java\jdk1.8.0_121\bin;C:\Program Files\Tomcat\apache-tomcat-8.0.39\bin;D:\涓嬭浇\ADB;D;\github\platform-tools;C:\Program Files\python;C:\Program Files\python\Scripts;D:\BtSoft\panel\script;C:\Program Files\Google\Chrome\Application;C:\Program Files\apache-maven-3.9.1\bin;D:\寰俊web寮�鍙戣�呭伐鍏穃dll;C:\Pro;ram Files (x86)\NetSarang\Xshell 7\;C:\Program Files\Git\cmd;C:\Program Files\TortoiseGit\bin;D:\宸ヤ綔\apache-ant-1.9.16-bin\apache-ant-1.9.16\bin;D:\宸ヤ綔\Microsoft VS Code\bin;C:\Program Files (x86)\nodejs\;C:\Program Files\Tomcat2\apache-tomcat2\bin;C:\Program Files\Docker;C:\Program Files\Docker\Docker\resources\bin;D:\Erlang OTP\bin;D:\MQ\rabbitmq_server-3.12.12\sbin;D:\python\Scripts\;D:\python\;C:\Users\SNG-012\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Google\Chrome\Application;C:\Users\SNG-012\AppData\Roaming\npm;."/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.vendor" value="Oracle Corporation"/>
- <property name="java.vm.version" value="25.121-b13"/>
- <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.8.0_121\jre\lib\ext;C:\Windows\Sun\Java\lib\ext"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="java.class.version" value="52.0"/>
- </properties>
- <testcase name="contextLoads" classname="com.mes.MesApplicationTests" time="0.225"/>
-</testsuite>
\ No newline at end of file
diff --git a/TemperingGlassModule/target/surefire-reports/com.mes.MesApplicationTests.txt b/TemperingGlassModule/target/surefire-reports/com.mes.MesApplicationTests.txt
deleted file mode 100644
index 93941f7..0000000
--- a/TemperingGlassModule/target/surefire-reports/com.mes.MesApplicationTests.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.mes.MesApplicationTests
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.389 s - in com.mes.MesApplicationTests
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 0666da4..a504e69 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -1,52 +1,209 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
+import {reactive, onMounted} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
-const dialogFormVisiblea = ref(false)
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import Landingindication from "./Landingindication.vue";
-// import Landingindicationtwo from "./Landingindicationtwo.vue";
+import Landingindicationtwo from "./Landingindicationtwo.vue";
+import unloadrequest from "@/utils/unloadrequest";
+const dialogFormVisiblea = ref(false)
-const tableData = [
- {
- id: '1',
- long: '1005',
- wide: '183.6',
- thick: '1991',
- state: '鏈惎鐢�',
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- state: '鏈惎鐢�'
- },
- {
- id: '3',
- long: '105',
- wide: '183',
- thick: '191',
- state: '鏈惎鐢�'
- },
- {
- id: '4',
- long: '105',
- wide: '183',
- thick: '191',
- state: '鏈惎鐢�'
- },
- {
- id: '5',
- long: '105',
- wide: '183',
- thick: '191',
- state: '鏈惎鐢�'
- },
-]
+
+
+const dialogFormVisiblea2 = ref(false)
+
+
+
+
+
+let socket;
+
+
+const initWebSocket = (token) =>{ //鍒濆鍖杦e
+
+let viewname = "unloadglass";
+
+if (typeof WebSocket === "undefined") {
+ console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+} else {
+ let socketUrl = "ws://" + "localhost"+":88" + "/api/unLoadGlass/api/talk/" + viewname;
+ if (socket != null) {
+ socket.close();
+ socket = null;
+ }
+
+ // 寮�鍚竴涓獁ebsocket鏈嶅姟
+ socket = new WebSocket(socketUrl);
+
+ // 鎵撳紑浜嬩欢
+ socket.onopen = function () {
+ console.log("websocket宸叉墦寮�");
+ };
+
+
+
+socket.onmessage = (msg) => {
+if (!msg.data) {
+return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+}
+
+
+
+ let obj = JSON.parse(msg.data);
+
+
+ console.log('鏀跺埌娑堟伅锛�', obj.data);
+
+ }
+
+ }
+ }
+
+
+
+
+// 鏁版嵁
+const loading = ref(false);
+
+
+// 寮规鏄剧ず鎺у埗
+
+const dialogFormVisible = ref(false);
+
+// 琛ㄥ崟鏁版嵁
+const workstationId = ref('');
+const flowCardId = ref('');
+const flowCardOptions = ref([]);
+
+
+// 鏂规硶
+const handleSelectionChange = () => {
+ // 澶勭悊琛ㄦ牸琛岄�夋嫨浜嬩欢
+};
+
+const handleBindRack = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+
+ // 鍙戣捣鎺ュ彛璇锋眰鑾峰彇娴佺▼鍗″彿
+ fetchFlowCardId();
+
+
+ dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+
+
+
+//鑾峰彇娴佺▼鍗″彿
+const fetchFlowCardId = async () => {
+ try {
+ const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId');
+ console.log(response)
+ if (response.code === 200) {
+ flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+};
+//纭
+const handleConfirm = async () => {
+ try {
+ const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', {
+ workstationId: workstationId.value,
+ flowCardId: flowCardId.value
+ });
+
+ console.log(response)
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ console.log('缁戝畾鎴愬姛');
+ ElMessage.success(response.message);
+ dialogFormVisiblea.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+};
+
+
+
+const handleBindRack2 = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+
+
+
+
+ dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+//娓呴櫎鍐呭
+const handleclear = async () => {
+ try {
+ const response = await unloadrequest.post('/api/unLoadGlass/clear', {
+ workstationId: workstationId.value,
+ });
+
+ console.log(response);
+
+ if (response.code === 200) {
+ // 娓呴櫎鎴愬姛鐨勯�昏緫
+ console.log('娓呴櫎鎴愬姛');
+ ElMessage.success(response.message);
+ dialogFormVisiblea2.value = false;
+ } else if (response.code === 400) {
+ // 娓呴櫎澶辫触鐨勯�昏緫
+ console.log('娓呴櫎澶辫触');
+ console.log(response.message); // 鎵撳嵃鏈嶅姟鍣ㄨ繑鍥炵殑閿欒淇℃伅
+ ElMessage.error(response.message);
+ dialogFormVisiblea2.value = false;
+ }
+ } catch (error) {
+ // console.log(error);
+ ElMessage.error("娓呴櫎澶辫触");
+ dialogFormVisiblea2.value = false;
+ }
+};
+
+
+
+const tableData = reactive([]);
+
+// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
+const fetchTableData = async () => {
+ try {
+ // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
+ const response = await unloadrequest.get('/api/unLoadGlass/getone');
+
+ // 妫�鏌ュ搷搴旂姸鎬�
+ if (response.code === 200) {
+ // 鏇存柊琛ㄦ牸鏁版嵁
+ console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
+ tableData.splice(0, tableData.length, ...response.data);
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
+ ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
+ }
+};
+
+
+
+
+initWebSocket();
+onMounted(fetchTableData);
+setInterval(fetchTableData, 2000)
+
const open = () => {
ElMessageBox.confirm(
'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -84,17 +241,6 @@
}
}
-const dialogForm = () => {
- ElMessageBox.confirm(
- '鏄惁娓呯┖璇ユ潯淇℃伅?',
- '鎻愮ず',
- {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- )
-}
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -133,6 +279,10 @@
],
})
+
+
+
+
</script>
<template>
@@ -142,53 +292,80 @@
<el-table height="100%" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="涓嬬墖浣�" min-width="80" />
- <el-table-column prop="long" align="center" label="鏋跺彿" min-width="120" />
- <el-table-column prop="wide" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="wide" align="center" label="鎬绘暟閲�" min-width="120" />
- <el-table-column prop="wide" align="center" label="宸茶惤鏋舵暟閲�" min-width="120" />
- <el-table-column prop="state" align="center" label="鍚敤鐘舵��" min-width="120" />
+ <el-table-column prop="workstationId" align="center" label="涓嬬墖浣�" min-width="80" />
+ <el-table-column prop="workstationId" align="center" label="鏋跺彿" min-width="120" />
+ <el-table-column prop="flowCardId" align="center" label="娴佺▼鍗″彿" min-width="120" />
+ <el-table-column prop="totalquantity" align="center" label="鎬绘暟閲�" min-width="120" />
+ <el-table-column prop="racksnumber" align="center" label="宸茶惤鏋舵暟閲�" min-width="120" />
+ <el-table-column prop="work_state" align="center" label="鐘舵��" min-width="120" />
+ <el-table-column prop="deviceId" align="center" label="璁惧鍙�" min-width="120" />
+ <el-table-column prop="enableState" align="center" label="鍚敤鐘舵��" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
- <template #default>
- <el-button size="mini" type="text" plain v-show="state !== '宸插惎鐢�' " @click="dialogFormVisiblea = true">缁戝畾鏋跺瓙</el-button>
- <el-button size="mini" type="text" plain @click="dialogForm">娓呯┖</el-button>
- </template>
+ <template #default="scope">
+ <el-button size="mini" type="text" plain v-show="scope.row.enableState !== '宸插惎鐢�' " @click="handleBindRack(scope.row)">缁戝畾鏋跺瓙</el-button>
+ <el-button size="mini" type="text" plain @click="handleBindRack2(scope.row)">娓呯┖</el-button>
+ </template>
</el-table-column>
</el-table>
</div>
</el-card>
-
- </div>
- <div style="display: flex;">
- <div id="main-body">
- <Landingindication></Landingindication>
- </div>
- <!-- <div id="main-body">
- <Landingindicationtwo></Landingindicationtwo>
- </div> -->
- </div>
+
+
<el-dialog v-model="dialogFormVisiblea" top="21vh" width="30%" title="缁戝畾鏋跺瓙" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
- <el-form label-width="100px" label-position="right">
- <el-form-item label="鏋跺彿锛�" :required="true" style="width: 18vw">
- <el-input autocomplete="off"/>
- </el-form-item>
- <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 18vw;">
- <el-input autocomplete="off" />
- </el-form-item>
- </el-form>
- </el-form>
- </div>
+ <el-form size="mini" label-width="150px">
+ <el-form label-width="100px" label-position="right">
+ <el-form-item label="鏋跺彿锛�" :required="true" style="width: 18vw">
+ <el-input v-model="workstationId" autocomplete="off"/>
+ </el-form-item>
+ <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 18vw;">
+ <el-select v-model="flowCardId" placeholder="璇烽�夋嫨娴佺▼鍗″彿">
+ <el-option v-for="item in flowCardOptions" :key="item.flowcard_id" :label="item.flowcard_id" :value="item.flowcard_id" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ </el-form>
+ </div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisiblea = false">
+ <el-button type="primary" @click="handleConfirm">
纭
</el-button>
<el-button @click="dialogFormVisiblea = false">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
+
+
+
+
+ <el-dialog v-model="dialogFormVisiblea2" top="21vh" width="30%" title="娓呴櫎鏋跺瓙鐜荤拑" >
+
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleclear">
+ 纭
+ </el-button>
+ <el-button @click="dialogFormVisiblea2 = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+
+
+ <!-- workstationId: '1',
+ workstationId: '1005',
+ flowCardId: '183.6',
+ totalquantity: '1991',
+ racksnumber:"1",
+ work_state: '寰呰瘑鍒�', -->
+ </div>
+ <div style="display: flex;">
+ <div id="main-body">
+ <Landingindication></Landingindication>
+ </div>
+ <div id="main-bodya">
+ <Landingindicationtwo></Landingindicationtwo>
+ </div></div>
</template>
<style scoped>
@@ -212,7 +389,11 @@
height: 450px;
}
#main-body{
+ margin-top: -20px;
+ margin-left: 300px;
+}
+#main-bodya{
margin-top: -10px;
- margin-left: 450px;
+ margin-left: 100px;
}
</style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index 82e9685..ae22d4f 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -6,6 +6,7 @@
<artifactId>hangzhoumesParent</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,13 +44,13 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
@@ -171,6 +172,12 @@
<version>1.2.33</version>
</dependency>
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join</artifactId>
+ <version>1.2.4</version>
+ </dependency>
+
</dependencies>
diff --git a/hangzhoumesParent/common/servicebase/pom.xml b/hangzhoumesParent/common/servicebase/pom.xml
index bc347e1..e7f1411 100644
--- a/hangzhoumesParent/common/servicebase/pom.xml
+++ b/hangzhoumesParent/common/servicebase/pom.xml
@@ -6,18 +6,12 @@
<artifactId>common</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>servicebase</artifactId>
- <dependencies>
- <dependency>
- <groupId>com.github.yulichang</groupId>
- <artifactId>mybatis-plus-join</artifactId>
- <version>1.1.6</version>
- </dependency>
- </dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java
index c1d3a8e..df9b277 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java
@@ -13,7 +13,7 @@
* @since 2024-04-16
*/
@RestController
-@RequestMapping("/userinfo/optimize-detail")
+@RequestMapping("/optimize-detail")
public class OptimizeDetailController {
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeLayoutController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeLayoutController.java
index 65b9a8b..5b54fe3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeLayoutController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeLayoutController.java
@@ -13,7 +13,7 @@
* @since 2024-04-16
*/
@RestController
-@RequestMapping("/userinfo/optimize-layout")
+@RequestMapping("/optimize-layout")
public class OptimizeLayoutController {
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 712cb52..222759c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -26,6 +26,7 @@
@RestController
@RequestMapping("/optimizeProject")
@Slf4j
+
public class OptimizeProjectController {
@Autowired
//鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
@@ -44,8 +45,9 @@
@PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
log.info("鑾峰彇閫夋嫨濂界殑宸ョ▼id杩涜鏌ヨ鏁版嵁鍚庝繚瀛�");
- List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
- log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庤繘琛屼繚瀛�:{}", glass);
+ List<OptimizeProject> glass = optimizeProjectService.selectSaveProject(optimizeRequest);
+ log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庝繚瀛樺埌upPattenUsage琛�:{}", glass);
+ optimizeProjectService.insetupPattenUsage(glass);
//void insetProject(glass);
return Result.build(200, "", glass);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
index 7a2c882..08c1911 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import org.apache.ibatis.annotations.Mapper;
@@ -18,6 +19,6 @@
*/
@Mapper
@DS("pp")
-public interface OptimizeProjectMapper extends BaseMapper<OptimizeProject> {
+public interface OptimizeProjectMapper extends MPJBaseMapper<OptimizeProject> {
List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
index 61b201a..0fb765e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -1,6 +1,7 @@
package com.mes.pp.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
@@ -14,26 +15,21 @@
* @author zhoush
* @since 2024-04-16
*/
-public interface OptimizeProjectService extends IService<OptimizeProject> {
+public interface OptimizeProjectService extends MPJBaseService<OptimizeProject> {
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
- *
* @return
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
-
/**
* 鏌ヨ淇濆瓨鍒板師鐗囦娇鐢ㄨ鎯呰〃鐨勬暟鎹�
- *
* @return
*/
- List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
-
+ List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest);
/**
* 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
- *
* @return
*/
- void insetProject(OptimizeProject glass);
+ void insetupPattenUsage(List<OptimizeProject> glass);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index 4ec8d74..5df4ef4 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -4,13 +4,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Collections;
import java.util.List;
/**
@@ -24,16 +29,17 @@
@Service
@DS("pp")
@Slf4j
-public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
-
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(OptimizeProject::getState, optimizeRequest.getState())
- .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()), OptimizeProject::getProjectNo, optimizeRequest.getProjectNo())
- //.groupBy(OptimizeProject::getProjectNo)
+ wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
+ .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
+ //.groupBy(OptimizeProject::getProjectNo)
;
log.info("杩斿洖宸ョ▼淇℃伅");
return this.list(wrapper);
@@ -41,12 +47,19 @@
@Override
- public void insetProject(OptimizeProject glass) {
-
+ public void insetupPattenUsage(List<OptimizeProject> glass) {
+ log.info("寰幆鏌ヨ缁撴灉淇濆瓨鍒癠pPattenUsage琛ㄤ腑");
+ for (OptimizeProject project : glass) {
+ UpPattenUsage upPattenUsage = new UpPattenUsage();
+ upPattenUsage.setEngineeringId(project.getProjectNo());
+ upPattenUsage.setFilmsId(project.getGlassType());
+ upPattenUsage.setState(project.getState());
+ upPattenUsageMapper.insert(upPattenUsage);
+ }
}
@Override
- public List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) {
+ public List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest) {
log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
log.info("杩斿洖宸ョ▼淇℃伅");
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 156cd06..c0a3d4d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -8,8 +8,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
import java.util.List;
/**
@@ -21,7 +23,7 @@
* @since 2024-04-18
*/
@RestController
-@RequestMapping("/userinfo/up-patten-usage")
+@RequestMapping("/up-patten-usage")
@Slf4j
public class UpPattenUsageController {
@@ -34,5 +36,13 @@
log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
return Result.build(200, "", glass);
}
+
+ @ApiOperation("鐐瑰嚮閫夋嫨宸ョ▼淇濆瓨鍚庤繘琛岃皟鐢�,浼犲叆宸ョ▼鍙�")
+ @GetMapping("/saveUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ public Result<Integer> saveUpPattenUsage(@RequestBody String engineeringId) {
+ //List<OptimizeUpPattenUsage> glass = upPattenUsageService.saveUpPattenUsage(engineeringId);
+ log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", 200);
+ return Result.build(200, "", 200);
+ }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java
new file mode 100644
index 0000000..2b747b6
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java
@@ -0,0 +1,98 @@
+package com.mes.uppattenusage.entity;
+
+public class OptimizeUpPattenUsage {
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
+
+ /**
+ * 鑶滅郴id
+ */
+ private String glassType;
+
+ /**
+ * 瀹�
+ */
+ private Double width;
+
+ /**
+ * 楂�
+ */
+ private Double height;
+
+ /**
+ * 鍘氬害
+ */
+ private Double glassThickness;
+
+ /**
+ * 鍘熺墖鐗堝浘鐗囧簭
+ */
+ private Integer heatLayoutSort;
+
+ /**
+ * 鐘舵��
+ */
+ private Integer state;
+
+ // Getter methods
+ public String getProjectNo() {
+ return projectNo;
+ }
+
+ public String getGlassType() {
+ return glassType;
+ }
+
+ public Double getWidth() {
+ return width;
+ }
+
+ public Double getHeight() {
+ return height;
+ }
+
+ public Double getGlassThickness() {
+ return glassThickness;
+ }
+
+ public Integer getHeatLayoutSort() {
+ return heatLayoutSort;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ // Setter methods
+ public void setProjectNo(String projectNo) {
+ this.projectNo = projectNo;
+ }
+
+ public void setGlassType(String glassType) {
+ this.glassType = glassType;
+ }
+
+ public void setWidth(Double width) {
+ this.width = width;
+ }
+
+ public void setHeight(Double height) {
+ this.height = height;
+ }
+
+ public void setGlassThickness(Double glassThickness) {
+ this.glassThickness = glassThickness;
+ }
+
+ public void setHeatLayoutSort(Integer heatLayoutSort) {
+ this.heatLayoutSort = heatLayoutSort;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
index 680bc4d..a92188d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
@@ -35,7 +35,7 @@
/**
* 鑶滅郴id
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 瀹�
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
index a53a12b..154e50d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
@@ -1,5 +1,6 @@
package com.mes.uppattenusage.mapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,6 +12,6 @@
* @author zhoush
* @since 2024-04-18
*/
-public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> {
+public interface UpPattenUsageMapper extends MPJBaseMapper<UpPattenUsage> {
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index ff18b32..47a6c20 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -1,8 +1,9 @@
package com.mes.uppattenusage.service;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -12,6 +13,9 @@
* @author zhoush
* @since 2024-04-18
*/
-public interface UpPattenUsageService extends IService<UpPattenUsage> {
+public interface UpPattenUsageService extends MPJBaseService<UpPattenUsage> {
List<UpPattenUsage> prioritylist(int state);
+
+ List<Map> saveUpPattenUsage(String engineeringId);
}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index ab87070..cf60362 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -1,14 +1,22 @@
package com.mes.uppattenusage.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.mapper.OptimizeProjectMapper;
+import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -20,7 +28,10 @@
*/
@Service
@Slf4j
-public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
+public class UpPattenUsageServiceImpl extends MPJBaseServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
+
+ @Autowired
+ OptimizeProjectMapper optimizeProjectMapper;
@Override
public List<UpPattenUsage> prioritylist(int state) {
log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
@@ -30,6 +41,19 @@
return this.list(wrapper);
}
+ @Override
+ @DS("pp")
+ public List<Map> saveUpPattenUsage(String engineeringId) {
+
+ if (engineeringId != null) {
+
+ List<Map> upPattenUsageList=optimizeProjectMapper.selectJoinList(Map.class,new MPJQueryWrapper<OptimizeProject>()
+ .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort")
+ .leftJoin("optimize_layout b on t.project_no=b.project_no")
+ .eq("b.project_no",engineeringId));
+ }
+ return Collections.emptyList();
+ }
}
diff --git a/hangzhoumesParent/common/springsecurity/pom.xml b/hangzhoumesParent/common/springsecurity/pom.xml
index f4e6eed..70e572c 100644
--- a/hangzhoumesParent/common/springsecurity/pom.xml
+++ b/hangzhoumesParent/common/springsecurity/pom.xml
@@ -6,6 +6,7 @@
<artifactId>common</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hangzhoumesParent/gateway/pom.xml b/hangzhoumesParent/gateway/pom.xml
index 5125cf1..6334bf7 100644
--- a/hangzhoumesParent/gateway/pom.xml
+++ b/hangzhoumesParent/gateway/pom.xml
@@ -6,6 +6,7 @@
<artifactId>hangzhoumesParent</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index bec683f..192058e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -6,6 +6,7 @@
<artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -24,6 +25,7 @@
<!-- <dependency>-->
<!-- <groupId>com.github.yulichang</groupId>-->
<!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
+<!-- <version>1.4.12</version>-->
<!-- </dependency>-->
</dependencies>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
index 5e3bed7..d7a94c3 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -6,6 +6,7 @@
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,41 +24,40 @@
* @author zhoush
* @since 2024-04-07
*/
+@Api("纾ㄨ竟鍓嶇紦瀛�")
@RestController
@RequestMapping("/edgStorageCage")
public class EdgStorageCageController {
@Autowired
- private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+ private EdgStorageCageService edgStorageCageService;
-
- //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
+ @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()")
@PostMapping("/selectEdgStorageCage")
@ResponseBody
public Result selectEdgStorageCage () {
- List<Map> list=edgStorageCageServiceImpl.selectEdgStorageCages();
+ List<Map> list=edgStorageCageService.selectEdgStorageCages();
return Result.build(200,"鎴愬姛",list);
}
- //娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠�
+ @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(EdgStorageCage edgStorageCage)")
@PostMapping("/insertEdgStorageCage")
@ResponseBody
public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"娣诲姞鎴愬姛",1);
}
- //淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�
+ @ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�")
@PostMapping("/updateEdgStorageCage")
@ResponseBody
public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"鏇存崲鎴愬姛",1);
}
-
- //鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��
+ @ApiOperation("鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
@PostMapping("/deleteEdgStorageCage")
@ResponseBody
public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 5dc7252..af0ffe8 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import java.util.List;
@@ -14,7 +15,7 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
+public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
/**
* 璇嗗埆 鐮存崯/鎷胯蛋
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index 5d2f575..4e16726 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import java.util.List;
@@ -14,7 +15,7 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface EdgStorageCageService extends IService<EdgStorageCage> {
+public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> {
//鏌ヨ绗煎唴绌烘牸
List<Map> selectCacheEmpty();
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 48ae3fc..e5339fb 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -2,14 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.interfaces.LambdaJoin;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.Map;
@@ -22,16 +26,16 @@
* @since 2024-04-07
*/
@Service
-public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- //鑾峰彇鍏ㄩ儴鏁版嵁
+public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
+
@Autowired
- private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+ UpPattenUsageMapper upPattenUsageMapper;
//璇嗗埆 鐮存崯/鎷胯蛋
public boolean identWorn(String glassid, int ControlsId) {
- List<EdgStorageCageDetails> edgStorageCageDetails = edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
if (edgStorageCageDetails.size() == 1) {
- edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
return true;
}
return false;
@@ -40,12 +44,13 @@
//鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@Override
public List<Map> selectCutTerritory() {
- List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ List<Map> list = upPattenUsageMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
.select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
+ .select("gi.x_coordinate","gi.y_coordinate","gi.tempering_feed_sequence")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
.leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("state", 1)
+ .eq("t.state", 1)
.orderByAsc("t.layout_sequence")
);
return list;
@@ -54,7 +59,7 @@
//鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
@Override
public List<Map> selectCurrentCutTerritory(String current) {
- List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
+ List<Map> list = baseMapper.selectJoinList(
Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
.select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
@@ -62,7 +67,7 @@
.eq("t.engineering_id", current)
.orderByAsc("t.layout_sequence")
);
- return list;
+ return list;
}
;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index b337c2d..e863425 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,10 +26,8 @@
* @since 2024-04-07
*/
@Service
-public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
+public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Autowired
- EdgStorageCageMapper edgStorageCageMapper;
@Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
@Autowired
@@ -37,7 +36,7 @@
@Override
//鏌ヨ绗煎唴绌烘牸
public List<Map> selectCacheEmpty(){
- List<Map> map=edgStorageCageMapper.selectJoinList(
+ List<Map> map=baseMapper.selectJoinList(
Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
@@ -62,7 +61,7 @@
@Override
//鐞嗙墖缂撳瓨璇︽儏
public List<Map> selectEdgStorageCages(){
- List<Map> map=edgStorageCageMapper.selectJoinList(
+ List<Map> map=baseMapper.selectJoinList(
Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
@@ -73,7 +72,7 @@
@Override
//淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
- edgStorageCageMapper.updateById(edgStorageCage);
+ baseMapper.updateById(edgStorageCage);
return true;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
index cd7d224..5a78021 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
@@ -3,6 +3,7 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,26 +27,27 @@
public class GlassInfoController {
@Autowired
- private GlassInfoServiceImpl GlassInfoServiceImpl;
+ private GlassInfoService glassInfoService;
- @PostMapping("/selectId") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ApiOperation("鏍规嵁鐜荤拑灏忕墖ID鏌ヨ 鐜荤拑鏁版嵁锛氬弬鏁�(鐜荤拑ID)")
+ @PostMapping("/selectId")
@ResponseBody
public Result selectId(String ProcessId) {
- List<GlassInfo> list = GlassInfoServiceImpl.selectId(ProcessId);
+ List<GlassInfo> list = glassInfoService.selectId(ProcessId);
return Result.build(200,"鎴愬姛",list);
}
-
- @PostMapping("/selectAll") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ApiOperation("鏌ヨ鎵�鏈夌幓鐠冨皬鐗囦俊鎭� 鐜荤拑鏁版嵁 鍙傛暟()")
+ @PostMapping("/selectAll")
@ResponseBody
public Result selectAll() {
- List<GlassInfo> list = GlassInfoServiceImpl.selectAll();
+ List<GlassInfo> list = glassInfoService.selectAll();
return Result.build(200,"鎴愬姛",list);
}
-
- @PostMapping("/selectFlowCardId") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ApiOperation("鏌ヨ宸ョ▼涓嬬殑鐜荤拑灏忕墖淇℃伅 鐜荤拑鏁版嵁 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/selectFlowCardId")
@ResponseBody
public Result selectFlowCardId(String flowCardId) {
- List<GlassInfo> list = GlassInfoServiceImpl.selectFlowCardId(flowCardId);
+ List<GlassInfo> list = glassInfoService.selectFlowCardId(flowCardId);
return Result.build(200,"鎴愬姛",list);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index cae494e..a874049 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -22,24 +22,22 @@
@Service
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
- @Autowired
- GlassInfoMapper glassInfoMapper;
//鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectId(String glassId){
- return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
+ return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
};
//鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectAll(){
- return glassInfoMapper.selectList(null);
+ return baseMapper.selectList(null);
};
//鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectFlowCardId(String flowCardId){
- return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
+ return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
};
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index cb8fb57..9634f19 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -1,10 +1,13 @@
package com.mes.taskcache.controller;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import com.mes.taskcache.service.HangzhoumesService;
import com.mes.taskcache.service.PpService;
import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,51 +27,49 @@
public class TaskCacheController {
@Autowired
- private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
-
- @Autowired
- private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
private HangzhoumesService hangzhoumesService;
- @PostMapping("/cutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/cutTerritory")
@ResponseBody
public Result cutTerritory(String current) {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCurrentCutTerritory(current);
+ List<Map> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/currentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
+ @ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
+ @PostMapping("/currentCutTerritory")
@ResponseBody
public Result currentCutTerritory() {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
+ List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/selectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
+ @ApiOperation("璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘 鍙傛暟(鐗堝浘缂栧彿)")
+ @PostMapping("/selectCutTerritory")
@ResponseBody
public Result selectCutTerritory(String TerritoryId) {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
+ List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/identControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[0:鐮存崯锛�1锛氭嬁璧癩锛�")
+ @PostMapping("/identControls")
@ResponseBody
public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
- boolean issucess = edgStorageCageDetailsServiceImpl.identWorn(identId,controlsId);
+ boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
return Result.build(200,"鎴愬姛",issucess);
}
-
- @PostMapping("/selectCageInfo") // 鏌ヨ绗煎唴淇℃伅
+ @ApiOperation("鏌ヨ绗煎唴淇℃伅 鍙傛暟()")
+ @PostMapping("/selectCageInfo")
@ResponseBody
- public Result selectCageInfo(String ProcessId) {
+ public Result selectCageInfo() {
List<Map> h = hangzhoumesService.SelectCageInfo();
return Result.build(200,"鎴愬姛",h);
}
-
- @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
+ @ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
+ @PostMapping("/selectEdgTask")
@ResponseBody
public Result selectEdgTask(String ProcessId) {
List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 73efed6..74d2904 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -23,46 +23,42 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
- @Autowired
- GlassInfoMapper glassInfoMapper;
- @Autowired
- TaskCacheMapper taskCacheMapper;
//娣诲姞鐞嗙墖绗间换鍔�
@Override
public boolean insertTaskCache(TaskCache taskCache){
- taskCacheMapper.insert(taskCache);
+ baseMapper.insert(taskCache);
return true;
}
//鏌ヨ纾ㄨ竟浠诲姟
@Override
public List<TaskCache> selectEdgInfo(String line) {
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
}
//鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
@Override
public List<TaskCache> selectCacheInfo(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
}
//鏌ヨ鍏ㄩ儴浠诲姟
@Override
public List<TaskCache> selectAll() {
- return taskCacheMapper.selectList(null);
+ return baseMapper.selectList(null);
}
//鏌ヨ寰呰繘鐗囦换鍔�
@Override
public List<TaskCache> selectInputTaskCache(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
}
//鏌ヨ寰呭嚭鐗囦换鍔�
@Override
public List<TaskCache> selectOutTaskCache(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
}
//鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
@Override
public List<TaskCache> selectLastOutCacheInfo(String line){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java
deleted file mode 100644
index a6e1a20..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mes.uppattenusage.controller;
-
-import com.mes.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl;
-import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
-import com.mes.taskcache.service.HangzhoumesService;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@RestController
-@RequestMapping("/taskCache")
-public class uppattenusageController {
-
- @Autowired
- private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
-
- @Autowired
- private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
-
- @Autowired
- private HangzhoumesService hangzhoumesService;
-
-
- @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
- @ResponseBody
- public Result selectEdgTask(String ProcessId) {
- List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
- return Result.build(200,"鎴愬姛",EdgTasks);
- }
-
-}
-
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
deleted file mode 100644
index dba071e..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mes.uppattenusage.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("`up_patten_usage`")
-public class UpPattenUsage {
- @TableId(type = IdType.AUTO)
- private Integer id;//鍘熺墖浣跨敤鎯呭喌琛╥d
- private Integer engineeringid;//宸ョ▼鍙�
- private Integer filmsid;//鑶滅郴id
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Integer layoutsequence;//鍘熺墖鐗堝浘鐗囧簭
- private Integer state;//鐘舵��
-
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
deleted file mode 100644
index b6efc63..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mes.uppattenusage.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.mes.uppattenusage.entity.UpPattenUsage;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpPattenUsageMapper extends MPJBaseMapper<UpPattenUsage> {
-
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
deleted file mode 100644
index 5083b96..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.uppattenusage.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.uppattenusage.entity.UpPattenUsage;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpPattenUsageService extends IService<UpPattenUsage> {
-
-
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
deleted file mode 100644
index 718c4e6..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mes.uppattenusage.service.impl;
-
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
-import com.mes.uppattenusage.service.UpPattenUsageService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Service
-public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
-
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index bfda445..2cb20e5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -1,5 +1,7 @@
package com.mes;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -23,7 +25,9 @@
public class CacheGlassModuleApplicationTest {
@Autowired
- EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+ EdgStorageCageService edgStorageCageService;
+ @Autowired
+ EdgStorageCageDetailsService edgStorageCageDetailsService;
@Test
public void testFindPath() {
@@ -32,17 +36,17 @@
@Test
public void testCacheGlass() {
- List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages();
+ List<Map> map= edgStorageCageService.selectEdgStorageCages();
log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
}
@Test
public void testselectCacheEmpty() {
- List<Map> map= edgStorageCageServiceImpl.selectCacheEmpty();
+ List<Map> map= edgStorageCageService.selectCacheEmpty();
log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
}
@Test
public void testScan() {
- List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages();
+ List<Map> map= edgStorageCageDetailsService.selectCutTerritory();
log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
index 4b53602..23fa7e1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
@@ -6,6 +6,7 @@
<artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,6 +18,11 @@
<artifactId>mybatis-plus-join</artifactId>
<version>1.1.6</version>
</dependency>
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join</artifactId>
+ <version>1.1.6</version>
+ </dependency>
</dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
index 0a684a8..d84d57b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
@@ -2,14 +2,12 @@
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
-import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
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;
import java.util.List;
@@ -24,7 +22,7 @@
*/
@ApiModel("杩涚墖浠诲姟淇℃伅")
@RestController
-@RequestMapping("/userinfo/big-storage-cage-feed-task")
+@RequestMapping("/big-storage-cage-feed-task")
public class BigStorageCageFeedTaskController {
@Autowired
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
index 1330b54..d98ee38 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
@@ -1,8 +1,6 @@
package com.mes.userinfo.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import io.swagger.annotations.ApiModel;
@@ -10,7 +8,6 @@
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;
import java.util.List;
@@ -25,7 +22,7 @@
*/
@ApiModel("鍑虹墖浠诲姟淇℃伅")
@RestController
-@RequestMapping("/userinfo/big-storage-cage-out-task")
+@RequestMapping("/big-storage-cage-out-task")
public class BigStorageCageOutTaskController {
@Autowired
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
index 28383ce..a11c8d2 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
@@ -2,7 +2,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
/**
@@ -14,7 +13,7 @@
* @since 2024-04-16
*/
@RestController
-@RequestMapping("/userinfo/task-cache")
+@RequestMapping("/task-cache")
public class TaskCacheController {
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 29a0efb..71c5cb3 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,10 +3,20 @@
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
+ 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
+ salve_hangzhoumes:
+ url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
+ username: sa
+ password: beibo.123/
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml b/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml
index b5c3882..1450378 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/pom.xml
@@ -6,6 +6,7 @@
<artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/controller/UpPattenUsageController.java
deleted file mode 100644
index c95e08f..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/controller/UpPattenUsageController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.glassinfo.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@RestController
-@RequestMapping("/upPattenUsage")
-public class UpPattenUsageController {
-
-}
-
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/entity/UpPattenUsage.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/entity/UpPattenUsage.java
deleted file mode 100644
index 279f93b..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/entity/UpPattenUsage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mes.glassinfo.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class UpPattenUsage implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍘熺墖浣跨敤鎯呭喌琛╥d
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 宸ョ▼鍙�
- */
- private Integer engineeringId;
-
- /**
- * 鑶滅郴id
- */
- private Integer filmsId;
-
- /**
- * 瀹�
- */
- private Double width;
-
- /**
- * 楂�
- */
- private Double height;
-
- /**
- * 鍘氬害
- */
- private Double thickness;
-
- /**
- * 鍘熺墖鐗堝浘鐗囧簭
- */
- private Integer layoutSequence;
-
- /**
- * 鐘舵��
- */
- private Integer state;
-
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/mapper/UpPattenUsageMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/mapper/UpPattenUsageMapper.java
deleted file mode 100644
index 4dca443..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/mapper/UpPattenUsageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.glassinfo.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.glassinfo.entity.UpPattenUsage;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/UpPattenUsageService.java
deleted file mode 100644
index bc3d5d7..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/UpPattenUsageService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.glassinfo.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.glassinfo.entity.UpPattenUsage;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpPattenUsageService extends IService<UpPattenUsage> {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/UpPattenUsageServiceImpl.java
deleted file mode 100644
index 9f2301a..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/UpPattenUsageServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.glassinfo.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.glassinfo.entity.UpPattenUsage;
-import com.mes.glassinfo.mapper.UpPattenUsageMapper;
-import com.mes.glassinfo.service.UpPattenUsageService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Service
-public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
-
-}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
index 9a4e2c8..c17d927 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -37,7 +37,7 @@
//鏂板宸ヤ綅淇℃伅淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
//鍒犻櫎宸ヤ綅淇℃伅涔熺敤杩欎釜,闄や簡宸ヤ綅id鐜荤拑淇℃伅浼爊ull
- @ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�")
+ @ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴")
@PostMapping("/updateGlassMessage")
@ResponseBody
public void updateGlassMessage(@RequestBody UpWorkstation upwork) {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
index 546b6a7..74f6cce 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiOperation;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -65,7 +66,7 @@
/**
* 鑶滅郴
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 鏁伴噺
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
index 5ebb233..16d3ca2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -1,16 +1,19 @@
package com.mes;
-import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
+import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
+import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* @Author : zhoush
@@ -24,6 +27,8 @@
@Resource
private OptimizeProjectMapper optimizeProjectMapper;
+ @Autowired
+ private UpPattenUsageServiceImpl upPattenUsageService;
@Test
public void test() {
@@ -36,4 +41,10 @@
public void testFindPath() {
log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
}
+
+ @Test
+ public void testFindPa() {
+ List<Map> glass = upPattenUsageService.saveUpPattenUsage("P24032204");
+ log.info("瀹屾暣璺緞锛歿}", Arrays.asList(glass));
+ }
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml b/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml
index bce3faf..b2ee602 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/pom.xml
@@ -6,6 +6,7 @@
<artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
index 27baa5d..7f8d916 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml
@@ -6,6 +6,7 @@
<artifactId>moduleService</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,6 +32,12 @@
<version>1.2.4</version>
</dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>sqljdbc4</artifactId>
+ <version>4.0</version>
+ </dependency>
+
</dependencies>
<properties>
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 beff854..bd213d8 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
@@ -19,9 +19,10 @@
System.out.println("鍚姩瀹屾垚");
- new PLCAutoMes().start();
- new Plchome().start();
+// new PLCAutoMes().start();
+//
+// new Plchome().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
index 0aa64b9..c9a17a1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
@@ -8,5 +8,4 @@
public class DownGlassInfoController {
- // Other endpoints can be added for CRUD operations
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java
index ae4a15f..4daca39 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java
@@ -15,16 +15,10 @@
* @author zhoush
* @since 2024-04-07
*/
-@Api(tags = "涓嬫枡浠诲姟")
+
@RestController
@RequestMapping("/downGlassTask")
public class DownGlassTaskController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
- }
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
index ef7ffd5..232b7b7 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
@@ -1,6 +1,5 @@
package com.mes.downglassinfo.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,7 +23,7 @@
/**
* id
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id")
private Long id;
/**
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java
index cb91c98..0d596f5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java
@@ -1,5 +1,6 @@
package com.mes.downglassinfo.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.downglassinfo.entity.DownGlassTask;
@@ -11,6 +12,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@DS("salve_hangzhoumes")
public interface DownGlassTaskMapper extends BaseMapper<DownGlassTask> {
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 cd89680..1e8ed89 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
@@ -17,11 +17,11 @@
List<DownGlassTask> getUnloadingTaskState();
- void updateTaskStateToZero(String flowCardId);
+ void updateTaskStateToZero(long id);
- void deleteTask(String flowCardId);
+ void deleteTask(long id);
DownGlassTask selectLastOutCacheInfo(String endCell);
- Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId);
+ Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId);
}
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 31d78d0..4e9cdf8 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
@@ -32,16 +32,16 @@
}
@Override
- public void updateTaskStateToZero(String flowCardId) {
+ public void updateTaskStateToZero(long id) {
UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("task_stauts", 0).eq("flow_card_id", flowCardId);
+ updateWrapper.set("task_stauts", 0).eq("id", id);
baseMapper.update(null, updateWrapper);
}
@Override
- public void deleteTask(String flowCardId) {
+ public void deleteTask(long id) {
LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(DownGlassTask::getFlowCardId, flowCardId);
+ queryWrapper.eq(DownGlassTask::getId, id);
baseMapper.delete(queryWrapper);
}
@@ -58,7 +58,7 @@
}
@Override
- public Integer insertCacheTask(int id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) {
+ public Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) {
DownGlassTask glassInfo = new DownGlassTask();
glassInfo.setId(id);
glassInfo.setStartCell(start);
@@ -76,4 +76,8 @@
}
+
+
+
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index e7b0344..4a6a297 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -2,18 +2,24 @@
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.downstorage.service.DownStorageCageService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import java.util.Map;
+@Api(tags = "缂撳瓨")
@RestController
-@RequestMapping("/down-storage-cage-details")
+@RequestMapping("/api/unLoadGlass/downstorage")
public class DownStorageCageDetailsController {
@Autowired
private DownStorageCageDetailsService downStorageCageDetailsService;
+ @Autowired
+ private DownStorageCageService downStorageCageService;
@PostMapping("/add")
public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
@@ -21,5 +27,22 @@
return "Details added successfully";
}
+
+
+ //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
+ @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏")
+ @GetMapping("/selectStorageCage")
+ @ResponseBody
+ public Result selectEdgStorageCage () {
+ List<Map> list=downStorageCageService.getCacheInfo();
+ return Result.build(200,"鎴愬姛",list);
+ }
+
+
+
+
+//
+
+
// Other CRUD operations can be defined here
}
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 bdb011a..7418618 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
@@ -1,16 +1,16 @@
package com.mes.downstorage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
+import com.mes.glassinfo.entity.GlassInfo;
+import org.apache.ibatis.annotations.*;
import java.util.List;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author zhoush
@@ -18,7 +18,7 @@
*/
@Mapper
public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> {
- //
+//
// @Select("select * from `glass_info` where id=#{id}")
// GlassInfo SelectGlassId(String id);
// 鏌ヨ绗煎瓙鍐呯┖闂�
@@ -27,13 +27,13 @@
// 鏌ヨ绗﹀悎宸ヤ綅鐨勫嚭鐗囩幓鐠�
@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);
-
+ 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);
@@ -64,7 +64,7 @@
// 娣诲姞涓嬬墖浠诲姟
@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);
+ 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/mapper/DownStorageCageMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageMapper.java
index ff19df6..ae0b8a2 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageMapper.java
@@ -1,6 +1,7 @@
package com.mes.downstorage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.downstorage.entity.DownStorageCage;
/**
@@ -11,6 +12,6 @@
* @author zhoush
* @since 2024-03-27
*/
-public interface DownStorageCageMapper extends BaseMapper<DownStorageCage> {
+public interface DownStorageCageMapper extends MPJBaseMapper<DownStorageCage> {
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
index ce6d4e3..382665d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
@@ -3,50 +3,39 @@
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
+
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+import com.mes.downworkstation.mapper.DownWorkstationMapper;
+import com.mes.tools.WebSocketServer;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.tools.WebSocketServer;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
@Data
@Service
public class DownGlassCacheLogic {
- @Autowired
- private DownStorageCageDetailsMapper selectInfo;
- private GlassInfoService GlassInfoService;
- private DownStorageCageDetailsService downStorageCageDetailsService;
- private DownGlassTaskService downGlassTaskService;
-
- /**
- * @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";
+ @Autowired
+ private DownStorageCageDetailsMapper selectInfo;
+ private GlassInfoService GlassInfoService;
+ private DownStorageCageService downStorageCageService;
+ private DownGlassTaskService downGlassTaskService;
+
+
+
+
public void process() {
String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + "";
@@ -77,20 +66,23 @@
public boolean processInto(String Number) {
GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
+ downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
+
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
- List<DownStorageCageDetails> list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
+ //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸
+ List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByLayoutAndSequence(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
//绌烘爡鏍煎彿
if (list.size() == 0) {
- list = selectInfo.SelectCacheLeisure();
+ //鏌ヨ绗煎瓙鍐呯┖闂�
+ list = downStorageCageService.getCacheLeisure();
}
//灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
if (list.size() == 0) {
- list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
+ list = downStorageCageService.getIsExistIntoCacheByLayout(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
}
if (list.size() > 0) {
//瀛樺湪绌烘牸
@@ -100,6 +92,7 @@
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;
}
@@ -117,12 +110,41 @@
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(1, 5);
- List<DownStorageCageDetails> list2 = selectInfo.SelectCacheOut(6, 10);
- List<DownStorageCageDetails> list3 = selectInfo.SelectCacheOut(1, 10);
+ List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
+ List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
+ List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
+ // 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
+ if (!list3.isEmpty()) {
+ DownStorageCageDetails item3 = list3.get(0);
+ if (item3.getHeight() >= 1 && item3.getWidth() >= 1) {
+
+ String endcell = "13";
+ String SendEndcell = "1";
+
+ selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ return true;
+ }
+ }
+
+ //鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
+ else if (!list3.isEmpty()) {
+ DownStorageCageDetails item3 = list3.get(0);
+ if (G06.equals("0") && G11.equals("0")) {
+
+ String endcell = "11";
+ String SendEndcell = "1";
+
+ selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
+ S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
+ return true;
+ }
+ }
// 鎸夌収椤哄簭绗﹀悎鍓嶇鍑虹墖
- if (!list.isEmpty()) {
+ else if (!list.isEmpty()) {
DownStorageCageDetails item = list.get(0);
if (G06.equals("0") && G11.equals("1")) {
// 鍑哄埌 G06
@@ -141,49 +163,19 @@
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
}
- // 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
- } else if (!list3.isEmpty()) {
- DownStorageCageDetails item3 = list3.get(0);
- if (item3.getHeight() >= 3440 && item3.getWidth() >= 1440) {
- String endcell = "06";
- String SendEndcell = "1";
-
- selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
}
+
// 杩斿洖缁撴灉
return false;
}
-//鏌ヨ鏄惁缁戝畾鏋跺瓙
-// public boolean selectFlowCardId(String FlowCardId){
-//
-// }
/**
- * @param Number //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
+ * @param Number
+ * //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
*/
-
- public void processMb(String Number) {
- //鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo = GlassInfoService.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");
- }
- //杩斿洖缁撴灉
- }
/**
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index bbe9a5c..9bc7a7b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -2,6 +2,9 @@
import com.mes.downstorage.entity.DownStorageCageDetails;
+import java.util.List;
+import java.util.Map;
+
public interface DownStorageCageDetailsService {
void addDownStorageCageDetails(DownStorageCageDetails details);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
index 76a7993..f54c837 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downstorage.entity.DownStorageCage;
+import com.mes.downstorage.entity.DownStorageCageDetails;
import java.util.List;
import java.util.Map;
@@ -16,4 +17,12 @@
*/
public interface DownStorageCageService extends IService<DownStorageCage> {
public List<Map> gettask();
+
+ // List<Map<String, Object>> selectCacheLeisure();
+ List<DownStorageCageDetails> getCacheLeisure();
+ List<DownStorageCageDetails> getCacheOut(int start, int end);
+ List<Map> getCacheInfo();
+ List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width);
+ List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width);
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index 877de8e..dd58aa6 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -1,13 +1,27 @@
package com.mes.downstorage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
@Service
public class DownStorageCageDetailsServiceImpl extends ServiceImpl<DownStorageCageDetailsMapper, DownStorageCageDetails> implements DownStorageCageDetailsService {
+
+
@Override
public void addDownStorageCageDetails(DownStorageCageDetails details) {
@@ -15,5 +29,18 @@
}
+
+
+
+
+
+
+
+
+
+
+
+
+
// Other business methods can be implemented here
}
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 fe93e4a..40c62bb 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
@@ -1,9 +1,12 @@
package com.mes.downstorage.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.downstorage.entity.DownStorageCage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,23 +15,128 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
+@Slf4j
@Service
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
@Autowired
private DownStorageCageMapper downStorageCageMapper;
-
@Override
- public List<Map> gettask() {
+ public List<Map> gettask(){
downStorageCageMapper.selectList(null);
// downStorageCageMapper.selectJoin();
return null;
+ };
+
+
+
+ @Override
+ public List<DownStorageCageDetails> getCacheLeisure() {
+ log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�");
+ List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNull("escd.slot")
+ .orderByAsc("escd.slot")
+ );
+ return list;
}
- ;
+
+// @Override
+// public List<Map> getCacheOut(int start, int end) {
+// log.info(" 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
+// List<Map> map = downStorageCageMapper.selectJoinList(
+// Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .isNotNull("escd.slot")
+// .between("dw.workstation_id", start, end)
+// .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+// );
+// return map;
+// }
+
+
+
+
+
+ @Override
+ public List<DownStorageCageDetails> getCacheOut(int start, int end) {
+ log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
+ List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+ .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ")
+ .isNotNull("escd.slot")
+ .between("dw.workstation_id", start, end)
+ .orderByDesc("escd.width")
+ .orderByDesc("escd.height")
+ );
+ return list;
+ }
+
+
+
+
+
+ @Override
+ public List<Map> getCacheInfo() {
+ log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
+ List<Map> map = downStorageCageMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .orderByAsc("t.slot")
+ );
+ return map;
+ }
+
+ @Override
+ public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
+
+ List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .eq("escd.tempering_layout_id", tempering_layout_id)
+ .lt("escd.tempering_feed_sequence", tempering_feed_sequence)
+ .gt("t.remain_width", width)
+ .orderByAsc("escd.tempering_feed_sequence")
+ );
+ return list;
+ }
+
+ @Override
+ public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+ List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .lt("escd.tempering_layout_id", tempering_layout_id)
+ // 鏉′欢 t.remain_width - width > 0
+ .apply("t.remain_width - " + width + " > 0")
+ .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+ );
+ return list;
+ }
+
+
+
+
+
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index b08f73b..c2305f2 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -4,6 +4,8 @@
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.glassinfo.service.GlassInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -15,7 +17,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -23,6 +25,7 @@
*/
@RestController
+@Api(tags = "宸ヤ綅")
@RequestMapping("/api/unLoadGlass")
public class DownWorkstationController {
@@ -30,11 +33,11 @@
private DownWorkstationService downWorkstationService;
@Autowired
private GlassInfoService glassInfoService;
-
+ @ApiOperation("鑾峰彇宸ヤ綅淇℃伅")
@GetMapping("/getone")
public ResponseEntity<?> getOneDownWorkstations() {
try {
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 5);
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5);
// 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
Map<String, Object> responseData = new HashMap<>();
responseData.put("code", 200);
@@ -52,11 +55,7 @@
}
}
- @GetMapping("/gettwo")
- public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationService.getoneDownWorkstations(6, 10);
- }
-
+ @ApiOperation("鑾峰彇娴佺▼鍗″彿")
@GetMapping("/getflowCardId")
public ResponseEntity<Map<String, Object>> getflowCardId() {
Map<String, Object> responseData = new HashMap<>();
@@ -75,7 +74,9 @@
}
- //缁戝畾鏋跺瓙
+
+//缁戝畾鏋跺瓙
+@ApiOperation("缁戝畾鏋跺瓙")
@PostMapping("/updateFlowCardId")
public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
// 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
@@ -96,7 +97,7 @@
return ResponseEntity.ok(responseData);
}
-
+ @ApiOperation("娓呴櫎宸ヤ綅淇℃伅")
@PostMapping("/clear")
public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
// 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
@@ -113,7 +114,8 @@
responseData.put("code", 200);
// 杩斿洖澶勭悊缁撴灉
return ResponseEntity.ok(responseData);
- } else {
+ }
+ else {
// 濡傛灉鎬绘暟閲忓拰钀芥灦鏁伴噺涓嶄竴鑷达紝杩斿洖閿欒鍝嶅簲
Map<String, Object> errorResponse = new HashMap<>();
errorResponse.put("message", "Total workstations count does not match down workstations count.");
@@ -127,5 +129,9 @@
}
+
+
+
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
index 12efb2c..e142356 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
@@ -21,41 +21,16 @@
@Service
public class DownGlassLogic {
@Autowired
- private DownGlassInfo downGlassInfo;
- private DownWorkstation downWorkstation;
- private DownGlassInfoMapper downGlassInfoMapper;
+
+
private DownGlassInfoService downGlassInfoService;
private DownGlassTaskService downGlassTaskService;
private DownWorkstationMapper downWorkstationMapper;
private DownWorkstationService downWorkstationService;
private DownWorkstationTaskService downWorkstationTaskService;
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();
- /**
- * // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
- */
- private List<DownGlassInfo> glassList;
- /**
- * 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
- */
- private List<DownStorageCageDetails> cageDetailsList;
+
/**
* //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
@@ -68,7 +43,6 @@
downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class);
downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);
List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
//
@@ -100,7 +74,7 @@
downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
//鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
- downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId());
+ downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
sequence++; // 閫掑椤哄簭瀛楁鍊�
@@ -126,9 +100,10 @@
//鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
//鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
- downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getFlowCardId());
+ downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
+
//鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
- downGlassTaskService.deleteTask(downWorkstation.getFlowCardId());
+ downGlassTaskService.deleteTask(downWorkstation.getId());
}
}
@@ -142,14 +117,6 @@
}
- /**
- * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
- */
-
-// public void clearFlowCardId(DownWorkstation downWorkstation) {
-//
-// downWorkstationMapper.clearFlowCardId(downWorkstation);
-// }
}
\ No newline at end of file
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 58e3445..94a7f16 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
@@ -15,5 +15,5 @@
public interface DownWorkstationTaskService extends IService<DownWorkstationTask> {
void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
- void updateTaskStateToZero(String flowCardId);
+ void updateTaskStateToZero(long Id);
}
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 ca152d0..0c44dac 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
@@ -3,6 +3,7 @@
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.DownGlassTask;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationMapper;
@@ -13,6 +14,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
@Service
public class DownWorkstationServiceImpl extends ServiceImpl<DownWorkstationMapper, DownWorkstation> implements DownWorkstationService {
@@ -22,7 +24,8 @@
private DownWorkstationTaskMapper downWorkstationTaskMapper;
- // @Override
+
+// @Override
// public List<DownWorkstation> gettwoDownWorkstations() {
// return downWorkstationMapper.getDownWorkstationsInRange(6,10);
// }
@@ -43,7 +46,7 @@
// return totalQuantity != null ? totalQuantity : 0;
// }
- // @Override
+// @Override
// public int getRacksNumber(int workstationId) {
// Integer racksNumber = downWorkstationMapper.getRacksNumber(workstationId);
// return racksNumber != null ? racksNumber : 0;
@@ -58,8 +61,7 @@
DownWorkstation result = baseMapper.selectOne(queryWrapper);
return result != null ? result.getRacksnumber() : 0;
}
-
- //鏍规嵁鏉′欢鑾峰彇宸ヤ綅鐜荤拑淇℃伅
+//鏍规嵁鏉′欢鑾峰彇宸ヤ綅鐜荤拑淇℃伅
@Override
public List<DownWorkstation> getoneDownWorkstations(int startId, int endId) {
QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
@@ -75,9 +77,10 @@
@Override
public void updateracksnumber(String flowCardId, int racksNumber) {
UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("racks_number", racksNumber).eq("flow_card_id", flowCardId);
+ updateWrapper.set("racks_number",racksNumber).eq("flow_card_id", flowCardId);
baseMapper.update(null, updateWrapper);
}
+
@Override
@@ -102,6 +105,13 @@
}
+
+
+
+
+
+
+
@Transactional
public void crossDatabaseQuery() {
// 浠� MySQL 鏁版嵁搴撲腑鏌ヨ鏁版嵁锛屽彧杩斿洖涓�鏉＄鍚堟潯浠剁殑鏁版嵁
@@ -110,7 +120,10 @@
// 浠� SQL Server 鏁版嵁搴撲腑鏌ヨ鏁版嵁
List<DownWorkstationTask> downWorkstationTasks = downWorkstationTaskMapper.selectList();
-
}
+
+
+
+
}
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 89bbd8e..4c81b4e 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
@@ -33,9 +33,9 @@
}
@Override
- public void updateTaskStateToZero(String flowCardId) {
+ public void updateTaskStateToZero(long id) {
UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("state", 0).eq("flow_card_id", flowCardId);
+ updateWrapper.set("state", 0).eq("id", id);
baseMapper.update(null, updateWrapper);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index bea69f9..3b51bf1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -12,6 +12,11 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+ salve_hangzhoumes:
+ url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
+ username: sa
+ password: beibo.123/
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
cloud:
nacos:
discovery:
@@ -24,12 +29,6 @@
port: 6379
password: 123456
mybatis-plus:
- mapper-locations: classpath*:mapper/**/*.xml
-
- # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- # 璁剧疆 MyBatis 鏃ュ織绾у埆涓� ERROR
-logging:
- level:
- com:
- baomidou:
- mybatisplus=ERROR:
+ mapper-locations: classpath*:mapper/*.xml
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
new file mode 100644
index 0000000..f64b4b3
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -0,0 +1,54 @@
+package mes;
+
+import com.mes.UnLoadGlassApplication;
+import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = UnLoadGlassApplication.class)
+public class UnloadGlassModuleApplicationTest {
+
+ @Autowired
+ DownStorageCageServiceImpl downStorageCageServiceImpl;
+
+ @Test
+ public void testFindPath() {
+ log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
+ }
+
+ @Test
+ public void testCacheGlass() {
+ List<Map> map= downStorageCageServiceImpl.getCacheInfo();
+ log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+ }
+ @Test
+ public void testselectCacheEmpty() {
+ List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheLeisure();
+ log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+ }
+
+
+ @Test
+ public void testgetCacheOut() {
+ List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheOut(1,5);
+ log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗囷細{}", Arrays.asList(map));
+ }
+
+}
diff --git a/hangzhoumesParent/moduleService/pom.xml b/hangzhoumesParent/moduleService/pom.xml
index 4541032..c3bf5ce 100644
--- a/hangzhoumesParent/moduleService/pom.xml
+++ b/hangzhoumesParent/moduleService/pom.xml
@@ -6,6 +6,7 @@
<artifactId>hangzhoumesParent</artifactId>
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,6 +68,12 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/hangzhoumesParent/pom.xml b/hangzhoumesParent/pom.xml
index d0f498c..9ef3261 100644
--- a/hangzhoumesParent/pom.xml
+++ b/hangzhoumesParent/pom.xml
@@ -18,6 +18,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
+ <relativePath/>
</parent>
<properties>
--
Gitblit v1.8.0