fix(依赖)：

远程配置调整

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

@@ -64,8 +64,8 @@ public class BusDeviceConfigurationController  implements BaseQueryController<Bu
     @PostMapping("/update")
     @SaCheckPermission("device:configuration:update")
     @ApiOperation(value = "编辑远程配置管理",notes = "权限【device:configuration:update】")
-    public R updateConfiguration(@RequestBody ConfigurationParamVo config, @RequestBody List<BusDeviceConfigurationEntity> device){
-        return R.success(configurationService.updateConfiguration(config ,device));
+    public R updateConfiguration(@RequestBody ConfigurationParamVo config){
+        return R.success(configurationService.updateConfiguration(config ,config.getDevice()));
     }
 
 

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

@@ -1,14 +1,13 @@
 package com.nb.web.service.bus.controller.vo;
 
+import com.nb.web.api.entity.BusDeviceConfigurationEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import javax.validation.constraints.*;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author zsl
@@ -20,33 +19,37 @@ import java.math.BigDecimal;
 @ApiModel("远程配置参数")
 @Data
 public class ConfigurationParamVo {
-    @ApiModelProperty(value = "总量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "总量")
     @Max(value = 999,message = "总量最大值不得超过999")
     @Min(value = 0,message ="总量最小值不得超过0" )
     private Integer totalDose;
 
-    @ApiModelProperty(value = "公共参数-首次量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "公共参数-首次量")
     @Max(value = 50,message = "首次量最大值不得超过50")
     @Min(value = 0,message ="首次量最小值不得超过0" )
     private Integer firstDose;
 
-    @ApiModelProperty(value = "公共参数-极限量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "公共参数-极限量")
     @DecimalMax(value = "90",message = "PCA追加量最大值不得超过90")
     @DecimalMin(value = "0",message ="PCA追加量最小值不得低于0" )
     private Integer maxDose;
 
-    @ApiModelProperty(value = "公共参数-追加量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "公共参数-追加量")
     @DecimalMax(value = "10",message = "PCA追加量最大值不得超过10")
     @DecimalMin(value = "0",message ="PCA追加量最小值不得低于0" )
     private BigDecimal appendDose;
 
-    @ApiModelProperty(value = "持续泵参数-持续量",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "持续泵参数-持续量")
     @DecimalMax(value = "50",message = "持续给液量最大值不得超过50")
     @DecimalMin(value = "0",message ="持续给液量最小值不得低于0" )
     private BigDecimal continueDose;
 
-    @ApiModelProperty(value = "公共参数-自控锁时 即单次追加锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "公共参数-自控锁时 即单次追加锁时")
     @DecimalMax(value = "99",message = "PCA追加量最大值不得超过99")
     @DecimalMin(value = "1",message ="PCA追加量最小值不得低于0" )
     private Integer selfControlLockTime;
+
+    @ApiModelProperty(value = "设备参数")
+    @NotNull(message = "设备信息不能为空")
+    private List<BusDeviceConfigurationEntity> device;
 }

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

@@ -31,6 +31,7 @@
             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
+        left join bus_infusion_history as bih on bd.infusion_id = bih.id
         <where>
             bd.status != '0'
             <if test="query.deviceId!=null">
@@ -63,7 +64,8 @@
         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 join bus_device_configuration as bdc on bd.remote_config_id = bdc.id
+        from bus_device as bd left 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'
             <if test="query.deviceId!=null">