From 3351ade035a3a027d38e0372e496a5669cd7bde2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 00:34:42 +0800
Subject: [PATCH] 下发工单bug
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java | 3 +
ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java | 2 -
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 15 ++++---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 70 +++++++++++++++++-----------------
4 files changed, 46 insertions(+), 44 deletions(-)
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 b0efda5..5f1038f 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
@@ -10,6 +10,7 @@
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 涓嬪彂宸ュ崟鏌ヨ
@@ -52,7 +53,7 @@
private LocalDateTime end;
@NotNull(message = "璇烽�夋嫨鏁呴殰绫诲瀷")
- private String errorType;
+ private List<String> errorType;
}
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 32536ae..b9edc3a 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
@@ -56,6 +56,11 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -559,7 +564,7 @@
.select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
- .eq(WorkOrder::getErrorType, data.getErrorType())
+ .in(WorkOrder::getErrorType, data.getErrorType())
.between(WorkOrder::getCreateTime, data.getStart(), data.getEnd())
.orderByDesc(WorkOrder::getCreateTime)
.last("limit " + data.getFastNumLimit())
@@ -621,6 +626,7 @@
ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + query.getWorkOrderNOList().size() + "鏉″伐鍗�");
} catch (Exception e) {
+ System.out.println(e.getMessage());
return Result.error("鎿嶄綔澶辫触");
} finally {
distributeUnLock();
@@ -765,8 +771,6 @@
FFmpegFrameGrabber grabber = null;
try {
grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
- //璁剧疆10s瓒呮椂
- grabber.setTimeout(10000);
grabber.start();
Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯�
if (frame != null) {
@@ -785,17 +789,16 @@
} else {
System.out.println("鏈崟鑾峰埌甯�");
}
- } catch (FrameGrabber.Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
} finally {
if (grabber != null) {
try {
grabber.stop(); // 鍋滄鎹曡幏
+ grabber.release();
} catch (FrameGrabber.Exception e) {
e.printStackTrace();
}
- // 閫氬父涓嶉渶瑕佽皟鐢╮elease()锛屽洜涓簊top()浼氬鐞嗚祫婧愰噴鏀�
- // grabber.release(); // 閲婃斁璧勬簮
}
}
}
diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
index 3581a1d..fec0a42 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -25,8 +25,6 @@
@Slf4j
@Component("checkScoreTask")
-//TODO:澧炲姞鑰冩牳鏍囩瀛楀吀锛氬叕瀹夐儴
-//TODO:淇敼鐐逛綅鐘舵�佸瓧鍏革細鍦ㄧ嚎銆佺绾�
//TODO锛氫慨鏀箂core銆乮ndex榛樿鍙戝竷
public class CheckScoreTask {
@Autowired
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index c070048..39d0d29 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -273,41 +273,41 @@
public void recordMetaDSumTask() {
//褰曞儚鍙敤鐜�
log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
- RecordMetaDSumParam param = new RecordMetaDSumParam();
- param.setTenantId(tenantId);
- Calendar instance = Calendar.getInstance();
- instance.setTime(new Date());
- instance.add(Calendar.DAY_OF_MONTH, -1);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- String yesterday = format.format(instance.getTime());
- param.setStatTime(yesterday);
- JSONObject jsonObject = uyClient.recordMetaDSumList(param);
- if (jsonObject != null) {
- if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
- List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
- if (!CollectionUtils.isEmpty(records)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
- records.stream().forEach(item -> {
- if (Objects.nonNull(item.getDeviceId())) {
- item.setNo(item.getDeviceId());
- }
- });
- pointService.setDeviceTagByGB(records);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(records);
- // 宸ュ崟鐢熸垚
- uyErrorTypeCheckService.recordMetaDSumCheck(records);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
- }
- }
- // 鏈湴娴嬭瘯
-// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
-// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
+// RecordMetaDSumParam param = new RecordMetaDSumParam();
+// param.setTenantId(tenantId);
+// Calendar instance = Calendar.getInstance();
+// instance.setTime(new Date());
+// instance.add(Calendar.DAY_OF_MONTH, -1);
+// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+// String yesterday = format.format(instance.getTime());
+// param.setStatTime(yesterday);
+// JSONObject jsonObject = uyClient.recordMetaDSumList(param);
+// if (jsonObject != null) {
+// if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
+// List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
+// if (!CollectionUtils.isEmpty(records)) {
+// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria
+// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
+// records.stream().forEach(item -> {
+// if (Objects.nonNull(item.getDeviceId())) {
+// item.setNo(item.getDeviceId());
+// }
+// });
+// pointService.setDeviceTagByGB(records);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.recordMetaDSumCheck(records);
+// }
+// } else {
+// log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+// }
+// }
+// 鏈湴娴嬭瘯
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
--
Gitblit v1.8.0