Merge branch 'wanjing' into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/callback/CloudBoxCallbackoxController.java

@@ -4,6 +4,7 @@ import com.tuoheng.admin.entity.FlightData;
 import com.tuoheng.admin.service.flightdata.IFlightDataService;
 import com.tuoheng.common.core.common.OperationEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,6 +30,7 @@ public class CloudBoxCallbackoxController {
      * @param entity
      * @return
      */
+    @PostMapping("/add")
     public OperationEnum addCallback(@RequestBody FlightData entity) {
         flightDataService.addCallback(entity);
         return OperationEnum.OPERATION_SUCCESS;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightdata/FlightDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tuoheng.admin.service.flightdata;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -63,19 +64,25 @@ public class FlightDataServiceImpl extends BaseServiceImpl<FlightDataMapper, Fli
 
     @Override
     public void addCallback(FlightData entity) {
-        if (entity != null && StringUtils.isNotEmpty(entity.getBoxSn())) {
-            log.info("addCallback接口入参：" + entity);
-            //查询正在执行的云盒所对应的任务
-            List<Inspection> inspectionList = inspectionMapper.getListByBox(entity.getBoxSn());
-            if (StringUtils.isNotEmpty(inspectionList)) {
-                entity.setTenantId(inspectionList.get(0).getTenantId());
-                entity.setInspectionId(inspectionList.get(0).getId());
-                //将最新一条数据存放入缓存，并设置过期时间
-                redisUtils.set(inspectionList.get(0).getId(), entity, 10);
-            }
-            entity.setCreateTime(DateUtils.now());
-            flightDataMapper.insert(entity);
-            log.info("addCallback接口入库成功：" + entity.getId());
+        log.info("addCallback接口入参：" + entity);
+        if (ObjectUtil.isNull(entity)) {
+            log.info("传入参数entity为空");
+            return;
         }
+        if (StringUtils.isEmpty(entity.getBoxSn())) {
+            log.info("云盒SN号为空");
+            return;
+        }
+        //查询正在执行的云盒所对应的任务
+        List<Inspection> inspectionList = inspectionMapper.getListByBox(entity.getBoxSn());
+        if (StringUtils.isNotEmpty(inspectionList)) {
+            entity.setTenantId(inspectionList.get(0).getTenantId());
+            entity.setInspectionId(inspectionList.get(0).getId());
+            //将最新一条数据存放入缓存，并设置过期时间
+            redisUtils.set(inspectionList.get(0).getId(), entity, 10);
+        }
+        entity.setCreateTime(DateUtils.now());
+        flightDataMapper.insert(entity);
+        log.info("addCallback接口入库成功：" + entity.getId());
     }
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/flyer/OnlineIdentifService.java

@@ -208,7 +208,7 @@ public class OnlineIdentifService {
             response = restTemplate.exchange(url, HttpMethod.PUT, httpEntity, JsonResult.class);
         } catch (Exception e) {
             deliverStreamingService.deliver(liveChannelDto.getCode());
-            log.error("", e);
+            log.error("设置通道状态异常！{}", e);
             throw new ServiceException(HttpStatus.BAD_REQUEST.value(), "设置通道状态异常！");
         }
         if (response == null || !response.hasBody() || response.getBody().getCode() != JsonResult.SUCCESS) {