'bug'

src/main/java/com/taauav/admin/service/impl/TauvWaterDataServiceImpl.java

@@ -206,22 +206,22 @@ public class TauvWaterDataServiceImpl extends BaseServiceImpl<TauvWaterDataMappe
                 BigDecimal value = BigDecimal.ZERO;
                 switch (item.getCode().toLowerCase()) {
                     case "cod":
-                        value = new BigDecimal(waterData.getWaterCod());
+                        value = waterData.getWaterCod() != null ? new BigDecimal(waterData.getWaterCod()) : null;
                         break;
                     case "nh3-n":
-                        value = new BigDecimal(waterData.getWaterNh3n());
+                        value = waterData.getWaterNh3n() != null ? new BigDecimal(waterData.getWaterNh3n()) :null;
                         break;
                     case "tp":
-                        value = new BigDecimal(waterData.getWaterTp());
+                        value = waterData.getWaterTp() != null ? new BigDecimal(waterData.getWaterTp()) : null;
                         break;
                     case "tn":
-                        value = new BigDecimal(waterData.getWaterTn());
+                        value = waterData.getWaterTn() != null ? new BigDecimal(waterData.getWaterTn()) : null;
                         break;
                     case "do":
-                        value = new BigDecimal(waterData.getWaterDo());
+                        value = waterData.getWaterDo() != null ? new BigDecimal(waterData.getWaterDo()) : null;
                         break;
                     case "tub":
-                        value = new BigDecimal(waterData.getWaterTub());
+                        value = waterData.getWaterTub() != null ? new BigDecimal(waterData.getWaterTub()) : null;
                         break;
                     default:
                         break;
@@ -252,6 +252,9 @@ public class TauvWaterDataServiceImpl extends BaseServiceImpl<TauvWaterDataMappe
                 if (standardValue.compareTo(BigDecimal.ZERO) == 0) {
                     return false;
                 }
+                if (value == null) {
+                    continue;
+                }
                 BigDecimal exceed = value.subtract(standardValue);
                 TauvWaterAlarmInfo waterAlarmInfo = new TauvWaterAlarmInfo();
                 waterAlarmInfo.setName(item.getName());

src/main/java/com/taauav/admin/service/impl/TauvWaterTrendServiceImpl.java

@@ -154,6 +154,8 @@ public class TauvWaterTrendServiceImpl extends BaseServiceImpl<TauvWaterTrendMap
                 throw new ApiException("第" + m + "行河湖名称错误");
             }
             // 唯一性校验
+            Date castTime = FunctionUtils.strToDate(forecastTime, "yyyy-MM");
+            forecastTime = FunctionUtils.dateToString(castTime, "yyyy-MM");
             QueryWrapper wrapper = new QueryWrapper();
             wrapper.eq("driver_area", city.getId());
             wrapper.eq("driver_id", driver.getId());