fix(依赖)：

远程配置调整

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusAlarmController.java

@@ -34,14 +34,6 @@ public class BusAlarmController extends BaseCrudController<BusDeviceAlarmEntity,
 
     private final WsPublishUtils wsPublishUtils;
 
-
-    @PostMapping("/test")
-    @ApiOperation("测试")
-    public R test(){
-        wsPublishUtils.publishPatientMonitor("1542042749847519234","1");
-        return R.success();
-    }
-
     @PostMapping("/cause/{id}")
     @ApiOperation(value = "添加报警原因",notes = "权限：【bus:alarm:cause】")
     @SaCheckPermission("bus:alarm:cause")

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusDeviceConfigurationMapper.java

@@ -2,6 +2,7 @@ package com.nb.web.service.bus.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.entity.BusDeviceConfigurationEntity;
 import com.nb.web.service.bus.service.dto.DeviceConfigurationQuery;
 import com.nb.web.service.bus.service.dto.DeviceConfigurationResult;
@@ -22,5 +23,5 @@ public interface BusDeviceConfigurationMapper extends BaseMapper<BusDeviceConfig
     @Deprecated
     int updateByDeviceId(@Param("entity") BusDeviceConfigurationEntity entity);
 
-    IPage<DeviceConfigurationResult> selectRecordPage(@Param("query") DeviceConfigurationQuery query);
+    IPage<DeviceConfigurationResult> selectRecordPage(Page<DeviceConfigurationResult> page, @Param("query") DeviceConfigurationQuery query);
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceConfigurationService.java

@@ -88,6 +88,6 @@ public class LocalBusDeviceConfigurationService extends BaseService<BusDeviceCon
     }
 
     public IPage<DeviceConfigurationResult> selectRecordPage(DeviceConfigurationQuery query) {
-        return  baseMapper.selectRecordPage(query);
+        return  baseMapper.selectRecordPage(query.getPage(),query);
     }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/DeviceConfigurationQuery.java

@@ -1,5 +1,6 @@
 package com.nb.web.service.bus.service.dto;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,4 +26,7 @@ public class DeviceConfigurationQuery {
     @ApiModelProperty("设备类型集合")
     private List<Integer> deviceTypes;
 
+    @ApiModelProperty("分页参数")
+    private Page<DeviceConfigurationResult> page;
+
 }

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceConfigurationMapper.xml

@@ -64,7 +64,7 @@
         bdc.continue_dose as continue_dose,
         bdc.self_control_lock_time as self_control_lock_time,
         bdc.patient_code as patient_code
-        from bus_device as bd left join bus_device_configuration as bdc on bd.remote_config_id = bdc.id
+        from bus_device as bd join bus_device_configuration as bdc on bd.remote_config_id = bdc.id
         left join bus_infusion_history as bih on bd.infusion_id = bih.id
         <where>
             bd.status != '0'