fix

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

@@ -170,7 +170,8 @@ public class GasCommonController {
 
         for (DeviceBo deviceBo : so2) {
             deviceBo.setOrgName(orgMap.get(deviceBo.getMonitorName()));
-            deviceBo.setDevicePhoto(StrUtil.split(collect.get("device.guangpu"), ","));
+            String guangpuPhoto = collect.get("device.guangpu");
+            deviceBo.setDevicePhoto(StrUtil.split(guangpuPhoto, ","));
             switch (deviceBo.getMonitorName()) {
                 case "南京三桥":
                     njsanq.add(deviceBo);
@@ -194,7 +195,8 @@ public class GasCommonController {
         }
         for (DeviceBo deviceBo : ais) {
             deviceBo.setOrgName(orgMap.get(deviceBo.getMonitorName()));
-            deviceBo.setDevicePhoto(StrUtil.split(collect.get("device.xiutan"), ","));
+            String xiutanPhoto = collect.get("device.xiutan");
+            deviceBo.setDevicePhoto(StrUtil.split(xiutanPhoto, ","));
             switch (deviceBo.getMonitorName()) {
                 case "南京三桥":
                     njsanq.add(deviceBo);
@@ -217,7 +219,8 @@ public class GasCommonController {
             }
         }
         for (DeviceBo deviceBo : heiyan) {
-            deviceBo.setDevicePhoto(StrUtil.split(collect.get("device.heiyan"), ","));
+            String heiyanPhoto = collect.get("device.heiyan");
+            deviceBo.setDevicePhoto(StrUtil.split(heiyanPhoto, ","));
             switch (deviceBo.getMonitorName()) {
                 case "南京三桥":
                     njsanq.add(deviceBo);
@@ -438,7 +441,7 @@ public class GasCommonController {
     public final static Map<String, String> orgMap = new HashMap<String, String>() {{
         put("南京三桥", "南京海事局");
         put("南京四桥", "南京海事局");
-        put("润扬大桥", "扬州海事局");
+        put("润扬大桥", "镇江海事局");
         put("泰州大桥", "泰州海事局");
         put("江阴大桥", "江阴海事局");
         put("苏通大桥", "常熟海事局");

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

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -83,7 +84,7 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
     public final static Map<String, String> orgMap = new HashMap<String, String>() {{
         put("南京三桥", "南京海事局");
         put("南京四桥", "南京海事局");
-        put("润扬大桥", "扬州海事局");
+        put("润扬大桥", "镇江海事局");
         put("泰州大桥", "泰州海事局");
         put("江阴大桥", "江阴海事局");
         put("苏通大桥", "常熟海事局");
@@ -182,7 +183,9 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
 
     @SneakyThrows
     private void indexES(Map<String, Object> beforeDataMap, Map<String, Object> afterDataMap, CanalEntry.EventType eventType, String database, String table) {
-        log.info("eventType:{},database:{},table:{}\nbeforeMap:{},\n afterMap:{}", eventType, database, table, beforeDataMap, afterDataMap);
+        if (MapUtil.isNotEmpty(afterDataMap)) {
+            log.info("eventType:{},database:{},table:{}\nbeforeMap:{},\n afterMap:{}", eventType, database, table, beforeDataMap, afterDataMap);
+        }
         if (!StrUtil.equalsAnyIgnoreCase(database, "smoke_api", "ship", "ais_database")) {
             return;
         }
@@ -430,7 +433,7 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
                             CacheConstants.DEVICE_LIST_STATIC));
                 } else if (StrUtil.equalsIgnoreCase(database, "ship") && StrUtil.equalsIgnoreCase(table, "monitor_point")) {
                     // 检测点信息
-                    client.deleteDocument(ElasticConstants.SO2_MONITOR_POINT, Convert.toStr(afterDataMap.get("id")));
+                    client.deleteDocument(ElasticConstants.SO2_MONITOR_POINT, Convert.toStr(beforeDataMap.get("id")));
                     redisCache.deleteObject(CacheConstants.DEVICE_STATIC);
                 } else if (StrUtil.equalsIgnoreCase(database, "ship") && StrUtil.equalsIgnoreCase(table, "device")) {
                     // 设备信息
@@ -441,7 +444,7 @@ public class CanalScheduling implements Runnable, ApplicationContextAware {
                             CacheConstants.DEVICE_LIST_STATIC));
                 } else if (StrUtil.equalsIgnoreCase(database, "ais_database") && (StrUtil.equalsIgnoreCase(table, "sem_instrument"))) {
                     // 嗅探系统-站点信息
-                    client.deleteDocument(ElasticConstants.AIS_SEM_INSTRUMENT, Convert.toStr(afterDataMap.get("id")));
+                    client.deleteDocument(ElasticConstants.AIS_SEM_INSTRUMENT, Convert.toStr(beforeDataMap.get("id")));
                     log.info("删除redis设备缓存");
                     redisCache.deleteObject(CollUtil.set(false,
                             CacheConstants.DEVICE_STATIC,

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

@@ -53,7 +53,7 @@ public class GasCommonServiceImpl implements IGasCommonService {
     public final static Map<String, String> orgMap = new HashMap<String, String>() {{
         put("南京三桥", "南京海事局");
         put("南京四桥", "南京海事局");
-        put("润扬大桥", "扬州海事局");
+        put("润扬大桥", "镇江海事局");
         put("泰州大桥", "泰州海事局");
         put("江阴大桥", "江阴海事局");
         put("苏通大桥", "常熟海事局");

ruoyi-admin/src/main/resources/logback.xml

@@ -12,6 +12,26 @@
         </encoder>
     </appender>
 
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- 日志最大 2天 -->
+            <maxHistory>2</maxHistory>
+            <maxFileSize>20MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+        </filter>
+    </appender>
+
     <!-- 系统日志输出 -->
     <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.path}/sys-info.log</file>
@@ -20,7 +40,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>30</maxHistory>
             <maxFileSize>20MB</maxFileSize>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -68,7 +88,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>10</maxHistory>
             <maxFileSize>20MB</maxFileSize>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -90,6 +110,7 @@
     <root level="info">
         <appender-ref ref="file_info"/>
         <appender-ref ref="file_error"/>
+        <appender-ref ref="file_console"/>
     </root>
 
     <!--系统用户操作日志-->