From 1ad1bdc46ee343bfa5bf663f600796aed1014982 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 28 八月 2024 10:33:53 +0800 Subject: [PATCH] 海康取OSD --- ycl-server/src/main/java/com/ycl/task/PythonTask.java | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/task/PythonTask.java b/ycl-server/src/main/java/com/ycl/task/PythonTask.java index 46d2a08..c0830bf 100644 --- a/ycl-server/src/main/java/com/ycl/task/PythonTask.java +++ b/ycl-server/src/main/java/com/ycl/task/PythonTask.java @@ -2,26 +2,19 @@ import com.alibaba.fastjson2.JSONObject; import com.mongodb.client.result.DeleteResult; -import com.ycl.feign.PythonClient; -import com.ycl.feign.UYClient; import com.ycl.platform.domain.param.UY.*; import com.ycl.platform.domain.result.UY.*; -import com.ycl.platform.service.ITMonitorService; -import com.ycl.platform.service.IYwThresholdService; import com.ycl.platform.service.UYErrorTypeCheckService; import com.ycl.utils.DateUtils; import constant.ApiConstants; 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.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -36,39 +29,6 @@ @Autowired private MongoTemplate mongoTemplate; @Autowired - private PythonClient pythonClient; - @Autowired private UYErrorTypeCheckService uyErrorTypeCheckService; - - public void pythonOsdTask(){ - log.info("寮�濮嬫墽琛宲ythonOsd鏁版嵁鍚屾"); - PyOsdParam pyOsdParam = new PyOsdParam(); - pyOsdParam.setDate(DateUtils.getDate()); - Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); - List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class); - if(!CollectionUtils.isEmpty(oneMachineFileResults)) { - List<String> deviceIdList = oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList()); - pyOsdParam.setDeviceNoList(deviceIdList); - //鏌ヨosd鏍囨敞鍜屾椂闂翠俊鎭� - JSONObject jsonObject = pythonClient.pythonOsd(pyOsdParam); - if (jsonObject != null) { - if (ApiConstants.UYSuccessCode.equals(jsonObject.getInteger("code"))) { - List<PyOsdResult> records = jsonObject.getList("data", PyOsdResult.class); - if (!CollectionUtils.isEmpty(records)) { - //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 - Query pyQuery = new Query(Criteria - .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); - DeleteResult result = mongoTemplate.remove(pyQuery, PyOsdResult.class); - //瀛樻斁鍦╩ongo涓� - mongoTemplate.insertAll(records); - // 宸ュ崟鐢熸垚 - uyErrorTypeCheckService.osdCheck(records); - } - } else { - log.error("pythonOsd鏁版嵁涓虹┖{}", jsonObject); - } - } - log.info("缁撴潫鎵цpythonOsd鏁版嵁鍚屾"); - } - } + } -- Gitblit v1.8.0