增加黑烟的范围查询

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

@@ -63,7 +63,7 @@ public class BlackGasController extends BaseController {
         equalsCondition.put("shipName", StrUtil.isBlank(shipRecognition.getShipName()) ? null : StrUtil.concat(true, "*", shipRecognition.getShipName(), "*"));
         equalsCondition.put("monitorPointName", StrUtil.isBlank(shipRecognition.getMonitorPointName()) ? null : StrUtil.concat(true, "*", shipRecognition.getMonitorPointName(), "*"));
         equalsCondition.put("shipRegionType", shipRecognition.getShipRegionType());
-        equalsCondition.put("rcgSoot", shipRecognition.getRcgSoot());
+        equalsCondition.put("rcgSoot", shipRecognition.getRcgSoots());
         equalsCondition.put("illegalStatus", shipRecognition.getIllegalStatus());
         equalsCondition.put("orgName", shipRecognition.getOrgName());
         if (StrUtil.isNotBlank(shipRecognition.getFilterMmsi()) && StrUtil.isBlank(shipRecognition.getMmsi())) {

ruoyi-system/src/main/java/com/ruoyi/system/domain/ShipRecognition.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 船舶信息对象 ship_recognition
@@ -98,6 +99,8 @@ public class ShipRecognition extends BaseEntity {
     @Excel(name = "黑烟:度数")
     private Long rcgSoot;
 
+    private List<Long> rcgSoots;
+
     /**
      * 船舶过闸闸次
      */