From e498e084b2ccc08afc7a7bf3a83e6eb462c1629b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 九月 2024 11:29:26 +0800
Subject: [PATCH] 工单取图片优化
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 126 insertions(+), 25 deletions(-)
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 ab8a75b..5504f50 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -3,51 +3,64 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
+import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.param.UY.*;
-import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
-import com.ycl.platform.domain.result.UY.OneMachineFileResult;
-import com.ycl.platform.domain.result.UY.OsdMonitorResult;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.result.UY.*;
-import com.ycl.platform.service.ITMonitorService;
-import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.platform.domain.vo.OnlineThreadVO;
+import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.vo.UpdateOnlineVO;
+import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.platform.service.YwPointService;
+import com.ycl.system.domain.SysConfig;
+import com.ycl.system.mapper.SysConfigMapper;
+import com.ycl.thread.OnlineCheckThread;
+import com.ycl.utils.CheckPointUtil;
import com.ycl.utils.DateUtils;
+import com.ycl.utils.http.HttpUtils;
+import com.ycl.utils.http.SelfHttpUtil;
import constant.ApiConstants;
+import constant.RedisConstant;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import java.io.IOException;
+import java.net.InetAddress;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
//浼樹簯瀵规帴鏁版嵁浠诲姟
@Slf4j
@Component("UYTask")
+@RequiredArgsConstructor
public class UYTask {
- @Autowired
- private MongoTemplate mongoTemplate;
- @Autowired
- private UYClient uyClient;
- @Autowired
- private IYwThresholdService ywThresholdService;
- @Autowired
- private ITMonitorService monitorService;
- @Autowired
- private UYErrorTypeCheckService uyErrorTypeCheckService;
-
+ private final MongoTemplate mongoTemplate;
+ private final UYClient uyClient;
+ private final UYErrorTypeCheckService uyErrorTypeCheckService;
+ private final YwPointService pointService;
+ private final TMonitorMapper monitorMapper;
+ private final WorkOrderService workOrderService;
+ private final SysConfigMapper sysConfigMapper;
+ private final CheckPointUtil checkPointUtil;
@Value("${youYun.tenantId}")
private String tenantId;
@Value("${youYun.apikey}")
@@ -58,6 +71,14 @@
private String email;
@Value("${youYun.passwd}")
private String passwd;
+
+ private static final ExecutorService executorService = new ThreadPoolExecutor(16,
+ 128,
+ 5000,
+ TimeUnit.SECONDS,
+ new ArrayBlockingQueue<>(1000),
+ new ThreadPoolExecutor.CallerRunsPolicy()
+ );
// 鍥惧儚妫�娴�
public void imageDetection() {
@@ -79,6 +100,12 @@
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, ImageDetectionResult.class);
+ records.stream().forEach(item -> {
+ if (Objects.nonNull(item.getDeviceId())) {
+ item.setNo(item.getDeviceId());
+ }
+ });
+ pointService.setDeviceTagByGB(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
// 宸ュ崟鐢熸垚
@@ -122,6 +149,13 @@
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class);
+ records.stream().forEach(item -> {
+ if (Objects.nonNull(item.getSerialNumber())) {
+ item.setNo(item.getSerialNumber().getShowValue());
+ }
+ });
+ pointService.setDeviceTagByGB(records);
+ pointService.setNew(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
// 宸ュ崟鐢熸垚
@@ -142,7 +176,66 @@
log.info("缁撴潫涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
}
- //鐐逛綅鍦ㄧ嚎鐜�
+ /**
+ * 鐐逛綅鍦ㄧ嚎妫�娴�
+ */
+ public void pointOnline() throws ExecutionException, InterruptedException {
+ log.info("寮�濮嬫娴嬬偣浣嶅湪绾�");
+ Integer times = 2;
+ SysConfig config = new SysConfig();
+ config.setConfigKey("DAY_OF_POINT_OUTLINE_TIMES");
+ SysConfig sysConfig = sysConfigMapper.selectConfig(config);
+ if (Objects.nonNull(sysConfig)) {
+ times = Integer.valueOf(sysConfig.getConfigValue());
+ } else {
+ log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
+ }
+ // 鍏堟煡鍑鸿澶嘔P闆嗗悎
+ List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
+ List<Future<TMonitorResult>> futureList = new ArrayList<>(48);
+ List<TMonitorResult> dataList = new ArrayList<>(48);
+ for (TMonitorResult monitor : monitorList) {
+ OnlineCheckThread thread = new OnlineCheckThread(monitor,checkPointUtil,times);
+ Future<TMonitorResult> future = executorService.submit(thread);
+ futureList.add(future);
+ }
+ for (Future<TMonitorResult> future : futureList) {
+ dataList.add(future.get()); // get鏂规硶浼氶樆濉烇紝鐭ラ亾鎷垮埌缁撴灉鎵嶇户缁墽琛宖or
+ }
+
+ // 鏇存柊point琛ㄧ殑鍦ㄧ嚎鏍囪瘑
+ Date now = new Date();
+ List<UpdateOnlineVO> willUpdateList = dataList.stream().map(item -> {
+ UpdateOnlineVO vo = new UpdateOnlineVO();
+ vo.setOnline(item.getOnline());
+ vo.setIp(item.getIp());
+ vo.setUpdateTime(now);
+ return vo;
+ }).collect(Collectors.toList());
+ monitorMapper.updateOnline(willUpdateList);
+
+ // 宸ュ崟
+ List<WorkOrder> workOrderList = dataList.stream()
+ .filter(item -> Objects.nonNull(item.getWorkOrder()))
+ .map(TMonitorResult::getWorkOrder)
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ return;
+ }
+ workOrderService.innerAddWorkOrder(workOrderList);
+ //瀛樻斁鍒癿ongo
+ if (!CollectionUtils.isEmpty(dataList)) {
+ //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insertAll(dataList);
+ log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
+ }
+ log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
+ }
+
+ //锛堝純鐢級鐐逛綅鍦ㄧ嚎鐜�
public void videoOnlineTask() {
//瑙嗛鍥惧儚璐ㄩ噺
log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�");
@@ -207,6 +300,12 @@
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);
// 宸ュ崟鐢熸垚
@@ -222,4 +321,6 @@
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
+
+
}
--
Gitblit v1.8.0