删除py任务

xiangpei

2024-08-28 f15fcfb9087877d83ae3db39030633b418af99b2

删除py任务

 ycl-server/src/main/java/com/ycl/api/PythonController.java

File was deleted

 ycl-server/src/main/java/com/ycl/feign/PythonClient.java

File was deleted

 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 {

 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("开始执行pythonOsd数据同步");
        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);
                        //存放在mongo中
                        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("开始执行pythonOsd数据同步");
//        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);
//                        //存放在mongo中
//                        mongoTemplate.insertAll(records);
//                        // 工单生成
//                        uyErrorTypeCheckService.osdCheck(records);
//                    }
//                } else {
//                    log.error("pythonOsd数据为空{}", jsonObject);
//                }
//            }
//            log.info("结束执行pythonOsd数据同步");
//        }
//    }
//}

 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：xp
 * @date：2024/8/21 11:56
 */
@Slf4j
@RequiredArgsConstructor
@Component("workOrderImgTask")
public class WorkOrderImgTask {

 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

 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

 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">