From 3a85f920e943187fdf645c9a84588b79aab32da9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 20 十一月 2025 17:02:44 +0800
Subject: [PATCH] 新设备图片补充

---
 nglib/src/builder/Manager.java |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/nglib/src/builder/Manager.java b/nglib/src/builder/Manager.java
index 644db4b..b705925 100644
--- a/nglib/src/builder/Manager.java
+++ b/nglib/src/builder/Manager.java
@@ -82,7 +82,7 @@
 			//读取设备列表
 			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 from machine where id>=80");
+			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();
 
 			//创建所有设备通讯
@@ -95,22 +95,9 @@
 			   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);
-//				   if(port==102){
-//					   if(id==78){
-//						   S7control s7=new S7control(EPlcType.S1500, ip, port, 0, 0);
-//						   System.out.println("S7-S1500:"+s7.readWord("DB34.122",  1));
-//						   s7.writeWord("DB34.122",26);
-//						   System.out.println("S7-S1500:"+s7.readWord("DB34.122",  1));
-//					   }else{
-//						   S7control s7=new S7control(EPlcType.S1200, ip, port, 0, 0);
-//						   System.out.println("S7-S1200:"+s7.readWord("DB20.0",  1));
-//					   }
-//				   }else{
-//
-//				   }
-
+				   mmgr.createDevice(db,id,name,ip,port,readOffset,readSize,null,functionType,remarks);
 			   }
 
 			}
@@ -220,11 +207,6 @@
 			System.out.println("错误");
 		}
 	}
-	@Override
-	public void start() {
-
-	}
-
 	public static void main(String[] args){
 		Manager.appStart(new String[]{"jdbc:mysql://localhost/gmms?serverTimezone=GMT%2B8","root","beibo.123/" });
 		while(true){

--
Gitblit v1.8.0