admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2024-01-24 18:29:22 +08:00
parent fbf9dbb8c4
commit 26adb2882e
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
View File

@ -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.entity.VideoItem;
import com.zhgd.xmgl.modules.video.mapper.VideoItemMapper; import com.zhgd.xmgl.modules.video.mapper.VideoItemMapper;
import com.zhgd.xmgl.modules.video.service.impl.VideoItemServiceImpl; 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.HikVideoUtil;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
@ -103,27 +102,27 @@ public class RtWorkTicketServiceImpl extends ServiceImpl<RtWorkTicketMapper, RtW
List<VideoItem> videoList = rtWorkTicket.getVideoList(); List<VideoItem> videoList = rtWorkTicket.getVideoList();
if (CollUtil.isNotEmpty(videoList)) { if (CollUtil.isNotEmpty(videoList)) {
for (VideoItem videoItem : videoList) { for (VideoItem videoItem : videoList) {
//设置视频 try {
if (StringUtils.isNotEmpty(videoItem.getSerialNumber())) { //设置视频
String url = HikVideoUtil.callPostApiGetPreviewURL(videoItem.getSerialNumber(), "hls", null, videoConfig.getAccount(), if (StringUtils.isNotEmpty(videoItem.getSerialNumber()) && StringUtils.isNotEmpty(videoConfig.getAppId()) && StringUtils.isNotEmpty(videoConfig.getAppSecret())) {
videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret()); String url = HikVideoUtil.callPostApiGetPreviewURL(videoItem.getSerialNumber(), "hls", null, videoConfig.getAccount(),
videoItem.setPlayUrl(url); videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret());
videoItem.setPlayUrl(url);
}
} catch (Exception e) {
e.printStackTrace();
} }
} }
} }
} }
try { String workTicket = rtWorkTicket.getWorkTicket();
String workTicket = rtWorkTicket.getWorkTicket(); if (StringUtils.isNotBlank(workTicket)) {
if (StringUtils.isNotBlank(workTicket)) { JSONArray jsonArray = JSON.parseArray(workTicket);
JSONArray jsonArray = JSON.parseArray(workTicket); for (int i = 0; i < jsonArray.size(); i++) {
for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i);
JSONObject jsonObject = jsonArray.getJSONObject(i); jsonObject.put("urlJson", Base64.encode(jsonObject.getString("url")));
jsonObject.put("urlJson", Base64.encode(jsonObject.getString("url")));
}
rtWorkTicket.setWorkTicket(JSON.toJSONString(jsonArray));
} }
} catch (Exception e) { rtWorkTicket.setWorkTicket(JSON.toJSONString(jsonArray));
e.printStackTrace();
} }
} }
} }

3
src/main/java/com/zhgd/xmgl/util/PwUtil.java
View File

@ -2,7 +2,6 @@ package com.zhgd.xmgl.util;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import java.util.Date; import java.util.Date;
@ -34,7 +33,7 @@ public class PwUtil {
*/ */
public boolean checkPwExpire(Date date) { public boolean checkPwExpire(Date date) {
//口令最长有效期为90天，并为所有登录登录用 //口令最长有效期为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 true;
} }
return false; return false;