调整字段

README.md

@@ -90,4 +90,4 @@ sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
 
 > 记录
 
-- 共同的字段：mmsi、shipName
+- 共同的字段：mmsi、shipName、destination、berthName、monitorPointName

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

@@ -59,9 +59,9 @@ public class BlackGasController extends BaseController {
         Map<String, Object> params = shipRecognition.getParams();
         Map<String, Object> equalsCondition = new HashMap<>();
         // 组装查询条件
-        equalsCondition.put("aisMmsi", ObjectUtil.isEmpty(shipRecognition.getAisMmsi()) ? null : StrUtil.concat(true, "*", Convert.toStr(shipRecognition.getAisMmsi()), "*"));
-        equalsCondition.put("aisShipName", StrUtil.isBlank(shipRecognition.getAisShipName()) ? null : StrUtil.concat(true, "*", shipRecognition.getAisShipName(), "*"));
-        equalsCondition.put("snapPos", StrUtil.isBlank(shipRecognition.getSnapPos()) ? null : StrUtil.concat(true, "*", shipRecognition.getSnapPos(), "*"));
+        equalsCondition.put("mmsi", ObjectUtil.isEmpty(shipRecognition.getMmsi()) ? null : StrUtil.concat(true, "*", Convert.toStr(shipRecognition.getMmsi()), "*"));
+        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("illegalStatus", shipRecognition.getIllegalStatus());
@@ -74,9 +74,9 @@ public class BlackGasController extends BaseController {
         if (ObjectUtil.isNotEmpty(params.get("endTime"))) {
             params.put("endTime", params.get("endTime") + " 23:59:59");
         }
-        rangeCondition.put("snapTimeFmt", StrUtil.concat(true, "[", Convert.toStr(params.get("beginTime")), ",", Convert.toStr(params.get("endTime")), "]"));
+        rangeCondition.put("createTime", StrUtil.concat(true, "[", Convert.toStr(params.get("beginTime")), ",", Convert.toStr(params.get("endTime")), "]"));
         List<String> orderBy = new ArrayList<>();
-        orderBy.add("-snapTime");
+        orderBy.add("-createTime");
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Map<String, Object> maps = client.searchDocument(equalsCondition, rangeCondition, orderBy, pageDomain.getPageNum(), pageDomain.getPageSize(), ElasticConstants.HEIYAN_SHIP_RECOGNITION);
 

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

@@ -233,7 +233,7 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
                         if (ObjectUtil.isNotEmpty(afterDataMap.get("aisMmsi")) && !"0".equals(Convert.toStr(afterDataMap.get("aisMmsi")))) {
                             AisShipInfo shipInfo = aisInfoService.getShipInfo("", Convert.toStr(afterDataMap.get("aisMmsi")), "", "");
                             if (shipInfo != null) {
-                                afterDataMap.put("aisShipName", shipInfo.getShipName());
+                                afterDataMap.put("shipName", shipInfo.getShipName());
                                 afterDataMap.put("shipRegionType", shipInfo.getShipRegionType());
                             }
                         }
@@ -242,6 +242,7 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
                         afterDataMap.put("orgName", orgMap.get(Convert.toStr(afterDataMap.get("snapPos"))));
                     }
                     afterDataMap.put("createTime", afterDataMap.get("snapTimeFmt"));
+                    afterDataMap.put("monitorPointName", afterDataMap.get("snapPos"));
                     client.createDocument(ElasticConstants.HEIYAN_SHIP_RECOGNITION, Convert.toStr(afterDataMap.get("id")), afterDataMap);
                 } else if (StrUtil.equalsIgnoreCase(database, "smoke_api") && StrUtil.equalsIgnoreCase(table, "ship_snap_address")) {
                     // 删除设备和类型的统计缓存

ruoyi-admin/src/main/java/com/ruoyi/web/service/Impl/GasCommonServiceImpl.java

@@ -94,6 +94,8 @@ public class GasCommonServiceImpl implements IGasCommonService {
                 } else {
                     stringObjectMap.put("illegalStatus", 1);
                 }
+                stringObjectMap.put("shipName", stringObjectMap.get("aisShipName"));
+                stringObjectMap.put("monitorPointName", stringObjectMap.get("snapPos"));
                 stringObjectMap.put("uploadFlag", 0);
                 stringObjectMap.put("illegalType", "heiyan");
                 stringObjectMap.put("shipRegionType", 0);

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

@@ -273,6 +273,10 @@ public class ShipRecognition extends BaseEntity {
 
     private Integer illegalStatus;
     private Integer uploadFlag;
-    
 
+    private String shipName;
+
+    private String monitorPointName;
+
+    private String mmsi;
 }