修复 阿里云参数解析空指针问题

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

@@ -15,19 +15,28 @@ app:
 
 # MinIO相关配置
 # MinIO相关配置
+#minio:
+#  upload:
+#    endpoint: pca.tuoren.com
+#    accessKey: tuoren
+#    secretKey: Tuoren@123
+#  down:
+#    endpoint: pca.tuoren.com
+#    accessKey: tuoren
+#    secretKey: Tuoren@123
+#  bucketName: ${app.name}-${profiles.active}-bucket
+#  port: 5001
+#  secure: true
 minio:
-  upload:
-    endpoint: pca.tuoren.com
-    accessKey: tuoren
-    secretKey: Tuoren@123
-  down:
-    endpoint: pca.tuoren.com
-    accessKey: tuoren
-    secretKey: Tuoren@123
+  uploadEndpoint: 192.168.100.32
+  uploadPort: 7001
+  uploadSecure: false
+  downEndpoint: 192.168.100.32
+  downPort: 7002
+  downSecure: false
+  accessKey: nbnetpump
+  secretKey: tuoren123
   bucketName: ${app.name}-${profiles.active}-bucket
-  port: 5001
-  secure: true
-
 # 数据源配置
 spring:
   datasource:
@@ -107,9 +116,9 @@ spring:
         max-wait: -1ms
 request:
   check:
-    enable: true
+    enable: false
     # 开启请求验签
-    sign: true
+    sign: false
     # 请求与服务器时间间隔不得超过 10分钟
     expire-interval: 600
     # 请求不可重复接收时间 10分钟

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

@@ -2,7 +2,11 @@ package com.nb.admin;
 
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nb.aliyun.service.AliyunConsumerGroupService;
 import com.nb.web.api.entity.BusDeviceEntity;
+import com.nb.web.api.enums.DeviceStatusEnum2;
+import com.nb.web.api.enums.HospitalLogEnum;
+import com.nb.web.api.utils.EnumUtils;
 import com.nb.web.service.bus.service.LocalBusDeviceService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -40,6 +44,14 @@ public class BusNetpumpTest {
 
     }
     @Test
+    public void update(){
+        BusDeviceEntity device=new BusDeviceEntity();
+        device.setId("43036339393103CD");
+        device.setStatus(DeviceStatusEnum2.OFFLINE);
+        device.setAlias("");
+        deviceService.updateDevice(device);
+    }
+    @Test
     public void save(){
 //        StpUtil.login();
         BusDeviceEntity deviceEntity = deviceService.getOne(new QueryWrapper<BusDeviceEntity>().last("limit 1"));
@@ -105,5 +117,16 @@ public class BusNetpumpTest {
     @Test
     public void queryRegistry(){
 
+    }
+    @Autowired
+    private AliyunConsumerGroupService consumerGroupService;
+    @Test
+    public void alias(){
+        BusDeviceEntity device = new BusDeviceEntity();
+        device.setDeviceId("43047342373902A5");
+        device.setStatus(DeviceStatusEnum2.OFFLINE);
+        // 更新设备状态
+        deviceService.updateDevice(device);
+
     }
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/utils/Items.java

@@ -1,11 +1,11 @@
 package com.nb.web.api.utils;
 
 import com.alibaba.fastjson.JSONObject;
-import com.nb.web.api.utils.PumpParams;
 import lombok.AllArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * @Author 龙三郎
@@ -25,20 +25,20 @@ public class Items {
     }
 
     public Integer getInteger(PumpParams param){
-        return items.getJSONObject(param.getParam()).getInteger(VALUE);
+        return Optional.ofNullable(items.getJSONObject(param.getParam())).orElse(new JSONObject()).getInteger(VALUE);
     }
 
     public Date getDate(){
-        long time = items.getJSONObject(PumpParams.patientCode.getParam()).getLong(TIME);
-        return new Date(time);
+        Long time =Optional.ofNullable( items.getJSONObject(PumpParams.patientCode.getParam())).orElse(new JSONObject()).getLong(TIME);
+        return time==null?null:new Date(time);
     }
 
     public BigDecimal getBigDecimal(PumpParams param){
-        return items.getJSONObject(param.getParam()).getBigDecimal(VALUE);
+        return Optional.ofNullable(items.getJSONObject(param.getParam())).orElse(new JSONObject()).getBigDecimal(VALUE);
     }
 
     public Boolean getBoolean(PumpParams param){
-        return items.getJSONObject(param.getParam()).getBoolean(VALUE);
+        return Optional.ofNullable(items.getJSONObject(param.getParam())).orElse(new JSONObject()).getBoolean(VALUE);
     }
 
 }