From 50084de4a140dece61019b64fd91df041d242e47 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 23 十二月 2024 15:28:53 +0800
Subject: [PATCH] getInfoByIds(Set<String> pointIds) 模型输入计划数据获取、补全 模型输入mergeitem存默认生成的outputid sampleInfo.setPointMap 避免重复查询point
---
iailab-module-data/iailab-module-data-biz/pom.xml | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/pom.xml b/iailab-module-data/iailab-module-data-biz/pom.xml
index a55d2ee..1944423 100644
--- a/iailab-module-data/iailab-module-data-biz/pom.xml
+++ b/iailab-module-data/iailab-module-data-biz/pom.xml
@@ -27,6 +27,11 @@
<artifactId>iailab-module-data-api</artifactId>
<version>${revision}</version>
</dependency>
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-module-data-dahua</artifactId>
+ <version>${revision}</version>
+ </dependency>
<!-- 依赖服务 -->
<dependency>
@@ -55,6 +60,11 @@
<artifactId>iailab-common-biz-ip</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-mq</artifactId>
+ </dependency>
+
<!-- Web 相关 -->
<dependency>
<groupId>com.iailab</groupId>
@@ -66,6 +76,10 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-mybatis</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
<!-- RPC 远程调用相关 -->
<dependency>
@@ -76,10 +90,6 @@
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-monitor</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-biz-data-permission</artifactId>
</dependency>
<dependency>
@@ -135,6 +145,12 @@
<groupId>org.openscada.jinterop</groupId>
<artifactId>org.openscada.jinterop.core</artifactId>
<version>2.1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openscada.jinterop</groupId>
@@ -151,16 +167,28 @@
<groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.dcom</artifactId>
<version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.lib</artifactId>
<version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.61</version>
+ <version>1.70</version>
</dependency>
<!-- ModBus TCP -->
@@ -194,6 +222,27 @@
<version>6.8.0</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>net.java.dev.jna</groupId>-->
+<!-- <artifactId>jna</artifactId>-->
+<!-- <version>5.4.0</version>-->
+<!-- </dependency>-->
+
+ <dependency>
+ <groupId>com.hikvision</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.hikvision</groupId>
+ <artifactId>jna</artifactId>
+ <version>1.0</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.amqp</groupId>-->
+<!-- <artifactId>spring-rabbit</artifactId>-->
+<!-- </dependency>-->
+
</dependencies>
<build>
@@ -202,9 +251,16 @@
<plugins>
<!-- 打包 -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3