|
|
@@ -161,7 +161,6 @@ public class JyMaterialListServiceImpl implements IJyMaterialListService {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public void insertKeyWord(String type, String keyWord) {
|
|
|
jyMaterialListMapper.insertKeyWord(type, keyWord);
|
|
|
@@ -175,28 +174,25 @@ public class JyMaterialListServiceImpl implements IJyMaterialListService {
|
|
|
JSONArray keyArray = new JSONArray();
|
|
|
Integer isKey = 2; // 2 未命中 3 命中
|
|
|
JyMaterialList updateMaterial = new JyMaterialList();
|
|
|
- ResultResponse videoText = videoTextService.getVideoText(videoUrl);
|
|
|
+ String videoText = videoTextService.getVideoText(videoUrl);
|
|
|
if (!Check.isNull(videoText)) {
|
|
|
- String data = videoText.getData().toString();
|
|
|
- if (!Check.isNull(data)) {
|
|
|
- if (Check.isNull(keyList)) {
|
|
|
- getKeyList();
|
|
|
- }
|
|
|
- for (JSONObject keyJson : keyList) {
|
|
|
- String keyWord = keyJson.getString("keyWord");
|
|
|
- if (data.contains(keyWord)) {
|
|
|
- isKey = 3;
|
|
|
- keyArray.add(keyJson);
|
|
|
- }
|
|
|
+ if (Check.isNull(keyList)) {
|
|
|
+ getKeyList();
|
|
|
+ }
|
|
|
+ for (JSONObject keyJson : keyList) {
|
|
|
+ String keyWord = keyJson.getString("keyWord");
|
|
|
+ if (videoText.contains(keyWord)) {
|
|
|
+ isKey = 3;
|
|
|
+ keyArray.add(keyJson);
|
|
|
}
|
|
|
}
|
|
|
updateMaterial.setMaterialStatus(isKey);
|
|
|
- updateMaterial.setMaterialText(data);
|
|
|
+ updateMaterial.setMaterialText(videoText);
|
|
|
updateMaterial.setViolatingText(keyArray.toJSONString());
|
|
|
updateMaterial.setSignature(signature);
|
|
|
} else {
|
|
|
updateMaterial.setMaterialStatus(isKey);
|
|
|
- updateMaterial.setMaterialText(null);
|
|
|
+ updateMaterial.setMaterialText(videoText);
|
|
|
updateMaterial.setViolatingText(keyArray.toJSONString());
|
|
|
updateMaterial.setSignature(signature);
|
|
|
}
|