部署后相关BUG解决

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

@@ -28,10 +28,6 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
     @Inject
     CmcChannelMapper cmcChannelMapper;
 
-    // 移除循环依赖注入，直接使用mapper
-    // @Inject
-    // ICmcTemperatureService cmcTemperatureService;
-
     /**
      * 查询水温监测列表信息
      * @param cmcTemperature 水温监测信息
@@ -44,8 +40,7 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
         int channelSize = cmcChannelMapper.listChannel(cmcChannel).size();
         QueryWrapper qw = getQW(cmcTemperature, cmcChannel);
         List<CmcTemperature> records = cmcTemperatureMapper.selectListByQuery(qw);
-
-        if (records.isEmpty()) {
+        if (records == null || records.isEmpty()) {
             return new ArrayList<>();
         }
 
@@ -61,16 +56,16 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
                 if (diffInMillis / 1000 / 60 > 15) {
                     // 使用更安全的方式删除数据，避免内存泄漏
                     int removeStart = Math.max(0, records.size() - channelSize + 30);
-                    records = records.subList(0, removeStart);
+                    records = new ArrayList<>(records.subList(0, removeStart));
                 }
             }
 
             // 第1条数据与0时时间差 毫秒
-            if (records.size() > 0 && cmcTemperature.getStartTime() != null) {
+            if (!records.isEmpty() && cmcTemperature.getStartTime() != null) {
                 diffInMillis = records.get(0).getDatetime().getTime() - cmcTemperature.getStartTime().getTime();
                 if (diffInMillis / 1000 / 60 > 15) {
                     int removeStart = Math.max(0, records.size() - channelSize);
-                    records = records.subList(0, removeStart);
+                    records = new ArrayList<>(records.subList(0, removeStart));
                 }
             }
 
@@ -83,16 +78,19 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
             QueryWrapper qw1 = getQW(temperature, cmcChannel);
             List<CmcTemperature> previousData = cmcTemperatureMapper.selectListByQuery(qw1);
 
-            // 合并数据，避免重复创建列表
-            temperatureList.addAll(previousData);
-            temperatureList.addAll(records);
-
-            // 优化数据处理逻辑
-            if (channelSize > 30 && temperatureList.size() > channelSize) {
-                processTemperatureData(temperatureList, channelSize);
+            if (previousData != null && !previousData.isEmpty()) {
+                // 合并数据，避免重复创建列表
+                temperatureList.addAll(previousData);
             }
         }
 
+        temperatureList.addAll(records);
+
+        // 优化数据处理逻辑
+        if (channelSize > 30 && temperatureList.size() > channelSize) {
+            processTemperatureData(temperatureList, channelSize);
+        }
+
         return temperatureList;
     }
 

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

@@ -168,25 +168,13 @@ mybatis-flex:
       jdbcUrl: jdbc:sqlite::resource:static/cmc-temperature.db?date_string_format=yyyy-MM-dd HH:mm:ss
       username:
       password:
-      # 添加连接池优化配置
-      maximumPoolSize: 5
-      minimumIdle: 1
-      connectionTimeout: 180000
-      idleTimeout: 600000
-      maxLifetime: 1800000
     access:
       type: com.zaxxer.hikari.HikariDataSource
       driverClassName: net.ucanaccess.jdbc.UcanaccessDriver
-#      jdbcUrl: jdbc:ucanaccess://D:/temperature/Data/SKREC_ID1.accdb
-      jdbcUrl: jdbc:ucanaccess://E:/Java/cmc-temperature/cmc-temperature-back/sql/Data/SKREC_ID1.accdb
+#      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
       username:
       password:
-      # 添加连接池优化配置
-      maximumPoolSize: 5
-      minimumIdle: 1
-      connectionTimeout: 180000
-      idleTimeout: 600000
-      maxLifetime: 1800000
 #      type: com.zaxxer.hikari.HikariDataSource
 #      driverClassName: com.mysql.cj.jdbc.Driver
 #      jdbcUrl: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true
@@ -226,9 +214,15 @@ 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://127.0.0.1:6379
+        address: redis://localhost:6379
         password:
         database: 7
       codec: !<org.redisson.codec.JsonJacksonCodec> {}

cmc-temperature-ui/src/layout/components/Navbar.vue

@@ -31,6 +31,9 @@
               <router-link to="/user/profile">
                 <el-dropdown-item>个人中心</el-dropdown-item>
               </router-link>
+              <router-link to="/index">
+                <el-dropdown-item>返回主页</el-dropdown-item>
+              </router-link>
               <el-dropdown-item v-if="settingsStore.showSettings" command="setLayout">
                 <span>布局设置</span>
               </el-dropdown-item>

cmc-temperature-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 100000
+  timeout: 200000
 })
 
 // request拦截器
@@ -89,7 +89,7 @@ service.interceptors.response.use(res => {
     }
     return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
   } else if (code === 500) {
-    ElMessage({ message: msg, type: 'error' })
+    // ElMessage({ message: msg, type: 'error' })
     return Promise.reject(new Error(msg))
   } else if (code === 601) {
     ElMessage({ message: msg, type: 'warning' })
@@ -111,7 +111,7 @@ error => {
   } else if (message.includes('Request failed with status code')) {
     message = '系统接口' + message.substr(message.length - 3) + '异常'
   }
-  ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
+  // ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
   return Promise.reject(error)
 })
 

cmc-temperature-ui/src/views/temperature/temMonitor.vue

@@ -127,7 +127,7 @@ const userStore = useUserStore()
 
 // 搜索表单数据
 const today = ref(parseTime(new Date(), '{y}-{m}-{d}'))
-const yesterday = ref(parseTime(new Date(new Date().setDate(new Date().getDate()-1)), '{y}-{m}-{d}'))
+const yesterday = ref(parseTime(new Date(new Date().setDate(new Date().getDate() - 1)), '{y}-{m}-{d}'))
 const searchForm = reactive({
   timeRange: [yesterday.value, today.value],
   Info: '',
@@ -158,20 +158,29 @@ const chartData = ref([])
 const chartSensorColumns = ref([])
 const allDataList = ref([])
 
-const getDeviceList = () => {
-  channelInfoList().then(res => {
-    deviceOptions.value = res.map(item => ({
-      label: item,
-      value: item
-    }))
-  })
-  recentOperLog({createBy: userStore.userId}).then(res => {
+const getDeviceList = async () => {
+  try {
+    const deviceRes = await channelInfoList()
+    if (deviceRes && Array.isArray(deviceRes)) {
+      deviceOptions.value = deviceRes.map(item => ({
+        label: item,
+        value: item
+      }))
+    }
+  }
+  catch (error) {
+    ElMessage.warning('监测数据已更新，请刷新当前页面')
+  }
+}
+// 在组件挂载时调用
+onMounted(() => {
+  getDeviceList()
+  recentOperLog({ operName: userStore.name }).then(res => {
     if (res.operParam) {
       searchForm.Info = res.operParam.split('Info\', values=[')[1].split(']')[0]
     }
   })
-}
-getDeviceList()
+})
 
 // 处理图表数据，使用全部数据
 const processChartData = (dataList) => {
@@ -252,7 +261,7 @@ const processTableData = () => {
     const sensorName = item.channel?.info || `传感器${item.sensorNo}`
     timeGroups[item.datetime][sensorName] = item.data
   })
-  
+
   // 转换为数组并排序
   const allTableData = Object.values(timeGroups)
 
@@ -317,24 +326,24 @@ const handleSearch = async () => {
       Info: searchForm.Info
     })
 
-    // 为图表和表格准备全部数据
-    const allData = allDataRes.list || allDataRes
-    totalCount.value = Number(allDataRes.total)
+    if (allDataRes) {
+      // 为图表和表格准备全部数据
+      const allData = allDataRes.list || allDataRes
+      totalCount.value = Number(allDataRes.total)
 
-    // 存储全部数据
-    allDataList.value = allData
+      // 存储全部数据
+      allDataList.value = allData
 
-    // 处理全部数据，生成图表数据
-    processChartData(allData)
+      // 处理全部数据，生成图表数据
+      processChartData(allData)
 
-    // 处理全部数据，生成表格数据（前端分页）
-    processTableData()
-
-    ElMessage.success('查询成功')
+      // 处理全部数据，生成表格数据（前端分页）
+      processTableData()
 
+      ElMessage.success('查询成功')
+    }
   } catch (error) {
-    ElMessage.error('查询失败')
-    console.error('查询错误:', error)
+    ElMessage.warning('监测数据已更新，请刷新当前页面')
   } finally {
     loading.value = false
   }
@@ -362,7 +371,7 @@ const handleExport = () => {
 
   // ElMessage.success('导出功能开发中...')
   // 这里可以添加导出逻辑
-  proxy.$download('monitoring/temperature/export', {    
+  proxy.$download('monitoring/temperature/export', {
     startTime: searchForm.timeRange[0] + ' 00:00:00',
     endTime: searchForm.timeRange[1] + ' 23:59:59',
     Info: searchForm.Info