From 746a85a842adc99322b364d1c564a624dce62429 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 30 十月 2024 23:01:49 +0800
Subject: [PATCH] 工单阈值bug、工单分页故障查询bug、工单未进入下发表bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 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 3dae6eb..2aafe2f 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
@@ -4,12 +4,18 @@
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.excel.PointExport;
import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
import com.ycl.platform.mapper.YwThresholdMapper;
import com.ycl.platform.service.IYwThresholdService;
import com.ycl.platform.service.WorkOrderService;
+import com.ycl.system.Result;
import com.ycl.utils.ip.PingUtil;
+import com.ycl.utils.poi.EasyExcelImportUtils;
+import com.ycl.utils.uuid.IdUtils;
+import constant.PointHeaderConstant;
import constant.YwThreadConstants;
import enumeration.CompareType;
import enumeration.ErrorType;
@@ -19,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
import utils.DateUtils;
import java.util.*;
@@ -146,6 +153,21 @@
// 浜害寮傚父鏁呴殰妫�娴�
}
+ @Override
+ public Result importData(MultipartFile file) {
+ List<Map<String, String>> list = EasyExcelImportUtils.makeData(file);
+ List<PointExport> dataList = new ArrayList<>();
+ for (Map<String, String> map : list) {
+ PointExport pointExport = new PointExport();
+ pointExport.setPointName(map.get(PointHeaderConstant.Point_Name));
+ pointExport.setSerialNumber(map.get(PointHeaderConstant.Serial_Number));
+ dataList.add(pointExport);
+ }
+ workOrderService.batchImportWhite(dataList);
+ return Result.ok("瀵煎叆鎴愬姛");
+
+ }
+
/**
* 鍒ゆ柇浜鸿劯闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
*
@@ -154,9 +176,9 @@
@Override
public void faceCheck(List<FaceDeviceInspectionResult> list) {
Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.FACE.name());
- //鍑嗗涓嬪彂宸ュ崟闆嗗悎
+ //鍑嗗寰呬笅鍙戝伐鍗曢泦鍚�
List<WorkOrder> distributeList = new ArrayList<>();
- //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
+ //鍑嗗鐩存帴涓嬪彂宸ュ崟闆嗗悎
List<WorkOrder> workOrderList = new ArrayList<>();
//澶勭悊鎺ュ彛鏁版嵁
for (FaceDeviceInspectionResult result : list) {
@@ -262,6 +284,7 @@
/** 娣诲姞宸ュ崟 */
workOrderService.innerAddWorkOrder(workOrderList);
workOrderService.innerAddWorkOrder(distributeList);
+
}
/**
@@ -295,23 +318,25 @@
v -> {
YwThreshold ywThreshold = thresholds.get(key);
//杞崲绫诲瀷
- T thresholdValue = parseThreshold(ywThreshold.getValueAuto(), value.getClass());
- T thresholdAutoValue = parseThreshold(ywThreshold.getValue(), value.getClass());
+ //寰呭伐鍗曢槇鍊�
+ T thresholdAutoValue = parseThreshold(ywThreshold.getValueAuto(), value.getClass());
+ //鐩存帴涓嬪彂宸ュ崟闃堝��
+ T thresholdValue = parseThreshold(ywThreshold.getValue(), value.getClass());
//姣旇緝澶у皬锛屽姞鍏ュ埌瀵瑰簲寰呭鐞嗛泦鍚�
- if (compareType.compare(v, thresholdAutoValue)) {
- //鑷姩涓嬪彂宸ュ崟
+ if (compareType.compare(v, thresholdValue)) {
+ //杩涘叆宸ュ崟鐩存帴涓嬪彂
workOrder.setSerialNumber(serialNumber);
- workOrder.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
workOrder.setErrorTypeList(new ArrayList<>());
workOrder.getErrorTypeList().add(errorType);
} else {
workOrder.getErrorTypeList().add(errorType);
}
- } else if (compareType.compare(v, thresholdValue)) {
+ } else if (compareType.compare(v, thresholdAutoValue)) {
//杩涘叆宸ュ崟浠ｄ笅鍙�
workOrder.setSerialNumber(serialNumber);
- workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ workOrder.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
workOrder.setErrorTypeList(new ArrayList<>());
workOrder.getErrorTypeList().add(errorType);
--
Gitblit v1.8.0