Merge branch 'release-本地版问题上报' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/InnerController.java
#	src/main/java/com/fdkankan/contro/generate/AutoGenerate.java

src/main/java/com/fdkankan/contro/controller/InnerController.java

@@ -4,12 +4,17 @@ import com.fdkankan.contro.annotation.SignVerification;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.service.IInnerService;
 import com.fdkankan.contro.service.IScenePlusService;
+import com.fdkankan.contro.service.ILocalFdageLogService;
+import com.fdkankan.contro.vo.LocalfdageLogParamVo;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 场景文件上传模块
@@ -23,6 +28,8 @@ public class InnerController {
     private IInnerService innerService;
     @Autowired
     private IScenePlusService scenePlusService;
+    @Autowired
+    private ILocalFdageLogService localfdageLogService;
 
     @SignVerification
     @GetMapping("uploadArtificialResult")
@@ -66,5 +73,12 @@ public class InnerController {
         return ResultData.ok();
     }
 
+    @SignVerification
+    @PostMapping("noticeLocalfdageLogs")
+    public ResultData noticeLocalfdageLogs(@RequestBody @Valid LocalfdageLogParamVo param) throws Exception {
+        localfdageLogService.noticeLocalfdageLogs(param);
+        return ResultData.ok();
+    }
+
 
 }

src/main/java/com/fdkankan/contro/controller/LocalFdageLogController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.contro.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 四维看看本地版问题上报表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2025-09-19
+ */
+@RestController
+@RequestMapping("/contro/localFdageLog")
+public class LocalFdageLogController {
+
+}
+

src/main/java/com/fdkankan/contro/entity/LocalFdageLog.java

@@ -0,0 +1,57 @@
+package com.fdkankan.contro.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 2025-09-19
+ */
+@Getter
+@Setter
+@TableName("t_local_fdage_log")
+public class LocalFdageLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("scene_code")
+    private String sceneCode;
+
+    @TableField("scene_name")
+    private String sceneName;
+
+    @TableField("local_path")
+    private String localPath;
+
+    @TableField("cloud_path")
+    private String cloudPath;
+
+    @TableField("contact")
+    private String contact;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+
+}

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

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

src/main/java/com/fdkankan/contro/mapper/ILocalFdageLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.LocalFdageLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 四维看看本地版问题上报表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-09-19
+ */
+@Mapper
+public interface ILocalFdageLogMapper extends BaseMapper<LocalFdageLog> {
+
+}

src/main/java/com/fdkankan/contro/service/ILocalFdageLogService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.LocalFdageLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.vo.LocalfdageLogParamVo;
+
+/**
+ * <p>
+ * 四维看看本地版问题上报表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-09-19
+ */
+public interface ILocalFdageLogService extends IService<LocalFdageLog> {
+
+    void noticeLocalfdageLogs(LocalfdageLogParamVo param) throws Exception;
+
+}

src/main/java/com/fdkankan/contro/service/impl/LocalFdageLogServiceImpl.java

@@ -0,0 +1,59 @@
+package com.fdkankan.contro.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fdkankan.contro.entity.LocalFdageLog;
+import com.fdkankan.contro.mapper.ILocalFdageLogMapper;
+import com.fdkankan.contro.service.ILocalFdageLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.vo.LocalfdageLogParamVo;
+import com.fdkankan.dingtalk.DingTalkSendUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 四维看看本地版问题上报表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-09-19
+ */
+@Service
+public class LocalFdageLogServiceImpl extends ServiceImpl<ILocalFdageLogMapper, LocalFdageLog> implements ILocalFdageLogService {
+
+    @Value("${localfdage:dingding.access-token:xxxxxx}")
+    private String localfdageAccessToken;
+    @Value("${localfdage:dingding.access-secret:xxxxxx}")
+    private String localfdageAccessSecret;
+
+    @Value("${env:gn}")
+    private String env;
+    @Resource
+    private DingTalkSendUtils dingTalkSendUtils;
+
+    public static final String DINGTALK_MSG_PATTERN =
+            "**环境**: %s\n\n" +
+            "**联系方式**: %s\n\n" +
+            "**场景名称**: %s\n\n" +
+            "**场景码**: %s\n\n" +
+            "**本地路径**: %s\n\n" +
+            "**云端路径**: %s\n\n";
+
+    @Override
+    public void noticeLocalfdageLogs(LocalfdageLogParamVo param) throws Exception {
+        LocalFdageLog log = BeanUtil.toBean(param, LocalFdageLog.class);
+        this.save(log);
+        String content = String.format(DINGTALK_MSG_PATTERN,
+                env.equals("gn") ? "中国区" : "非中国区",
+                log.getContact(),
+                log.getSceneName(),
+                log.getSceneCode(),
+                log.getLocalPath(),
+                log.getCloudPath());
+        dingTalkSendUtils.sendActioncardMsgToDingRobot(localfdageAccessToken, localfdageAccessSecret, content, "本地版问题上报");
+    }
+
+
+}

src/main/java/com/fdkankan/contro/vo/LocalfdageLogParamVo.java

@@ -0,0 +1,22 @@
+package com.fdkankan.contro.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class LocalfdageLogParamVo {
+
+    @NotBlank
+    private String sceneCode;
+    @NotBlank
+    private String sceneName;
+    @NotBlank
+    private String localPath;
+    @NotBlank
+    private String clouldPath;
+    @NotBlank
+    private String contact;
+
+
+}

src/main/resources/mapper/contro/LocalFdageLogMapper.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.contro.mapper.ILocalFdageLogMapper">
+
+</mapper>