From 2be2f6c3e5b2be2bae1562423a9a4d29aa174aae Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 22 七月 2024 10:57:10 +0800 Subject: [PATCH] 工单阈值重构 --- ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 198 +++++++------------------------------------------ 1 files changed, 30 insertions(+), 168 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 6b3703c..273be68 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,31 @@ package com.ycl.platform.service.impl; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; 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.mapper.WorkOrderMapper; import com.ycl.platform.mapper.YwThresholdMapper; import com.ycl.platform.service.IYwThresholdService; -import com.ycl.utils.DateUtils; -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.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; +public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService +{ + @Autowired + private YwThresholdMapper ywThresholdMapper; /** * 鏌ヨ杩愮淮闃堝�� @@ -39,7 +34,8 @@ * @return 杩愮淮闃堝�� */ @Override - public YwThreshold selectYwThresholdById(Integer id) { + public YwThreshold selectYwThresholdById(Long id) + { return ywThresholdMapper.selectYwThresholdById(id); } @@ -50,11 +46,11 @@ * @return 杩愮淮闃堝�� */ @Override - public List<YwThreshold> selectYwThresholdList(YwThreshold ywThreshold) { - List<YwThreshold> list = new LambdaQueryChainWrapper<>(baseMapper) - .orderByDesc(YwThreshold::getCreateTime) - .list(); - return list; + 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; } /** @@ -64,7 +60,8 @@ * @return 缁撴灉 */ @Override - public int insertYwThreshold(YwThreshold ywThreshold) { + public int insertYwThreshold(YwThreshold ywThreshold) + { ywThreshold.setCreateTime(DateUtils.getNowDate()); return ywThresholdMapper.insertYwThreshold(ywThreshold); } @@ -72,13 +69,14 @@ /** * 淇敼杩愮淮闃堝�� * - * @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); } /** @@ -88,7 +86,8 @@ * @return 缁撴灉 */ @Override - public int deleteYwThresholdByIds(Integer[] ids) { + public int deleteYwThresholdByIds(Long[] ids) + { return ywThresholdMapper.deleteYwThresholdByIds(ids); } @@ -99,145 +98,8 @@ * @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("鏁版嵁涓嶅瓨鍦�"); - } - BeanUtils.copyProperties(form, ywThreshold); -// ywThreshold.setIndicator(JSON.toJSONString(form)); - return baseMapper.updateById(ywThreshold); - } - - @Override - public int editCar(CarThresholdForm form) { - YwThreshold ywThreshold = baseMapper.selectById(form.getId()); - if (Objects.isNull(ywThreshold)) { - throw new RuntimeException("鏁版嵁涓嶅瓨鍦�"); - } - 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("鏁版嵁涓嶅瓨鍦�"); - } - 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("璇烽厤缃汉鑴哥殑宸ュ崟闃堝��"); - } - // 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) { - 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) { - 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 - 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