From 03f8996994c1334f6dda1a7a131561d6f0736c2f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 11:13:13 +0800
Subject: [PATCH] 快速下发丢弃最近半小时，monitorvo增加deviceType
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java | 2 +-
ycl-common/src/main/java/enumeration/general/FastDistributeTypeEnum.java | 1 -
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 9 +++++----
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java | 6 ++++++
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/general/FastDistributeTypeEnum.java b/ycl-common/src/main/java/enumeration/general/FastDistributeTypeEnum.java
index c73c7c2..eb22386 100644
--- a/ycl-common/src/main/java/enumeration/general/FastDistributeTypeEnum.java
+++ b/ycl-common/src/main/java/enumeration/general/FastDistributeTypeEnum.java
@@ -12,7 +12,6 @@
@Getter
public enum FastDistributeTypeEnum {
- LAST_HALF_HOUR("LAST_HALF_HOUR", "鏈�杩戝崐灏忔椂"),
LAST_HOUR("LAST_HOUR", "鏈�杩戜竴灏忔椂"),
LAST_TWO_HOUR("LAST_TWO_HOUR", "鏈�杩戜袱灏忔椂"),
LAST_DAY("LAST_DAY", "鏈�杩戜竴澶�"),
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java
index a9ccdd7..b0efda5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java
@@ -30,7 +30,7 @@
/**
* 蹇�熶笅鍙戞柟寮�
*/
- @NotNull(message = "璇烽�夋嫨蹇嵎涓嬪彂鏂瑰紡")
+ @NotNull(message = "璇烽�夋嫨蹇嵎涓嬪彂鏂瑰紡")
private FastDistributeTypeEnum fastWay;
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
index 45c0ba3..215c6fd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
@@ -267,4 +267,10 @@
* 鍔ㄦ�佸垪
*/
private List<DynamicColumnVO> dynamicColumnList;
+
+ /**
+ * 璁惧鍘傚晢锛� 0娴峰悍 1澶у崕 2瀹囪
+ */
+ private Integer deviceType;
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index 89062aa..33c678f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -124,7 +124,7 @@
}
@PostMapping("/distribute/ids")
- @ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
+ @ApiOperation(value = "涓嬪彂閫夋嫨鐨勫伐鍗�", notes = "涓嬪彂閫夋嫨閫夋嫨鐨勫伐鍗�")
@PreAuthorize("@ss.hasPermi('work:order:distribute')")
public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
return workOrderService.selectedIdsDistribute(query);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 06ca137..b7b68f1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -489,9 +489,6 @@
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
data.setEnd(now);
switch (data.getFastWay()) {
- case LAST_HALF_HOUR:
- data.setStart(now.minusMinutes(30));
- break;
case LAST_HOUR:
data.setStart(now.minusHours(1));
break;
@@ -501,8 +498,12 @@
case LAST_DAY:
data.setStart(now.minusDays(1));
break;
+ default:
+ break;
}
-
+ if (Objects.isNull(data.getStart())) {
+ throw new RuntimeException("鏃犳硶鐢熸垚蹇�熶笅鍙戠殑鏃堕棿鑼冨洿锛岃閫夋嫨姝ｇ‘鐨勫揩閫熶笅鍙戞柟寮�");
+ }
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
.select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
--
Gitblit v1.8.0