新增场景计算错误原因

src/main/java/com/fdkankan/manage/common/SceneBuildProcessLogEnum.java

@@ -0,0 +1,31 @@
+package com.fdkankan.manage.common;
+
+import com.fdkankan.manage.entity.SceneBuildProcessLog;
+
+public enum SceneBuildProcessLogEnum {
+
+    PRE_ERROR("pre","场景计算资源准备错误"),
+    CALL_ERROR("call","算法计算错误"),
+    POST_ERROR("post","场景计算结果处理错误"),
+    NOT_KNOW_ERROR("not_know","未知原因错误");
+
+
+    private String process;
+    private String remark;
+
+
+    SceneBuildProcessLogEnum(String process, String remark) {
+        this.process = process;
+        this.remark = remark;
+    }
+
+    public static String getReason(String process) {
+        switch (process){
+            case "pre" : return PRE_ERROR.remark;
+            case "call" : return CALL_ERROR.remark;
+            case "post" : return POST_ERROR.remark;
+            default: return NOT_KNOW_ERROR.remark;
+        }
+    }
+
+}

src/main/java/com/fdkankan/manage/entity/SceneBuildProcessLog.java

@@ -0,0 +1,81 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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-01-28
+ */
+@Getter
+@Setter
+@TableName("t_scene_build_process_log")
+public class SceneBuildProcessLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 计算流程（pre-前置处理，call-计算，post-后置处理）
+     */
+    @TableField("process")
+    private String process;
+
+    /**
+     * mq消息队列名称
+     */
+    @TableField("queue_name")
+    private String queueName;
+
+    /**
+     * 处理状态（0-处理中，1-成功，-1-失败）
+     */
+    @TableField("state")
+    private Integer state;
+
+    /**
+     * 失败原因
+     */
+    @TableField("reason")
+    private String reason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * A-有效，I-无效
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_folder_scene",
+                "t_scene_build_process_log",
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -46,8 +46,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://rm-wz90w10465iiwwv098o.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod",
-                "root","D2719bd0cae1a005")
+        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
+                "root","4Dage@4Dage#@168")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/fdkankan/manage/mapper/ISceneBuildProcessLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.SceneBuildProcessLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景计算流程状态表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-01-28
+ */
+@Mapper
+public interface ISceneBuildProcessLogMapper extends BaseMapper<SceneBuildProcessLog> {
+
+}

src/main/java/com/fdkankan/manage/service/ISceneBuildProcessLogService.java

@@ -0,0 +1,17 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.SceneBuildProcessLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景计算流程状态表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-01-28
+ */
+public interface ISceneBuildProcessLogService extends IService<SceneBuildProcessLog> {
+
+    SceneBuildProcessLog getByNum(String num);
+}

src/main/java/com/fdkankan/manage/service/impl/SceneBuildProcessLogServiceImpl.java

@@ -0,0 +1,33 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.entity.SceneBuildProcessLog;
+import com.fdkankan.manage.mapper.ISceneBuildProcessLogMapper;
+import com.fdkankan.manage.service.ISceneBuildProcessLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 场景计算流程状态表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-01-28
+ */
+@Service
+public class SceneBuildProcessLogServiceImpl extends ServiceImpl<ISceneBuildProcessLogMapper, SceneBuildProcessLog> implements ISceneBuildProcessLogService {
+
+    @Override
+    public SceneBuildProcessLog getByNum(String num) {
+        LambdaQueryWrapper<SceneBuildProcessLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SceneBuildProcessLog::getNum,num);
+        List<SceneBuildProcessLog> list = this.list(wrapper);
+        if(list == null || list.size() <=0 ){
+            return null;
+        }
+        return list.get(0);
+    }
+}

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -9,14 +9,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.manage.common.OssPath;
-import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.common.*;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.*;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
 import com.fdkankan.manage.httpClient.service.LaserService;
-import com.fdkankan.manage.common.CameraConstant;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.ISceneProMapper;
 import com.fdkankan.manage.service.*;
@@ -80,6 +77,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     FdKKClient fdKKClient;
     @Autowired
     IFolderSceneService folderSceneService;
+    @Autowired
+    ISceneBuildProcessLogService sceneBuildProcessLogService;
 
 
     @Override
@@ -327,6 +326,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     record.setIsCopy(true);
                 }
             }
+            if(record.getStatus() == -1){  //计算失败
+                SceneBuildProcessLog sceneBuildProcessLog = sceneBuildProcessLogService.getByNum(record.getNum());
+                if(sceneBuildProcessLog != null){
+                    record.setSceneBuildProcessLog(sceneBuildProcessLog);
+                    record.setBuildErrorReason(SceneBuildProcessLogEnum.getReason(sceneBuildProcessLog.getProcess()));
+                }
+            }
         }
         return PageInfo.PageInfo(page);
     }

src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.response;
 
+import com.fdkankan.manage.entity.SceneBuildProcessLog;
 import lombok.Data;
 
 @Data
@@ -24,4 +25,8 @@ public class SceneVo {
 
     private Integer isObj =1 ;
 
+    private SceneBuildProcessLog sceneBuildProcessLog;
+
+    private String buildErrorReason;
+
 }

src/main/resources/mapper/manage/SceneBuildProcessLogMapper.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.manage.mapper.ISceneBuildProcessLogMapper">
+
+</mapper>