修改接口

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DeviceController.java

@@ -68,13 +68,14 @@ public class DeviceController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "箱变开关数据")
     @GetMapping("/xbdata")
-    public ResponseModel<Map<String,Object>> xbdata(
+    public ResponseModel< Page< Map<String,Object>> > xbdata(
             @RequestParam(value = "frontModule") String frontModule,
             @RequestParam(value = "stationBasicId") String stationBasicId,
-            @RequestParam(value = "equipmentNumber" , required = false ) String equipmentNumber) {
+            @RequestParam(value = "equipmentNumber" , required = false ) String equipmentNumber,
+            long current, long size) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationBasicId);
         String fanGatewayId = stationBasic.getFanGatewayId();
-        Map<String,Object> resultsData=monitorFanIndicatorImpl.getxbdata(   frontModule,  fanGatewayId,  equipmentNumber);
+        Page< Map<String,Object>>  resultsData=monitorFanIndicatorImpl.getxbdata(   frontModule,  fanGatewayId,  equipmentNumber,current,size);
         return ResponseHelper.buildResponse(resultsData);
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -2141,7 +2141,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     }
 
-    public Map<String,Object> getxbdata(String frontModule, String fanGatewayId,  String equipmentNumber) {
+    public  Page< Map<String,Object>>  getxbdata(String frontModule, String fanGatewayId,  String equipmentNumber,long current, long size) {
         Map<String, List<String>> queryCodntion = new HashMap<>();
         queryCodntion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(fanGatewayId));
         queryCodntion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("高压开关合闸", "QF1低压断路器合闸", "QF2低压断路器合闸"));
@@ -2157,7 +2157,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 map.put("2_dy","true".equals(alldatum.getValue())?true:false);
             }
         }
-        return map;
+        Page< Map<String,Object>> page = new Page<>(current, size);
+        List<Map<String,Object>> collect=new ArrayList();
+        collect.add(map);
+        page.setTotal(1);
+        page.setRecords(collect);
+        return page;
     }