Преглед изворни кода

bugfix:正常视频审核通过,

刘云鑫 пре 2 месеци
родитељ
комит
ac3994feae

+ 7 - 4
alien-store/src/main/java/shop/alien/store/service/impl/CommonRatingServiceImpl.java

@@ -101,8 +101,11 @@ public class CommonRatingServiceImpl extends ServiceImpl<CommonRatingMapper, Com
             int i = this.save(commonRating) ? 0 : 1;
             // 一次遍历完成分类,避免多次流式处理
             Map<String, List<String>> urlCategoryMap = StoreRenovationRequirementServiceImpl.classifyUrls(Arrays.asList(commonRating.getImageUrls().split(",")));
-            AiContentModerationUtil.AuditResult auditResult = aiContentModerationUtil.auditContent(commonRating.getContent(), urlCategoryMap.get("image"));
-            if (!auditResult.isPassed() &&( StringUtils.isNotEmpty(commonRating.getContent()) || urlCategoryMap.get("video").size() > 0)) {
+            AiContentModerationUtil.AuditResult auditResult = new AiContentModerationUtil.AuditResult(true, "");
+            if( StringUtils.isNotEmpty(commonRating.getContent()) || urlCategoryMap.get("image").size() > 0){
+                auditResult = aiContentModerationUtil.auditContent(commonRating.getContent(), urlCategoryMap.get("image"));
+            }
+            if (!auditResult.isPassed()) {
                 // 审核不通过
                 CommonRating rating = this.getById(commonRating.getId());
                 rating.setAuditStatus(2);
@@ -382,7 +385,7 @@ public class CommonRatingServiceImpl extends ServiceImpl<CommonRatingMapper, Com
             AtomicReference<Integer> count = new AtomicReference<>(0);
             count.updateAndGet(v -> v + collect.size());
             // 1.查询评价的评论的记录
-            LambdaQueryWrapper<CommonComment> commentWrapper = new LambdaQueryWrapper<CommonComment>()
+/*            LambdaQueryWrapper<CommonComment> commentWrapper = new LambdaQueryWrapper<CommonComment>()
                     .eq(CommonComment::getSourceType, CommentSourceTypeEnum.STORE_COMMENT.getType())
                     .in(CommonComment::getSourceId, collect);
             List<Long> collect1 = commonCommentMapper.selectList(commentWrapper).stream().map(x -> x.getId()).collect(Collectors.toList());
@@ -391,7 +394,7 @@ public class CommonRatingServiceImpl extends ServiceImpl<CommonRatingMapper, Com
                 // 2.在再评论的表中查询评论的回复(根评论)
                 Integer allCommentsOnCommentsNum = getAllCommentsOnCommentsNum(collect1);
                 count.updateAndGet(v -> v + allCommentsOnCommentsNum);
-            }
+            }*/
             ratingCount.put("totalCount", count.get());
 
             // 3用户图片

+ 7 - 3
alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffReviewServiceImpl.java

@@ -5,11 +5,11 @@ import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -73,8 +73,12 @@ public class StoreStaffReviewServiceImpl extends ServiceImpl<StoreStaffReviewMap
         // AI审核
         // 一次遍历完成分类,避免多次流式处理
         Map<String, List<String>> urlCategoryMap = StoreRenovationRequirementServiceImpl.classifyUrls(reviewDto.getReviewImages());
-        AiContentModerationUtil.AuditResult auditResult = aiContentModerationUtil.auditContent(reviewDto.getReviewContent(), urlCategoryMap.get("image"));
-        if (!auditResult.isPassed() && (StringUtils.isNotEmpty(reviewDto.getReviewContent()) || urlCategoryMap.get("video").size() > 0)) {
+
+        AiContentModerationUtil.AuditResult auditResult = new AiContentModerationUtil.AuditResult(true, "");
+        if( StringUtils.isNotEmpty(reviewDto.getReviewContent()) || urlCategoryMap.get("image").size() > 0){
+            auditResult = aiContentModerationUtil.auditContent(reviewDto.getReviewContent(), urlCategoryMap.get("image"));
+        }
+        if (!auditResult.isPassed()) {
             // 审核不通过
             StoreStaffReview staffReview = this.getById(review.getId());
             staffReview.setAuditStatus(2);