From 8fa931b74e07ea783fa453367174f8b012e7bc52 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 十月 2024 19:18:56 +0800
Subject: [PATCH] 取图片、点位导入
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 7 +++++--
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 16 ++--------------
2 files changed, 7 insertions(+), 16 deletions(-)
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 39cce7e..4d824fa 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
@@ -766,8 +766,11 @@
public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception {
String url = String.format(this.rtspServer + "/api/play/start/img/%s/%s", deviceId, channelId);
String result = HttpUtils.sendGet(url);
- log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + result);
- return result;
+ JSONObject jsonObject = JSON.parseObject(result);
+ Object imgUrl = jsonObject.get("data");
+ imgUrl = Objects.isNull(imgUrl) ? "" : imgUrl;
+ log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + imgUrl);
+ return (String) imgUrl;
// WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
// String imgUrl = null;
// if (wvpResult.getCode() == 0) {
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 4a4cbb4..c39f5cd 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
@@ -371,21 +371,9 @@
this.waitAllFinishAndGetResult(pointList);
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws
- InterruptedException, ExecutionException {
- int start = 0;
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
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;
- }
- }
+ this.baseMapper.updatePoint(dataList);
Date endTime = new Date();
log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
}
--
Gitblit v1.8.0