|
@@ -81,7 +81,7 @@ public class StationHourServiceImpl extends ServiceImpl<StationHourMapper, Stati
|
|
|
stationHour.setWaterTemperature(numberDouble);
|
|
stationHour.setWaterTemperature(numberDouble);
|
|
|
}
|
|
}
|
|
|
//浊度
|
|
//浊度
|
|
|
- int turbidityIndex = dataStr.indexOf("4919",ffa01Index - 1);
|
|
|
|
|
|
|
+ int turbidityIndex = dataStr.lastIndexOf("4919",ffa01Index - 1);
|
|
|
// 如果找到了并且后面有6个字符
|
|
// 如果找到了并且后面有6个字符
|
|
|
if (turbidityIndex != -1 && turbidityIndex + 6 < dataStr.length()) {
|
|
if (turbidityIndex != -1 && turbidityIndex + 6 < dataStr.length()) {
|
|
|
// 提取后面的6个字符1
|
|
// 提取后面的6个字符1
|
|
@@ -89,7 +89,7 @@ public class StationHourServiceImpl extends ServiceImpl<StationHourMapper, Stati
|
|
|
stationHour.setTurbidity(Integer.parseInt(result));
|
|
stationHour.setTurbidity(Integer.parseInt(result));
|
|
|
}
|
|
}
|
|
|
//电压
|
|
//电压
|
|
|
- int voltageIndex = dataStr.indexOf("3812",ffa01Index - 1);
|
|
|
|
|
|
|
+ int voltageIndex = dataStr.lastIndexOf("3812",ffa01Index - 1);
|
|
|
// 如果找到了并且后面有4个字符
|
|
// 如果找到了并且后面有4个字符
|
|
|
if (voltageIndex != -1 && voltageIndex + 4 < dataStr.length()) {
|
|
if (voltageIndex != -1 && voltageIndex + 4 < dataStr.length()) {
|
|
|
// 提取后面的4个字符
|
|
// 提取后面的4个字符
|