From 80b88f63ec734fceba41bf6c3bb2ffb201e3b05b Mon Sep 17 00:00:00 2001
From: xc <xucheng@yyigou.com>
Date: Fri, 04 Dec 2020 16:34:31 +0800
Subject: [PATCH] 引入 famehistory 模板化
---
src/main/resources/application.properties | 5 ++
src/main/java/com/hbbh/adapter/config/FameHistoryConfig.java | 30 +++++++++++++++
pom.xml | 32 ++++++++++++++++
src/main/java/com/hbbh/adapter/config/GoldenConfig.java | 2 -
4 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4455e0..8948ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,11 @@
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.6</version>
+ </dependency>
<!-- Golden实时数据库依赖jar包-->
<dependency>
@@ -106,6 +111,33 @@
<artifactId>golden.protobuf.java</artifactId>
<version>2.6.1</version>
</dependency>
+
+ <!--杰控FameHistory实时数据库依赖jar包-->
+ <dependency>
+ <groupId>famehistory</groupId>
+ <artifactId>famehistory.cvs.dataprovider</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>famehistory</groupId>
+ <artifactId>famehistory.hd.dataprovider</artifactId>
+ <version>3.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>famehistory</groupId>
+ <artifactId>famehistory.hd.datasdk</artifactId>
+ <version>3.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>famehistory</groupId>
+ <artifactId>famehistory.hd</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>famehistory</groupId>
+ <artifactId>famehistory</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/hbbh/adapter/config/FameHistoryConfig.java b/src/main/java/com/hbbh/adapter/config/FameHistoryConfig.java
new file mode 100644
index 0000000..7b4c58f
--- /dev/null
+++ b/src/main/java/com/hbbh/adapter/config/FameHistoryConfig.java
@@ -0,0 +1,30 @@
+package com.hbbh.adapter.config;
+
+import com.alibaba.fastjson.JSON;
+import com.baosight.hdsdk.HDConnectionFactory;
+import com.baosight.hdsdk.HDServerFactory;
+import com.baosight.hdsdk.HDTagManager;
+import com.baosight.hdsdk.domain.data.HDBasicTag;
+import com.baosight.hdsdk.domain.data.HDDataConnection;
+import com.baosight.hdsdk.domain.data.HDDataServer;
+
+public class FameHistoryConfig {
+
+
+ private static String serverip="192.168.1.120";
+
+ /**
+ * 服务端端口 5673
+ * 数据文件路径端口 5678
+ */
+ private static int port=5678;
+
+ public static void main(String[] args) throws Exception{
+ HDDataServer server = HDServerFactory.getHDDataServer(serverip, port);
+ HDDataConnection conn = HDConnectionFactory.getHDDataConnection(server);
+ HDTagManager tagManager = conn.getTagManager();
+ int tagID = 1;
+ HDBasicTag basicTag = tagManager.getBasicTagById(tagID);
+ System.out.println(JSON.toJSONString(basicTag));
+ }
+}
diff --git a/src/main/java/com/hbbh/adapter/config/GoldenConfig.java b/src/main/java/com/hbbh/adapter/config/GoldenConfig.java
index ab31bfa..83a47f2 100644
--- a/src/main/java/com/hbbh/adapter/config/GoldenConfig.java
+++ b/src/main/java/com/hbbh/adapter/config/GoldenConfig.java
@@ -4,8 +4,6 @@
import com.rtdb.service.impl.ServerImplPool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowire;
-import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a7eb4c0..72d9346 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -29,10 +29,13 @@
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
-#remote inof
+#remote golden inof
golden.ip = 47.92.145.232
golden.port = 6327
golden.username = sa
golden.password = golden
golden.poolSize = 5
golden.maxSize = 10
+
+#renite famehistory info
+famehistory.ip=192.168.1.120
--
Gitblit v1.9.1