From 26adb2882e2665a36ad631b20e8f5cfe55b25de7 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Wed, 24 Jan 2024 18:29:22 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RtWorkTicketServiceImpl.java | 33 +++++++++----------
 src/main/java/com/zhgd/xmgl/util/PwUtil.java  |  3 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
index 88b88173b..24cde61f9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
@@ -25,7 +25,6 @@ import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService;
 import com.zhgd.xmgl.modules.video.entity.VideoItem;
 import com.zhgd.xmgl.modules.video.mapper.VideoItemMapper;
 import com.zhgd.xmgl.modules.video.service.impl.VideoItemServiceImpl;
-import com.zhgd.xmgl.util.Base64Util;
 import com.zhgd.xmgl.util.HikVideoUtil;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RefUtil;
@@ -103,27 +102,27 @@ public class RtWorkTicketServiceImpl extends ServiceImpl<RtWorkTicketMapper, RtW
                     List<VideoItem> videoList = rtWorkTicket.getVideoList();
                     if (CollUtil.isNotEmpty(videoList)) {
                         for (VideoItem videoItem : videoList) {
-                            //设置视频
-                            if (StringUtils.isNotEmpty(videoItem.getSerialNumber())) {
-                                String url = HikVideoUtil.callPostApiGetPreviewURL(videoItem.getSerialNumber(), "hls", null, videoConfig.getAccount(),
-                                        videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret());
-                                videoItem.setPlayUrl(url);
+                            try {
+                                //设置视频
+                                if (StringUtils.isNotEmpty(videoItem.getSerialNumber()) && StringUtils.isNotEmpty(videoConfig.getAppId()) && StringUtils.isNotEmpty(videoConfig.getAppSecret())) {
+                                    String url = HikVideoUtil.callPostApiGetPreviewURL(videoItem.getSerialNumber(), "hls", null, videoConfig.getAccount(),
+                                            videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret());
+                                    videoItem.setPlayUrl(url);
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
                     }
                 }
-                try {
-                    String workTicket = rtWorkTicket.getWorkTicket();
-                    if (StringUtils.isNotBlank(workTicket)) {
-                        JSONArray jsonArray = JSON.parseArray(workTicket);
-                        for (int i = 0; i < jsonArray.size(); i++) {
-                            JSONObject jsonObject = jsonArray.getJSONObject(i);
-                            jsonObject.put("urlJson", Base64.encode(jsonObject.getString("url")));
-                        }
-                        rtWorkTicket.setWorkTicket(JSON.toJSONString(jsonArray));
+                String workTicket = rtWorkTicket.getWorkTicket();
+                if (StringUtils.isNotBlank(workTicket)) {
+                    JSONArray jsonArray = JSON.parseArray(workTicket);
+                    for (int i = 0; i < jsonArray.size(); i++) {
+                        JSONObject jsonObject = jsonArray.getJSONObject(i);
+                        jsonObject.put("urlJson", Base64.encode(jsonObject.getString("url")));
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    rtWorkTicket.setWorkTicket(JSON.toJSONString(jsonArray));
                 }
             }
         }
diff --git a/src/main/java/com/zhgd/xmgl/util/PwUtil.java b/src/main/java/com/zhgd/xmgl/util/PwUtil.java
index 95c32d7e7..3f23228c8 100644
--- a/src/main/java/com/zhgd/xmgl/util/PwUtil.java
+++ b/src/main/java/com/zhgd/xmgl/util/PwUtil.java
@@ -2,7 +2,6 @@ package com.zhgd.xmgl.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zhgd.jeecg.common.execption.OpenAlertException;
 import lombok.experimental.UtilityClass;
 
 import java.util.Date;
@@ -34,7 +33,7 @@ public class PwUtil {
      */
     public boolean checkPwExpire(Date date) {
         //口令最长有效期为90天，并为所有登录登录用
-        if (DateUtil.betweenDay(date, new Date(), true) > 90) {
+        if (DateUtil.compare(date, new Date()) < 0 && DateUtil.betweenDay(date, new Date(), true) > 90) {
             return true;
         }
         return false;