|
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.takai.ai.domain.dto.drone.ProjectDetectionParam;
|
|
import com.takai.ai.domain.dto.drone.ProjectDetectionParam;
|
|
|
|
|
+import com.takai.ai.domain.dto.drone.SafeWarning;
|
|
|
import com.takai.ai.domain.entity.*;
|
|
import com.takai.ai.domain.entity.*;
|
|
|
import com.takai.ai.service.ITakaiAiService;
|
|
import com.takai.ai.service.ITakaiAiService;
|
|
|
import com.takai.common.core.controller.BaseController;
|
|
import com.takai.common.core.controller.BaseController;
|
|
@@ -108,6 +109,15 @@ public class DroneAiController extends BaseController {
|
|
|
List<String> extractFields = null;
|
|
List<String> extractFields = null;
|
|
|
String rootArrayPath = null;
|
|
String rootArrayPath = null;
|
|
|
if (VisionTypeEnum.SAFE.getCode().equals(type)) {
|
|
if (VisionTypeEnum.SAFE.getCode().equals(type)) {
|
|
|
|
|
+ //检查label是否为空
|
|
|
|
|
+ int size = requestBody.getSafe().getWarning().size();
|
|
|
|
|
+ for(int i = 0; i < size; i++) {
|
|
|
|
|
+ SafeWarning sw = requestBody.getSafe().getWarning().get(i);
|
|
|
|
|
+ if(!StringUtils.hasText(sw.getLabel())) {
|
|
|
|
|
+ return AjaxResult.error(HttpStatus.BAD_REQUEST.value(),"label不能为空");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ requestBody.getSafe().getWarning().size();
|
|
|
// 调用通用方法:提取safe.warning下的label和judgment字段
|
|
// 调用通用方法:提取safe.warning下的label和judgment字段
|
|
|
extractFields = Arrays.asList("label", "judgment");
|
|
extractFields = Arrays.asList("label", "judgment");
|
|
|
rootArrayPath = "safe.warning";
|
|
rootArrayPath = "safe.warning";
|