fix(ModbusTcp): 无法获取传感器名问题

admin/src/main/java/com/dcs/equipment/controller/ModbusTcpController.java

@@ -4,7 +4,6 @@ import com.dcs.common.core.domain.AjaxResult;
 import com.dcs.dcs.service.IDcsEquipmentService;
 import com.dcs.equipment.domain.Condition;
 import com.dcs.equipment.domain.ModbusRequest;
-import com.dcs.equipment.domain.vo.DataTwinEquipmentVO;
 import com.dcs.equipment.service.ModbusTcpService;
 import com.dcs.hnyz.domain.EquipmentParam;
 import com.dcs.hnyz.domain.vo.EquipmentParamFormVo;
@@ -14,14 +13,15 @@ import com.intelligt.modbus.jlibmodbus.exception.ModbusProtocolException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.dcs.common.core.domain.AjaxResult.error;
 import static com.dcs.common.core.domain.AjaxResult.success;
 
 /**
@@ -50,24 +50,24 @@ public class ModbusTcpController {
         return success();
     }
 
-    @GetMapping("/getDataTwinEquipmentValues/{equipmentId}")
-    @ApiOperation(value = "数据孪生获取设备数据")
-    public AjaxResult getDataTwinEquipmentValues(@PathVariable("equipmentId") Long equipmentId) {
-        List<EquipmentParamFormVo> equipmentFormVoList = service.getDataTwinEquipmentValues();
-        List<DataTwinEquipmentVO> dataTwinEquipmentVoList = new ArrayList<>();
-        for (EquipmentParamFormVo equipmentFormVo : equipmentFormVoList) {
-            DataTwinEquipmentVO target = new DataTwinEquipmentVO();
-            BeanUtils.copyProperties(equipmentFormVo, target);
-            dataTwinEquipmentVoList.add(target);
-        }
-        List<DataTwinEquipmentVO> dataTwinEquipmentVoTree = dcsEquipmentService.buildDataTwinTree(dataTwinEquipmentVoList);
-        for (DataTwinEquipmentVO equipmentFormVo : dataTwinEquipmentVoTree) {
-            if (equipmentFormVo.getEquipmentId().equals(equipmentId)) {
-                return success(equipmentFormVo);
-            }
-        }
-        return error("设备不存在");
-    }
+//    @GetMapping("/getDataTwinEquipmentValues/{equipmentId}")
+//    @ApiOperation(value = "数据孪生获取设备数据")
+//    public AjaxResult getDataTwinEquipmentValues(@PathVariable("equipmentId") Long equipmentId) {
+//        List<EquipmentParamFormVo> equipmentFormVoList = service.getDataTwinEquipmentValues();
+//        List<DataTwinEquipmentVO> dataTwinEquipmentVoList = new ArrayList<>();
+//        for (EquipmentParamFormVo equipmentFormVo : equipmentFormVoList) {
+//            DataTwinEquipmentVO target = new DataTwinEquipmentVO();
+//            BeanUtils.copyProperties(equipmentFormVo, target);
+//            dataTwinEquipmentVoList.add(target);
+//        }
+//        List<DataTwinEquipmentVO> dataTwinEquipmentVoTree = dcsEquipmentService.buildDataTwinTree(dataTwinEquipmentVoList);
+//        for (DataTwinEquipmentVO equipmentFormVo : dataTwinEquipmentVoTree) {
+//            if (equipmentFormVo.getEquipmentId().equals(equipmentId)) {
+//                return success(equipmentFormVo);
+//            }
+//        }
+//        return error("设备不存在");
+//    }
 
     @GetMapping("/getValues")
     @ApiOperation(value = "modbus tcp 获取数据")

admin/src/main/java/com/dcs/equipment/domain/vo/DataTwinEquipmentVO.java

@@ -3,8 +3,6 @@ package com.dcs.equipment.domain.vo;
 import com.dcs.common.annotation.Excel;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author: wangpx
  * @date: 2025-04-10 09:56
@@ -22,23 +20,15 @@ public class DataTwinEquipmentVO {
 
     /** 设备名 */
     @Excel(name = "设备名")
-    private String equipmentName;
+    private String registerName;
 
     /** 数据类型 */
 //    @Excel(name = "数据类型")
 //    private String dataType;
 
-    /** 父设备id */
-    @Excel(name = "父设备id")
-    private Long parentsId;
-
-//    /** 流程id */
-//    @Excel(name = "流程id")
-//    private String flowId;
-
 //    /** 设备标识 */
 //    @Excel(name = "设备标识")
-//    private String equipmentCode;
+//    private String code;
 
 //    /** 寄存器类型 */
 //    @Excel(name = "寄存器类型")
@@ -53,13 +43,8 @@ public class DataTwinEquipmentVO {
 //    @Excel(name = "设备类型")
 //    private String equipmentType;
 
-//    /** 流程归属 */
-//    @Excel(name = "流程归属")
-//    private String flowName;
-
     /** 设备值 */
     @Excel(name = "设备值")
     private Object value;
 
-    private List<DataTwinEquipmentVO> children;
 }

admin/src/main/java/com/dcs/equipment/task/ModbusTcpTask.java

@@ -119,6 +119,7 @@ public class ModbusTcpTask {
         for (EquipmentParam equipmentParam : equipmentParamList) {
             EquipmentParamFormVo equipmentParamVO = new EquipmentParamFormVo();
             BeanUtils.copyProperties(equipmentParam, equipmentParamVO);
+            equipmentParamVO.setRegisterName(equipmentParam.getRegisterName());
             deepCopyEquipmentParamFormVOList.add(equipmentParamVO);
         }
         // 装填设备数据

bin/move.bat

@@ -38,4 +38,6 @@ for %%i in (%MODULE_LIST%) do (
 )
 
 endlocal
-pause
+if "%ERROR_FOUND%"=="1" (
+    pause
+)