Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tuoheng.admin.service.third.dsp;
 
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -155,6 +156,7 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
             List<InspectionFile> thirstyQuestionFiles = questionFiles.stream().map(questionFile -> {
                 // 遍历创建巡检图片信息
                 InspectionFile inspectionFile = new InspectionFile();
+                inspectionFile.setId(RandomUtil.randomString(36));
                 // 对象属性拷贝
                 BeanUtils.copyProperties(questionFile, inspectionFile);
                 //问题编号
@@ -208,6 +210,7 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                     String gaodeAddressOff = GaodeUtil.getGaodeAddress(gaodeCoordinateOff.getString("longitude"), gaodeCoordinateOff.getString("latitude"));
                     inspectionFile.setLocation(gaodeAddressOff);
                     inspectionFile.setGaodeAddress(gaodeAddressOff);
+
                 }
                 if (online_condition) {
                     // 实时直播处理

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionFileMapper.xml

@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 批量新增问题图片 -->
     <insert id="addBatch" parameterType="com.tuoheng.admin.entity.InspectionFile">
-        insert into th_inspection_file (file_code, inspection_id, file_type, file_name,
+        insert into th_inspection_file (id,file_code, inspection_id, file_type, file_name,
         file_thumbnail, file_original, file_image,
         file_size, latitude, longitude,
         `location`, gaode_longitude, gaode_latitude,
@@ -121,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         values
         <foreach collection="list" item="item" separator=",">
             (
+            #{item.id,jdbcType=VARCHAR},
             #{item.fileCode,jdbcType=VARCHAR},
             #{item.inspectionId,jdbcType=INTEGER},
             #{item.fileType,jdbcType=BOOLEAN},