Просмотр исходного кода

update 获取更新安装包fix 丢包率

18339543638 3 лет назад
Родитель
Сommit
f8ab487608

+ 1 - 1
nb-admin/src/main/resources/application-prod.yml

@@ -30,7 +30,7 @@ spring:
     driverClassName: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://47.101.214.91:7001/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
     username: root
-    password: 123456
+    password: Tuoren123.
     druid:
       # 初始连接数
       initialSize: 5

+ 14 - 4
nb-admin/src/test/java/com/nb/admin/BusClinicTest.java

@@ -5,6 +5,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.nb.core.result.R;
+import com.nb.web.service.bus.controller.BusDeviceHistoryController;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
 import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusDocEntity;
@@ -25,6 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -47,8 +50,15 @@ public class BusClinicTest {
     private ObjectMapper objectMapper;
     @Autowired
     private LocalBusInfusionHistoryService infusionHistoryService;
-@Autowired
-private LocalBusDocService docService;
+    @Autowired
+    private LocalBusDocService docService;
+
+    @Autowired
+    private BusDeviceHistoryController historyController;
+    @Test
+    public void lost(){
+        R<BigDecimal> bigDecimalR = historyController.lossRate("1575009329758154754");
+    }
     @Test
     public void stats(){
         ClinicStatsVo clinicStatsVo = new ClinicStatsVo();
@@ -90,9 +100,9 @@ private LocalBusDocService docService;
     @Transactional(rollbackFor = ArithmeticException.class)
     public void test(){
         clinicService.update(new UpdateWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getId,"1528668113304244226")
-        .set(BusClinicEntity::getSurgeryName,"临床数据5"));
+                .set(BusClinicEntity::getSurgeryName,"临床数据5"));
         docService.update(new UpdateWrapper<BusDocEntity>().lambda().eq(BusDocEntity::getId,"1512720050274963458")
-        .set(BusDocEntity::getType,"about1"));
+                .set(BusDocEntity::getType,"about1"));
         int i=1/0;
     }
 

+ 1 - 1
nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusDeviceHistoryController.java

@@ -94,7 +94,7 @@ public class BusDeviceHistoryController extends BaseCrudController<BusDeviceHist
         AtomicReference<BigDecimal> result=new AtomicReference<>(BigDecimal.ZERO);
         if(CollectionUtil.isNotEmpty(histories)){
             histories.stream().map(BusDeviceHistoryEntity::getDataNumber)
-                    .max(Comparator.comparing(Integer::byteValue))
+                    .max(Comparator.comparing(Integer::valueOf))
                     .map(max->{
                         BigDecimal proportionRate = BigDecimal.valueOf(count).divide(BigDecimal.valueOf(max), 2, BigDecimal.ROUND_HALF_UP);
                         result.set(BigDecimal.ONE.subtract(proportionRate).multiply(BigDecimal.valueOf(100)));