add 新增设备固件版本字段

nb-system/src/main/java/com/nb/bus/controller/BusPatientController.java

@@ -138,6 +138,9 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
                                @RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId){
         log.info("结束管理,【{}】",JSONUtil.toJsonStr(monitorFinishedVo));
         if(haveDevice){
+            if(CollUtil.isEmpty(monitorFinishedVo.getPatientIds())){
+                throw new CustomException("未选择住院号");
+            }
             R<Boolean> result = monitorFinished(monitorFinishedVo, tenantId);
             CompletableFuture.runAsync(()->wsPublishUtils.publishMonitorTotalCount(tenantId))
                     .thenRunAsync(()->wsPublishUtils.publishDeviceNone(tenantId))

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFinishMonitorConfigHandler.java

@@ -56,7 +56,9 @@ public class HospitalFinishMonitorConfigHandler extends AbstractHospitalConfigHa
     public void handler(BusDeviceRunningEntity source) {
         FunctionFinishMonitorConfig config = this.getConfig().as(FunctionFinishMonitorConfig.class);
         if(config==null||!Boolean.TRUE.equals(config.isEnable())||Objects.isNull(config.getShutDownInterval())){
-            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            if(log.isDebugEnabled()){
+                log.debug("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            }
             return;
         }
         judgeShutdownAutoFinish(source,config);

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionAnalConfigHandler.java

@@ -57,7 +57,9 @@ public class HospitalFunctionAnalConfigHandler extends AbstractHospitalConfigHan
     public void handler(BusDeviceRunningEntity source) {
         FunctionAnalConfig config = this.getConfig().as(FunctionAnalConfig.class);
         if(config==null){
-            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            if(log.isDebugEnabled()){
+                log.debug("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            }
             return;
         }
         judgeAnalPoor(source,config);

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionExtraConfigHandler.java

@@ -64,7 +64,9 @@ public class HospitalFunctionExtraConfigHandler  extends  AbstractHospitalConfig
     public void handler(BusDeviceRunningEntity source) {
         FunctionExtraConfig config = this.getConfig().as(FunctionExtraConfig.class);
         if(config==null){
-            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            if(log.isDebugEnabled()){
+                log.debug("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            }
             return;
         }
         if (config.getNoSignal()!=null&&config.getNoSignal()>=0) {

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalPatientCodeHandler.java

@@ -42,7 +42,9 @@ public class HospitalPatientCodeHandler  extends AbstractHospitalConfigHandler<F
     public void handler(BusDeviceRunningEntity source) {
         FunctionPatientCodeConfig config = this.getConfig().as(FunctionPatientCodeConfig.class);
         if(config==null||!Boolean.TRUE.equals(config.getEnable())|| Objects.isNull(config.getFillChar())){
-            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            if(log.isDebugEnabled()){
+                log.debug("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
+            }
             source.setFormatPatientCode(source.getPatientCode());
             return;
         }

nb-system/src/main/java/com/nb/bus/service/dto/DeviceResult.java

@@ -32,6 +32,9 @@ public class DeviceResult  implements Serializable {
     @ApiModelProperty(value = "设备类型")
     private DeviceTypeEnum type;
 
+    @ApiModelProperty(value = "设备固件版本号")
+    private String version;
+
     @ApiModelProperty(value = "运行状态",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     private DeviceStatusEnum runState;
 

nb-system/src/main/resources/mapper/bus/BusDeviceMapper.xml

@@ -7,6 +7,7 @@
         <result column="device_id" property="deviceId"/>
         <result column="alias" property="alias"/>
         <result column="type" property="type"/>
+        <result column="version" property="version"/>
         <result column="run_state" property="runState"/>
         <result column="alarm" property="alarm"/>
         <result column="config" property="config" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
@@ -47,6 +48,7 @@
         d.id as id,
         d.device_id as device_id,
         d.alias as alias,
+        d.version as version,
         ifnull(i.type,0) as type,
         i.run_state as run_state,
         i.alarm as alarm,