From ae0c129c499e7e166399f2e3e2ccca93a076a669 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 10:05:36 +0800
Subject: [PATCH] osd等待时间配置，安全资源手动打分
---
ycl-server/src/main/java/com/ycl/api/DH/utils/InitUtils.java | 4 +-
ycl-server/src/main/java/com/ycl/api/YS/YSInit.java | 4 +-
ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java | 3 +
ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml | 6 +++
ycl-server/src/main/java/com/ycl/api/HK/HKApi.java | 4 +-
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 8 ++-
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 1
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 3 +
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 12 +++---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 15 ++++---
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 13 +++---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 1
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 24 ++++-------
ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java | 5 ++
14 files changed, 58 insertions(+), 45 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
index 136a3d5..ca4fb44 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
@@ -74,7 +74,7 @@
netsdk.CLIENT_SetAutoReconnect(haveReConnect, null);
//璁剧疆鐧诲綍瓒呮椂鏃堕棿鍜屽皾璇曟鏁帮紝鍙��
- int waitTime = 5000; //鐧诲綍璇锋眰鍝嶅簲瓒呮椂鏃堕棿璁剧疆涓�5S
+ int waitTime = 3000; //鐧诲綍璇锋眰鍝嶅簲瓒呮椂鏃堕棿璁剧疆涓�5S
int tryTimes = 1; //鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺�1娆�
netsdk.CLIENT_SetConnectTime(waitTime, tryTimes);
@@ -82,7 +82,7 @@
// 璁剧疆鏇村缃戠粶鍙傛暟锛孨ET_PARAM鐨刵Waittime锛宯ConnectTryNum鎴愬憳涓嶤LIENT_SetConnectTime
// 鎺ュ彛璁剧疆鐨勭櫥褰曡澶囪秴鏃舵椂闂村拰灏濊瘯娆℃暟鎰忎箟鐩稿悓,鍙��
NetSDKLib.NET_PARAM netParam = new NetSDKLib.NET_PARAM();
- netParam.nConnectTime = 10000; // 鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺ョ殑瓒呮椂鏃堕棿
+ netParam.nConnectTime = 3000; // 鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺ョ殑瓒呮椂鏃堕棿
netParam.nGetConnInfoTime = 3000; // 璁剧疆瀛愯繛鎺ョ殑瓒呮椂鏃堕棿
netParam.nGetDevInfoTime = 3000;//鑾峰彇璁惧淇℃伅瓒呮椂鏃堕棿锛屼负0榛樿1000ms
netsdk.CLIENT_SetNetworkParam(netParam);
@@ -181,12 +181,13 @@
osdInfo.read();
NET_GBMODE_CUSTOMTITLE_INFO[] stuCustomTitle = osdInfo.stuCustomTitle;
for (NET_GBMODE_CUSTOMTITLE_INFO title : stuCustomTitle) {
- String position = new String(title.szPositon, StandardCharsets.UTF_8).trim();
+ String position = new String(title.szPositon, StandardCharsets.UTF_8);
if("LeftDown".equals(position)) {
NET_TITLE_OSD_INFO[] stuOSD = title.stuOSD;
for (NET_TITLE_OSD_INFO osd : stuOSD) {
String osdStr = null;
osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
+ log.info("TEXT锛�"+osdStr);
if (!StringUtils.isEmpty(osdStr)) {
osdResult.setOSD4(osdStr);
}
@@ -197,6 +198,7 @@
for (NET_TITLE_OSD_INFO osd : stuOSD) {
String osdStr = null;
osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
+ log.info("TEXT锛�"+osdStr);
if (!StringUtils.isEmpty(osdStr)) {
if(num ==0){
osdResult.setOSD1(osdStr);
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/utils/InitUtils.java b/ycl-server/src/main/java/com/ycl/api/DH/utils/InitUtils.java
index 5ed86c7..6eaebb4 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/utils/InitUtils.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/utils/InitUtils.java
@@ -107,7 +107,7 @@
NetSDKLib.DEV_EVENT_FACERECOGNITION_INFO msg = new NetSDKLib.DEV_EVENT_FACERECOGNITION_INFO();
// 鑰楁椂20ms宸﹀彸
ToolKits.GetPointerData(pAlarmInfo, msg);
- //todo 淇濆瓨浜鸿劯瀵规瘮淇℃伅
+ // 淇濆瓨浜鸿劯瀵规瘮淇℃伅
// 閲婃斁鍐呭瓨
msg = null;
@@ -119,7 +119,7 @@
{
NetSDKLib.DEV_EVENT_FACEDETECT_INFO msg = new NetSDKLib.DEV_EVENT_FACEDETECT_INFO();
ToolKits.GetPointerData(pAlarmInfo, msg);
- //todo 淇濆瓨鍥剧墖锛岃幏鍙栧浘鐗囩紦瀛�
+ // 淇濆瓨鍥剧墖锛岃幏鍙栧浘鐗囩紦瀛�
// 閲婃斁鍐呭瓨
msg = null;
diff --git a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
index a427de7..4afd313 100644
--- a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
@@ -110,8 +110,8 @@
// 璁剧疆璇锋眰閰嶇疆
RequestConfig requestConfig = RequestConfig.custom()
- .setConnectTimeout(1000)
- .setSocketTimeout(1000)
+ .setConnectTimeout(3000)
+ .setSocketTimeout(3000)
.build();
httpGet.setConfig(requestConfig);
try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
index e36f651..6843e77 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -3,21 +3,14 @@
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
-import com.ycl.api.DH.lib.ToolKits;
-import com.ycl.api.DH.utils.DHApi;
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
-import com.ycl.api.YS.util.Common;
import com.ycl.platform.domain.result.OSDResult;
-import com.ycl.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Vector;
+import java.util.Date;
import static com.ycl.api.YS.lib.NetDEVSDKLib.NETDEV_LOGIN_PROTO_E.NETDEV_LOGIN_PROTO_ONVIF;
@@ -25,7 +18,6 @@
public class YSApi {
public static OSDResult getOsd(String ip, String userName, String password) {
- log.info("ip:{},鐢ㄦ埛:{}锛屽瘑鐮�:{}", ip, userName, password);
//鐧诲綍
NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S stDevLoginInfo = new NetDEVSDKLib.NETDEV_DEVICE_LOGIN_INFO_S();
NetDEVSDKLib.NETDEV_SELOG_INFO_S stSELogInfo = new NetDEVSDKLib.NETDEV_SELOG_INFO_S();
@@ -44,15 +36,17 @@
NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[] stVideoChlList = (NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S[]) new NetDEVSDKLib.NETDEV_VIDEO_CHL_DETAIL_INFO_EX_S().toArray(nMaxChlCount);
boolean bRe = YSInit.netdevsdk.NETDEV_QueryVideoChlDetailListEx(lpUserID, dwChlCount, stVideoChlList);
if (!bRe) {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
return null;
}
//鑾峰彇鏃堕棿
NetDEVSDKLib.NETDEV_TIME_CFG_S stTimeCfg = new NetDEVSDKLib.NETDEV_TIME_CFG_S();
stTimeCfg.write();
boolean bRetime = NetDemo.netdevsdk.NETDEV_GetSystemTimeCfg(lpUserID, stTimeCfg);
+ Date checkTime = new Date();
+ osdResult.setCheckTime(checkTime);
if (!bRetime) {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
return null;
} else {
stTimeCfg.read();
@@ -82,7 +76,7 @@
try {
osdResult.setOsdTime(format.parse(strTime));
} catch (Exception e) {
- log.error(ip + "鏃堕棿瑙ｆ瀽鏈夎");
+// log.error(ip + "鏃堕棿瑙ｆ瀽鏈夎");
}
}
//鑾峰彇osd
@@ -92,7 +86,7 @@
boolean bRet = YSInit.netdevsdk.NETDEV_GetDevConfig(lpUserID, stVideoChlList[0].dwChannelID, NetDEVSDKLib.NETDEV_CONFIG_COMMAND_E.NETDEV_GET_OSDCFG, stOSDInfo.getPointer(), 616, dwBytesReturned);
if (!bRet) {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
return null;
}
stOSDInfo.read();
@@ -117,9 +111,9 @@
YSInit.netdevsdk.NETDEV_Logout(lpUserID);
return osdResult;
} else {
- log.error("error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+// log.error("ip:"+ip+",error code" + YSInit.netdevsdk.NETDEV_GetLastError());
+ return null;
}
- return null;
}
public static void demo() {
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java b/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java
index 8adbfad..991de3a 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSInit.java
@@ -49,11 +49,11 @@
}
NetDEVSDKLib.NETDEV_REV_TIMEOUT_S pstRevTimeout=new NetDEVSDKLib.NETDEV_REV_TIMEOUT_S();
- pstRevTimeout.dwRevTimeOut=2;
+ pstRevTimeout.dwRevTimeOut=3;
pstRevTimeout.dwFileReportTimeOut=30;
pstRevTimeout.write();
boolean rbet1=netdevsdk.NETDEV_SetRevTimeOut(pstRevTimeout);
- boolean rbet2=netdevsdk.NETDEV_SetConnectTime(2, 1);
+ boolean rbet2=netdevsdk.NETDEV_SetConnectTime(3, 1);
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index 96de59e..38ca460 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -117,7 +117,6 @@
stats.totalSites++;
if (ApiConstants.HK_SnapCount_ResultType_Null != result.getResultType()) {
stats.onlineSites++;
- } else {
stats.totalDataSum += result.getDataCount();
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
index 4b2e20e..7913a99 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -11,6 +11,7 @@
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -33,7 +34,7 @@
/**
* 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('check:score:list')")
+ @PreAuthorize("@ss.hasPermi('check:score:list')")
@GetMapping("/list")
public AjaxResult list(CheckScore checkScore)
{
@@ -44,7 +45,7 @@
/**
* 鏌ヨ鑰冩牳绉垎鎶樼嚎鍥�
*/
-// @PreAuthorize("@ss.hasPermi('check:score:chart')")
+ @PreAuthorize("@ss.hasPermi('check:score:chart')")
@GetMapping("/chart")
public AjaxResult selectCheckScoreChart(CheckScore checkScore)
{
@@ -55,7 +56,7 @@
/**
* 鍖哄幙璇︽儏鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('check:score:list')")
+ @PreAuthorize("@ss.hasPermi('check:score:list')")
@GetMapping("/detail")
public TableDataInfo detail(CheckScore checkScore)
{
@@ -68,7 +69,7 @@
/**
* 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅
*/
-// @PreAuthorize("@ss.hasPermi('check:score:query')")
+ @PreAuthorize("@ss.hasPermi('check:score:query')")
@GetMapping(value = "/detail/index")
public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
{
@@ -79,7 +80,7 @@
/**
* 鍙戝竷鑰冩牳绉垎
*/
-// @PreAuthorize("@ss.hasPermi('check:score:edit')")
+ @PreAuthorize("@ss.hasPermi('check:score:edit')")
@Log(title = "鍙戝竷鑰冩牳绉垎", businessType = BusinessType.UPDATE)
@PutMapping("/publish")
public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO)
@@ -90,7 +91,7 @@
/**
* 瀵煎嚭鑰冩牳绉垎鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('check:score:export')")
+ @PreAuthorize("@ss.hasPermi('check:score:export')")
@Log(title = "瀵煎嚭鑰冩牳绉垎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java
index 3b433f9..e80ce2d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java
@@ -3,6 +3,7 @@
import com.ycl.platform.domain.entity.ImageResourceSecurity;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -66,4 +67,6 @@
* @param imageResourceSecurities 鏁版嵁闆嗗悎
*/
void saveBatch(ArrayList<ImageResourceSecurity> imageResourceSecurities);
+
+ ImageResourceSecurity getLatest(Long deptId, Date date);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java b/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java
index 4303294..e1a141c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java
@@ -2,9 +2,11 @@
import com.ycl.platform.domain.entity.ImageResourceSecurity;
import jakarta.servlet.http.HttpServletResponse;
+import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -81,4 +83,7 @@
* @param imageResourceSecurities 鏁版嵁闆嗗悎
*/
void saveBatch(ArrayList<ImageResourceSecurity> imageResourceSecurities);
+
+
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index cb241bd..48dd150 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -140,6 +140,7 @@
if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
+
// 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
if (checkScores.isEmpty()) {
CheckScore one = new LambdaQueryChainWrapper<>(baseMapper).select(CheckScore::getCreateTime).last("order by create_time desc limit 1").one();
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index ae12191..222a915 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -193,7 +193,7 @@
long checkTime = osdResult.getCheckTime().getTime();
long osdTime = osdResult.getOsdTime().getTime();
long timeDiff = (checkTime - osdTime) / 1000;
- if (timeDiff <=60) {
+ if (timeDiff <= 60) {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Correct);
} else {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
@@ -202,10 +202,10 @@
//妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
//鏍￠獙瑙勫垯锛岃繖閲屾殏鏃朵笉姣旇緝鍏ㄦ櫙鍜岀粏鑺備袱瀛椼��
if (!StringUtils.isEmpty(osdResult.getName()) && !StringUtils.isEmpty(monitor.getName())) {
- if (monitor.getName().equals(osdResult.getName()) || monitor.getName().replace("鍏ㄦ櫙","缁嗚妭").equals(osdResult.getName()) || monitor.getName().replace("缁嗚妭","鍏ㄦ櫙").equals(osdResult.getName())) {
+ if (monitor.getName().equals(osdResult.getName()) || monitor.getName().replace("鍏ㄦ櫙", "缁嗚妭").equals(osdResult.getName()) || monitor.getName().replace("缁嗚妭", "鍏ㄦ櫙").equals(osdResult.getName())) {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Correct);
osdCheckResult.setOsdName(osdResult.getName());
- }else {
+ } else {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
}
}
@@ -253,7 +253,7 @@
OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
if (hkosd != null) {
hkosd.setSerialNumber(monitor.getSerialNumber());
- log.info("娴峰悍璋冪敤鎴愬姛"+hkosd);
+ log.info("娴峰悍璋冪敤鎴愬姛" + hkosd);
synchronized (hkList) {
hkList.add(monitor.getSerialNumber());
}
@@ -263,7 +263,7 @@
OSDResult dhosd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
if (dhosd != null) {
dhosd.setSerialNumber(monitor.getSerialNumber());
- log.info("澶у崕璋冪敤鎴愬姛"+dhosd);
+ log.info("澶у崕璋冪敤鎴愬姛" + dhosd);
synchronized (dhList) {
dhList.add(monitor.getSerialNumber());
}
@@ -273,7 +273,7 @@
OSDResult ysosd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
- log.info("瀹囪璋冪敤鎴愬姛"+ysosd);
+ log.info("瀹囪璋冪敤鎴愬姛" + ysosd);
synchronized (ysList) {
ysList.add(monitor.getSerialNumber());
}
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index a5d1da3..3a277bd 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -9,10 +9,7 @@
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.domain.vo.PlatformOnlineVO;
import com.ycl.platform.domain.vo.TMonitorVO;
-import com.ycl.platform.mapper.CheckIndexVideoMapper;
-import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
-import com.ycl.platform.mapper.PlatformOnlineMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.*;
import com.ycl.platform.service.IImageResourceSecurityService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.DictUtils;
@@ -51,6 +48,8 @@
private final IImageResourceSecurityService imageResourceSecurityService;
private final CheckIndexVideoMapper checkIndexVideoMapper;
private final ImageResourceSecurityDetailMapper imageResourceSecurityDetailMapper;
+ private final ImageResourceSecurityMapper imageResourceSecurityMapper;
+
private static final BigDecimal NUM = new BigDecimal("0.15");
public void siteOnlineTask() {
@@ -115,10 +114,10 @@
public void osdTask() {
log.info("寮�濮嬭绠桹sd鏍囨敞銆佹椂闂村噯纭巼");
//璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼
-// Date yesterday = DateUtils.addDays(new Date(), -1);
+ Date yesterday = DateUtils.addDays(new Date(), -1);
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
calculator.calculate(results);
@@ -128,7 +127,6 @@
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
*/
- //鎵嬪姩鎵撳垎鍙栨渶杩戞暟鎹紝鍓嶇椤甸潰鍔犳墦鍒嗚鍒欐彁绀�
@Transactional
public void videoSecurity() {
ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
@@ -161,6 +159,9 @@
imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
imageResourceSecurities.add(imageResourceSecurity);
+ //鑾峰彇鏈�杩戜竴娆℃暟鎹墜鍔ㄦ墦鍒�
+ ImageResourceSecurity latest = imageResourceSecurityMapper.getLatest(checkIndexVideo.getDeptId(),new Date());
+ imageResourceSecurity.setBoundaryIntegrity(latest.getBoundaryIntegrity());
// 鏇存柊鎸囨爣鏁版嵁
checkIndexVideo.setImageResourceSecurity(
imageResourceSecurity.getPlatformOnline()
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 50a9c53..de53afb 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -138,7 +138,8 @@
WHERE
examine_tag = #{examineTag}
AND DATE_FORMAT(tcs.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m') AND DATE_FORMAT(#{endDate}, '%Y-%m')
- </select>
+ GROUP BY tcs.dept_id, examine_category,examine_tag
+</select>
<select id="home" resultType="java.util.Map">
<![CDATA[
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
index 97b345f..10404c6 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
@@ -101,4 +101,10 @@
#{id}
</foreach>
</delete>
+ <select id="getLatest" resultType="com.ycl.platform.domain.entity.ImageResourceSecurity">
+ select * from t_image_resource_security where dept_id = #{deptId}
+ where date_format(create_time,'%Y-%m') = DATE_FORMAT(#{date}, '%Y-%m')
+ order by create_time desc
+ limit 1
+ </select>
</mapper>
--
Gitblit v1.8.0