Merge branch 'feature-增加接口日志-dsx' into release

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

@@ -5,8 +5,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.contro.service.IAppCameraFailLogService;
 import com.fdkankan.contro.service.ISceneFileBuildService;
+import com.fdkankan.contro.service.ISceneUploadCountService;
+import com.fdkankan.contro.vo.ReportFailLogVO;
 import com.fdkankan.contro.vo.ResponseSceneFile;
+import com.fdkankan.contro.vo.SceneUploadCountParamVO;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
@@ -14,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,6 +39,12 @@ public class SceneFileController{
     @Autowired
     private FYunFileServiceInterface fYunFileService;
 
+    @Autowired
+    private ISceneUploadCountService sceneUploadCountService;
+
+    @Autowired
+    private IAppCameraFailLogService appCameraFailLogService;
+
 
     /**
      * 场景文件上传之前先获取fileId
@@ -69,8 +80,11 @@ public class SceneFileController{
     }
 
     @GetMapping("rebuildScene")
-    public ResultData rebuildScene(@RequestParam(value = "num") String num,@RequestParam(value = "force",defaultValue = "false") Boolean force ,@RequestParam(value = "deleteExtras",defaultValue = "true") Boolean deleteExtras) throws IOException {
-        return sceneFileBuildService.rebuildScene(num,force,deleteExtras);
+    public ResultData rebuildScene(@RequestParam(value = "num") String num,
+                                   @RequestParam(value = "force",defaultValue = "false") Boolean force ,
+                                   @RequestParam(value = "deleteExtras",defaultValue = "true") Boolean deleteExtras,
+                                   @RequestParam(value = "from", defaultValue = "api") String from) throws IOException {
+        return sceneFileBuildService.rebuildScene(num,force,deleteExtras, from);
     }
 
 
@@ -119,4 +133,22 @@ public class SceneFileController{
                                        @RequestParam(value = "sourceBucket") String sourceBucket) throws Exception {
         return sceneFileBuildService.copyDataAndBuild(sourceBucket,dataSource ,sceneVer);
     }
+
+    /**
+     * 记录app触发上传场景
+     * @param param
+     * @return
+     */
+    @PostMapping("/increSceneUploadCount")
+    public ResultData increSceneUploadCount(@RequestBody @Valid SceneUploadCountParamVO param){
+        sceneUploadCountService.increSceneUploadCount(param);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/reportFailLog")
+    public ResultData reportFailLog(@RequestBody @Valid ReportFailLogVO param){
+        appCameraFailLogService.reportFailLog(param);
+        return ResultData.ok();
+    }
+
 }

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

@@ -0,0 +1,52 @@
+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.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * app错误上报
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Getter
+@Setter
+@TableName("t_app_camera_fail_log")
+public class AppCameraFailLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("uuid")
+    private String uuid;
+
+    /**
+     * 错误来源（app，camera）
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 错误原因
+     */
+    @TableField("reason")
+    private String reason;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+
+}

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

@@ -0,0 +1,49 @@
+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.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表
+ * </p>
+ *
+ * @author
+ * @since 2024-05-17
+ */
+@Getter
+@Setter
+@TableName("t_scene_rebuild_log")
+public class SceneRebuildLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 调用来源（api-接口调用，manage-管理后台调用，laser-点位校准调用）
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.fdkankan.contro.entity;
+
+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>
+ * app触发场景上传统计表
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Getter
+@Setter
+@TableName("t_scene_upload_count")
+public class SceneUploadCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @TableField("uuid")
+    private String uuid;
+
+    /**
+     * 相机码
+     */
+    @TableField("sn_code")
+    private String snCode;
+
+    /**
+     * 触发上传次数
+     */
+    @TableField("count")
+    private Integer count;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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_scene_info_sync_mq_config"
+                "t_app_camera_fail_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

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

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.AppCameraFailLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * app错误上报 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Mapper
+public interface IAppCameraFailLogMapper extends BaseMapper<AppCameraFailLog> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.SceneRebuildLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-17
+ */
+@Mapper
+public interface ISceneRebuildLogMapper extends BaseMapper<SceneRebuildLog> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.SceneUploadCount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * app触发场景上传统计表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-20
+ */
+@Mapper
+public interface ISceneUploadCountMapper extends BaseMapper<SceneUploadCount> {
+
+}

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
+import cn.hutool.http.ContentType;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -38,6 +39,7 @@ import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -599,7 +601,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         statusJson.put("sceneScheme", scenePlusExt.getSceneScheme());
         FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJson.toString());
 
-        fYunFileService.uploadFile(statusJson.toJSONString().getBytes(StandardCharsets.UTF_8), dataViewPath + "status.json");
+        Map<String,String> headers = new HashMap<>();
+        headers.put(HttpHeaders.CONTENT_TYPE, ContentType.JSON.getValue());
+        fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", dataViewPath + "status.json", headers);
     }
 
     private void createQrCode(String num, ScenePlusExt scenePlusExt, String qrLogo) {

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

@@ -0,0 +1,23 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.AppCameraFailLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.vo.ReportFailLogVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * app错误上报 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+public interface IAppCameraFailLogService extends IService<AppCameraFailLog> {
+
+    void reportFailLog(ReportFailLogVO param);
+
+
+}

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

@@ -25,7 +25,7 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     ResultData turntableUploadSuccess(String params) throws Exception;
 
-    ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras) throws IOException;
+    ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras, String from) throws IOException;
 
     ResultData copyDataAndBuild(String sourceBucet,String dataSource,String sceneVer) throws Exception;
 }

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

@@ -0,0 +1,16 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.SceneRebuildLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-17
+ */
+public interface ISceneRebuildLogService extends IService<SceneRebuildLog> {
+
+}

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

@@ -0,0 +1,27 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.SceneUploadCount;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.vo.SceneUploadCountParamVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * app触发场景上传统计表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+public interface ISceneUploadCountService extends IService<SceneUploadCount> {
+
+    void increSceneUploadCount(SceneUploadCountParamVO param);
+
+    void resetCountByUuid(String uuid);
+
+    SceneUploadCount getByUUid(String uuid);
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.fdkankan.contro.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fdkankan.contro.entity.AppCameraFailLog;
+import com.fdkankan.contro.mapper.IAppCameraFailLogMapper;
+import com.fdkankan.contro.service.IAppCameraFailLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.vo.ReportFailLogVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * app错误上报 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+@Service
+public class AppCameraFailLogServiceImpl extends ServiceImpl<IAppCameraFailLogMapper, AppCameraFailLog> implements IAppCameraFailLogService {
+
+    @Override
+    public void reportFailLog(ReportFailLogVO param) {
+        AppCameraFailLog bean = BeanUtil.toBean(param, AppCameraFailLog.class);
+        this.save(bean);
+    }
+}

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

@@ -195,6 +195,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     private ISceneColdStorageService sceneColdStorageService;
     @Autowired
     private IntermitSceneService intermitSceneService;
+    @Autowired
+    private ISceneRebuildLogService sceneRebuildLogService;
+    @Autowired
+    private ISceneUploadCountService sceneUploadCountService;
 
     @Override
     public SceneFileBuild findByFileId(String fileId) {
@@ -626,6 +630,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             folderName = fileBuild.getUnicode();
             redisUtil.set(String.format(RedisConstants.FILEID_FOLDER_BUILD, fileId), folderName,2 * 24 * 60 * 60);
         }
+        sceneUploadCountService.resetCountByUuid(folderName);
+
         StringBuilder prefixBuffer = new StringBuilder(mac).append(File.separator).append(fileId).append(File.separator).append(folderName).append(File.separator);
 
         String buildType = "V2";
@@ -775,6 +781,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             redisUtil.set(String.format(RedisConstants.FILEID_FOLDER_BUILD, fileId), folderName);
         }
 
+        sceneUploadCountService.resetCountByUuid(folderName);
+
         //云目录
         StringBuilder prefixBuffer = new StringBuilder(mac).append(File.separator).append(fileId).append(File.separator).append(folderName).append(File.separator);
 
@@ -1188,7 +1196,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     @Override
-    public ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras) throws IOException {
+    public ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras, String from) throws IOException {
 
         ScenePro scenePro = sceneProService.getByNum(num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
@@ -1317,6 +1325,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         scenePlusExtService.updateById(scenePlusExt);
 
+        //记录日志表
+        SceneRebuildLog rebuildLog = new SceneRebuildLog();
+        rebuildLog.setNum(num);
+        rebuildLog.setSource(from);
+        sceneRebuildLogService.save(rebuildLog);
+
         return ResultData.ok();
     }
 

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

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service.impl;
+
+import com.fdkankan.contro.entity.SceneRebuildLog;
+import com.fdkankan.contro.mapper.ISceneRebuildLogMapper;
+import com.fdkankan.contro.service.ISceneRebuildLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景重算接口调用日志表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-05-17
+ */
+@Service
+public class SceneRebuildLogServiceImpl extends ServiceImpl<ISceneRebuildLogMapper, SceneRebuildLog> implements ISceneRebuildLogService {
+
+}

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

@@ -0,0 +1,69 @@
+package com.fdkankan.contro.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.CameraConstant;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.contro.entity.Camera;
+import com.fdkankan.contro.entity.SceneUploadCount;
+import com.fdkankan.contro.mapper.ISceneUploadCountMapper;
+import com.fdkankan.contro.service.ICameraService;
+import com.fdkankan.contro.service.ISceneUploadCountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.vo.SceneUploadCountParamVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * app触发场景上传统计表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-05-20
+ */
+@Service
+public class SceneUploadCountServiceImpl extends ServiceImpl<ISceneUploadCountMapper, SceneUploadCount> implements ISceneUploadCountService {
+
+    @Autowired
+    private ICameraService cameraService;
+
+    @Override
+    public void increSceneUploadCount(SceneUploadCountParamVO param) {
+        String uuid = param.getUuid();
+        String snCode = uuid.split("_")[0];
+
+        Camera camera = cameraService.getBySnCode(snCode);
+        if (camera == null) {
+            throw new BusinessException(CameraConstant.FAILURE_6003);
+        }
+
+        SceneUploadCount sceneUploadCount = this.getByUUid(uuid);
+        if(Objects.isNull(sceneUploadCount)){
+            sceneUploadCount = new SceneUploadCount();
+            sceneUploadCount.setUuid(uuid);
+            sceneUploadCount.setSnCode(snCode);
+            sceneUploadCount.setCount(1);
+        }else{
+            sceneUploadCount.setCount(sceneUploadCount.getCount() + 1);
+        }
+
+        this.saveOrUpdate(sceneUploadCount);
+    }
+
+    @Override
+    public void resetCountByUuid(String uuid) {
+        SceneUploadCount sceneUploadCount = this.getByUUid(uuid);
+        if(Objects.isNull(sceneUploadCount)){
+            return;
+        }
+        sceneUploadCount.setCount(0);
+        this.updateById(sceneUploadCount);
+    }
+
+    @Override
+    public SceneUploadCount getByUUid(String uuid) {
+        return this.getOne(new LambdaQueryWrapper<SceneUploadCount>().eq(SceneUploadCount::getUuid, uuid));
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.fdkankan.contro.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReportFailLogVO {
+
+    @NotBlank(message = "uuid不能为空")
+    private String uuid;
+
+    @NotBlank(message = "source不能为空")
+    private String source;
+
+    private String reason;
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.fdkankan.contro.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneUploadCountParamVO {
+    @NotBlank(message = "uuid不能为空")
+    private String uuid;
+}

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

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

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