From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java |  139 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 97 insertions(+), 42 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 52af163..f2476f6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -6,16 +6,18 @@
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.dataListener.CurrencyDataListener;
-import com.ycl.platform.base.BaseSelect;
+import com.ycl.platform.domain.entity.ReportAuditingRecord;
 import com.ycl.platform.domain.entity.YwPeople;
 import com.ycl.platform.domain.entity.YwPoint;
-import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.excel.PointExport;
 import com.ycl.platform.domain.form.BatchEditPointForm;
 import com.ycl.platform.domain.form.YwPointForm;
 import com.ycl.platform.domain.query.YwPointQuery;
+import com.ycl.platform.domain.result.BaseResult;
+import com.ycl.platform.domain.vo.CheckTagVO;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
 import com.ycl.platform.domain.vo.YwPointVO;
-import com.ycl.platform.domain.excel.PointExport;
-import com.ycl.platform.domain.excel.PointSelectHandler;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.mapper.YwPeopleMapper;
 import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.YwPointService;
@@ -23,6 +25,7 @@
 import com.ycl.system.Result;
 import com.ycl.system.mapper.SysDeptMapper;
 import com.ycl.system.page.PageUtil;
+import com.ycl.thread.PointImportCallable;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.SecurityUtils;
 import jakarta.servlet.http.HttpServletResponse;
@@ -36,9 +39,8 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -53,8 +55,8 @@
 public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
 
     private final SysDeptMapper sysDeptMapper;
-    private final YwUnitService unitService;
-    private final YwPeopleMapper ywPeopleMapper;
+    private final TMonitorMapper monitorMapper;
+
 
     /**
      * 娣诲姞
@@ -196,25 +198,13 @@
 
     @Override
     public Result select(String keyword) {
-        Long userId = SecurityUtils.getUserId();
-        // 鑾峰彇褰撳墠杩愮淮浜哄憳鐨勮繍缁村崟浣�
-        YwPeople people = new LambdaQueryChainWrapper<>(ywPeopleMapper)
-                .eq(YwPeople::getUserId, userId)
-                .one();
-        Integer unitId = null;
-        if (Objects.nonNull(people)) {
-            unitId = people.getBelongUnit();
-        }
-
-        List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
-                .eq(YwPoint::getUnitId, unitId)
-                .like(YwPoint::getPointName, keyword)
-                .list();
-        List<BaseSelect> data = list.stream().map(item -> {
-            BaseSelect baseSelect = new BaseSelect();
-            baseSelect.setId(item.getId());
-            baseSelect.setValue(item.getPointName());
-            return baseSelect;
+        Integer unitId = SecurityUtils.getUnitId();
+        List<YwPoint> list = baseMapper.select(keyword, unitId);
+        List data = list.stream().map(item -> {
+            Map map = new HashMap<String, Object>();
+            map.put("id", item.getSerialNumber());
+            map.put("value", item.getPointName());
+            return map;
         }).collect(Collectors.toList());
         return Result.ok().data(data);
     }
@@ -238,19 +228,29 @@
     public void export(YwPointQuery query, HttpServletResponse response) throws IOException {
         // 瀵煎嚭鏁版嵁
         List<PointExport> exportData = baseMapper.export(query);
-
         EasyExcel.write(response.getOutputStream(), PointExport.class)
                 .sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅")
                 .doWrite(exportData);
     }
 
     @Override
-    public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException {
+    public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException {
         Consumer<List<PointExport>> consumer = (dataList) -> {
-            this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag);
+            try {
+                this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
+            } catch (ExecutionException e) {
+                e.printStackTrace();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         };
         EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
         return Result.ok();
+    }
+
+    @Override
+    public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) {
+        return baseMapper.getReportResult(serialNumber, reportType);
     }
 
     /**
@@ -259,20 +259,75 @@
      * @param dataList
      * @param unitId
      */
-    private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) {
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws ExecutionException, InterruptedException {
         if (CollectionUtils.isEmpty(dataList)) {
             throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
         }
-        List<String> pointList = dataList.stream().map(PointExport::getSerialNumber).collect(Collectors.toList());
-        new LambdaUpdateChainWrapper<>(baseMapper)
-                .in(YwPoint::getSerialNumber, pointList)
-                .set(YwPoint::getUnitId, unitId)
-                .set(YwPoint::getStartTime, startTime)
-                .set(YwPoint::getEndTime, endTime)
-                .set(YwPoint::getProvinceTag, provinceTag)
-                .set(YwPoint::getImportantTag, importantTag)
-                .set(YwPoint::getImportantCommandImageTag, importantCommandImageTag)
-                .update();
+        List<YwPoint> pointList = dataList.stream().map(item -> {
+            YwPoint point = new YwPoint();
+            point.setImportantCommandImageTag("鏄�".equals(item.getImportantCommandImageTagString()));
+            point.setProvinceTag("鏄�".equals(item.getProvinceTagString()));
+            point.setDeptTag("鏄�".equals(item.getDeptTag()));
+            if (needUpdateUnit) {
+                if (Objects.nonNull(unitId)) {
+                    point.setUnitId(Long.valueOf(unitId));
+                }
+                point.setStartTime(startTime);
+                point.setEndTime(endTime);
+            } else {
+                point.setUnitId(null);
+                point.setStartTime(null);
+                point.setEndTime(null);
+            }
+
+            point.setPointName(item.getPointName());
+            point.setSerialNumber(item.getSerialNumber());
+            return point;
+        }).collect(Collectors.toList());
+        this.waitAllFinishAndGetResult(pointList);
+    }
+
+    public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws InterruptedException, ExecutionException {
+        int start = 0;
+        Date startTime = new Date();
+        while (true) {
+            if (dataList.size() < start + 800) {
+                List<YwPoint> list = dataList.subList(start, dataList.size() - 1);
+                this.baseMapper.updatePoint(list);
+                break;
+            } else {
+                List<YwPoint> list = dataList.subList(start, start + 800);
+                this.baseMapper.updatePoint(list);
+                start += 800;
+            }
+        }
+        Date endTime = new Date();
+        log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
+    }
+
+    @Override
+    public <T extends BaseResult> void setDeviceTagByGB(List<T> dataList) {
+        List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
+        List<CheckTagVO> pointList = baseMapper.getTagsByGB(gbList);
+        Map<String, CheckTagVO> pointMap = pointList.stream().collect(Collectors.toMap(CheckTagVO::getNo, item -> item));
+        for (BaseResult data : dataList) {
+            CheckTagVO tag = pointMap.get(data.getNo());
+            if (Objects.nonNull(tag)) {
+                BeanUtils.copyProperties(tag, data);
+            }
+        }
+    }
+
+    @Override
+    public <T extends BaseResult> void setNew(List<T> dataList) {
+        List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
+        Map<String, BaseResult> pointMap = dataList.stream().collect(Collectors.toMap(BaseResult::getNo, item -> item));
+        List<String> dbGBList = monitorMapper.getGBbyGB(gbList);
+        for (String s : gbList) {
+            BaseResult baseResult = pointMap.get(s);
+            baseResult.setNewDevice(!dbGBList.contains(s));
+        }
     }
 
 }

--
Gitblit v1.8.0