fix 排除嗅探系统内河船的数据

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GasCommonController.java

@@ -289,7 +289,7 @@ public class GasCommonController {
         equalsCondition.put("mmsi", "!0");
         Map<String, Object> rangeCondition = new HashMap<>();
         if (StrUtil.isBlank(startTime)) {
-            startTime = DateUtil.formatDateTime(DateUtil.offsetHour(new Date(), -3));
+            startTime = DateUtil.formatDateTime(DateUtil.offsetHour(new Date(), -2));
         }
         rangeCondition.put("createTime", StrUtil.concat(true, "[", startTime, ",", DateUtil.now(), "]"));
         List<String> orderBy = new ArrayList<>();

ruoyi-admin/src/main/java/com/ruoyi/web/job/CanalScheduling.java

@@ -325,6 +325,10 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
                         if (shipInfo != null) {
                             afterDataMap.put("shipName", shipInfo.getShipName());
                             afterDataMap.put("shipRegionType", shipInfo.getShipRegionType());
+                            if (StrUtil.equals(shipInfo.getShipRegionType(), "0")) {
+                                // 暂时排除内河船数据
+                                break;
+                            }
                         }
                     }
                     if (ObjectUtil.isNotEmpty(afterDataMap.get("sPercent")) && NumberUtil.isGreaterOrEqual(Convert.toBigDecimal(afterDataMap.get("sPercent")), Convert.toBigDecimal(so2ThresholdVal))) {