修改access数据库读取方式， sqlite数据库读取位置，不记录响应数据

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/mapper/CmcChannelMapper.java

@@ -20,7 +20,7 @@ public interface CmcChannelMapper extends BaseMapper<CmcChannel> {
      */
     List<CmcChannel> listChannel(CmcChannel cmcChannel);
 
-    Long selectMaxId();
+    Integer selectMaxId();
 
     int batchInsert(@Param("list") List<CmcChannel> list);
 

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/mapper/CmcTemperatureMapper.java

@@ -25,7 +25,7 @@ public interface CmcTemperatureMapper extends BaseMapper<CmcTemperature> {
                                          @Param("startTime") String startTime,
                                          @Param("endTime") String endTime);
 
-    Long selectMaxId();
+    Integer selectMaxId();
 
     int batchInsert(@Param("list") List<CmcTemperature> list);
 

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/mapper/access/AccessChannelMapper.java

@@ -1,18 +0,0 @@
-package com.ruoyi.monitoring.mapper.access;
-
-import com.mybatisflex.annotation.UseDataSource;
-import com.mybatisflex.core.BaseMapper;
-import com.ruoyi.monitoring.domain.CmcChannel;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@UseDataSource("access")
-public interface AccessChannelMapper extends BaseMapper<CmcChannel> {
-
-    List<CmcChannel> listAll();
-
-    List<CmcChannel> listByIdRange(@Param("minIdExclusive") Long minIdExclusive);
-}
-
-

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/mapper/access/AccessDataMapper.java

@@ -1,16 +0,0 @@
-package com.ruoyi.monitoring.mapper.access;
-
-import com.mybatisflex.annotation.UseDataSource;
-import com.mybatisflex.core.BaseMapper;
-import com.ruoyi.monitoring.domain.CmcTemperature;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@UseDataSource("access")
-public interface AccessDataMapper extends BaseMapper<CmcTemperature> {
-
-    List<CmcTemperature> listByIdRange(@Param("minIdExclusive") Long minIdExclusive);
-}
-
-

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/service/IAccessSyncService.java

@@ -2,7 +2,7 @@ package com.ruoyi.monitoring.service;
 
 public interface IAccessSyncService {
 
-    void syncAccessToSqlite();
+    void syncAccessToSqlite() throws  Exception;
 }
 
 

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/service/impl/AccessSyncServiceImpl.java

@@ -4,12 +4,13 @@ import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.ruoyi.monitoring.mapper.CmcChannelMapper;
 import com.ruoyi.monitoring.mapper.CmcTemperatureMapper;
-import com.ruoyi.monitoring.mapper.access.AccessChannelMapper;
-import com.ruoyi.monitoring.mapper.access.AccessDataMapper;
 import com.ruoyi.monitoring.service.IAccessSyncService;
+import org.noear.solon.Solon;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
+import java.sql.*;
+import java.util.ArrayList;
 import java.util.List;
 
 @Component
@@ -18,12 +19,6 @@ public class AccessSyncServiceImpl implements IAccessSyncService {
     // 每批插入的记录数
     private static final int BATCH_SIZE = 5000;
 
-    @Inject
-    AccessChannelMapper accessChannelMapper;
-
-    @Inject
-    AccessDataMapper accessDataMapper;
-
     @Inject
     CmcChannelMapper sqliteChannelMapper;
 
@@ -31,53 +26,106 @@ public class AccessSyncServiceImpl implements IAccessSyncService {
     CmcTemperatureMapper sqliteDataMapper;
 
     @Override
-    public void syncAccessToSqlite() {
+    public void syncAccessToSqlite() throws Exception {
         System.out.println("开始同步Access数据到SQLite...");
-        
-        try {
-            // 同步 Channel：增量，按ID递增同步
+        Class.forName(Solon.cfg().getProperty("mybatis-flex.datasource.access.driverClassName"));
+
+        try (Connection conn = DriverManager.getConnection(
+                Solon.cfg().getProperty("mybatis-flex.datasource.access.jdbcUrl"), "", "")) {
+
+            // 直接同步 Channel 表
             System.out.println("开始同步Channel表...");
-            Long channelMaxId = sqliteChannelMapper.selectMaxId();
-            if (channelMaxId == null) {
-                channelMaxId = 0L;
-            }
+            Integer channelMaxId = sqliteChannelMapper.selectMaxId();
             System.out.println("SQLite Channel表当前最大ID: " + channelMaxId);
-            List<CmcChannel> newChannels = accessChannelMapper.listByIdRange(channelMaxId);
-            if (newChannels != null && !newChannels.isEmpty()) {
+
+            List<CmcChannel> newChannels = new ArrayList<>();
+
+            String channelQuery = "SELECT ID, Sensor_No, Info, Ver, Sn, Ca, Cb, Units, LastDT " +
+                    "FROM Channel " +
+                    "WHERE ID > ? " +
+                    "ORDER BY ID ASC";
+
+            try (PreparedStatement pstmt = conn.prepareStatement(channelQuery)) {
+                pstmt.setInt(1, channelMaxId);
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    while (rs.next()) {
+                        CmcChannel channel = new CmcChannel();
+                        channel.setId(rs.getInt("ID"));
+                        channel.setSensorNo(rs.getInt("Sensor_No"));
+                        channel.setInfo(rs.getString("Info"));
+                        channel.setVer(rs.getInt("Ver"));
+                        channel.setSn(rs.getString("Sn"));
+                        channel.setCa(rs.getInt("Ca"));
+                        channel.setCb(rs.getInt("Cb"));
+                        channel.setUnits(rs.getString("Units"));
+                        channel.setLastDT(rs.getString("LastDT"));
+                        newChannels.add(channel);
+                    }
+                }
+            }
+
+            if (!newChannels.isEmpty()) {
                 System.out.println("从Access读取到" + newChannels.size() + "条新Channel记录（ID > " + channelMaxId + "）");
-                // 分批插入
                 batchInsertChannels(newChannels);
                 System.out.println("Channel表同步完成，共同步" + newChannels.size() + "条记录");
             } else {
                 System.out.println("没有新的Channel记录需要同步（ID > " + channelMaxId + "）");
             }
 
-            // 同步 Data：增量，按ID递增同步
+            // 同步 Data 表
             System.out.println("开始同步Data表...");
-            Long dataMaxId = sqliteDataMapper.selectMaxId();
-            if (dataMaxId == null) {
-                dataMaxId = 0L;
-            }
+            Integer dataMaxId = sqliteDataMapper.selectMaxId();
             System.out.println("SQLite Data表当前最大ID: " + dataMaxId);
-            List<CmcTemperature> newData = accessDataMapper.listByIdRange(dataMaxId);
-            for (CmcTemperature cmcTemperature : newData) {
-                cmcTemperature.setDatetime(cmcTemperature.getDatetime().replace(".000000", ""));
-                cmcTemperature.setData(cmcTemperature.getData().replace("00000", ""));
+
+            List<CmcTemperature> newData = new ArrayList<>();
+            String dataQuery = "SELECT ID, Group_No, Sensor_No, DateTime, Data, Volt, CSQ " +
+                    "FROM Data " +
+                    "WHERE ID > ? " +
+                    "ORDER BY ID ASC";
+
+            try (PreparedStatement pstmt = conn.prepareStatement(dataQuery)) {
+                pstmt.setInt(1, dataMaxId);
+                try (ResultSet rs = pstmt.executeQuery()) {
+                    while (rs.next()) {
+                        CmcTemperature data = new CmcTemperature();
+                        data.setId(rs.getInt("ID"));
+                        data.setGroupNo(rs.getInt("Group_No"));
+                        data.setSensorNo(rs.getInt("Sensor_No"));
+
+                        // 处理日期时间字段
+                        String datetime = rs.getString("DateTime");
+                        if (datetime != null) {
+                            data.setDatetime(datetime.replace(".000000", ""));
+                        } else {
+                            data.setDatetime("");
+                        }
+
+                        // 处理数据字段
+                        String dataValue = rs.getString("Data");
+                        if (dataValue != null) {
+                            data.setData(dataValue.replace("00000", ""));
+                        } else {
+                            data.setData("");
+                        }
+
+                        data.setVolt(rs.getString("Volt"));
+                        data.setCSQ(rs.getInt("CSQ"));
+                        newData.add(data);
+                    }
+                }
             }
-            if (newData != null && !newData.isEmpty()) {
+
+            if (!newData.isEmpty()) {
                 System.out.println("从Access读取到" + newData.size() + "条新Data记录（ID > " + dataMaxId + "）");
-                // 分批插入
                 batchInsertData(newData);
                 System.out.println("Data表同步完成，共同步" + newData.size() + "条新记录");
             } else {
                 System.out.println("没有新的Data记录需要同步（ID > " + dataMaxId + "）");
             }
-            
+
             System.out.println("Access数据同步到SQLite完成");
-        } catch (Exception e) {
-            System.out.println("同步Access数据到SQLite失败: " + e.getMessage());
-            e.printStackTrace();
-            throw e;
+        } catch (SQLException e) {
+            throw new RuntimeException("Access数据库查询失败", e);
         }
     }
 
@@ -87,12 +135,12 @@ public class AccessSyncServiceImpl implements IAccessSyncService {
     private void batchInsertChannels(List<CmcChannel> channels) {
         int total = channels.size();
         int batchCount = (total + BATCH_SIZE - 1) / BATCH_SIZE;
-        
+
         for (int i = 0; i < batchCount; i++) {
             int fromIndex = i * BATCH_SIZE;
             int toIndex = Math.min((i + 1) * BATCH_SIZE, total);
             List<CmcChannel> batch = channels.subList(fromIndex, toIndex);
-            
+
             sqliteChannelMapper.batchInsert(batch);
             System.out.println("Channel表已插入第 " + (i + 1) + "/" + batchCount + " 批，共 " + batch.size() + " 条记录");
         }
@@ -104,16 +152,14 @@ public class AccessSyncServiceImpl implements IAccessSyncService {
     private void batchInsertData(List<CmcTemperature> dataList) {
         int total = dataList.size();
         int batchCount = (total + BATCH_SIZE - 1) / BATCH_SIZE;
-        
+
         for (int i = 0; i < batchCount; i++) {
             int fromIndex = i * BATCH_SIZE;
             int toIndex = Math.min((i + 1) * BATCH_SIZE, total);
             List<CmcTemperature> batch = dataList.subList(fromIndex, toIndex);
-            
+
             sqliteDataMapper.batchInsert(batch);
             System.out.println("Data表已插入第 " + (i + 1) + "/" + batchCount + " 批，共 " + batch.size() + " 条记录");
         }
     }
-}
-
-
+}

cmc-temperature-back/cmc-monitoring/src/main/resources/mapper/access/AccessChannelMapper.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.monitoring.mapper.access.AccessChannelMapper">
-
-    <resultMap type="com.ruoyi.monitoring.domain.CmcChannel" id="CmcChannelResult">
-        <id     property="Id"      column="ID"      />
-        <result property="SensorNo"     column="Sensor_No"     />
-        <result property="Info"   column="Info"   />
-        <result property="Ver"    column="Ver"    />
-        <result property="Sn"      column="Sn"      />
-        <result property="Ca"    column="Ca"    />
-        <result property="Cb"    column="Cb"    />
-        <result property="Units"    column="Units"    />
-        <result property="LastDT"    column="LastDT"    />
-    </resultMap>
-
-    <select id="listAll" resultMap="CmcChannelResult">
-        SELECT c.ID, c.Sensor_No, c.Info, c.Ver, c.Sn, c.Ca, c.Cb, c.Units, c.LastDT
-        FROM Channel c
-    </select>
-
-    <select id="listByIdRange" resultMap="CmcChannelResult">
-        SELECT c.ID, c.Sensor_No, c.Info, c.Ver, c.Sn, c.Ca, c.Cb, c.Units, c.LastDT
-        FROM Channel c
-        WHERE c.ID > #{minIdExclusive}
-        ORDER BY c.ID ASC
-    </select>
-
-</mapper>
-

cmc-temperature-back/cmc-monitoring/src/main/resources/mapper/access/AccessDataMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.monitoring.mapper.access.AccessDataMapper">
-
-    <resultMap type="com.ruoyi.monitoring.domain.CmcTemperature" id="CmcTemperatureResult">
-        <id     property="Id"      column="ID"      />
-        <result property="GroupNo"    column="Group_No"    />
-        <result property="SensorNo"     column="Sensor_No"     />
-        <result property="Datetime"   column="DateTime"   />
-        <result property="Data"    column="Data"    />
-        <result property="Volt"      column="Volt"      />
-        <result property="CSQ"    column="CSQ"    />
-    </resultMap>
-
-    <select id="listByIdRange" resultMap="CmcTemperatureResult">
-        SELECT d.ID, d.Group_No, d.Sensor_No, d.DateTime, d.Data, d.Volt, d.CSQ
-        FROM Data d
-        WHERE d.ID &gt; #{minIdExclusive}
-        ORDER BY d.ID ASC
-    </select>
-
-</mapper>
-

cmc-temperature-back/cmc-monitoring/src/main/resources/mapper/temperature/CmcChannelMapper.xml

@@ -35,7 +35,7 @@
         </where>
     </select>
 
-    <select id="selectMaxId" resultType="long">
+    <select id="selectMaxId" resultType="int">
         SELECT IFNULL(MAX(ID), 0) FROM Channel
     </select>
 

cmc-temperature-back/cmc-monitoring/src/main/resources/mapper/temperature/CmcTemperatureMapper.xml

@@ -38,7 +38,7 @@
         ORDER BY d.DateTime ASC, d.Sensor_No ASC
     </select>
 
-    <select id="selectMaxId" resultType="long">
+    <select id="selectMaxId" resultType="int">
         SELECT IFNULL(MAX(ID), 0) FROM Data
     </select>
 

cmc-temperature-back/ruoyi-admin/src/main/resources/app-dev.yml

@@ -165,14 +165,14 @@ mybatis-flex:
     sqlite:
       type: com.zaxxer.hikari.HikariDataSource
       driverClassName: org.sqlite.JDBC
-      jdbcUrl: jdbc:sqlite::resource:static/cmc-temperature.db?date_string_format=yyyy-MM-dd HH:mm:ss
+      jdbcUrl: jdbc:sqlite:///home/cmcgis/projects/cmc-temperature/Data/cmc-temperature.db?date_string_format=yyyy-MM-dd HH:mm:ss
+#      jdbcUrl: jdbc:sqlite://E:/Java/cmc-temperature/cmc-temperature-back/sql/Data/cmc-temperature.db?date_string_format=yyyy-MM-dd HH:mm:ss
       username:
       password:
     access:
-      type: com.zaxxer.hikari.HikariDataSource
       driverClassName: net.ucanaccess.jdbc.UcanaccessDriver
-#      jdbcUrl: jdbc:ucanaccess:///home/cmcgis/projects/cmc-temperature/Data/SKREC_ID1.accdb;showSchema=false;sysSchema=false;memory=false;keepMirror=true;immediatelyReleaseResources=true;openExclusive=false;net.ucanaccess.metadata=ignore;ignoreCase=true;logLevel=WARNING;newDatabaseVersion=V2007
-      jdbcUrl: jdbc:ucanaccess://E:/Java/cmc-temperature/cmc-temperature-back/sql/Data/SKREC_ID1.accdb;memory=false;keepMirror=true;immediatelyReleaseResources=true;ignorecase=true;showschema=false;sysschema=false;openExclusive=false
+      jdbcUrl: jdbc:ucanaccess:///home/cmcgis/projects/cmc-temperature/Data/SKREC_ID1.accdb;ignorecase=true
+#      jdbcUrl: jdbc:ucanaccess://E:/Java/cmc-temperature/cmc-temperature-back/sql/Data/SKREC_ID1.accdb;ignorecase=true
       username:
       password:
 #      type: com.zaxxer.hikari.HikariDataSource
@@ -214,18 +214,18 @@ mybatis-flex:
 # Redis配置
 redis:
   cache_source:
-#    config: |
-#      singleServerConfig:
-#        address: redis://cmc-redis:6379
-#        password:
-#        database: 7
-#      codec: !<org.redisson.codec.JsonJacksonCodec> {}
     config: |
       singleServerConfig:
-        address: redis://localhost:6379
+        address: redis://cmc-redis:6379
         password:
         database: 7
       codec: !<org.redisson.codec.JsonJacksonCodec> {}
+#    config: |
+#      singleServerConfig:
+#        address: redis://localhost:6379
+#        password:
+#        database: 7
+#      codec: !<org.redisson.codec.JsonJacksonCodec> {}
 
 # 分页插件配置
 pagehelper:

cmc-temperature-back/ruoyi-framework/src/main/java/com/ruoyi/framework/annotation/RyLog.java

@@ -34,6 +34,6 @@ public @interface RyLog {
     /**
      * 是否保存响应数据
      */
-    boolean isSaveResponseData() default true;
+    boolean isSaveResponseData() default false;
 
 }

cmc-temperature-back/ruoyi-schedule/src/main/java/com/ruoyi/schedule/task/AccessSyncTask.java

@@ -0,0 +1,30 @@
+package com.ruoyi.schedule.task;
+
+import com.ruoyi.monitoring.service.IAccessSyncService;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;
+import org.noear.solon.scheduling.annotation.Scheduled;
+
+import java.util.Date;
+
+@Component
+public class AccessSyncTask {
+
+    @Inject
+    IAccessSyncService accessSyncService;
+
+    // 每小时执行一次（cron格式：秒 分 时 日 月 周 年）
+    @Scheduled(cron = "0 20 0/1 * * ? *", zone = "Asia/Shanghai")
+    public void sync() throws Exception {
+        System.out.println("========== Access数据同步任务开始执行，当前时间: " + new Date() + "==========");
+        try {
+            accessSyncService.syncAccessToSqlite();
+            System.out.println("========== Access数据同步任务执行成功，当前时间: " + new Date() + "==========");
+        } catch (Exception e) {
+            System.out.println("========== Access数据同步任务执行失败 ==========");
+            throw e;
+        }
+    }
+}
+
+