Quellcode durchsuchen

feat(Protocol): 统一获取数据接口

wangpx vor 9 Monaten
Ursprung
Commit
6461a68424

+ 18 - 4
admin/src/main/java/com/dcs/equipment/controller/ProtocolController.java

@@ -1,8 +1,9 @@
 package com.dcs.equipment.controller;
 
 import com.dcs.common.core.domain.AjaxResult;
+import com.dcs.equipment.constants.ProtocolConstants;
 import com.dcs.equipment.domain.DeviceRequest;
-import com.dcs.equipment.service.ProtocolService;
+import com.dcs.equipment.service.impl.ModbusTcpServiceImpl;
 import com.dcs.hnyz.domain.vo.EquipmentParamFormVO;
 import com.intelligt.modbus.jlibmodbus.exception.ModbusIOException;
 import com.intelligt.modbus.jlibmodbus.exception.ModbusNumberException;
@@ -29,7 +30,7 @@ import static com.dcs.common.core.domain.AjaxResult.success;
 @RequestMapping("/protocol")
 public class ProtocolController {
     @Autowired
-    private ProtocolService service;
+    private ModbusTcpServiceImpl modbusTcpService;
 
     private static List<EquipmentParamFormVO> VirtualData = new ArrayList<EquipmentParamFormVO>() {{
         EquipmentParamFormVO equipmentFormVo1 = new EquipmentParamFormVO();
@@ -37,9 +38,22 @@ public class ProtocolController {
     }};
 
     @GetMapping("/getValues")
-    @ApiOperation(value = "modbus tcp 获取数据")
+    @ApiOperation(value = "统一获取数据接口")
     public AjaxResult getValues(@ApiParam(name = "modbus请求参数", value = "modbus请求参数", required = true) DeviceRequest request) throws ModbusProtocolException, ModbusNumberException, ModbusIOException {
-        List<Object> values = service.getValues(request);
+        List<Object> values = null;
+                switch (request.getProtocol()){
+            case ProtocolConstants.MODBUS_TCP:
+                modbusTcpService.getValues(request);
+                break;
+            case ProtocolConstants.OPC_UA:
+                values = new ArrayList<>();
+                break;
+            case ProtocolConstants.MQTT:
+                values = new ArrayList<>();
+                break;
+            default:
+        }
+//        List<Object> values = service.getValues(request);
         return success(values);
     }