From 3d4d8e97543d6e5b4b2a84855e3cd08df1e6aaf4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 20 九月 2023 16:12:04 +0800
Subject: [PATCH] 提交仓内抓拍和后台配置

---
 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
index 500a440..361ee0e 100644
--- a/igds-protocol-modbus/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