变量列表列表查询

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -60,7 +60,7 @@ public class DeviceAnalogVariableListController {
     }
 
     /**
-     * 站点管理-变量列表-列表查询
+     * 站点管理-变量列表-列表查询-禁用
      *
      * @param deviceCode 设备编号
      * @param screen     筛选条件

fiveep-model/src/main/java/com/bizmatics/model/vo/DeviceAnalogVariableListVo.java

@@ -48,4 +48,9 @@ public class DeviceAnalogVariableListVo implements Serializable {
      * 1.模拟量 2.状态量 3.参数量
      */
     private Integer dataArea;
+
+    /**
+     * 监控设备ID
+     */
+    private Integer monitoringEquipment;
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceAnalogVariableListMapper.java

@@ -20,7 +20,8 @@ public interface DeviceAnalogVariableListMapper extends CrudMapper<DeviceAnalogV
                                                 @Param("variableName") String variableName,
                                                 @Param("startCurrent") Integer startCurrent,
                                                 @Param("current") Integer current,
-                                                @Param("dataArea") Integer dataArea);
+                                                @Param("dataArea") Integer dataArea,
+                                                @Param("monitoringEquipment")Integer monitoringEquipment);
 
 
 }

fiveep-persistence/src/main/resources/mapper/mysql/DeviceAnalogVariableListMapper.xml

@@ -39,6 +39,9 @@
             <if test="dataArea != null and dataArea !=0">
                 and a.data_area = #{dataArea}
             </if>
+            <if test="monitoringEquipment != null and monitoringEquipment !=0">
+                and a.monitoring_equipment = #{monitoringEquipment}
+            </if>
             <if test="variableName != null and variableName !=''">
                 and a.variable_name LIKE CONCAT(CONCAT('%', #{variableName}), '%')
             </if>

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java

@@ -69,13 +69,13 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     public CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
         int start_current = (deviceAnalogVariableListVo.getSize() - 1) * deviceAnalogVariableListVo.getCurrent();
         List<DeviceAnalogVariableList> deviceAnalogVariableListOne = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getVariableName(), null, null, deviceAnalogVariableListVo.getDataArea());
+                deviceAnalogVariableListVo.getVariableName(), null, null, deviceAnalogVariableListVo.getDataArea(),deviceAnalogVariableListVo.getMonitoringEquipment());
         int total = 0;
         if (deviceAnalogVariableListOne.size() > 0) {
             total = deviceAnalogVariableListOne.size();
         }
         List<DeviceAnalogVariableList> deviceAnalogVariableList = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getDataArea());
+                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getDataArea(),deviceAnalogVariableListVo.getMonitoringEquipment());
         return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
     }