Prechádzať zdrojové kódy

修复球幕视频xml

dsx 2 rokov pred
rodič
commit
3caf8ed505

+ 67 - 0
src/main/java/com/fdkankan/job/entity/SceneMoveLog.java

@@ -0,0 +1,67 @@
+package com.fdkankan.job.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@Getter
+@Setter
+@TableName("t_scene_move_log")
+public class SceneMoveLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 相机迁移日志表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 旧相机sn
+     */
+    @TableField("old_sn_code")
+    private String oldSnCode;
+
+    /**
+     * 新相机sn
+     */
+    @TableField("new_sn_code")
+    private String newSnCode;
+
+    @TableField("old_data_source")
+    private String oldDataSource;
+
+    @TableField("new_data_source")
+    private String newDataSource;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("data_source_bak")
+    private String dataSourceBak;
+
+
+}

+ 1 - 1
src/main/java/com/fdkankan/job/generate/AutoGenerate.java

@@ -17,7 +17,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"job", getTables(new String[]{
-                "t_scene_pro_edit"
+                "t_scene_move_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

+ 10 - 0
src/main/java/com/fdkankan/job/job/RepairVideosHandler.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.job.entity.SceneMoveLog;
 import com.fdkankan.job.entity.ScenePro;
 import com.fdkankan.job.service.*;
 import com.fdkankan.model.constants.ConstantFilePath;
@@ -43,6 +44,8 @@ public class RepairVideosHandler {
     private FYunFileServiceInterface fYunFileService;
     @Autowired
     private FYunFileConfig fYunFileConfig;
+    @Autowired
+    private ISceneMoveLogService sceneMoveLogService;
 
 
     @XxlJob("repairVideosHandler")
@@ -108,6 +111,13 @@ public class RepairVideosHandler {
                                     .orderByDesc(ScenePro::getCreateTime));
                     if (CollUtil.isNotEmpty(v3List)) {
                         for (ScenePro scenePro : v3List) {
+
+                            //查询是否做过场景迁移
+                            List<SceneMoveLog> moveList = sceneMoveLogService.list(new LambdaQueryWrapper<SceneMoveLog>().eq(SceneMoveLog::getNum, scenePro.getNum()));
+                            if(CollUtil.isNotEmpty(moveList)){
+                                continue;
+                            }
+
                             upPath = JSONObject.parseObject(scenePro.getVideos()).getString("upPath").replace(fYunFileConfig.getHost(), "");
                             if (!fYunFileService.fileExist(upPath)) {
                                 continue;

+ 18 - 0
src/main/java/com/fdkankan/job/mapper/ISceneMoveLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.job.mapper;
+
+import com.fdkankan.job.entity.SceneMoveLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@Mapper
+public interface ISceneMoveLogMapper extends BaseMapper<SceneMoveLog> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/job/service/ISceneMoveLogService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.job.service;
+
+import com.fdkankan.job.entity.SceneMoveLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+public interface ISceneMoveLogService extends IService<SceneMoveLog> {
+
+}

+ 20 - 0
src/main/java/com/fdkankan/job/service/impl/SceneMoveLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.job.service.impl;
+
+import com.fdkankan.job.entity.SceneMoveLog;
+import com.fdkankan.job.mapper.ISceneMoveLogMapper;
+import com.fdkankan.job.service.ISceneMoveLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@Service
+public class SceneMoveLogServiceImpl extends ServiceImpl<ISceneMoveLogMapper, SceneMoveLog> implements ISceneMoveLogService {
+
+}

+ 5 - 0
src/main/resources/mapper/job/SceneMoveLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.job.mapper.ISceneMoveLogMapper">
+
+</mapper>