From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java |   79 +++++++++++++--------------------------
 1 files changed, 27 insertions(+), 52 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 c3b29f3..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,29 +1,29 @@
 package com.ycl.platform.service.impl;
 
-import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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 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
-public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
+public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService
+{
     @Autowired
     private YwThresholdMapper ywThresholdMapper;
 
@@ -34,7 +34,8 @@
      * @return 杩愮淮闃堝��
      */
     @Override
-    public YwThreshold selectYwThresholdById(Integer id) {
+    public YwThreshold selectYwThresholdById(Long id)
+    {
         return ywThresholdMapper.selectYwThresholdById(id);
     }
 
@@ -45,8 +46,11 @@
      * @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;
     }
 
     /**
@@ -56,7 +60,8 @@
      * @return 缁撴灉
      */
     @Override
-    public int insertYwThreshold(YwThreshold ywThreshold) {
+    public int insertYwThreshold(YwThreshold ywThreshold)
+    {
         ywThreshold.setCreateTime(DateUtils.getNowDate());
         return ywThresholdMapper.insertYwThreshold(ywThreshold);
     }
@@ -64,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);
     }
 
     /**
@@ -80,7 +86,8 @@
      * @return 缁撴灉
      */
     @Override
-    public int deleteYwThresholdByIds(Integer[] ids) {
+    public int deleteYwThresholdByIds(Long[] ids)
+    {
         return ywThresholdMapper.deleteYwThresholdByIds(ids);
     }
 
@@ -91,40 +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);
     }
 }

--
Gitblit v1.8.0