From 67f0be5a1d634ba3274fa9366ceacc3580f056b7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 28 十一月 2025 13:10:42 +0800
Subject: [PATCH] 提交

---
 河北望美项目/MES_11/src/main/java/com/northglass/service/device/DeviceService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java"
index a63814e..816339c 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/device/DeviceService.java"
@@ -122,10 +122,10 @@
 		MessageProcessor.generateReturnMessage(str,Machine);
 	}
 	public void connect() {
-		/*List<Machines> shelf67=machineDao.findAll();		
+		List<Machines> shelf67=machineDao.findAll();		
 		for (Machines machines : shelf67) {
 			machineService.connect(machines);
-		}*/
+		}
 //		Machines Machine=machineDao.findOne(75L);
 //		machineService.connect(Machine);
 //		Machines Machine=machineDao.findOne(38L);
@@ -243,7 +243,7 @@
 	public static Connection getConnection() {
 		//localhost:3307 192.168.200.201 192.168.2.6   10.12.0.100:3306
 		try {
-			return DriverManager.getConnection("jdbc:mariadb://localhost:3307/gmms","root",""); 					
+			return DriverManager.getConnection("jdbc:mariadb://10.12.0.100:3306/gmms","root",""); 					
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}

--
Gitblit v1.8.0