update deviceEnum改为deviceTypeEnum

coffee-admin/src/test/java/com/coffee/admin/BusClinicTest.java

@@ -0,0 +1,44 @@
+package com.coffee.admin;
+
+import com.coffee.bus.controller.vo.ClinicStatsVo;
+import com.coffee.bus.entity.BusDeviceRunningEntity;
+import com.coffee.bus.entity.BusInfusionHistoryEntity;
+import com.coffee.bus.listener.event.bean.DeviceInfoEvent;
+import com.coffee.bus.service.LocalBusClinicService;
+import com.coffee.bus.service.LocalBusInfusionHistoryService;
+import com.coffee.bus.service.dto.ClinicStatsReturnResult;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @Author longsanlang
+ * @Date 2022-04-06 17:55:44
+ * @Version 1.0
+ * @Description XXX
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AdminApplication.class)
+public class BusClinicTest {
+
+    @Autowired
+    private LocalBusClinicService clinicService;
+
+
+    @Test
+    public void stats(){
+        ClinicStatsVo clinicStatsVo = new ClinicStatsVo();
+        clinicStatsVo.setContinueDose(true);
+        clinicStatsVo.setInValidCount(true);
+        clinicStatsVo.setValidCount(true);
+        clinicStatsVo.setClinicId("1519516923748319234");
+        clinicStatsVo.setDeviceId("456");
+        ClinicStatsReturnResult stats = clinicService.stats(clinicStatsVo);
+        System.out.println(stats);
+    }
+
+
+}

coffee-system/src/main/java/com/coffee/bus/controller/vo/DeviceRunningMockVo.java

@@ -3,9 +3,8 @@ package com.coffee.bus.controller.vo;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.coffee.bus.enums.DeviceAlarmEnum;
-import com.coffee.bus.enums.DeviceEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
-import com.coffee.common.enums.SexEnum;
+import com.coffee.bus.enums.DeviceTypeEnum;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -166,7 +165,7 @@ public class DeviceRunningMockVo {
 
     @ApiModelProperty(value = "泵类型",readOnly = true)
     @TableField(javaType = true,updateStrategy = FieldStrategy.NEVER)
-    private DeviceEnum type;
+    private DeviceTypeEnum type;
 
     @ApiModelProperty(value = "数据上传时间",readOnly = true,hidden = true)
     @JsonIgnoreProperties(allowSetters = true)

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceRunningEntity.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.enums.DeviceAlarmEnum;
-import com.coffee.bus.enums.DeviceEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
+import com.coffee.bus.enums.DeviceTypeEnum;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.coffee.common.enums.SexEnum;
 import com.fasterxml.jackson.annotation.*;
@@ -209,7 +209,7 @@ public class BusDeviceRunningEntity extends TenantGenericEntity<String,String> {
 
     @ApiModelProperty(value = "泵类型",readOnly = true)
     @TableField(javaType = true,updateStrategy = FieldStrategy.NEVER)
-    private DeviceEnum type;
+    private DeviceTypeEnum type;
 
     @ApiModelProperty(value = "数据上传时间",readOnly = true,hidden = true)
     @JsonIgnoreProperties(allowSetters = true)

coffee-system/src/main/java/com/coffee/bus/enums/DeviceTypeEnum.java

@@ -16,10 +16,10 @@ import lombok.Getter;
 @AllArgsConstructor
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum DeviceTypeEnum implements IEnum<Integer> {
-    no(0,"无泵"),
-    continuous(1,"持续型网络泵"),
+    continuous(0,"持续型网络泵"),
+    intelligent(1,"智能泵"),
     pulse(2,"脉冲泵"),
-    intelligent(3,"智能泵"),
+    no(3,"无泵"),
     other(4,"其他泵");
 
     @Getter

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

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.coffee.bus.entity.*;
 import com.coffee.bus.enums.DeviceAlarmEnum;
+import com.coffee.bus.enums.DeviceTypeEnum;
 import com.coffee.bus.enums.PatientAlarmEnum;
 import com.coffee.bus.listener.event.bean.HisEvent;
 import com.coffee.bus.registry.device.DeviceRegistry;
@@ -461,20 +462,20 @@ public class DeviceInfoListener {
             return;
         }
         ++count;
-//        BusDeviceRunningEntity pump = new BusDeviceRunningEntity();
-//        pump.setType(DeviceEnum.continuous);
-//        pump.setClassification(String.valueOf(mark));
-//        pump.setDeviceId("123");
-//        pump.setPatientCode("456");
-//        pump.setRemainDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-//        pump.setContinueDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-//        pump.setSelfControlLockTime(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-//        pump.setPcaValidCount(RandomUtil.randomInt(100));
-//        pump.setPcaInvalidCount(RandomUtil.randomInt(100));
-//        pump.setPcaTotalCount(RandomUtil.randomInt(100));
-//        SpringUtil.publishEvent(new DeviceInfoEvent(this,pump,pump.getDeviceId()));
-//
-//        Thread.sleep(5000);
+        BusDeviceRunningEntity pump = new BusDeviceRunningEntity();
+        pump.setType(DeviceTypeEnum.intelligent);
+        pump.setClassification(String.valueOf(mark));
+        pump.setDeviceId("123");
+        pump.setPatientCode("456");
+        pump.setRemainDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
+        pump.setContinueDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
+        pump.setSelfControlLockTime(BigDecimal.valueOf(RandomUtil.randomInt(100)));
+        pump.setPcaValidCount(RandomUtil.randomInt(100));
+        pump.setPcaInvalidCount(RandomUtil.randomInt(100));
+        pump.setPcaTotalCount(RandomUtil.randomInt(100));
+        SpringUtil.publishEvent(new DeviceInfoEvent(this,pump,pump.getDeviceId()));
+
+        Thread.sleep(5000);
 //
 //        BusDeviceRunningEntity pump1 = new BusDeviceRunningEntity();
 //        pump1.setDeviceId("456");