`fix`

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

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.data.domain.TblRoleDevice;
-import com.ruoyi.data.domain.TblWarn;
 import com.ruoyi.data.mapper.TblRoleDeviceMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -51,6 +50,8 @@ public class TblBreakdownServiceImpl implements ITblBreakdownService {
     @Override
     public TableDataInfo<TblBreakdownVo> queryPageList(TblBreakdownBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TblBreakdown> lqw = buildQueryWrapper(bo);
+        lqw.between(bo.getParams()!=null && bo.getParams().get("beginTime") != null && bo.getParams().get("endTime") != null,
+            TblBreakdown::getCreateTime, bo.getParams().get("beginTime"), bo.getParams().get("endTime"));
         Page<TblBreakdownVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }

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

@@ -88,8 +88,8 @@ public class TblSensorServiceImpl implements ITblSensorService {
         if(bo.getParams()!=null && bo.getParams().get("deviceids")!=null){
             lqw.in(TblSensor::getDeviceId, Arrays.stream(bo.getParams().get("deviceids").toString().split(",")).map(i->Long.parseLong(i)).collect(Collectors.toList()));
         }
-        if(bo.getParams()!=null && bo.getParams().get("sn")!=null){
-            lqw.like(TblSensor::getSn, "%"+bo.getParams().get("sn")+"%");
+        if(bo.getParams()!=null && bo.getParams().get("id")!=null){
+            lqw.like(TblSensor::getId, "%"+bo.getParams().get("id")+"%");
         }
         if(bo.getParams()!=null && bo.getParams().get("desc")!=null){
             lqw.like(TblSensor::getSensorDesc, "%"+bo.getParams().get("desc")+"%");

ruoyi-ui-vue3/src/layout/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
-    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
-      <div :class="{ 'fixed-header': fixedHeader }">
+    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+    <sidebar v-if="(!sidebar.hide) && ishowMum" class="sidebar-container" />
+    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container" :style="ishowMum?'' :'margin-left:0'">
+      <div :class="{ 'fixed-header': fixedHeader }"  v-if="ishowMum">
         <navbar @setLayout="setLayout" />
         <tags-view v-if="needTagsView" />
       </div>
       <app-main />
-      <settings ref="settingRef" />
+      <settings ref="settingRef"  />
     </div>
   </div>
 </template>
@@ -21,6 +21,8 @@ import defaultSettings from '@/settings'
 
 import useAppStore from '@/store/modules/app'
 import useSettingsStore from '@/store/modules/settings'
+import { useRoute } from 'vue-router'
+import { ref } from 'vue'
 
 const settingsStore = useSettingsStore()
 const theme = computed(() => settingsStore.theme);
@@ -37,6 +39,17 @@ const classObj = computed(() => ({
   mobile: device.value === 'mobile'
 }))
 
+const route = useRoute();
+
+
+
+const ishowMum = ref(false);
+
+if (localStorage.getItem("showmum")) {
+  ishowMum.value = localStorage.getItem("showmum") == '1' ? true : false;
+}
+
+
 const { width, height } = useWindowSize();
 const WIDTH = 992; // refer to Bootstrap's responsive design
 

ruoyi-ui-vue3/src/permission.js

@@ -5,16 +5,28 @@ import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
 import { isHttp } from '@/utils/validate'
 import { isRelogin } from '@/utils/request'
-import useUserStore from '@/store/modules/user'
 import useSettingsStore from '@/store/modules/settings'
 import usePermissionStore from '@/store/modules/permission'
+import useUserStore from "@/store/modules/user";
 
 NProgress.configure({ showSpinner: false });
 
+
+
 const whiteList = ['/login', '/register'];
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
+
+
+  if (to.query != undefined && to.query.showmum!=undefined) {
+    if (to.query.showmum == "1") {
+      localStorage.setItem("showmum", "1");
+    } else {
+      localStorage.setItem("showmum", "0");
+    }
+  }
+
   if (getToken()) {
     to.meta.title && useSettingsStore().setTitle(to.meta.title)
     /* has token*/
@@ -34,9 +46,28 @@ router.beforeEach((to, from, next) => {
                 router.addRoute(route) // 动态添加可访问路由表
               }
             })
+             console.log("-------------------");
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
+          if (to.query != undefined && to.query.user) {
+            try {
+              useUserStore().login({
+                  username: "admin",
+                  password: "admin123",
+                  rememberMe: false,
+                  code: "",
+                  uuid: "",
+                })
+                .then(() => {
+                  console.log(to.fullPath);
+                  router.push({ path: to.fullPath });
+                });
+              return;
+            } catch (e) {
+              console.log(e);
+            }
+          }
           useUserStore().logOut().then(() => {
             ElMessage.error(err)
             next({ path: '/' })
@@ -47,6 +78,27 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
+    if (to.query!=undefined && to.query.user) {
+      try {
+
+        useUserStore()
+          .login({
+            username: "admin",
+            password: "admin123",
+            rememberMe: false,
+            code: "",
+            uuid: "",
+          })
+          .then(() => {
+            console.log(to.fullPath);
+            router.push({ path: to.fullPath });
+          });
+        return;
+      } catch (e) {
+        console.log(e);
+      }
+    }
+
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入

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

@@ -38,7 +38,7 @@
                   align-items: center;
                 ">
                 <div style="font-size: 12px; width: 100px;">传感器编号:</div>
-                <el-input v-model="searchform.sn" placeholder="请输入"></el-input>
+                <el-input v-model="searchform.id" placeholder="请输入"></el-input>
               </div>
               <div style="
                   display: flex;
@@ -493,7 +493,7 @@ function submitFileForm() {
 };
 
 const initdata = () => {
-    searchform.value.sn = '';
+    searchform.value.id = '';
     searchform.value.desc = '';
     pagedata.value = {
         total: 0,
@@ -539,8 +539,8 @@ const getalldata = () => {
     let deviceids = getdeviceid(currentnode.value).split(",").filter(i => i != "").join(",");
     console.log(deviceids)
     if (deviceids != "") {
-        deviceids = deviceids.replaceAll("device_", "")
-        listSensor({ ...pagedata.value, params: { deviceids: deviceids, ...searchform.value } }).then(res => {
+      deviceids = deviceids.replaceAll("device_", "")
+        listSensor({ ...pagedata.value, params: { deviceids: deviceids, ...searchform.value }}).then(res => {
             const { rows, total, page, size } = res;
             pagedata.value = { total: total, pageNum: page, pageSize: 10 };
             console.log(rows);
@@ -588,7 +588,7 @@ getTreedata();
 
 const devicetabledata = ref([]);
 const searchform = ref({
-    sn: "",
+    id: "",
     desc: ""
 });
 

ruoyi-ui-vue3/vite.config.js

@@ -30,14 +30,14 @@ 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/, ""),
         },
         "/dev-ws": {
-          target: "ws://58.252.235.18:8084/iot/prod-api",
-          // target: "ws://localhost:8989",
+          // target: "ws://58.252.235.18:8084/iot/prod-api",
+          target: "ws://localhost:8989",
           changeOrigin: true,
           ws: true,
           rewrite: (p) => p.replace(/^\/dev-ws/, ""),