diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java index af762b9..085c8c5 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppDynamicCommentController.java @@ -87,7 +87,7 @@ public class AppDynamicCommentController extends BaseController @ApiOperation(value = "新增动态评论", notes = "新增动态评论", httpMethod = "POST") public AjaxResult add(@RequestBody AppDynamicComment appDynamicComment) { - return toAjax(appDynamicCommentService.insertAppDynamicComment(appDynamicComment)); + return appDynamicCommentService.insertAppDynamicComment(appDynamicComment); } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java index de2e09a..2d265ba 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java @@ -96,7 +96,7 @@ public class AppUserDynamicController extends BaseController @ApiOperation(value = "新增App用户动态", notes = "新增App用户动态", httpMethod = "POST") public AjaxResult add(@RequestBody AppUserDynamic appUserDynamic) { - return toAjax(appUserDynamicService.insertAppUserDynamic(appUserDynamic)); + return appUserDynamicService.insertAppUserDynamic(appUserDynamic); } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java index b536192..64779e0 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppDynamicCommentService.java @@ -3,6 +3,7 @@ package com.ruoyi.app.service; import java.util.List; import com.ruoyi.app.domain.AppDynamicComment; import com.ruoyi.app.domain.vo.AppDynamicCommentVo; +import com.ruoyi.common.core.web.domain.AjaxResult; /** * 动态评论Service接口 @@ -34,7 +35,7 @@ public interface IAppDynamicCommentService * @param appDynamicComment 动态评论 * @return 结果 */ - public int insertAppDynamicComment(AppDynamicComment appDynamicComment); + public AjaxResult insertAppDynamicComment(AppDynamicComment appDynamicComment); /** * 修改动态评论 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java index e32a6cf..eae7dc4 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java @@ -3,6 +3,7 @@ package com.ruoyi.app.service; import java.util.List; import com.ruoyi.app.domain.AppUserDynamic; import com.ruoyi.app.domain.vo.AppUserDynamicVo; +import com.ruoyi.common.core.web.domain.AjaxResult; /** * App用户动态Service接口 @@ -35,7 +36,7 @@ public interface IAppUserDynamicService * @param appUserDynamic App用户动态 * @return 结果 */ - public int insertAppUserDynamic(AppUserDynamic appUserDynamic); + public AjaxResult insertAppUserDynamic(AppUserDynamic appUserDynamic); /** * 修改App用户动态 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java index bdcd29a..e29b4ec 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppDynamicCommentServiceImpl.java @@ -7,7 +7,9 @@ import java.util.stream.Collectors; import com.ruoyi.app.domain.AppUser; import com.ruoyi.app.domain.vo.AppDynamicCommentVo; import com.ruoyi.app.mapper.AppUserMapper; +import com.ruoyi.app.utils.TextAutoRoute; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,8 +60,12 @@ public class AppDynamicCommentServiceImpl implements IAppDynamicCommentService * @return 结果 */ @Override - public int insertAppDynamicComment(AppDynamicComment appDynamicComment) + public AjaxResult insertAppDynamicComment(AppDynamicComment appDynamicComment) { + AjaxResult ajaxResult = TextAutoRoute.check(appDynamicComment.getContent()); + if ((ajaxResult.get("code").toString()).equals("2001")){ + return ajaxResult; + } if (appDynamicComment.getParentId() != null && appDynamicComment.getParentId() > 0) { AppDynamicComment entity = appDynamicCommentMapper.selectAppDynamicCommentById(appDynamicComment.getParentId()); appDynamicComment.setParentIds(appDynamicComment.getParentId() + ","); @@ -68,7 +74,7 @@ public class AppDynamicCommentServiceImpl implements IAppDynamicCommentService } } appDynamicComment.setCreateTime(DateUtils.getNowDate()); - return appDynamicCommentMapper.insertAppDynamicComment(appDynamicComment); + return AjaxResult.success(appDynamicCommentMapper.insertAppDynamicComment(appDynamicComment)); } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index c155489..b0ba9c7 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -7,7 +7,9 @@ import java.util.stream.Collectors; import com.ruoyi.app.domain.*; import com.ruoyi.app.domain.vo.AppUserDynamicVo; import com.ruoyi.app.mapper.*; +import com.ruoyi.app.utils.TextAutoRoute; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.web.domain.AjaxResult; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -72,7 +74,11 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService * @return 结果 */ @Override - public int insertAppUserDynamic(AppUserDynamic appUserDynamic) { + public AjaxResult insertAppUserDynamic(AppUserDynamic appUserDynamic) { + AjaxResult ajaxResult = TextAutoRoute.check(appUserDynamic.getContent()); + if ((ajaxResult.get("code").toString()).equals("2001")){ + return ajaxResult; + } appUserDynamic.setCreateTime(DateUtils.getNowDate()); appUserDynamicMapper.insertAppUserDynamic(appUserDynamic); if (StringUtils.isNotBlank(appUserDynamic.getImgUrls())) { @@ -85,7 +91,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService appDynamicImgMapper.insertAppDynamicImg(appDynamicImg); } } - return 1; + return AjaxResult.success(null); } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/TextAutoRoute.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/TextAutoRoute.java index 474526d..da177d2 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/TextAutoRoute.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/TextAutoRoute.java @@ -75,9 +75,20 @@ public class TextAutoRoute { Integer code = result.getCode(); if (code != null && code == 200) { TextModerationResponseBody.TextModerationResponseBodyData data = result.getData(); - /*System.out.println("labels = [" + data.getLabels() + "]"); - System.out.println("reason = [" + data.getReason() + "]");*/ - return AjaxResult.success(data.getLabels()); +// System.out.println("labels = [" + data.getLabels() + "]"); +// System.out.println("reason = [" + data.getReason() + "]"); + if (StringUtils.isBlank(data.getLabels())) { + return AjaxResult.success(null); + } + // customizedWords + JSONObject jsonObject = JSON.parseObject(data.getReason()); + String msg = null; + try { + msg = jsonObject.get("riskTips").toString(); + } catch (NullPointerException e) { + msg = jsonObject.get("customizedWords").toString(); + } + return AjaxResult.error(2001,msg); } } } @@ -88,8 +99,8 @@ public class TextAutoRoute { } public static void main(String[] args) { - AjaxResult ajaxResult = check("吃饭好"); - if (Integer.valueOf(ajaxResult.get("code").toString()) == 200 && StringUtils.isNotBlank(ajaxResult.get("msg").toString())){ + AjaxResult ajaxResult = check("吃饭"); + if ((ajaxResult.get("code").toString()).equals("2001")){ System.out.println(1); } System.out.println(ajaxResult);