From fbfc2ba9276e79950a0949324bc8ba976cdca99b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 五月 2024 17:29:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
index 6eca6d8..6b3703c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
@@ -51,7 +51,10 @@
*/
@Override
public List<YwThreshold> selectYwThresholdList(YwThreshold ywThreshold) {
- return ywThresholdMapper.selectYwThresholdList(ywThreshold);
+ List<YwThreshold> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(YwThreshold::getCreateTime)
+ .list();
+ return list;
}
/**
@@ -171,12 +174,52 @@
@Override
public FaceThresholdForm getFace(Integer id) {
- return null;
+ YwThreshold result = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(YwThreshold::getId,
+ YwThreshold::getMonitorType,
+ YwThreshold::getCaptureNum,
+ YwThreshold::getCaptureNumAuto,
+ YwThreshold::getTimelyRate,
+ YwThreshold::getTimelyRateAuto,
+ YwThreshold::getDelayAmount,
+ YwThreshold::getDelayAmountAuto,
+ YwThreshold::getDeviceActiveRate,
+ YwThreshold::getDeviceActiveRateAuto,
+ YwThreshold::getTimeAccuracy,
+ YwThreshold::getTimeAccuracyAuto,
+ YwThreshold::getTimelyCapture,
+ YwThreshold::getTimelyCaptureAuto)
+ .eq(YwThreshold::getId, id)
+ .eq(YwThreshold::getMonitorType, BusinessTypeEnum.FACE)
+ .one();
+ FaceThresholdForm form = new FaceThresholdForm();
+ BeanUtils.copyProperties(result, form);
+ return form;
}
@Override
public CarThresholdForm getCar(Integer id) {
- return null;
+ YwThreshold result = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(YwThreshold::getId,
+ YwThreshold::getMonitorType,
+ YwThreshold::getPassCarNum,
+ YwThreshold::getPassCarNumAuto,
+ YwThreshold::getPassCarMissRate,
+ YwThreshold::getPassCarMissRateAuto,
+ YwThreshold::getPassCarEffectiveNum,
+ YwThreshold::getPassCarEffectiveNumAuto,
+ YwThreshold::getDeviceActiveRate,
+ YwThreshold::getDeviceActiveRateAuto,
+ YwThreshold::getTimeAccuracy,
+ YwThreshold::getTimeAccuracyAuto,
+ YwThreshold::getTimelyCapture,
+ YwThreshold::getTimelyCaptureAuto)
+ .eq(YwThreshold::getId, id)
+ .eq(YwThreshold::getMonitorType, BusinessTypeEnum.CAR)
+ .one();
+ CarThresholdForm form = new CarThresholdForm();
+ BeanUtils.copyProperties(result, form);
+ return form;
}
@Override
--
Gitblit v1.8.0