From 002f99b94810ccff674b133124cc442f8a49764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 06 五月 2024 15:16:52 +0800
Subject: [PATCH] 工单阈值完善

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 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 47fd25b..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
@@ -1,6 +1,5 @@
 package com.ycl.platform.service.impl;
 
-import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.dto.CarDTO;
@@ -16,7 +15,6 @@
 import enumeration.general.BusinessTypeEnum;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -53,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;
     }
 
     /**
@@ -173,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