Merge branch 'feature' into 'release'

2024/6/17 aiApiResultConversion中null异常处理

See merge request !104

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceAiMark.java

@@ -141,24 +141,26 @@ public class TaskServiceAiMark implements TaskService {
 
     private AiApiResult aiApiResultConversion(String s) {
         JSONObject res = JSONObject.parseObject(s);
-        JSONObject feiHeiRes = res.getJSONObject("feihe-compet-tagger");
-        if (Objects.nonNull(feiHeiRes)) {
-            JSONObject result = feiHeiRes.getJSONObject("result");
-            if (Objects.nonNull(result)) {
-                aiApiResultTitleSubString(result);
-                if (feiHeiRes.getString("status").equals("DONE")) {
-                    AiApiResult aiRes = new AiApiResult();
-                    aiRes.setId(feiHeiRes.getString("result_id"));
-                    aiRes.setCreateAt(System.currentTimeMillis());
-                    aiRes.setInfo_class(result.getString("info_class"));
-                    aiRes.setNoise(result.getString("denoise"));
-                    aiRes.setSent(result.getString("sent"));
-                    aiRes.setStatus(feiHeiRes.getString("status"));
-                    aiRes.setResult(res.toJSONString());
-                    aiApiResultDao.insert(aiRes);
-                    return aiRes;
-                } else {
-                    return aiApiResultDao.findOne(new Query(Criteria.where("_id").is(result.getString("dedup"))));
+        if (Objects.nonNull(res)) {
+            JSONObject feiHeiRes = res.getJSONObject("feihe-compet-tagger");
+            if (Objects.nonNull(feiHeiRes)) {
+                JSONObject result = feiHeiRes.getJSONObject("result");
+                if (Objects.nonNull(result)) {
+                    aiApiResultTitleSubString(result);
+                    if (feiHeiRes.getString("status").equals("DONE")) {
+                        AiApiResult aiRes = new AiApiResult();
+                        aiRes.setId(feiHeiRes.getString("result_id"));
+                        aiRes.setCreateAt(System.currentTimeMillis());
+                        aiRes.setInfo_class(result.getString("info_class"));
+                        aiRes.setNoise(result.getString("denoise"));
+                        aiRes.setSent(result.getString("sent"));
+                        aiRes.setStatus(feiHeiRes.getString("status"));
+                        aiRes.setResult(res.toJSONString());
+                        aiApiResultDao.insert(aiRes);
+                        return aiRes;
+                    } else {
+                        return aiApiResultDao.findOne(new Query(Criteria.where("_id").is(result.getString("dedup"))));
+                    }
                 }
             }
         }