From 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
similarity index 86%
rename from igds-core/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
rename to igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
index 500a440..361ee0e 100644
--- a/igds-core/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
@@ -3,7 +3,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
-import com.ld.igds.modbus.service.HDeviceModbusService;
+import com.ld.igds.modbus.service.HModbusService;
import com.ld.igds.models.DeviceModbus;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
@@ -20,7 +20,7 @@
public class DeviceModbusPR {
@Resource
- private HDeviceModbusService deviceModbusService;
+ private HModbusService deviceModbusService;
/**
* deviceModbusPR#listAll
@@ -30,7 +30,7 @@
@DataProvider
public List<DeviceModbus> listAll() {
String companyId = ContextUtil.getCompanyId();
- return deviceModbusService.listAll(companyId);
+ return deviceModbusService.listAllDevice(companyId);
}
/**
@@ -41,7 +41,7 @@
@Expose
public void flushCache() {
String companyId = ContextUtil.getCompanyId();
- deviceModbusService.flushCache(companyId);
+ deviceModbusService.flushCacheDevice(companyId);
}
/**
@@ -52,7 +52,7 @@
@Expose
public String delData(DeviceModbus data) {
if (null == data.getId()) return null;
- return deviceModbusService.delData(data);
+ return deviceModbusService.delDataDevice(data);
}
/**
@@ -63,7 +63,7 @@
*/
@DataResolver
public void updateData(List<DeviceModbus> details) {
- deviceModbusService.updateData(details);
+ deviceModbusService.updateDataDevice(details);
}
@@ -87,6 +87,5 @@
list.add(new DicTrigger(ModbusConstant.FUN_99, "鏈厤缃�"));
return list;
}
-
}
--
Gitblit v1.9.3