1 上电断电调整

2 查询设备信息调整

zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingCabinetInspectionAndPowerCheckTask.java

@@ -84,7 +84,7 @@ public class AgingCabinetInspectionAndPowerCheckTask {
                 // 10 层
                 List<Integer> registerOffsets = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
                 try {
-                    master = Modbus4jUtils.getMaster(equipmentInfo.getfIp(), equipmentInfo.getfPort());
+                    master = Modbus4jUtils.getMaster(equipmentInfo.getfPowerOutageIp(), equipmentInfo.getfPowerOutagePort());
                     Map<Integer, Object> integerObjectMap = Modbus4jUtils.batchReadAgingCabinetStatus(master, registerOffsets);
 
                     equipmentInfo.setRegisterValues(integerObjectMap);
@@ -170,13 +170,14 @@ public class AgingCabinetInspectionAndPowerCheckTask {
                 for (Map.Entry<Integer, Object> entry : registerValues.entrySet()) {
                     Integer registerOffset = entry.getKey();
                     Object registerValue = entry.getValue();
+                    log.info("registerValue =  " + registerValue);
                     if ("true".equals(registerValue)) {
                         eventPublisher.publishEvent(new CheckPowerOnCommandEvent(
                                 this,
                                 modbusDeviceData.getfEquipmentCode(),
                                 modbusDeviceData.getfPowerOutageIp(),
                                 modbusDeviceData.getfPowerOutagePort(),
-                                registerOffset
+                                registerOffset + 1
                         ));
                         isRun = true;
                         // 要给这个 层 发断电的  指令
@@ -187,7 +188,7 @@ public class AgingCabinetInspectionAndPowerCheckTask {
                                 modbusDeviceData.getfEquipmentCode(),
                                 modbusDeviceData.getfPowerOutageIp(),
                                 modbusDeviceData.getfPowerOutagePort(),
-                                registerOffset
+                                registerOffset + 1
                         ));
                     }
                 }

zhmes-agecal-system/src/main/resources/mapper/system/TStoreyInfoMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="queryByDepartmentId" parameterType="long" resultMap="TStoreyInfoResult">
         <include refid="selectTStoreyInfoVo"/>
-        where f_equipment_id = #{fEquipmentId}
+        where storeyInfo.f_equipment_id = #{fEquipmentId}
     </select>
     
     <select id="selectTStoreyInfoById" parameterType="Long" resultMap="TStoreyInfoResult">