`fix`

ruoyi-admin/pom.xml

@@ -138,7 +138,7 @@
                     </from>
                     <to>
                         <!--镜像名称和tag，使用了mvn内置变量${project.version}，表示当前工程的version-->
-                        <image>docker.xt.wenhq.top:8083/docker_r/ioc:${project.version}</image>
+                        <image>docker.xt.wenhq.top:8083/docker_r/ioc:4.8.2</image>
                         <auth>
                             <username>admin</username>
                             <password>xtwenhongquan</password>

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

@@ -68,9 +68,12 @@ public class TblEquipmentSbookController extends BaseController {
         List<TblEquipmentVo> tblEquipmentVos = iTblEquipmentService.queryList(tblEquipmentBo);
         for(TblEquipmentSbookVo tblEquipmentSbook:tblEquipmentVoList){
             for(TblEquipmentOrganizationalVo tblEquipmentOrganizationalVo:tblEquipmentOrganizationalVoList){
-                if(tblEquipmentSbook.getEquipmentTreeId().longValue() == tblEquipmentOrganizationalVo.getId().longValue()){
-                    tblEquipmentSbook.setDeptName(tblEquipmentOrganizationalVo.getName());
-                }
+                try{
+                    if(tblEquipmentSbook.getEquipmentTreeId().longValue() == tblEquipmentOrganizationalVo.getId().longValue()){
+                        tblEquipmentSbook.setDeptName(tblEquipmentOrganizationalVo.getName());
+                    }
+                }catch (Exception e){}
+
             }
         }
         listObj.setRows(tblEquipmentVoList);

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

@@ -109,6 +109,10 @@ public class TblSensorRecordServiceImpl implements ITblSensorRecordService {
             Date startTime1  = new Date();
             Date endTime1  =new Date();
             try{
+                if(bo.getParams().get("starttime")==null){
+                    bo.getParams().put("starttime",DateUtil.now());
+                    bo.getParams().put("endtime",DateUtil.now());
+                }
                 String startTime =  bo.getParams().get("starttime").toString();
                 String endTime =  bo.getParams().get("endtime").toString();
                 startTime1  = DateUtil.date(Long.parseLong(startTime)*1000);

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

@@ -26,8 +26,8 @@
       </el-col>
       <el-col :span="18"  v-if="isvideoshow">
         <div style="height: 100%;">
-          <div id="container" style="margin-top: 0px;width:100%;height:80vh"></div>
-           <!-- <iframe id="FrameID" :key="currenturl" style="width: 100%;height:100%" :src="currenturl"/> -->
+          <div v-if="currenturl==''||currenturl==null" id="container" style="margin-top: 0px;width:100%;height:80vh"></div>
+          <iframe v-if="currenturl!=''&&currenturl!=null" id="FrameID" :key="currenturl" style="width: 100%;height:100%" :src="currenturl"/>
         </div>
       </el-col>
       <el-col :span="18" v-if="!isvideoshow">
@@ -151,6 +151,7 @@ const vidoeParams = ref({
 
 
 const handleClick = (node) => {
+  currenturl.value = "";
   if (node.videoId != null) {
     searchform.value.id = node.videoId
   } else {
@@ -158,9 +159,15 @@ const handleClick = (node) => {
   }
     isvideoshow.value = true;
 
-    setTimeout(() => {
+
+
+  if (node.remark != null && node.remark != "") {
+    currenturl.value = node.remark;
+  } else {
+
+     setTimeout(() => {
       var $container = document.getElementById('container');
-   jessibuca = new Jessibuca({
+      jessibuca = new Jessibuca({
             container: $container,
             videoBuffer: 0.2, // 缓存时长
             isResize: false,
@@ -183,8 +190,8 @@ const handleClick = (node) => {
          jessibuca.play(node.voiceOutCode);
     }, 1000);
 
+  }
 
-  currenturl.value = node.remark;