`fix`

ruoyi-admin/src/main/resources/application.yml

@@ -136,7 +136,10 @@ security:
     # actuator 监控配置
     - /actuator
     - /actuator/**
+    - /data/device/faultList
     - /data/device/deviceList
+    - /data/device/allSensorStatus
+
 
 # MyBatisPlus配置
 # https://baomidou.com/config/
@@ -269,7 +272,7 @@ management:
       external-file: ./logs/sys-console.log
 
 mqtt:
-  url: ${MQTT_URL:tcp://xt.wenhq.top:8581}
+  url: ${MQTT_URL:tcp://58.252.235.18:1883}
   clientid: iotc_server
   user: ${MQTT_USER:iotc}
   password: ${MQTT_PWD:iotc}

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

@@ -40,7 +40,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -62,7 +62,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -122,7 +122,7 @@
         <appender-ref ref="console" />
         <appender-ref ref="async_info" />
         <appender-ref ref="async_error" />
-        <appender-ref ref="file_console" />
+<!--        <appender-ref ref="file_console" />-->
 <!--        <appender-ref ref="sky_log"/>-->
     </root>
 

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblDataController.java

@@ -1,13 +1,12 @@
 package com.ruoyi.data.controller;
 
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -129,7 +128,26 @@ public class TblDataController extends BaseController {
                 Map<String,Integer> aa = RedisUtils.getCacheObject("sensor_status_"+tblSensorVo.getId());
                 a.put("state",aa.get("12")>1?0:1);
             }else{
-                a.put("state",2);
+                TblSensorRecordBo a1 =new TblSensorRecordBo();
+                Map<String, Object> t = new HashMap<>();
+                t.put("starttime", DateUtil.formatDateTime(DateUtil.offset(new Date(), DateField.HOUR,-12 )));
+                t.put("endtime", DateUtil.formatDateTime(new Date()));
+                a1.setParams(t);
+                a1.setSensorId(tblSensorVo.getId());
+                List<TblSensorRecordVo>  a11 = iTblSensorRecordService.queryList(a1);
+
+                t.put("starttime", DateUtil.formatDateTime(DateUtil.offset(new Date(), DateField.HOUR,-24 )));
+                t.put("endtime", DateUtil.formatDateTime(new Date()));
+                a1.setParams(t);
+
+                List<TblSensorRecordVo>  a12 = iTblSensorRecordService.queryList(a1);
+                Map<String,Integer> temp = new HashMap<>();
+                temp.put("12",a11.size());
+                temp.put("24",a12.size());
+                RedisUtils.setCacheObject("sensor_status_"+tblSensorVo.getId(),temp, Duration.ofSeconds(60*60));
+
+                Map<String,Integer> aa = RedisUtils.getCacheObject("sensor_status_"+tblSensorVo.getId());
+                a.put("state",aa.get("12")>1?0:1);
             }
             list.add(a);
         });

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblBreakdownServiceImpl.java

@@ -74,8 +74,6 @@ public class TblBreakdownServiceImpl implements ITblBreakdownService {
     }
 
     private LambdaQueryWrapper<TblBreakdown> buildQueryWrapper1(TblBreakdownBo bo) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        Long roleId = loginUser.getRoles().get(0).getRoleId();
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblBreakdown> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), TblBreakdown::getName, bo.getName());

ruoyi-ui-vue3/src/views/device/sensordash/index.vue

@@ -249,7 +249,7 @@
              <template #default="scope">
                  <span>{{
                          (useWSStore().getMessage()[currentsensor.id]) ?
-                           (useWSStore().getMessage()[currentsensor.id][scope.row.name]?.value) : '-'
+                           parseFloat((useWSStore().getMessage()[currentsensor.id][scope.row.name]?.value)) : '-'
                        }}</span>
              </template>
           </el-table-column>

ruoyi-ui-vue3/vite.config.js

@@ -30,8 +30,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          // target: "http://58.252.235.18:8084/iot/prod-api",
-          target: "http://localhost:8989",
+          target: "http://58.252.235.18:8084/iot/prod-api",
+          // target: "http://localhost:8989",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },