From e5c7c3d63c5d498a340f48d18bf020632c8f666a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 8 Jul 2020 13:32:32 +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=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8B-?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE-=E8=AF=84=E8=AE=BA-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/07/08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventCommentServiceImpl.java | 51 ++++++++----------- .../impl/ActUserClockLogServiceImpl.java | 50 +++++++++--------- 2 files changed, 49 insertions(+), 52 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 065c4df85..6c24adcbc 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 @@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; +import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; @@ -148,24 +149,21 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); + textList.add(commentFormDTO.getContent()); + CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); + if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) { + if (!contentResult.getAllPass()) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getViolationsRecords(commentFormDTO.getUserId(), + commentFormDTO.getUserName(), "2", "1", "issue_comment", commentFormDTO.getContent(), + null, contentResult, null); + contentSecurityFeign.insertViolationsRecord(record); return new Result().error("内容审核未通过，请修改后重新提交！"); } - }else{ - logger.error("解析审核结果异常："+checkResult); + } else { + logger.error("解析审核结果异常：" + contentResult); } IssueEntity issueEntity = null; @@ -269,20 +267,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); + textList.add(appActUserClockLogDTO.getClockDesc()); + CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); CheckResultDTO imgResult = CheckDataUtils.checkImgs(appActUserClockLogDTO.getImages()); - if(contentResult!= null && imgResult!=null + if (contentResult != null && imgResult != null && 200 == contentResult.getDetails().get(0).getCode() - && 200 == imgResult.getDetails().get(0).getCode()){ - if(!contentResult.getAllPass() || !imgResult.getAllPass()){ + && 200 == imgResult.getDetails().get(0).getCode()) { + if (!contentResult.getAllPass() || !imgResult.getAllPass()) { String userName = ""; - Result user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); - if(user.getData()!=null){ + Result user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); + if (user.getData() != null) { userName = user.getData().getNickname(); } //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getViolationsRecords(appActUserClockLogDTO.getUserId(), - userName,"2","help_signIn",appActUserClockLogDTO.getClockDesc(), - appActUserClockLogDTO.getImages(),contentResult,imgResult); + userName, "2", "1", "help_signIn", appActUserClockLogDTO.getClockDesc(), + appActUserClockLogDTO.getImages(), contentResult, imgResult); contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } - }else{ - logger.error("解析审核结果异常contentResult："+contentResult +"---imgResult:"+imgResult); + } else { + logger.error("解析审核结果异常contentResult：" + contentResult + "---imgResult:" + imgResult); } //查询人员活动关系Id(可打卡的) List statusList = new ArrayList<>(); @@ -360,20 +362,22 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); - if(user.getData()!=null){ - userName = user.getData().getNickname(); + if (contentResult != null && imgResult != null + && 200 == contentResult.getDetails().get(0).getCode() + && 200 == imgResult.getDetails().get(0).getCode()) { + CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); + if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { + String userName = ""; + Result user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); + if (user.getData() != null) { + userName = user.getData().getNickname(); + } + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getUnCheckRecords(appActUserClockLogDTO.getUserId(), + userName, "2", "help_signIn", appActUserClockLogDTO.getClockDesc(), + appActUserClockLogDTO.getImages(), entity.getId(), twoTypes); + contentSecurityFeign.insertRecords(record); } - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getUnCheckRecords(appActUserClockLogDTO.getUserId(), - userName,"2","help_signIn",appActUserClockLogDTO.getClockDesc(), - appActUserClockLogDTO.getImages(),entity.getId(),twoTypes); - - contentSecurityFeign.insertRecords(record); } return new Result().ok("打卡成功"); }