由从access文件改为从sqlite读取数据

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

@@ -193,7 +193,7 @@ public class CmcTemperatureController extends BaseController {
                 .from(CmcTemperature.class)
                 .leftJoin(CmcChannel.class)
                 .on(CmcChannel::getSensorNo, CmcTemperature::getSensorNo)
-                .where(CmcChannel::getInfo).like(cmcChannel.getInfo())
+                .where(CmcChannel::getInfo).likeLeft(cmcChannel.getInfo())
                 .and(CmcTemperature::getId).eq(cmcTemperature.getId())
                 .and(CmcTemperature::getGroupNo).eq(cmcTemperature.getGroupNo())
                 .and(CmcTemperature::getSensorNo).eq(cmcTemperature.getSensorNo())

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

@@ -10,7 +10,7 @@ import java.util.List;
  * 水温监测 数据层
  * @author cmc
  */
-@UseDataSource("access")
+@UseDataSource("sqlite")
 public interface CmcChannelMapper extends BaseMapper<CmcChannel> {
 
     /**

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

@@ -4,6 +4,7 @@ import com.ruoyi.monitoring.domain.CmcChannel;
 import com.ruoyi.monitoring.domain.CmcTemperature;
 import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * 水温监测 数据层
  * @author cmc
  */
-@UseDataSource("access")
+@UseDataSource("sqlite")
 public interface CmcTemperatureMapper extends BaseMapper<CmcTemperature> {
 
     /**
@@ -19,6 +20,9 @@ public interface CmcTemperatureMapper extends BaseMapper<CmcTemperature> {
      * @param cmcTemperature 水温监测信息
      * @param cmcChannel 监测点位信息
      */
-    List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature, CmcChannel cmcChannel);
+    List<CmcTemperature> listTemperature(@Param("cmcTemperature") CmcTemperature cmcTemperature,
+                                         @Param("cmcChannel") CmcChannel cmcChannel,
+                                         @Param("startTime") String startTime,
+                                         @Param("endTime") String endTime);
 
 }

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

@@ -11,6 +11,7 @@ import com.ruoyi.monitoring.service.ICmcTemperatureService;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -38,8 +39,12 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
     public List<CmcTemperature> listTemperature(CmcTemperature cmcTemperature, CmcChannel cmcChannel) {
         // 使用mapper直接查询，避免循环依赖
         int channelSize = cmcChannelMapper.listChannel(cmcChannel).size();
-        QueryWrapper qw = getQW(cmcTemperature, cmcChannel);
-        List<CmcTemperature> records = cmcTemperatureMapper.selectListByQuery(qw);
+//        QueryWrapper qw = getQW(cmcTemperature, cmcChannel);
+//        List<CmcTemperature> records = cmcTemperatureMapper.selectListByQuery(qw);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startStr = cmcTemperature.getStartTime() == null ? null : sdf.format(cmcTemperature.getStartTime());
+        String endStr = cmcTemperature.getEndTime() == null ? null : sdf.format(cmcTemperature.getEndTime());
+        List<CmcTemperature> records = cmcTemperatureMapper.listTemperature(cmcTemperature, cmcChannel, startStr, endStr);
         if (records == null || records.isEmpty()) {
             return new ArrayList<>();
         }
@@ -75,8 +80,11 @@ public class CmcTemperatureServiceImpl extends ServiceImpl<CmcTemperatureMapper,
             Date fifteenMinutesAgo = new Date(fifteenMinutesAgoMillis);
             temperature.setStartTime(fifteenMinutesAgo);
             temperature.setEndTime(cmcTemperature.getStartTime());
-            QueryWrapper qw1 = getQW(temperature, cmcChannel);
-            List<CmcTemperature> previousData = cmcTemperatureMapper.selectListByQuery(qw1);
+//            QueryWrapper qw1 = getQW(temperature, cmcChannel);
+//            List<CmcTemperature> previousData = cmcTemperatureMapper.selectListByQuery(qw1);
+            String prevStart = temperature.getStartTime() == null ? null : sdf.format(temperature.getStartTime());
+            String prevEnd = temperature.getEndTime() == null ? null : sdf.format(temperature.getEndTime());
+            List<CmcTemperature> previousData = cmcTemperatureMapper.listTemperature(temperature, cmcChannel, prevStart, prevEnd);
 
             if (previousData != null && !previousData.isEmpty()) {
                 // 合并数据，避免重复创建列表

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

@@ -25,7 +25,7 @@
         <where>
             <if test="Id != null ">c.ID = #{Id}</if>
             <if test="SensorNo != null ">c.Sensor_No = #{SensorNo}</if>
-            <if test="Info != null ">c.Info LIKE concat('%', #{Info}, '%')</if>
+            <if test="Info != null ">c.Info LIKE '%' || #{Info} || '%'</if>
             <if test="Ver != null ">c.Ver = #{Ver}</if>
             <if test="Sn != null ">c.Sn = #{Sn}</if>
             <if test="Ca != null ">c.Ca = #{Ca}</if>

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

@@ -11,23 +11,31 @@
         <result property="Data"    column="Data"    />
         <result property="Volt"      column="Volt"      />
         <result property="CSQ"    column="CSQ"    />
+        <association property="channel" javaType="com.ruoyi.monitoring.domain.CmcChannel">
+            <result property="Info" column="Info" />
+        </association>
     </resultMap>
 
     <sql id="selectTemperatureVo">
-        SELECT d.ID, d.Group_No, d.Sensor_No, d.DateTime, d.Data, d.Volt, d.CSQ
+        SELECT d.ID, d.Group_No, d.Sensor_No, d.DateTime, d.Data, d.Volt, d.CSQ, c.Info
         FROM Data d
+        LEFT JOIN Channel c ON c.Sensor_No = d.Sensor_No
     </sql>
 
-    <select id="listTemperature" parameterType="com.ruoyi.monitoring.domain.CmcTemperature" resultMap="CmcTemperatureResult">
+    <select id="listTemperature" resultMap="CmcTemperatureResult">
         <include refid="selectTemperatureVo"/>
         <where>
-            <if test="Id != null ">d.ID = #{Id}</if>
-            <if test="GroupNo != null ">d.Group_No = #{GroupNo}</if>
-            <if test="SensorNo != null ">d.Sensor_No = #{SensorNo}</if>
-            <if test="Data != null ">d.Data = #{Data}</if>
-            <if test="Volt != null ">d.Volt = #{Volt}</if>
-            <if test="CSQ != null ">d.CSQ = #{CSQ}</if>
+            <if test="CmcTemperature != null and CmcTemperature.Id != null">d.ID = #{CmcTemperature.Id}</if>
+            <if test="CmcTemperature != null and CmcTemperature.GroupNo != null">AND d.Group_No = #{CmcTemperature.GroupNo}</if>
+            <if test="CmcTemperature != null and CmcTemperature.SensorNo != null">AND d.Sensor_No = #{CmcTemperature.SensorNo}</if>
+            <if test="CmcTemperature != null and CmcTemperature.Data != null">AND d.Data = #{CmcTemperature.Data}</if>
+            <if test="CmcTemperature != null and CmcTemperature.Volt != null">AND d.Volt = #{CmcTemperature.Volt}</if>
+            <if test="CmcTemperature != null and CmcTemperature.CSQ != null">AND d.CSQ = #{CmcTemperature.CSQ}</if>
+            <if test="startTime != null and startTime != ''">AND d.DateTime &gt;= #{startTime}</if>
+            <if test="endTime != null and endTime != ''">AND d.DateTime &lt;= #{endTime}</if>
+            <if test="CmcChannel != null and CmcChannel.Info != null and CmcChannel.Info != ''">AND c.Info LIKE '%' || #{CmcChannel.Info} || '%'</if>
         </where>
+        ORDER BY d.DateTime ASC, d.Sensor_No ASC
     </select>
 
 </mapper>

cmc-temperature-back/ruoyi-common/src/main/java/com/ruoyi/common/constants/UserConstant.java

@@ -18,9 +18,9 @@ public class UserConstant {
      * 密码长度限制
      */
     // 最小
-    public static final int PASSWORD_MIN_LENGTH = 5;
+    public static final int PASSWORD_MIN_LENGTH = 6;
     // 最大
-    public static final int PASSWORD_MAX_LENGTH = 20;
+    public static final int PASSWORD_MAX_LENGTH = 12;
 
     /**
      * 超级管理员

cmc-temperature-ui/.env.development

@@ -9,7 +9,7 @@ VITE_APP_ENV = 'development'
 
 
 # 页面标题
-VITE_APP_TITLE = 国能青海黄河玛尔挡水电站水温监测系统
+VITE_APP_TITLE = 高原水温监测系统
 
 # 开发环境前缀
 VITE_APP_BASE_API = '/dev-api'

cmc-temperature-ui/.env.production

@@ -3,7 +3,7 @@ VITE_APP_ENV = 'production'
 
 
 # 页面标题
-VITE_APP_TITLE = 国能青海黄河玛尔挡水电站水温监测系统
+VITE_APP_TITLE = 高原水温监测系统
 
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'

cmc-temperature-ui/index.html

@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/src/assets/images/logo/logo.png">
-  <title>国能青海黄河玛尔挡水电站水温监测系统</title>
+  <title>高原水温监测系统</title>
   <!-- [if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif] -->
   <style>
     html,

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

@@ -144,11 +144,11 @@ getCookie()
 <style lang='scss' scoped>
 .login {
   display: flex;
-  flex-direction: column;
+  flex-direction:column;
   justify-content: top;
   align-items: center;
   height: 100%;
-  background-image: url('@/assets/images/loginBg.jpeg');
+  background-image: url('@/assets/images/loginBg4.jpeg');
   background-size: cover;
   background-position: center;
   position: relative;
@@ -156,13 +156,13 @@ getCookie()
 
 .login-header {
   text-align: center;
-  left: 70%;
+  left: 76%;
   top: 8%;
   position: absolute;
   z-index: 2;
   
   .main-title {
-    font-size: 26px;
+    font-size: 30px;
     font-weight: 700;
     color: #ffffff;
     margin-bottom: 10px;

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

@@ -443,8 +443,8 @@ function handleResetPwd(row) {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     closeOnClickModal: false,
-    inputPattern: /^.{5,20}$/,
-    inputErrorMessage: '登录密码长度必须介于 5 和 20 之间'
+    inputPattern: /^.{6,12}$/,
+    inputErrorMessage: '登录密码长度必须介于 6 和 12 之间'
   }).then(({ value }) => {
     resetUserPwd(row.userId, value).then(response => {
       proxy.$modal.msgSuccess('修改成功，新密码是：' + value)

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: wrh
+ * @Date: 2025-08-19 15:15:48
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-10-11 12:44:05
+-->
 <template>
   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="旧密码" prop="oldPassword">
@@ -36,13 +42,22 @@ const equalToPassword = (rule, value, callback) => {
     callback()
   }
 }
+const hasUpperLowerCaseNumber = (rule, value, callback) => {
+  const check = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]+$/;
+  if (!check.test(value)) {
+    callback(new Error('新密码应为大小写字母及数字组合'))
+  } else {
+    callback()
+  }
+}
 const rules = ref({
   oldPassword: [
     { required: true, message: '旧密码不能为空', trigger: 'blur' }
   ],
   newPassword: [
     { required: true, message: '新密码不能为空', trigger: 'blur' },
-    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
+    { min: 6, max: 12, message: '长度在 6 到 12 个字符', trigger: 'blur' },
+    { required: true, validator: hasUpperLowerCaseNumber, trigger: 'blur'}
   ],
   confirmPassword: [
     { required: true, message: '确认密码不能为空', trigger: 'blur' },