18339543638 1 anno fa
parent
commit
71578ae762

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

@@ -30,7 +30,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/nbnetpump?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+    url: jdbc:mysql://192.168.100.32:3306/nbnetpump?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
     username: root
     password: root
     druid:

+ 1 - 0
nb-admin/src/main/resources/db/migration/V2__init_20240830.sql

@@ -0,0 +1 @@
+ALTER TABLE bus_evaluation ADD COLUMN remark varchar(2048) DEFAULT NULL COMMENT '备注';

+ 2 - 0
nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusEvaluationEntity.java

@@ -174,6 +174,8 @@ public class BusEvaluationEntity extends TenantGenericEntity<String,String> {
     @DecimalMin(value = "-100",message ="血氧饱和度最小值不得低于-100" )
     private BigDecimal bloodOxygenSaturation;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
     @JsonIgnore
     @TableField(exist = false)

+ 3 - 0
nb-service-api/web-service-api/src/main/java/com/nb/web/api/utils/WarnFlowUtils.java

@@ -10,6 +10,9 @@ import com.nb.web.api.enums.FlowStatusEnum;
  */
 public class WarnFlowUtils {
     public static FlowStatusEnum getAlarm(Integer i){
+        if(i==null){
+            return FlowStatusEnum.None;
+        }
         if (i == 0){
             // 正常
             return FlowStatusEnum.None;

+ 0 - 1
nb-service/iot-service/src/main/java/com/nb/aliyun/controller/IotController.java

@@ -76,7 +76,6 @@ public class IotController {
             BusDeviceEntity device = new BusDeviceEntity();
             device.setStatus(DeviceStatusEnum2.ONLINE);
             device.setDeviceId(source.getDeviceId());
-            device.setStatus(DeviceStatusEnum2.ONLINE);
             device.setAlias(source.getAlias());
             device.setEnable(true);
             deviceService.saveDevice(device);