Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/constant/SystemConstant.java

@@ -22,7 +22,7 @@ public interface SystemConstant {
     /**
      *  推送微信消息
      */
-    String API_WEIXIN_SEND_MESSAGE = "/telecomumale/miniprogram/weiXin/send/message";
+    String API_WEIXIN_SEND_MESSAGE = "/freeway/miniprogram/weiXin/send/message";
 
     /**
      * 机场平台：获取航点文件坐标

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightdata/query/QueryFlightDataTrackService.java

@@ -36,27 +36,23 @@ public class QueryFlightDataTrackService {
     public JsonResult track(InspectionRequest inspectionRequest) {
         Inspection inspection = inspectionMapper.selectById(inspectionRequest.getRequestId());
         if (ObjectUtil.isEmpty(inspection)) {
+            log.info("被硬件调用，存飞行轨迹，巡检任务不存在,inspectionId={}", inspectionRequest.getRequestId());
             throw new ServiceException(ServiceExceptionEnum.TASK_DOES_NOT_EXIST);
         }
-        log.info("正在巡检的任务,inspection={}",inspection);
-
         FlightData flightData = new FlightData();
         BeanUtils.copyProperties(inspectionRequest, flightData);
         flightData.setTenantId(inspection.getTenantId());
         flightData.setInspectionId(inspection.getId());
         flightData.setAltitude(null);
-        //机场传过来的高度是相对高度
-        flightData.setUltrasonic(inspectionRequest.getAltitude());
+        flightData.setUltrasonic(inspectionRequest.getAltitude());    // 机场传过来的高度是相对高度
         flightData.setSpeed(inspectionRequest.getHspeed());
         flightData.setYsingal(inspectionRequest.getYsingal());
         flightData.setDistHome(inspectionRequest.getDistHome());
-
-        log.info("云盒遥测数据,flightData={}",flightData);
-
         //将最新一条数据放入缓存，并设置过期时间
         redisUtils.set(String.valueOf(inspection.getId()), flightData, 10);
         int result = flightDataMapper.insert(flightData);
-        if(result<=0){
+        if (result <= 0) {
+            log.info("被硬件调用，存飞行轨迹，数据报存失败，inspectionId={}", inspectionRequest.getRequestId());
             return JsonResult.error("遥测数据保存失败");
         }
 

tuoheng-service/tuoheng-admin/src/test/java/com/tuoheng/admin/service/DspCallbackServiceTest.java

@@ -9,9 +9,11 @@ import com.tuoheng.admin.mapper.SectionMapper;
 import com.tuoheng.admin.request.dept.AddDeptRequest;
 import com.tuoheng.admin.request.dept.EditDeptRequest;
 import com.tuoheng.admin.request.third.DspCallbackRequest;
+import com.tuoheng.admin.request.third.QuestionFile;
 import com.tuoheng.admin.service.dept.IDeptService;
 import com.tuoheng.admin.service.dept.query.QueryListTreeService;
 import com.tuoheng.admin.service.third.dsp.IDspCallbackService;
+import com.tuoheng.common.core.utils.DateUtils;
 import com.tuoheng.common.core.utils.JsonResult;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -35,10 +38,22 @@ public class DspCallbackServiceTest {
 
     @Test
     public void testGetOneById() {
-        String requestId = "dc96139337854ae78da7f20e144b3a9f";
+        String requestId = "369567d311de473886c40a5c85305493";
         DspCallbackRequest dspCallbackRequest = new DspCallbackRequest();
         dspCallbackRequest.setAnalyseStatus(2);
         dspCallbackRequest.setType(1);
+
+        List<QuestionFile> questionFiles = new ArrayList<>();
+        QuestionFile questionFile = new QuestionFile();
+        questionFile.setFileCode("PVR2024010815484594512");
+        questionFile.setFileName("2024-01-08-15-48-45_frame-52-332_type_20240108154845591880-1-003-1_AI.jpg");
+        questionFile.setFileOriginalUrl("https://image.t-aaron.com/369567d311de473886c40a5c85305493/2024-01-08-15-48-45_frame-52-332_type_20240108154845581518-1-0-0_OR.jpg");
+        questionFile.setFileMarkerUrl("https://image.t-aaron.com/369567d311de473886c40a5c85305493/2024-01-08-15-48-45_frame-52-332_type_20240108154845591880-1-003-1_AI.jpg");
+        questionFile.setAnalyseTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, "2024-01-08 15:48:45"));
+        questionFile.setQuestionName("车辆");
+        questionFile.setQuestionCode("003008");
+        questionFiles.add(questionFile);
+        dspCallbackRequest.setQuestionFiles(questionFiles);
         dspCallbackService.saveCallbackData(requestId, dspCallbackRequest);
     }