From b76b221bfb709c601a4f040bbc120c47a5fde2f0 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 16 Jul 2020 19:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=91-=E3=80=90=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07?= =?UTF-8?q?/16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventCommentServiceImpl.java | 15 ++++++++++----- .../service/impl/EpdcEventsServiceImpl.java | 15 ++++++++++----- .../item/service/impl/ItemServiceImpl.java | 15 ++++++++++----- .../service/impl/TopicCommentServiceImpl.java | 15 ++++++++++----- .../topic/service/impl/TopicServiceImpl.java | 13 +++++++++---- .../activity/service/impl/ActInfoServiceImpl.java | 15 ++++++++++----- .../service/impl/ActUserClockLogServiceImpl.java | 15 ++++++++++----- 7 files changed, 69 insertions(+), 34 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index cf5c89f02..6d480bb39 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -169,11 +169,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one, ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, - null,null,mobile); - contentSecurityFeign.insertViolationsRecord(record); + null,null,mobile,"0"); + contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); - } else { - logger.error("未进入违规信息记录：" + contentResult); + } + //接口异常，保存至待审核信息 + if(contentResult == null) { + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, + null, null,null,null, null,mobile,"1"); + contentSecurityFeign.insertRecords(record); } ItemEntity itemEntity = new ItemEntity(); @@ -354,7 +359,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null,itemEntity.getId(), null,null,twoTypes,mobile); + null,itemEntity.getId(), null,null,twoTypes,mobile,"0"); contentSecurityFeign.insertRecords(record); } }//如果是审核状态是pass，不作任何处理 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java index 96d740db5..c223b4dd8 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java @@ -150,11 +150,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile()); + formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0"); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); - } else { - logger.info("未进入违规信息记录contentResult：" + contentResult + "---imgResult:" + imgResult); + } + //接口异常，保存至待审核信息 + if(contentResult == null || imgResult == null) { + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), + formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, + formDto.getImages(), null,null,null, null,formDto.getMobile(),"1"); + contentSecurityFeign.insertRecords(record); } TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class); @@ -243,7 +248,7 @@ public class TopicServiceImpl extends BaseServiceImpl imp //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile()); + formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0"); contentSecurityFeign.insertRecords(record); } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index dabcb17f7..beb58ed87 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -161,11 +161,16 @@ public class ActInfoServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); @@ -368,8 +373,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl