|
|
|
@ -1487,11 +1487,13 @@ public class HikVisionServiceImpl implements HikVisionService { |
|
|
|
//画框标注 |
|
|
|
String s = ImageOverlays(infraPictureInfo, infraredInfo); |
|
|
|
infraredInfo.setOutPath(s); |
|
|
|
log.info("计算过后最高温{}",infraredInfo.getFrameMax()); |
|
|
|
log.info("计算过后最高温 ->是否等于0.0f{}",infraredInfo.getFrameMax() == 0.0f); |
|
|
|
//温度未取到 |
|
|
|
if(StringUtils.isNull(maxTemperature)){ |
|
|
|
maxTemperature = "-1"; |
|
|
|
infraredInfo.setFrameMax(-1); |
|
|
|
} else if(StringUtils.isNull(infraredInfo.getFrameMax())){ |
|
|
|
} else if(infraredInfo.getFrameMax() == 0.0f){ |
|
|
|
infraredInfo.setFrameMax(Float.parseFloat((maxTemperature))); |
|
|
|
} |
|
|
|
} else if (AlgConstants.INFRA_1800.equals(imageType)) { |
|
|
|
@ -1518,8 +1520,6 @@ public class HikVisionServiceImpl implements HikVisionService { |
|
|
|
String imageName = Paths.get(imagePath).getFileName().toString(); |
|
|
|
boolean isLoginHr = pic2Ftp(imageName, inputStream, host, port, username, password); |
|
|
|
String ftpUrlName = "[\"" + hrFtpUrl + imageName + "\"]"; |
|
|
|
|
|
|
|
|
|
|
|
float[][] imageTem = new float[0][]; |
|
|
|
if (isLoginHr) { |
|
|
|
//可以登陆华软ftp |
|
|
|
|