修改界面：登录页、个人中心、水温时刻图表、查询页

修改后端：操作日志、水温列表查询优化

cmc-temperature-back/cmc-monitoring/pom.xml

@@ -20,6 +20,11 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+
         <!-- lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>

cmc-temperature-back/cmc-monitoring/src/main/java/com/ruoyi/monitoring/controller/CmcTemperatureController.java

@@ -3,8 +3,10 @@ package com.ruoyi.monitoring.controller;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ExcelUtil;
 import com.ruoyi.common.web.domain.PageData;
+import com.ruoyi.framework.annotation.RyLog;
 import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.ruoyi.monitoring.service.ICmcChannelService;
@@ -104,6 +106,7 @@ public class CmcTemperatureController extends BaseController {
     /**
      * 根据点位查询水温监测列表（不分页）
      */
+    @RyLog(title = "数据查询", businessType = BusinessType.QUERY)
     @Get
     @Mapping("listAllByInfo")
     public PageData<CmcTemperature> listAllByInfo(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
@@ -115,6 +118,7 @@ public class CmcTemperatureController extends BaseController {
     /**
      * 导出用户列表
      */
+    @RyLog(title = "数据导出", businessType = BusinessType.EXPORT)
     @Post
     @Mapping("export")
     public void export(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {

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

@@ -28,11 +28,9 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
     @Inject
     CmcChannelMapper cmcChannelMapper;
 
-    @Inject
-    ICmcTemperatureService cmcTemperatureService;
-
-    @Inject
-    ICmcChannelService cmcChannelService;
+    // 移除循环依赖注入，直接使用mapper
+    // @Inject
+    // ICmcTemperatureService cmcTemperatureService;
 
     /**
      * 查询水温监测列表信息
@@ -42,54 +40,98 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
      */
     @Override
     public List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
+        // 使用mapper直接查询，避免循环依赖
         int channelSize = cmcChannelMapper.listChannel(cmcChannel).size();
         QueryWrapper qw = getQW(cmcTemperature, cmcChannel);
-        List<CmcTemperature> records = cmcTemperatureService.list(qw);
+        List<CmcTemperature> records = cmcTemperatureMapper.selectListByQuery(qw);
+
+        if (records.isEmpty()) {
+            return new ArrayList<>();
+        }
+
         List<CmcTemperature> temperatureList = new ArrayList<>();
+
+        // 优化内存使用：减少不必要的列表操作
         if (records.size() > 2) {
             long diffInMillis;
             // 第30条与第31条数据时间差 毫秒
-            if (channelSize > 30) {
+            if (channelSize > 30 && records.size() > 30) {
                 diffInMillis = records.get(30).getDatetime().getTime() - records.get(29).getDatetime().getTime();
                 // 时间差超过15分钟，删最后10条数据
-                if (diffInMillis / 1000 / 60 > 15)
-                    records.subList(records.size() - channelSize + 30, records.size()).clear();
+                if (diffInMillis / 1000 / 60 > 15) {
+                    // 使用更安全的方式删除数据，避免内存泄漏
+                    int removeStart = Math.max(0, records.size() - channelSize + 30);
+                    records = records.subList(0, removeStart);
+                }
             }
+
             // 第1条数据与0时时间差 毫秒
-            diffInMillis = records.get(0).getDatetime().getTime() - cmcTemperature.getStartTime().getTime();
-            if (diffInMillis / 1000 / 60 > 15)
-                records.subList(records.size() - channelSize, records.size()).clear();
+            if (records.size() > 0 && 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);
+                }
+            }
+
+            // 查询15分钟前的数据
             CmcTemperature temperature = new CmcTemperature();
             long fifteenMinutesAgoMillis = cmcTemperature.getStartTime().getTime() - (15 * 60 * 1000);
             Date fifteenMinutesAgo = new Date(fifteenMinutesAgoMillis);
             temperature.setStartTime(fifteenMinutesAgo);
             temperature.setEndTime(cmcTemperature.getStartTime());
             QueryWrapper qw1 = getQW(temperature, cmcChannel);
-            temperatureList = cmcTemperatureService.list(qw1);
+            List<CmcTemperature> previousData = cmcTemperatureMapper.selectListByQuery(qw1);
+
+            // 合并数据，避免重复创建列表
+            temperatureList.addAll(previousData);
             temperatureList.addAll(records);
-            if (channelSize > 30) {
-                for (int i = 0; i < temperatureList.size() - channelSize + 1; i = i + channelSize) {
-                    Date minTime = temperatureList.get(i).getDatetime();
-                    if (temperatureList.get(i + 10).getDatetime().getTime() > minTime.getTime()) {
-                        for (int j = i + 10; j < i + channelSize; j++) {
-                            temperatureList.get(j).setDatetime(minTime);
-                        }
-                    } else {
-                        if (temperatureList.get(i + 30).getDatetime().getTime() > minTime.getTime()) {
-                            for (int j = i + 30; j < i + channelSize; j++) {
-                                temperatureList.get(j).setDatetime(minTime);
-                            }
-                        }
-                    }
-                }
+
+            // 优化数据处理逻辑
+            if (channelSize > 30 && temperatureList.size() > channelSize) {
+                processTemperatureData(temperatureList, channelSize);
             }
         }
+
         return temperatureList;
     }
 
+    /**
+     * 处理温度数据，优化内存使用
+     * @param temperatureList 温度数据列表
+     * @param channelSize 通道数量
+     */
+    private void processTemperatureData(List<CmcTemperature> temperatureList, int channelSize) {
+        // 使用迭代器模式，避免频繁的索引访问
+        for (int i = 0; i < temperatureList.size() - channelSize + 1; i += channelSize) {
+            if (i + channelSize > temperatureList.size()) {
+                break;
+            }
+
+            Date minTime = temperatureList.get(i).getDatetime();
+
+            // 优化时间比较逻辑
+            if (i + 10 < temperatureList.size() &&
+                    temperatureList.get(i + 10).getDatetime().getTime() > minTime.getTime()) {
+                // 更新第10-30条数据的时间
+                for (int j = i + 10; j < Math.min(i + channelSize, temperatureList.size()); j++) {
+                    temperatureList.get(j).setDatetime(new Date(minTime.getTime()));
+                }
+            } else if (i + 30 < temperatureList.size() &&
+                    temperatureList.get(i + 30).getDatetime().getTime() > minTime.getTime()) {
+                // 更新第30条之后数据的时间
+                for (int j = i + 30; j < Math.min(i + channelSize, temperatureList.size()); j++) {
+                    temperatureList.get(j).setDatetime(new Date(minTime.getTime()));
+                }
+            }
+        }
+    }
+
     private QueryWrapper getQW(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
         QueryWrapper qw = QueryWrapper.create();
-        qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
+        qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo,
+                        CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ,
+                        CmcTemperature::getDatetime)
                 .select(CmcChannel::getInfo)
                 .from(CmcTemperature.class)
                 .leftJoin(CmcChannel.class)

cmc-temperature-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOperLogController.java

@@ -14,7 +14,9 @@ import org.noear.solon.auth.annotation.AuthPermissions;
 import org.noear.solon.core.handle.Result;
 
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 操作日志 操作处理
@@ -39,6 +41,20 @@ public class SysOperLogController extends BaseController {
         return getPageData(result);
     }
 
+    /**
+     * 查询最近操作日志
+     */
+    @Get
+    @Mapping("recent")
+    public SysOperLog list(SysOperLog sysOperLog) {
+        QueryWrapper qw = getQW(sysOperLog);
+        List<SysOperLog> resultList = sysOperLogService.list(qw).stream().sorted(Comparator.comparing(SysOperLog::getCreateTime).reversed()).collect(Collectors.toList());
+        SysOperLog result = new SysOperLog();
+        if (resultList.size() > 0)
+            result = resultList.get(0);
+        return result;
+    }
+
     /**
      * 导出操作日志列表
      */

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

@@ -168,12 +168,25 @@ 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://E:/Java/cmc-temperature/cmc-temperature-back/sql/SKREC_ID1.accdb
+#      jdbcUrl: jdbc:ucanaccess://D:/temperature/Data/SKREC_ID1.accdb
+      jdbcUrl: jdbc:ucanaccess://E:/Java/cmc-temperature/cmc-temperature-back/sql/Data/SKREC_ID1.accdb
       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

cmc-temperature-back/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java

@@ -53,5 +53,10 @@ public enum BusinessType {
     /**
      * 清空数据
      */
-    CLEAN
+    CLEAN,
+
+    /**
+     * 查询
+     */
+    QUERY
 }

cmc-temperature-ui/src/api/system/operlog.js

@@ -9,6 +9,15 @@ export function listOperLog(query) {
   })
 }
 
+// 查询最近操作日志
+export function recentOperLog(query) {
+  return request({
+    url: '/system/operlog/recent',
+    method: 'get',
+    params: query
+  })
+}
+
 // 删除操作日志
 export function delOperlog(operId) {
   return request({

cmc-temperature-ui/src/store/modules/user.js

@@ -1,6 +1,12 @@
+/*
+ * @Author: wrh
+ * @Date: 2025-08-19 15:15:48
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-09-19 13:54:07
+ */
 import { login, logout, getUserInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import defAva from '@/assets/images/avatar.jpg'
+import defAva from '@/assets/images/user.png'
 
 const useUserStore = defineStore(
   'user',

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

@@ -59,8 +59,8 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 
 const loginForm = ref({
-  username: 'admin',
-  password: 'admin123',
+  username: '',
+  password: '',
   rememberMe: false,
   code: '',
   uuid: ''
@@ -145,7 +145,7 @@ getCookie()
 .login {
   display: flex;
   flex-direction: column;
-  justify-content: center;
+  justify-content: top;
   align-items: center;
   height: 100%;
   background-image: url('@/assets/images/loginBg.jpeg');
@@ -156,12 +156,13 @@ getCookie()
 
 .login-header {
   text-align: center;
-  margin-bottom: 40px;
-  position: relative;
+  left: 70%;
+  top: 8%;
+  position: absolute;
   z-index: 2;
   
   .main-title {
-    font-size: 42px;
+    font-size: 26px;
     font-weight: 700;
     color: #ffffff;
     margin-bottom: 10px;
@@ -185,8 +186,10 @@ getCookie()
   border-radius: 16px;
   padding: 40px;
   box-shadow: 0 15px 35px rgba(0, 0, 0, 0.2);
-  width: 450px;
-  position: relative;
+  width: 500px;
+  position: absolute;
+  bottom: 30%;
+  left: 70%;
   z-index: 2;
   border: 1px solid rgba(255, 255, 255, 0.3);
   transition: all 0.3s ease;

cmc-temperature-ui/src/views/system/user/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!-- 部门数据 -->
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -25,7 +25,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-      </el-col>
+      </el-col> -->
       <!-- 用户数据 -->
       <el-col :span="20" :xs="24">
         <el-form v-show="showSearch" ref="queryRef" :model="queryParams" :inline="true" label-width="68px">

cmc-temperature-ui/src/views/system/user/profile/index.vue

@@ -17,14 +17,14 @@
                 <svg-icon icon-class="user" />登录账号
                 <div class="pull-right">{{ state.user.userName }}</div>
               </li>
-              <li class="list-group-item">
+              <!-- <li class="list-group-item">
                 <svg-icon icon-class="phone" />手机号码
                 <div class="pull-right">{{ state.user.phonenumber }}</div>
-              </li>
-              <li class="list-group-item">
+              </li> -->
+              <!-- <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ state.user.email }}</div>
-              </li>
+              </li> -->
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
                 <div v-if="state.user.dept" class="pull-right">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>

cmc-temperature-ui/src/views/system/user/profile/userInfo.vue

@@ -3,7 +3,7 @@
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="user.nickName" maxlength="30" />
     </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
+    <!-- <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
@@ -14,7 +14,7 @@
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
       </el-radio-group>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item>
       <el-button type="primary" :loading="loadingButton" @click="submit">保存</el-button>
       <el-button type="danger" @click="close">关闭</el-button>
@@ -39,14 +39,14 @@ const rules = ref({
   nickName: [
     { required: true, message: '用户昵称不能为空', trigger: 'blur' }
   ],
-  email: [
-    { required: true, message: '邮箱地址不能为空', trigger: 'blur' },
-    { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
-  ],
-  phonenumber: [
-    { required: true, message: '手机号码不能为空', trigger: 'blur' },
-    { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
-  ]
+  // email: [
+  //   { required: true, message: '邮箱地址不能为空', trigger: 'blur' },
+  //   { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
+  // ],
+  // phonenumber: [
+  //   { required: true, message: '手机号码不能为空', trigger: 'blur' },
+  //   { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+  // ]
 })
 
 /** 提交按钮 */

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

@@ -562,6 +562,7 @@ const updateMomentChart = (selectedTime) => {
     },
     yAxis: {
       type: 'category',
+      inverse: true,
       data: momentSeries.map(s => s.name),
       axisLine: {
         lineStyle: {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-08-20 10:14:22
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-21 09:52:13
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-09-19 11:19:17
 -->
 <template>
   <div class="temperature-page">
@@ -22,8 +22,16 @@
           </div>
           <template #dropdown>
             <el-dropdown-menu>
+              <el-dropdown-item v-if="isAdmin" divided command="system">
+                <svg-icon icon-class="system" />
+                系统管理
+              </el-dropdown-item>
+              <el-dropdown-item v-if="!isAdmin" divided command="profile">
+                <svg-icon icon-class="user" />
+                个人中心
+              </el-dropdown-item>
               <el-dropdown-item divided command="logout">
-                <svg-icon icon-class="logout" />
+                <svg-icon icon-class="eye" />
                 退出登录
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -40,7 +48,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, getCurrentInstance } from 'vue'
 import { useRouter } from 'vue-router'
 import useUserStore from '@/store/modules/user'
 import { title } from '@/store/modules/settings'
@@ -49,20 +57,20 @@ import temMonitor from './temMonitor.vue'
 const router = useRouter()
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
+const isAdmin = ref(false)
 
 // 用户信息
 const userInfo = ref({
-  username: 'admin',
+  username: '',
   avatar: ''
 })
 
 // 获取用户信息
 const getUserInfo = () => {
-  const user = userStore.user
-  if (user) {
-    userInfo.value.username = user.userName || 'admin'
-    userInfo.value.avatar = user.avatar || ''
-  }
+  if (userStore.name == '玛尔挡水电站')
+    isAdmin.value = true
+  userInfo.value.username = userStore.name
+  userInfo.value.avatar = userStore.avatar  
 }
 
 // 处理下拉菜单命令
@@ -70,12 +78,15 @@ const handleCommand = (command) => {
   switch (command) {
     case 'profile':
       // 跳转到个人中心
-      router.push('/system/user/profile')
+      router.push('/user/profile')
       break
     case 'settings':
       // 跳转到系统设置
       router.push('/system/config')
       break
+    case 'system':
+      router.push('/system/user')
+      break
     case 'logout':
       handleLogout()
       break

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

@@ -107,12 +107,15 @@
 </template>
 
 <script setup>
-import { ref, reactive, computed, onMounted, nextTick } from 'vue'
+import { ref, reactive, computed, onMounted, nextTick, getCurrentInstance } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { listTemperature, listByInfo, listAllByInfo } from '@/api/monitoring/temperature'
+import { recentOperLog } from '@/api/system/operlog'
 import { listChannel, channelInfoList } from '@/api/monitoring/channel'
 import TemperatureChart from './TemperatureChart.vue'
+import useUserStore from '@/store/modules/user'
+import { parseTime } from '@/utils/date'
 
 // 响应式数据
 const loading = ref(false)
@@ -120,10 +123,13 @@ const totalCount = ref(0)
 const activeTab = ref('table')
 const chartRef = ref(null)
 const { proxy } = getCurrentInstance()
+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 searchForm = reactive({
-  timeRange: [],
+  timeRange: [yesterday.value, today.value],
   Info: '',
   queryType: '',
   deviceId: '',
@@ -159,6 +165,11 @@ const getDeviceList = () => {
       value: item
     }))
   })
+  recentOperLog({createBy: userStore.userId}).then(res => {
+    if (res.operParam) {
+      searchForm.Info = res.operParam.split('Info\', values=[')[1].split(']')[0]
+    }
+  })
 }
 getDeviceList()