From 54fe125d1165783cc5bc401124fccf203dfe5814 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 22 十二月 2023 16:29:20 +0800
Subject: [PATCH] 每周更新
---
河北望美项目/MES_11/src/main/java/com/northglass/service/device/DeviceService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 5ed6b4d..0c29c94 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();
- for (Machines machines : shelf67) {
- machineService.connect(machines);
- }
+// 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 192.168.200.201 192.168.2.6 10.12.0.100
try {
- return DriverManager.getConnection("jdbc:mariadb://10.12.0.100/gmms","root","");
+ return DriverManager.getConnection("jdbc:mariadb://localhost/gmms","root","");
} catch (SQLException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0