elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【内容审核】-【党群议事-议题项目-评论-修改】-（王童）-2020/07/08

feature/dangjian
Jackwang 6 years ago
parent
a4f0748f6f
commit
e5c7c3d63c
2 changed files with 49 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  2. 50
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

51
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
View File

@ -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<EventCommentDao, Ev
@Transactional(rollbackFor = Exception.class)
public Result submit(SubmitCommentFormDTO commentFormDTO) {
//内容审核
CheckResultDTO checkResult = CheckDataUtils.checkContent(null,commentFormDTO.getContent());
if(checkResult != null && 200 == checkResult.getDetails().get(0).getCode()){
if(!checkResult.getAllPass()){
SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
record.setUserId(commentFormDTO.getUserId());
record.setName(commentFormDTO.getUserName());
record.setCategory("2");//居民
record.setDecision("1");//系统判定
record.setModule("issue_comment");//党群议事-议题项目-评论
record.setContent(commentFormDTO.getContent());
record.setSuggestion(checkResult.getDetails().get(0).getResults().get(0).getSuggestion());
record.setLabel(checkResult.getDetails().get(0).getResults().get(0).getLabel());
record.setRate(checkResult.getDetails().get(0).getResults().get(0).getRate());
List<String> 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<EventCommentDao, Ev
newsTask.insertUserInformation(informationFormDTO);
//判断是否为待审核
if(checkResult != null
&& 200 == checkResult.getDetails().get(0).getCode()
&& "review".equals(checkResult.getDetails().get(0).getResults().get(0).getSuggestion())){
SaveCheckRecordsDTO record = new SaveCheckRecordsDTO();
record.setUserId(commentFormDTO.getUserId());
record.setName(commentFormDTO.getUserName());
record.setCategory("2");//居民
record.setModule("issue_comment");//党群议事-议题项目-评论
record.setContent(commentFormDTO.getContent());
record.setRelationId(commentEntity.getId());
record.setSuggestion(checkResult.getDetails().get(0).getResults().get(0).getSuggestion());
record.setLabel(checkResult.getDetails().get(0).getResults().get(0).getLabel());
record.setRate(checkResult.getDetails().get(0).getResults().get(0).getRate());
contentSecurityFeign.insertRecords(record);
if (contentResult != null && 200 == contentResult.getDetails().get(0).getCode()) {
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getUnCheckRecords(commentFormDTO.getUserId(),
commentFormDTO.getUserName(), "2", "issue_comment", commentFormDTO.getContent(),
null, commentEntity.getId(), twoTypes);
contentSecurityFeign.insertRecords(record);
}
}//如果是审核状态是pass，不作任何处理
return new Result();
}

50
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
View File

@ -303,27 +303,29 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
@Override
public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
//内容审核
CheckResultDTO contentResult = CheckDataUtils.checkContent(null,appActUserClockLogDTO.getClockDesc());
List<String> 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<UserDTO> user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId());
if(user.getData()!=null){
Result<UserDTO> 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<String> statusList = new ArrayList<>();
@ -360,20 +362,22 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
}
actInfoService.addClockNum(appActUserClockLogDTO.getActId());
//保存待审核记录
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
if(CheckDataUtils.review.equals(twoTypes.getSuggestion())){
String userName = "";
Result<UserDTO> 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<UserDTO> 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("打卡成功");
}

Write Preview
Loading…
Cancel
Save