From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbusPR.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbusPR.java b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbusPR.java
new file mode 100644
index 0000000..05d89ff
--- /dev/null
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/GasModbusPR.java
@@ -0,0 +1,83 @@
+package com.ld.igds.modbus;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.modbus.service.HModbusService;
+import com.ld.igds.models.DeviceModbus;
+import com.ld.igds.models.GasModbus;
+import com.ld.igds.util.ContextUtil;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MOOBUS-TCP璁惧鍙傛暟閰嶇疆
+ */
+@Component
+public class GasModbusPR {
+
+    @Resource
+    private HModbusService modbusService;
+
+    /**
+     * gasModbusPR#getGasData
+     *
+     * @return
+     */
+    @DataProvider
+    public DeviceModbus getGasData(String depotId) {
+        if (null == depotId) return new DeviceModbus();
+
+        String bizType = BizType.GAS.getCode();
+
+        String companyId = ContextUtil.getCompanyId();
+
+        DeviceModbus result = modbusService.getGasData(companyId, depotId, bizType);
+
+        if (null == result) {
+            result = new DeviceModbus();
+            result.setBizType(bizType);
+            result.setDeviceCode(depotId);
+            result.setListGas(new ArrayList<>());
+        }
+
+        return result;
+    }
+
+    /**
+     * gasModbusPR#listGasModBus
+     *
+     * @param depotId
+     * @return
+     */
+    @DataProvider
+    public List<GasModbus> listGasModBus(String depotId) {
+        return modbusService.listGasModBus(depotId);
+    }
+
+
+    /**
+     * gasModbusPR#updateData
+     * @param data
+     */
+    @DataResolver
+    public void updateData(DeviceModbus data){
+        modbusService.updateGasModbus(data);
+    }
+
+    /**
+     * deviceModbusPR#delData
+     *
+     * @return
+     */
+    @Expose
+    public String delData(GasModbus data) {
+        if (null == data.getId()) return null;
+        return modbusService.delDataGas(data);
+    }
+
+}

--
Gitblit v1.9.3