From ae9ede70c133e257baead8e36bc65063d5b5c3c9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 01 九月 2024 17:56:15 +0800
Subject: [PATCH] 系统优化+bug修复
---
ycl-server/src/main/resources/logback.xml | 16 ++++---
ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ScoreIndexDTO.java | 1
ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java | 1
ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java | 5 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 6 +-
ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java | 3 +
ycl-server/src/main/java/com/ycl/api/HK/HKApi.java | 13 ++++--
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 6 ++-
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java | 3 +
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 1
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 5 ++
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 14 +++++-
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 19 ++++++++-
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 13 ++++++
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 9 +++-
15 files changed, 85 insertions(+), 30 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ScoreIndexDTO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ScoreIndexDTO.java
index 4c408c9..93dc7c8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ScoreIndexDTO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ScoreIndexDTO.java
@@ -12,5 +12,6 @@
private String tableName;
private Long deptId;
private String date;
+ private Integer examineTag;
private List<String> quarter;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
index ade1021..f2427e0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
@@ -35,7 +35,10 @@
* 閫氶亾鍚嶏紙monitor鐨勮澶囧悕锛�
*/
private String name;
-
+ /**
+ * OSD4銆�5閮藉彲鑳戒负鍚嶅瓧锛屼袱鏉′竴璧锋瘮瀵�
+ */
+ private String name2;
//osd宸︿笅
/**
* 鍥恒�佹灙銆佽矾銆佽タ鍖�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index 83a1247..806c08f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -3,18 +3,18 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
-import org.springframework.data.mongodb.core.annotation.Collation;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
/**
- * python鑾峰彇osd鏁版嵁
+ * 鑾峰彇osd鏁版嵁
*
* @author锛歺p
* @date锛�2024/8/8 19:35
*/
@Data
-@Collation("osd_check_result")
+@Document(collection = "osd_check_result")
public class OsdCheckResult extends BaseResult {
/**
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 db98253..694047d 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
@@ -186,7 +186,7 @@
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);
+ osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
if (!StringUtils.isEmpty(osdStr)) {
osdResult.setOSD4(osdStr);
}
@@ -196,7 +196,7 @@
int num = 0;
for (NET_TITLE_OSD_INFO osd : stuOSD) {
String osdStr = null;
- osdStr = new String(osd.szText, StandardCharsets.UTF_8);
+ osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
if (!StringUtils.isEmpty(osdStr)) {
if(num ==0){
osdResult.setOSD1(osdStr);
@@ -206,6 +206,8 @@
osdResult.setOSD3(osdStr);
}else if(num ==3){
osdResult.setName(osdStr);
+ }else if(num ==4){
+ osdResult.setName2(osdStr);
}
}
num++;
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 44d2226..cd6869c 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
@@ -66,17 +66,20 @@
Node node = nodeList.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE && "TextOverlay".equals(tagName1)) {
Element element = (Element) node;
+ String id = element.getElementsByTagName("id").item(0).getTextContent();
String textContent = element.getElementsByTagName(tagName2).item(0).getTextContent();
// log.info("TEXT : " + textContent);
- if (i == 0) {
+ if ("1".equals(id)) {
osdResult.setOSD1(textContent);
- } else if (i == 1) {
+ } else if ("2".equals(id)) {
osdResult.setOSD2(textContent);
- } else if (i == 2) {
+ } else if ("3".equals(id)) {
osdResult.setOSD3(textContent);
- } else if (i == 3) {
+ } else if ("4".equals(id)) {
osdResult.setName(textContent);
- } else if (i == 4) {
+ } else if ("5".equals(id)) {
+ osdResult.setName2(textContent);
+ } else if ("7".equals(id)) {
osdResult.setOSD4(textContent);
}
} else if (node.getNodeType() == Node.ELEMENT_NODE && "Time".equals(tagName1)) {
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
index 7f91098..0a9c2f1 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -47,6 +47,7 @@
//鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
private static class AreaStats {
int totalCount = 0;
+ int delayCount = 0;
//0-180s
int delayCount1 = 0;
//180-300s
@@ -105,6 +106,7 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalCount += result.getDataCount();
+ stats.delayCount += result.getDelayCount();
stats.delayCount1 += result.getDataDelayCount1();
stats.delayCount2 += result.getDataDelayCount2();
stats.delayCount3 += result.getDataDelayCount3();
@@ -122,6 +124,7 @@
//璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉�
Map<String, Object> param = new HashMap<>();
param.put("totalCount", stats.totalCount);
+ param.put("delayCount", stats.delayCount);
param.put("delayCount1", stats.delayCount1);
param.put("delayCount2", stats.delayCount2);
param.put("delayCount3", stats.delayCount3);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
index f40268e..fb91789 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
@@ -42,6 +42,7 @@
//鍖哄煙浜鸿劯鏁版嵁涓婁紶寤惰繜鎸囨爣鐨勫唴閮ㄧ被
private static class AreaStats {
int totalCount = 0;
+ int delayCount = 0;
//0-180s
int delayCount1 = 0;
//180-300s
@@ -100,6 +101,7 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalCount += result.getDataCount();
+ stats.delayCount += result.getDelayCount();
stats.delayCount1 += result.getDataDelayCount1();
stats.delayCount2 += result.getDataDelayCount2();
stats.delayCount3 += result.getDataDelayCount3();
@@ -116,6 +118,7 @@
//璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉�
Map<String, Object> param = new HashMap<>();
param.put("totalCount", stats.totalCount);
+ param.put("delayCount", stats.delayCount);
param.put("delayCount1", stats.delayCount1);
param.put("delayCount2", stats.delayCount2);
param.put("delayCount3", stats.delayCount3);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index 5515b18..5446079 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -115,12 +115,15 @@
//鏁版嵁涓婁紶鍙婃椂鎬�
public BigDecimal snapshopDelay(Map<String, Object> param) {
BigDecimal totalCount = new BigDecimal((Integer) param.get("totalCount"));
+ BigDecimal delayCount = new BigDecimal((Integer) param.get("delayCount"));
BigDecimal delayCount1 = new BigDecimal((Integer) param.get("delayCount1"));
BigDecimal delayCount2 = new BigDecimal((Integer) param.get("delayCount2"));
BigDecimal delayCount3 = new BigDecimal((Integer) param.get("delayCount3"));
- BigDecimal result = BigDecimal.ZERO.compareTo(totalCount) == 0 ? BigDecimal.ZERO : delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
- .add(delayCount2.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.8")))
- .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
+ BigDecimal result = BigDecimal.ZERO.compareTo(totalCount) == 0 ? BigDecimal.ZERO :
+ totalCount.subtract(delayCount).divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
+ .add(delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE))
+ .add(delayCount2.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.8")))
+ .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
return result.setScale(4, RoundingMode.HALF_UP);
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
index 62778ca..b5325f6 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
@@ -42,7 +42,6 @@
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
private static class AreaStats {
int totalSites = 0;
-
int importantTotalSites = 0;
int importantOsdAccuracySites = 0;
int importantTimeAccuracySites = 0;
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
index fedc6b1..4ebc0d6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
@@ -17,6 +17,7 @@
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.glassfish.jaxb.core.v2.TODO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
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 decb126..cb241bd 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
@@ -99,7 +99,7 @@
.setDate(checkScoreIndexDTO.getDate())
.setQuarter(checkScoreIndexDTO.getQuarter());
scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
-
+ scoreIndexDTO.setExamineTag(checkScore.getExamineTag());
//鑾峰綋鏈堜唤
if(StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())){
//濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
@@ -244,12 +244,14 @@
@Override
public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
String date = checkScoreDTO.getDate();
+ Integer examineTag = null;
//濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
if(StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())){
CheckScore checkScore = getById(checkScoreDTO.getId());
Date createTime = checkScore.getCreateTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
date = formatter.format(createTime);
+ examineTag = checkScore.getExamineTag();
}
/** 瀵间笁寮爏heet */
@@ -257,18 +259,27 @@
CheckIndexCar checkIndexCar = new CheckIndexCar();
checkIndexCar.setDate(date);
checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
+ if(examineTag!=null) {
+ checkIndexCar.setExamineTag(Short.parseShort(examineTag + ""));
+ }
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁",checkIndexCars,CheckIndexCar.class);
//浜鸿劯
CheckIndexFace checkIndexFace = new CheckIndexFace();
checkIndexFace.setDate(date);
checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
+ if(examineTag!=null) {
+ checkIndexFace.setExamineTag(Short.parseShort(examineTag + ""));
+ }
List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁",checkIndexFaces,CheckIndexFace.class);
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
+ if(examineTag!=null) {
+ checkIndexVideo.setExamineTag(Short.parseShort(examineTag + ""));
+ }
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
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 3bde6d8..f2c565a 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -88,7 +88,7 @@
);
List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
- log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size());
+// log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size());
for (TMonitor monitor : monitors) {
executorService.submit(() -> {
if (DeviceType.HK.getType().equals(monitor.getDeviceType())) {
@@ -137,6 +137,7 @@
//灏佽OsdCheckResult
OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
checkCorrect(osdResult, monitor, osdCheckResult);
+ log.info("鏍￠獙缁撴灉锛歿}",osdCheckResult);
checkResults.add(osdCheckResult);
}
log.info("缁撴灉鏁版嵁澶у皬:{}", checkResults.size());
@@ -194,10 +195,17 @@
}
}
//妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
+ //TODO:鏍￠獙瑙勫垯锛岃繖閲屾殏鏃朵笉姣旇緝鍏ㄦ櫙鍜岀粏鑺備袱瀛椼��
if (!StringUtils.isEmpty(osdResult.getName()) && !StringUtils.isEmpty(monitor.getName())) {
- if (monitor.getName().equals(osdResult.getName())) {
+ if (monitor.getName().equals(osdResult.getName()) || monitor.getName().replace("鍏ㄦ櫙","缁嗚妭").equals(osdResult.getName()) || monitor.getName().replace("缁嗚妭","鍏ㄦ櫙").equals(osdResult.getName())) {
+ //OSD4鍜�5閮藉彲鑳戒负鍚嶅瓧銆佹瘮杈冨叾涓竴鏉℃纭嵆鍙紝姝ｇ‘浜嗘敼涓烘纭悕瀛�
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Correct);
- } else {
+ osdCheckResult.setOsdName(osdResult.getName());
+ }else if (monitor.getName().equals(osdResult.getName2()) || monitor.getName().replace("鍏ㄦ櫙","缁嗚妭").equals(osdResult.getName2()) || monitor.getName().replace("缁嗚妭","鍏ㄦ櫙").equals(osdResult.getName2())) {
+ //OSD4鍜�5閮藉彲鑳戒负鍚嶅瓧銆佹瘮杈冨叾涓竴鏉℃纭嵆鍙紝姝ｇ‘浜嗘敼涓烘纭悕瀛�
+ osdCheckResult.setOsdName(osdResult.getName2());
+ osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Correct);
+ }else {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
}
}
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 b8f8a53..b559d09 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -27,6 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -53,6 +54,7 @@
private static final BigDecimal NUM = new BigDecimal("0.15");
public void siteOnlineTask() {
+ log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼");
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰閲嶇偣鐐逛綅鍦ㄧ嚎鐜囧拰鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
Query query = new Query();
@@ -62,9 +64,11 @@
List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
calculator.calculate(results);
+ log.info("缁撴潫璁＄畻鐐逛綅鍦ㄧ嚎鐜�");
}
public void videoUsabilityTask() {
+ log.info("寮�濮嬭绠楀綍鍍忓彲鐢ㄧ巼鍜岄噸鐐瑰綍鍍忓彲鐢ㄧ巼");
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�
Query query = new Query();
@@ -74,15 +78,19 @@
List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
calculator.calculate(results);
+ log.info("缁撴潫璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�");
}
public void oneMonitorFileTask() {
+ log.info("寮�濮嬭绠椾竴鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
//璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate);
calculator.calculate(tMonitorVOS);
+ log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
}
public void oneMonitorQualifyTask(){
+ log.info("寮�濮嬭绠椾竴鏈轰竴妗ｅ悎鏍肩巼");
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
Date yesterday = DateUtils.addDays(new Date(), -1);
Query query = new Query();
@@ -91,22 +99,27 @@
List<MonitorQualifyResult> results = mongoTemplate.find(query, MonitorQualifyResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorQualify);
calculator.calculate(results);
+ log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼");
}
public void platformOnlineTask() {
+ log.info("寮�濮嬭绠楀钩鍙板湪绾跨巼");
//璁＄畻骞冲彴鍦ㄧ嚎鐜�
List<PlatformOnlineVO> list = platformOnlineMapper.yesterdayData(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_PlatformOnline);
calculator.calculate(list);
+ log.info("缁撴潫璁＄畻骞冲彴鍦ㄧ嚎鐜�");
}
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(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
calculator.calculate(results);
+ log.info("缁撴潫璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼");
}
/**
@@ -138,7 +151,7 @@
count++;
}
}
- imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score));
+ imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score).divide(new BigDecimal(100),4, RoundingMode.HALF_UP));
// 鑾峰彇瀛楀吀鍊�-鎬绘暟
int onlineAssetsTotal = Integer.parseInt(DictUtils.getDictValue("online_assets_total", checkIndexVideo.getDeptName()));
imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
diff --git a/ycl-server/src/main/resources/logback.xml b/ycl-server/src/main/resources/logback.xml
index 77d7d62..7a43fd7 100644
--- a/ycl-server/src/main/resources/logback.xml
+++ b/ycl-server/src/main/resources/logback.xml
@@ -11,7 +11,7 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
-
+
<!-- 绯荤粺鏃ュ織杈撳嚭 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
@@ -34,7 +34,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
+
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
@@ -56,7 +56,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
+
<!-- 鐢ㄦ埛璁块棶鏃ュ織杈撳嚭 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-user.log</file>
@@ -70,7 +70,7 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
-
+
<!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
<logger name="com.ycl" level="info" />
<!-- Spring鏃ュ織绾у埆鎺у埗 -->
@@ -79,15 +79,17 @@
<root level="info">
<appender-ref ref="console" />
</root>
-
+ <!-- 璁剧疆 Spring Security 鐨勬棩蹇楃骇鍒负 DEBUG -->
+ <logger name="org.springframework.security" level="DEBUG"/>
+
<!--绯荤粺鎿嶄綔鏃ュ織-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
-
+
<!--绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織-->
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 8eeb9a8..50a9c53 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -35,7 +35,7 @@
<if test="deptId != null "> and tcs.dept_id = #{deptId}</if>
${params.dataScope}
</where>
- order by create_time desc;
+ order by create_time desc
</select>
<select id="selectCheckScoreById" parameterType="Long" resultMap="CheckScoreResult">
@@ -107,6 +107,9 @@
select t.* from ${tableName} t
left join sys_dept d on t.dept_id = d.dept_id
where t.dept_id = #{deptId}
+ <if test="examineTag != null">
+ and examine_tag = #{examineTag}
+ </if>
<if test="date != null">
and date_format(t.create_time,'%Y-%m') = #{date}
</if>
--
Gitblit v1.8.0