fix 修复一些BUG

nb-common/src/main/java/com/nb/common/notice/wechat/EnterpriseWeChatNotify.java

@@ -14,6 +14,7 @@ import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -28,7 +29,7 @@ import java.util.concurrent.*;
  * @createTime 2022年07月19日 15:21:00
  */
 @Component
-@Profile("prod")
+//@Profile("prod")
 public class EnterpriseWeChatNotify {
     @Autowired
     private DiskSpaceHealthIndicator spaceHealthIndicator;
@@ -44,19 +45,15 @@ public class EnterpriseWeChatNotify {
         HttpUtil.post(webHookUrl, msg.getSendMarkDownMsg());
     }
 
-    @PostConstruct
+    @Scheduled(cron = "0 0 0/6 * * ?")
     public void resourceNotify(){
         Health health = spaceHealthIndicator.getHealth(true);
         DiskMsg diskMsg = JSONUtil.parseObj(health.getDetails()).toBean(DiskMsg.class);
-        eventExecutors.scheduleAtFixedRate(() -> {
-            this.send( SysResourceMsg.of(SystemMonitor.systemCpuUsage,
-                    SystemMonitor.systemCpuLoad,
-                    SystemMonitor.jvmCpuUsage,
-                    SystemMonitor.freeSystemMemory,
-                    SystemMonitor.totalSystemMemory,
-                    diskMsg));
-        }, 0, 30,TimeUnit.MINUTES);
-
-
+        this.send( SysResourceMsg.of(SystemMonitor.systemCpuUsage,
+                SystemMonitor.systemCpuLoad,
+                SystemMonitor.jvmCpuUsage,
+                SystemMonitor.freeSystemMemory,
+                SystemMonitor.totalSystemMemory,
+                diskMsg));
     }
 }

nb-system/src/main/java/com/nb/bus/service/LocalBusInfusionHistoryService.java

@@ -305,8 +305,7 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
     public BusInfusionHistoryEntity deviceOccupation(BusInfusionHistoryEntity lastInfusion) {
         List<BusInfusionHistoryEntity> infusionHistories = this.list(new QueryWrapper<BusInfusionHistoryEntity>().lambda()
                 .eq(BusInfusionHistoryEntity::getFinished, false)
-                .eq(BusInfusionHistoryEntity::getPatientId, lastInfusion.getPatientId())
-                .eq(BusInfusionHistoryEntity::getTenantId, lastInfusion.getTenantId()));
+                .eq(BusInfusionHistoryEntity::getPatientId, lastInfusion.getPatientId()));
         int size = CollectionUtil.size(infusionHistories);
         if(size>0){
             lastInfusion = infusionHistories.stream()
@@ -315,7 +314,6 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
 
         patientService.update(new UpdateWrapper<BusPatientEntity>().lambda()
                 .eq(BusPatientEntity::getId,lastInfusion.getPatientId())
-                .eq(BusPatientEntity::getTenantId,lastInfusion.getTenantId())
                 .set(BusPatientEntity::getInfusionId,lastInfusion.getId())
                 .set(size==0,BusPatientEntity::getAlarm, PatientAlarmEnum.DEVICE_NONE)
                 .set(size==1,BusPatientEntity::getAlarm, PatientAlarmEnum.NONE)
@@ -323,44 +321,6 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
         return lastInfusion;
     }
 
-    /**
-     * 描述: 对设备关机进行处理
-     * @author lifang
-     * @date 2022/5/31 11:32
-     * @param tenantId 医院id
-     * @param patientCode 病号
-     * @param infusionId 关机的输注id
-     * @return void
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public BusInfusionHistoryEntity deviceShutDown(String infusionId, String patientCode, String tenantId) {
-        List<BusInfusionHistoryEntity> infusionHistories = this.list(new QueryWrapper<BusInfusionHistoryEntity>().lambda()
-                .ne(BusInfusionHistoryEntity::getId,infusionId)
-                .eq(BusInfusionHistoryEntity::getFinished, false)
-                .eq(BusInfusionHistoryEntity::getPatientCode, patientCode)
-                .eq(BusInfusionHistoryEntity::getTenantId,tenantId));
-        int size = CollectionUtil.size(infusionHistories);
-        BusInfusionHistoryEntity lastInfusion=null;
-        LambdaUpdateWrapper<BusPatientEntity> updateWrapper = new UpdateWrapper<BusPatientEntity>().lambda()
-                .eq(BusPatientEntity::getCode, patientCode)
-                .eq(BusPatientEntity::getTenantId, tenantId)
-                .set(size == 0, BusPatientEntity::getAlarm, PatientAlarmEnum.DEVICE_NONE)
-                .set(size == 1, BusPatientEntity::getAlarm, PatientAlarmEnum.NONE)
-                .set(size > 1, BusPatientEntity::getAlarm, PatientAlarmEnum.DEVICE_REPEAT);
-        if(size>0){
-            infusionHistories
-                    .stream()
-                    .max(Comparator.comparing(BusInfusionHistoryEntity::getStartTime))
-                    .map(infusion->{
-                        updateWrapper    .set(BusPatientEntity::getInfusionId, infusion.getId());
-                        return infusion;
-                    });
-        }
-        patientService.update(updateWrapper);
-        return lastInfusion;
-    }
-
-
     public IPage<CombineResult> queryPage(CombineQuery query, Page<CombineResult> page) {
         return this.baseMapper.queryPage(query,page);
     }

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

@@ -30,7 +30,6 @@ public class DeviceShiftConfig {
     private String patientCode;
 
     @ApiModelProperty("住院号id")
-    @JsonIgnore
     private String patientId;
 
     @ApiModelProperty("医院id")