海南bug修改提交

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java

@@ -36,10 +36,10 @@ public class TransientParam extends DeviceInfoParam.BusinessParam {
     private BigDecimal eventValueMin;
 
     @ApiModelProperty("持续时间最大值")
-    private Integer persistMax;
+    private Double persistMax;
 
     @ApiModelProperty("持续时间最小值")
-    private Integer persistMin;
+    private Double persistMin;
 
     @ApiModelProperty("严重度最大值")
     private BigDecimal severityMax;

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java

@@ -526,6 +526,7 @@ public class TransientServiceImpl implements TransientService {
                             log.info("cfg-----"+cfgPath);
                             log.info("cfg-----"+datPath);
 
+
                             //判断文件是否存在
                             File file = new File(cfgPath);
                             if(!file.exists()){
@@ -540,6 +541,8 @@ public class TransientServiceImpl implements TransientService {
                             log.info("cfg-----"+cfgPath);
                             log.info("cfg-----"+datPath);
                             cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath);
+                            datStream = waveFileComponent.getFileInputStreamByFilePath(datPath);
+
                         } else {
                             cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG;
                             boolean result1 = minIoUtils.checkFileIsExist(minIossProperties.getBucket(), cfgPath);