From 95f0a8b4d82a859f2018c9d77e1a8a3a38b2d523 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 17:06:50 +0800
Subject: [PATCH] 报备记录、编号工具方法
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 241 ++++++++++++++++++++++++++----------------------
1 files changed, 131 insertions(+), 110 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..549e453 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,36 +1,36 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.dto.CarDTO;
-import com.ycl.platform.domain.dto.FaceDTO;
-import com.ycl.platform.domain.dto.VideoDTO;
+import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.entity.YwThreshold;
-import com.ycl.platform.domain.form.CarThresholdForm;
-import com.ycl.platform.domain.form.FaceThresholdForm;
-import com.ycl.platform.domain.form.VideoThresholdForm;
+import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.platform.mapper.WorkOrderMapper;
import com.ycl.platform.mapper.YwThresholdMapper;
import com.ycl.platform.service.IYwThresholdService;
-import com.ycl.utils.DateUtils;
+import constant.CompareConstant;
+import constant.YwThreadConstants;
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 utils.DateUtils;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
-import java.util.Objects;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 杩愮淮闃堝�糞ervice涓氬姟灞傚鐞�
*
* @author gonghl
- * @date 2024-03-25
+ * @date 2024-07-19
*/
@Service
-@RequiredArgsConstructor
public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
-
- private final YwThresholdMapper ywThresholdMapper;
+ @Autowired
+ private YwThresholdMapper ywThresholdMapper;
/**
* 鏌ヨ杩愮淮闃堝��
@@ -39,7 +39,7 @@
* @return 杩愮淮闃堝��
*/
@Override
- public YwThreshold selectYwThresholdById(Integer id) {
+ public YwThreshold selectYwThresholdById(Long id) {
return ywThresholdMapper.selectYwThresholdById(id);
}
@@ -50,8 +50,10 @@
* @return 杩愮淮闃堝��
*/
@Override
- public List<YwThreshold> selectYwThresholdList(YwThreshold ywThreshold) {
- return ywThresholdMapper.selectYwThresholdList(ywThreshold);
+ public Map<String, List<YwThreshold>> selectYwThresholdList(YwThreshold ywThreshold) {
+ List<YwThreshold> ywThresholds = ywThresholdMapper.selectYwThresholdList(ywThreshold);
+ Map<String, List<YwThreshold>> map = ywThresholds.stream().collect(Collectors.groupingBy(YwThreshold::getMonitorType));
+ return map;
}
/**
@@ -69,13 +71,13 @@
/**
* 淇敼杩愮淮闃堝��
*
- * @param ywThreshold 杩愮淮闃堝��
+ * @param list 杩愮淮闃堝��
* @return 缁撴灉
*/
@Override
- public int updateYwThreshold(YwThreshold ywThreshold) {
- ywThreshold.setUpdateTime(DateUtils.getNowDate());
- return ywThresholdMapper.updateYwThreshold(ywThreshold);
+ public Boolean updateYwThreshold(List<YwThreshold> list) {
+ list.forEach(item -> item.setCreateTime(new Date()));
+ return updateBatchById(list);
}
/**
@@ -85,7 +87,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdByIds(Integer[] ids) {
+ public int deleteYwThresholdByIds(Long[] ids) {
return ywThresholdMapper.deleteYwThresholdByIds(ids);
}
@@ -96,105 +98,124 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdById(Integer id) {
+ public int deleteYwThresholdById(Long id) {
return ywThresholdMapper.deleteYwThresholdById(id);
}
+
@Override
- public int editFace(FaceThresholdForm form) {
- YwThreshold ywThreshold = baseMapper.selectById(form.getId());
- if (Objects.isNull(ywThreshold)) {
- throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ public void faceCheck(List list) {
+
+ }
+
+ @Override
+ public void videoCheck(List list) {
+
+ }
+
+ /**
+ * 鍒ゆ柇杞﹁締闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
+ @Override
+ public void carCheck(List<VehicleDeviceInspectionResult> list) {
+ QueryWrapper<YwThreshold> wrapper = new QueryWrapper<>();
+ wrapper.eq("monitor_type", BusinessTypeEnum.CAR.name());
+ List<YwThreshold> ywThresholds = ywThresholdMapper.selectList(wrapper);
+ Map<String, YwThreshold> map = new HashMap<>();
+ for (YwThreshold ywThreshold : ywThresholds) {
+ String key = ywThreshold.getKey();
+ map.put(key, ywThreshold);
}
- BeanUtils.copyProperties(form, ywThreshold);
-// ywThreshold.setIndicator(JSON.toJSONString(form));
- return baseMapper.updateById(ywThreshold);
- }
+ //鏃堕挓鍑嗙‘鐜囬槇鍊�
+ Float clockPercent = Float.valueOf(map.get(YwThreadConstants.Car_ClockPercent).getValue());
+ Float clockPercentAuto = Float.valueOf(map.get(YwThreadConstants.Car_ClockPercent).getValueAuto());
+ //鏁版嵁鍙婃椂鐜囬槇鍊�
+ Float timelyPercent = Float.valueOf(map.get(YwThreadConstants.Car_TimelyPercent).getValue());
+ Float timelyPercentAuto = Float.valueOf(map.get(YwThreadConstants.Car_TimelyPercent).getValueAuto());
+ //鎸佺画鏃犳暟鎹ぉ鏁伴槇鍊�
+ Integer continueNoDataCount = Integer.valueOf(map.get(YwThreadConstants.Car_ContinueNoDataCount).getValue());
+ Integer continueNoDataCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_ContinueNoDataCount).getValueAuto());
+ //涓嶅敮涓�鏁版嵁閲忛槇鍊�
+ Integer nouniqueCount = Integer.valueOf(map.get(YwThreadConstants.Car_NouniqueCount).getValue());
+ Integer nouniqueCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_NouniqueCount).getValueAuto());
+ //鐧藉ぉ鏈瘑鍒噺闃堝��
+ Integer dayNoNumberCount = Integer.valueOf(map.get(YwThreadConstants.Car_DayNoNumberCount).getValue());
+ Integer dayNoNumberCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_DayNoNumberCount).getValueAuto());
+ //杞﹁締鍏」灞炴�т笉瀹屾暣閲忛槇鍊�
+ Integer noIntegrityCount = Integer.valueOf(map.get(YwThreadConstants.Car_NoIntegrityCount).getValue());
+ Integer noIntegrityCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_NoIntegrityCount).getValueAuto());
- @Override
- public int editCar(CarThresholdForm form) {
- YwThreshold ywThreshold = baseMapper.selectById(form.getId());
- if (Objects.isNull(ywThreshold)) {
- throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ //澶勭悊鎺ュ彛鏁版嵁
+ for (VehicleDeviceInspectionResult result : list) {
+ if (result == null) {
+ log.error("杞﹁締瀵硅薄鏁版嵁涓虹┖");
+ continue;
+ }
+ //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
+ Integer continueNoDataCountResult = result.getContinueNoDataCount();
+ check(continueNoDataCount, continueNoDataCountAuto, result, continueNoDataCountResult, "杞﹁締鎸佺画鏃犳暟鎹ぉ鏁颁负绌�", CompareConstant.MoreThanEq);
+ //妫�鏌ユ椂閽熷噯纭巼
+ Float clockPercentResult = result.getSnapClock().getClockPercent();
+ check(clockPercent, clockPercentAuto, result, clockPercentResult, "杞﹁締鏃堕挓鍑嗙‘鐜囦负绌�", CompareConstant.LessThanEq);
+ //妫�鏌ユ暟鎹強鏃剁巼
+ Float timelyPercentResult = result.getSnapTimely().getTimelyPercent();
+ check(timelyPercent, timelyPercentAuto, result, timelyPercentResult, "杞﹁締鏁版嵁鍙婃椂鐜囦负绌�", CompareConstant.LessThanEq);
+ //妫�鏌ヤ笉鍞竴鏁版嵁閲�
+ Integer nouniqueCountResult = result.getSnapUnique().getNouniqueCount();
+ check(nouniqueCount, nouniqueCountAuto, result, nouniqueCountResult, "杞﹁締涓嶅敮涓�鏁版嵁閲忎负绌�", CompareConstant.MoreThanEq);
+ //妫�鏌ョ櫧澶╂湭璇嗗埆閲�
+ Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
+ check(dayNoNumberCount, dayNoNumberCountAuto, result, dayNoNumberCountResult, "杞﹁締鐧藉ぉ鏈瘑鍒噺涓虹┖", CompareConstant.MoreThanEq);
+ //杞﹁締鍏」灞炴�т笉瀹屾暣閲�
+ Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
+ check(noIntegrityCount, noIntegrityCountAuto, result, noIntegrityCountResult, "杞﹁締鍏」灞炴�т笉瀹屾暣閲忎负绌�", CompareConstant.MoreThanEq);
}
- BeanUtils.copyProperties(form, ywThreshold);
-// ywThreshold.setIndicator(JSON.toJSONString(form));
- return baseMapper.updateById(ywThreshold);
+
}
- @Override
- public int editVideo(VideoThresholdForm form) {
- YwThreshold ywThreshold = baseMapper.selectById(form.getId());
- if (Objects.isNull(ywThreshold)) {
- throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ private void check(Integer threshold, Integer thresholdAuto, VehicleDeviceInspectionResult result, Integer thresholdResult, String message, String command) {
+ if (thresholdResult != null) {
+ //澶т簬绫诲瀷
+ if (CompareConstant.MoreThanEq.equals(command)) {
+ if (thresholdResult >= thresholdAuto) {
+ //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
+ } else if (thresholdResult >= threshold) {
+ //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
+ }
+ } else if (CompareConstant.LessThanEq.equals(command)) {
+ //灏忎簬绫诲瀷
+ if (thresholdResult <= thresholdAuto) {
+ //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
+ } else if (thresholdResult <= threshold) {
+ //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
+ }
+ }
+ } else {
+ log.error(message + result);
}
- BeanUtils.copyProperties(form, ywThreshold);
-// ywThreshold.setIndicator(JSON.toJSONString(form));
- return baseMapper.updateById(ywThreshold);
}
- @Override
- public Boolean checkFace(List<FaceDTO> faceList) {
- YwThreshold faceEntity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.FACE)
- .one();
- if (Objects.isNull(faceEntity)) {
- throw new RuntimeException("璇烽厤缃汉鑴哥殑宸ュ崟闃堝��");
+ private void check(Float threshold, Float thresholdAuto, VehicleDeviceInspectionResult result, Float thresholdResult, String message, String command) {
+ if (thresholdResult != null) {
+ //澶т簬绫诲瀷
+ if (CompareConstant.MoreThanEq.equals(command)) {
+ if (thresholdResult >= thresholdAuto) {
+ //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
+ } else if (thresholdResult >= threshold) {
+ //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
+ }
+ } else if (CompareConstant.LessThanEq.equals(command)) {
+ //灏忎簬绫诲瀷
+ if (thresholdResult <= thresholdAuto) {
+ //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
+ } else if (thresholdResult <= threshold) {
+ //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
+ }
+ }
+ } else {
+ log.error(message + result);
}
- // todo 閬嶅巻鏉′欢锛岀敓鎴愬伐鍗�
- return Boolean.FALSE;
- }
-
- @Override
- public Boolean checkCar(List<CarDTO> faceList) {
- YwThreshold carEntity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.CAR)
- .one();
- if (Objects.isNull(carEntity)) {
- throw new RuntimeException("璇烽厤缃溅杈嗙殑宸ュ崟闃堝��");
- }
- // todo 閬嶅巻鏉′欢锛岀敓鎴愬伐鍗�
- return Boolean.FALSE;
- }
-
- @Override
- public Boolean checkVideo(List<VideoDTO> faceList) {
- YwThreshold videoEntity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.VIDEO)
- .one();
- if (Objects.isNull(videoEntity)) {
- throw new RuntimeException("璇烽厤缃棰戠殑宸ュ崟闃堝��");
- }
- // todo 閬嶅巻鏉′欢锛岀敓鎴愬伐鍗�
- return Boolean.FALSE;
- }
-
- @Override
- public FaceThresholdForm getFace(Integer id) {
- return null;
- }
-
- @Override
- public CarThresholdForm getCar(Integer id) {
- return null;
- }
-
- @Override
- public VideoThresholdForm getVideo(Integer id) {
- YwThreshold result = new LambdaQueryChainWrapper<>(baseMapper)
- .select(YwThreshold::getImageQuality,
- YwThreshold::getId,
- YwThreshold::getMonitorType,
- YwThreshold::getImageQualityAuto,
- YwThreshold::getVideoQuality,
- YwThreshold::getVideoQualityAuto,
- YwThreshold::getAnnotationAccuracy,
- YwThreshold::getAnnotationAccuracyAuto)
- .eq(YwThreshold::getId, id)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.VIDEO)
- .one();
- VideoThresholdForm form = new VideoThresholdForm();
- BeanUtils.copyProperties(result, form);
- return form;
}
}
--
Gitblit v1.8.0