From 2da75f7a5c4fee35770b88998dd15f33277a7a88 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 18 九月 2024 17:59:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/task/FaceTask.java | 2 -- ycl-server/src/main/java/com/ycl/task/CarTask.java | 2 -- ycl-server/src/main/java/com/ycl/task/VideoTask.java | 2 +- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java | 1 - ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 5 +---- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java index 9b5ea97..39da4e5 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java @@ -18,7 +18,6 @@ * @date 2024-03-04 */ @Data -//TODO:鏀瑰瓧鍏歌澶囩姸鎬� public class TMonitorVO extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java index 46a1751..ce7c654 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java @@ -111,9 +111,7 @@ //璁惧缂栧彿 List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList()); Query query = new Query(); - //TODO:鏈湴娴嬭瘯 - // Date now = new Date() - Date now = DateUtils.getDay(2024, 7, 13); + Date now = new Date(); query.addCriteria(Criteria.where("no").in(numbers) .and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now)) ); @@ -356,7 +354,6 @@ @Override public List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery) { - //TODO:鏂板dept AreaCode瀛楁 return baseMapper.monitorRate(dashboardQuery); } diff --git a/ycl-server/src/main/java/com/ycl/task/CarTask.java b/ycl-server/src/main/java/com/ycl/task/CarTask.java index dff3938..ea1e6fe 100644 --- a/ycl-server/src/main/java/com/ycl/task/CarTask.java +++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java @@ -41,7 +41,6 @@ private TMonitorMapper monitorMapper; @Autowired private YwPointMapper pointMapper; - //TODO锛氬姞浠诲姟 public void siteOnlineTask() { log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼"); List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Car); @@ -50,7 +49,6 @@ log.info("缁撴潫璁$畻瑙嗗浘搴撳鎺ョǔ瀹氭��"); } - //TODO锛氭敼浠诲姟鍚� public void viewConnectTask() { log.info("寮�濮嬭绠楄鍥惧簱瀵规帴绋冲畾鎬�"); Date yesterday = DateUtils.addDays(new Date(), -1); diff --git a/ycl-server/src/main/java/com/ycl/task/FaceTask.java b/ycl-server/src/main/java/com/ycl/task/FaceTask.java index 0aad46f..9692be4 100644 --- a/ycl-server/src/main/java/com/ycl/task/FaceTask.java +++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java @@ -37,7 +37,6 @@ @Autowired private TMonitorMapper monitorMapper; - //TODO锛氬姞浠诲姟 public void siteOnlineTask() { log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼"); List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Face); @@ -45,7 +44,6 @@ calculator.calculate(tMonitorResults); log.info("缁撴潫璁$畻瑙嗗浘搴撳鎺ョǔ瀹氭��"); } - //TODO锛氭敼鍚嶅瓧 public void viewConnectTask() { log.info("寮�濮嬭绠楄鍥惧簱瀵规帴绋冲畾鎬�"); Date yesterday = DateUtils.addDays(new Date(), -1); 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 e227f74..5271dd1 100644 --- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java +++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java @@ -54,7 +54,7 @@ private final ImageResourceSecurityMapper imageResourceSecurityMapper; private static final BigDecimal NUM = new BigDecimal("0.15"); - //TODO锛氬姞浠诲姟 + public void siteOnlineTask() { log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼"); List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Video); -- Gitblit v1.8.0