From 4a0c4ea48812f93cb283e6a818bd8c949c592f80 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 19 三月 2024 11:44:23 +0800
Subject: [PATCH] 修改通讯
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 7 ++-----
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 2 +-
springboot-vue3/src/main/java/MyGenerator.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 8 +++++---
springboot-vue3/effective-pom.xml | 20 +++++++++++++++++++-
springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json | 12 +-----------
7 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/springboot-vue3/effective-pom.xml b/springboot-vue3/effective-pom.xml
index a02c22b..ad8b457 100644
--- a/springboot-vue3/effective-pom.xml
+++ b/springboot-vue3/effective-pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- -->
-<!-- Generated by Maven Help Plugin on 2024-03-07T14:06:55+08:00 -->
+<!-- Generated by Maven Help Plugin on 2024-03-19T08:09:38+08:00 -->
<!-- See: http://maven.apache.org/plugins/maven-help-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
@@ -5574,6 +5574,24 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ <version>4.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
<version>2.3.2.RELEASE</version>
diff --git a/springboot-vue3/src/main/java/MyGenerator.java b/springboot-vue3/src/main/java/MyGenerator.java
index 8f9ca26..9343999 100644
--- a/springboot-vue3/src/main/java/MyGenerator.java
+++ b/springboot-vue3/src/main/java/MyGenerator.java
@@ -18,7 +18,7 @@
public class MyGenerator {
/** 鏁版嵁婧愰厤缃�*/
- private static final String jdbc = "jdbc:mysql://localhost:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ private static final String jdbc = "jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
private static final String driverName = "com.mysql.cj.jdbc.Driver";
private static final String username = "root";
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index dc51f1c..13c2640 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -35,10 +35,12 @@
}
// List<Short> ss= S7control.getinstance().ReadWord("DB14.0", 1);
// System.out.println(ss);
-
- String E01id = S7control.getinstance().readStrings("DB14.0");
- System.out.println(E01id);
+ // System.out.println(111111);
+ // List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.0",1);
+ // String E01id = S7control.getinstance().readStrings("DB14.38");
+ // System.out.println(E01id);
// if (S7control.getinstance().CheckConnected() == false) {
+ byte[] E0sss1id = S7control.getinstance().ReadByte("DB14.208",1);
spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
//spianService.selectAll(albaniaMapper.SelectGlass());
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 7878a32..44a6805 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -18,7 +18,7 @@
S7PLC s7PLC; // PLC閫氳绫诲疄渚�
private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
private String ip = "192.168.10.1"; // plc ip鍦板潃
- private int port = 65; // plc 绔彛鍙�
+ private int port = 102; // plc 绔彛鍙�
private static volatile S7control instance = null;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index d45a964..bf310e4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -16,20 +16,17 @@
// TODO Auto-generated method stub
//
System.out.println("鍚姩瀹屾垚");
-
+ // new PLCAutoMes().start();
// new PlcHold().start();
// new PlcHoldNew().start();
- // new PLCAutoMes().start();
+
new Plchome().start();
// new PlcLayout().start();
// new Plcalarm().start();
-
// new Plcsign().start();
-
// new Plcstate().start();
// new PlcPositioning1().start();
-
// new PlcParameter2().start();
// new PLCAutomaticParameterSetting().start();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 8c729b7..d600266 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -256,7 +256,7 @@
*/
public static Connection getConn() throws SQLException {
Connection conn = null;
- conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
+ conn = DriverManager.getConnection("jdbc:mysql://10.153.19.150:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
return conn;
}
diff --git a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
index bfde5fe..ab65b19 100644
--- a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
+++ b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
@@ -1,6 +1,6 @@
{
"plcAddressBegin":"DB14.0",
- "plcAddressLenght":"210",
+ "plcAddressLenght":"208",
"dataType":"word",
"parameteInfor":[
{
@@ -409,16 +409,6 @@
"addressLenght":"2",
"ratio":"1",
"unit":"mm/S"
- },{
- "codeId": "MainControl",
- "addressIndex":"208",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
}
-
-
-
-
]
}
--
Gitblit v1.8.0