fix 加档

nb-admin/src/test/java/com/nb/admin/NotifyTest.java

@@ -43,6 +43,9 @@ public class NotifyTest {
     @Test
     public void test(){
         flowStatsJob.flowStats();
+        while (true){
+
+        }
     }
     @Test
     public void disk(){

nb-common/src/main/java/com/nb/common/notice/NotifyEnums.java

@@ -46,7 +46,7 @@ public enum  NotifyEnums {
         @Override
         public String getMarkDownTitle() {
             return String.format("%s\n" +
-                    "<font color=\"info\">**%s**</font>，请相关同事注意。\n", DateUtil.now(),INTERFACE.text);
+                    "<font color=\"info\">**%s**</font>，请相关同事注意。\n", DateUtil.now(),DEVICE.text);
         }
     }
     ;

nb-common/src/main/java/com/nb/common/notice/msg/DeviceMsg.java

@@ -14,12 +14,12 @@ import lombok.Data;
 @Data
 @AllArgsConstructor(staticName = "of")
 public class DeviceMsg extends AbstractMsg {
-    private Integer msgCount;
-    private Integer deviceCount;
+    private long msgCount;
+    private long deviceCount;
     @Override
     String getSendMarkDownMsgContent() {
-        return  getType().getMarkDownTitle()+"\n"+String.format("> 设备使用数: <font color=\"comment\">**{  %s }**</font>\n" +
-                "> 设备消息数: <font color=\"comment\">**{  %s }**</font>",deviceCount,msgCount);
+        return  getType().getMarkDownTitle()+"\n"+String.format("> 昨日设备使用数: <font color=\"comment\">**{  %s }**</font>\n" +
+                "> 昨日设备消息数: <font color=\"comment\">**{  %s }**</font>",deviceCount,msgCount);
     }
 
     @Override

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

@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
  * @createTime 2022年07月19日 15:21:00
  */
 @Component
-@Profile("prod")
+//@Profile("prod")
 public class EnterpriseWeChatNotify {
     @Autowired
     private DiskSpaceHealthIndicator spaceHealthIndicator;

nb-system/src/main/java/com/nb/bus/job/DeviceFlowStatsJob.java

@@ -11,6 +11,7 @@ import com.nb.common.notice.msg.DeviceMsg;
 import com.nb.common.notice.wechat.EnterpriseWeChatNotify;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -31,6 +32,14 @@ public class DeviceFlowStatsJob {
     private final LocalBusHospitalLogService hospitalLogService;
     private final EnterpriseWeChatNotify enterpriseWeChatNotify;
 
+    /**
+     * 描述: 每天早上9点定时发送
+     * @author lifang
+     * @date 2022/7/29 9:03
+     * @param
+     * @return void
+     */
+    @Scheduled(cron = "0 0 9 * * ?")
     public void flowStats(){
         DateTime yesterday = DateUtil.yesterday();
         DateTime startTime = DateUtil.beginOfDay(yesterday);
@@ -41,6 +50,13 @@ public class DeviceFlowStatsJob {
                 .eq(BusHospitalLogEntity::getType, HospitalLogEnum.ALI_DATA_UPLOAD)
                 .lt(BusHospitalLogEntity::getCreateTime, endTime)
                 .gt(BusHospitalLogEntity::getCreateTime, startTime));
+
+        hospitalLogService.list(new QueryWrapper<BusHospitalLogEntity>()
+                .lambda()
+                .select(BusHospitalLogEntity::getIdentityCode, BusHospitalLogEntity::isSuccess)
+                .eq(BusHospitalLogEntity::getType, HospitalLogEnum.ALI_DATA_UPLOAD)
+                .lt(BusHospitalLogEntity::getCreateTime, endTime)
+                .gt(BusHospitalLogEntity::getCreateTime, startTime));
         Set<String> deviceIds = deviceLogs.parallelStream().map(BusHospitalLogEntity::getIdentityCode).collect(Collectors.toSet());
         int deviceCount= CollectionUtil.size(deviceIds);
         int msgCount=CollectionUtil.size(deviceLogs);

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

@@ -228,9 +228,12 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
     }
 
     /**
-     * 结束病患监控操作
+     * 描述:结束病患监控操作
+     * @author lifang
+     * @date 2022/7/29 8:59
      * @param manualUndoConfig
-     * @param  finishClinic 撤泵后是否结束相关临床
+     * @param finishClinic  撤泵后是否结束相关临床
+     * @return void
      */
     @Transactional(rollbackFor = Exception.class)
     public void undo(ManualUndoConfig manualUndoConfig, boolean finishClinic) {
@@ -271,7 +274,6 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
                             .set(runningInfusionCount>1,BusPatientEntity::getAlarm,PatientAlarmEnum.DEVICE_REPEAT)
                             .set(runningInfusionCount==0,BusPatientEntity::getAlarm,PatientAlarmEnum.NONE));
                     wsPublishUtils.publishDeviceRepeat(manualUndoConfig.getTenantId());
-                    wsPublishUtils.publishDeviceNone(manualUndoConfig.getTenantId());
                 }
             }
 

nb-system/src/main/java/com/nb/bus/websocket/listener/DeviceInfoListener.java

@@ -225,6 +225,12 @@ public class DeviceInfoListener {
                 deviceOperator.setContinueDose(device.getContinueDose());
                 return null;
             });
+        }else {
+            cacheOperation.add(()->{
+                //开机包不进行计算
+                deviceOperator.setContinueDose(null);
+                return null;
+            });
         }
     }