From f15fcfb9087877d83ae3db39030633b418af99b2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 28 八月 2024 10:09:31 +0800
Subject: [PATCH] 删除py任务

---
 /dev/null                                                                        |   21 -------
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml                    |    7 +-
 ycl-server/src/main/resources/application-prod.yml                               |    1 
 ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java                      |    2 
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |    3 +
 ycl-server/src/main/resources/application-dev.yml                                |    1 
 ycl-server/src/main/java/com/ycl/task/PythonTask.java                            |  141 ++++++++++++++++++++++------------------------
 7 files changed, 76 insertions(+), 100 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/api/PythonController.java b/ycl-server/src/main/java/com/ycl/api/PythonController.java
deleted file mode 100644
index 97c9500..0000000
--- a/ycl-server/src/main/java/com/ycl/api/PythonController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ycl.api;
-
-import com.ycl.platform.domain.param.UY.OsdMonitorParam;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 鎺ユ敹python鎺ュ彛鎺ㄩ�佺殑鏃堕挓鍑嗙‘
- */
-@RestController
-@RequestMapping("/api")
-public class PythonController {
-    @PostMapping("/videoClock")
-    public void videoClock(@RequestBody OsdMonitorParam param) {
-        //瀛樺偍python鎺ㄩ�佽棰戞椂閽熶俊鎭�
-
-    }
-}
diff --git a/ycl-server/src/main/java/com/ycl/feign/PythonClient.java b/ycl-server/src/main/java/com/ycl/feign/PythonClient.java
deleted file mode 100644
index 28eaf2e..0000000
--- a/ycl-server/src/main/java/com/ycl/feign/PythonClient.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ycl.feign;
-
-
-import com.alibaba.fastjson2.JSONObject;
-import com.ycl.platform.domain.param.UY.PyOsdParam;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@Component
-@FeignClient(name = "PythonClient", url = "${request.pythonDomain}")
-public interface PythonClient {
-    /**
-     * OSD鏍囨敞
-     *
-     * @return 鏌ヨ鎽勫儚鏈篛SD鏍囨敞
-     */
-    @PostMapping("/")
-    JSONObject pythonOsd(@RequestBody PyOsdParam param);
-}
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 a668898..9d519a6 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
@@ -664,9 +664,12 @@
     public String getFrameImgByDevice(String deviceId, String channelId) {
         String url = String.format(this.rtspServer + "/start/%s/%s", deviceId, channelId);
         String result = HttpUtils.sendGet(url);
+        log.error("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + result);
         WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
         if (0 == wvpResult.getCode()) {
+            log.error("璇锋眰鎴愬姛");
             StreamContent data = (StreamContent) wvpResult.getData();
+            log.error("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + data);
             String rtspUrl = data.getRtsp();
             if (StringUtils.hasText(rtspUrl)) {
                 try {
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..9b6e648 100644
--- a/ycl-server/src/main/java/com/ycl/task/PythonTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/PythonTask.java
@@ -1,74 +1,67 @@
-package com.ycl.task;
-
-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;
-
-/**
- * python瀵规帴浠诲姟
- * 鎷垮幓osd鏍囨敞銆佹爣娉ㄦ椂闂存暟鎹�
- */
-@Slf4j
-@Component("pythonTask")
-public class PythonTask {
-    @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鏁版嵁鍚屾");
-        }
-    }
-}
+//package com.ycl.task;
+//
+//import com.alibaba.fastjson2.JSONObject;
+//import com.mongodb.client.result.DeleteResult;
+//import com.ycl.platform.domain.param.UY.*;
+//import com.ycl.platform.domain.result.UY.*;
+//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.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.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///**
+// * python瀵规帴浠诲姟
+// * 鎷垮幓osd鏍囨敞銆佹爣娉ㄦ椂闂存暟鎹�
+// */
+//@Slf4j
+//@Component("pythonTask")
+//public class PythonTask {
+//    @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鏁版嵁鍚屾");
+//        }
+//    }
+//}
diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
index 8603ba8..4749539 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
@@ -3,6 +3,7 @@
 import com.ycl.platform.domain.vo.DeviceInfoVO;
 import com.ycl.platform.service.WorkOrderService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
@@ -18,6 +19,7 @@
  * @author锛歺p
  * @date锛�2024/8/21 11:56
  */
+@Slf4j
 @RequiredArgsConstructor
 @Component("workOrderImgTask")
 public class WorkOrderImgTask {
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index c88b4d7..b0129c1 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -132,7 +132,6 @@
   retry: 4 # 鏈�澶ч噸璇曟鏁�
   youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
   haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
-  pythonDomain: 11 # python鑴氭湰鍦板潃
 
 youYun:
   tenantId: e10adc3949ba59abbe56e057f20f88dd
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 690ddd5..5df6354 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -130,7 +130,6 @@
   retry: 4 # 鏈�澶ч噸璇曟鏁�
   youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
   haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
-  pythonDomain: 11 # python鑴氭湰鍦板潃
 
 youYun:
   tenantId: e10adc3949ba59abbe56e057f20f88dd
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index da3a49f..18827a0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -215,11 +215,12 @@
     <select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
         SELECT
                wo.id as workOrderId,
-               di.device_id,
-               di.channel_id
+               we.device_id,
+               wec.channel_id
         FROM
              t_work_order wo
-                 INNER JOIN t_device_info di ON wo.serial_number = di.device_id
+                 INNER JOIN wvp2.wvp_device we ON we.device_id = wo.serial_number
+                 INNER JOIN wvp2.wvp_device_channel wec ON we.device_id = wec.device_id
     </select>
 
     <insert id="addMany">

--
Gitblit v1.8.0