变量列表-下拉框接口添加2

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

@@ -35,12 +35,12 @@ public class DeviceAnalogVariableListVo implements Serializable {
     private String variableName;
 
     /**
-     * 页数
+     * 条数
      */
     private Integer size;
 
     /**
-     * 条数
+     * 页数
      */
     private Integer current;
 

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

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

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

@@ -47,8 +47,8 @@
             </if>
         </where>
          order by a.id desc
-        <if test="startCurrent != null and current != null and current !=0">
-            LIMIT  #{startCurrent},#{current}
+        <if test="startCurrent != null and size != null and size !=0">
+            LIMIT  #{startCurrent},#{size}
         </if>
     </select>
 

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

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