From 62e4c1883dfd13289970f8f20f0a56d86aff23ff Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 07 四月 2025 19:43:51 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
---
nglib/src/builder/Manager.java | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/nglib/src/builder/Manager.java b/nglib/src/builder/Manager.java
index 2ef111f..6cbe3a6 100644
--- a/nglib/src/builder/Manager.java
+++ b/nglib/src/builder/Manager.java
@@ -1,6 +1,5 @@
package builder;
-import S7.S7control;
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import ng.db.DBHelper;
import ng.db.DBSession;
@@ -12,7 +11,8 @@
import java.net.Socket;
import java.sql.ResultSet;
-public class Manager {
+
+public class Manager extends Thread {
//设备管理器
static MachineManager mmgr;
//优化排版管理器
@@ -82,35 +82,31 @@
//读取设备列表
DBHelper db=DBHelper.getDBHelper("mes");
sn=DBHelper.getDBHelper("mes").createSession(false);
- sn.createSql("select id,machine_name,ip_address,port,flag,read_size,read_offset,function_type,flag from machine where id=78");
+ sn.createSql("select id,machine_name,ip_address,port,flag,read_size,read_offset,function_type,remarks from machine where flag=1");
ResultSet set= sn.query().getCurrentResult();
- System.out.println("S7链接");
- S7control s7=new S7control(EPlcType.S1500, "192.168.30.14", 102, 0, 0);
- System.out.println("S7:"+s7.readByte("DB34.0", 2));
-// //创建所有设备通讯
-// while(set.next()){
-// int id=(int)set.getLong(1);
-// String name=set.getString(2);
-// String ip=set.getString(3);
-// int port=set.getInt(4);
-// int flag=set.getInt(5);
-// int readSize=set.getInt(6);
-// int readOffset=set.getInt(7);
-// byte functionType=set.getByte(8);
-// int flags=set.getInt(9);
-// if(flags==1){
-// mmgr.createDevice(db,id,name,ip,port,readOffset,readSize,null,functionType);
-// }
-//
-// }
+ //创建所有设备通讯
+ while(set.next()){
+ int id=(int)set.getLong(1);
+ String name=set.getString(2);
+ String ip=set.getString(3);
+ int port=set.getInt(4);
+ int flag=set.getInt(5);
+ int readSize=set.getInt(6);
+ int readOffset=set.getInt(7);
+ byte functionType=set.getByte(8);
+ String remarks=set.getString(9);
+ if(flag==1){
+ mmgr.createDevice(db,id,name,ip,port,readOffset,readSize,null,functionType,remarks);
+ }
+
+ }
}
catch(Exception e){
}
finally{
if(sn!=null){
-
sn.close();
}
}
@@ -211,9 +207,9 @@
System.out.println("错误");
}
}
-
+
public static void main(String[] args){
- //Manager.appStart(new String[]{"jdbc:mysql://10.153.19.150/gmms?serverTimezone=GMT%2B8","root","beibo.123/" });
+ Manager.appStart(new String[]{"jdbc:mysql://localhost/gmms?serverTimezone=GMT%2B8","root","beibo.123/" });
while(true){
try {
Thread.sleep(100);
--
Gitblit v1.8.0