|
|
|
@ -25,9 +25,11 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
|
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.ModuleName; |
|
|
|
import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; |
|
|
|
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.security.user.SecurityUser; |
|
|
|
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; |
|
|
|
@ -49,6 +51,7 @@ import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; |
|
|
|
import com.elink.esua.epdc.modules.comment.service.EventCommentService; |
|
|
|
import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService; |
|
|
|
import com.elink.esua.epdc.modules.events.service.EpdcEventsService; |
|
|
|
import com.elink.esua.epdc.modules.feign.AdminFeignClient; |
|
|
|
import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; |
|
|
|
import com.elink.esua.epdc.modules.feign.UserFeignClient; |
|
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueEntity; |
|
|
|
@ -100,6 +103,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev |
|
|
|
@Autowired |
|
|
|
private UserFeignClient userInfoFeignClient; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private AdminFeignClient adminFeignClient; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<EventCommentDTO> page(Map<String, Object> params) { |
|
|
|
IPage<EventCommentEntity> page = baseDao.selectPage( |
|
|
|
@ -163,13 +169,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev |
|
|
|
if(null != user.getData()){ |
|
|
|
mobile = user.getData().getMobile(); |
|
|
|
} |
|
|
|
// 获取所有上级机构名称和ID拼接
|
|
|
|
ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); |
|
|
|
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); |
|
|
|
if (contentResult != null && !contentResult.getAllPass()) { |
|
|
|
//组装要保存的信息
|
|
|
|
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), |
|
|
|
commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, |
|
|
|
ModuleName.ISSUE_COMMENT.getCode(), textList,null, null,contentResult, |
|
|
|
null,null,mobile,"0"); |
|
|
|
null,null,mobile,"0",deptDto); |
|
|
|
contentSecurityFeign.insertViolationsRecord(record); |
|
|
|
return new Result().error(CheckDataUtils.violations_message); |
|
|
|
} |
|
|
|
@ -278,7 +286,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev |
|
|
|
if(contentResult == null) { |
|
|
|
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), |
|
|
|
commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_COMMENT.getCode(), textList, |
|
|
|
null, commentEntity.getId(),null,null, null,mobile,"1"); |
|
|
|
null, commentEntity.getId(),null,null, null,mobile,"1",deptDto); |
|
|
|
contentSecurityFeign.insertRecords(record); |
|
|
|
} |
|
|
|
|
|
|
|
@ -289,7 +297,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev |
|
|
|
//组装要保存的信息
|
|
|
|
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), |
|
|
|
commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList, |
|
|
|
null,commentEntity.getId(), null,null,twoTypes,mobile,"0"); |
|
|
|
null,commentEntity.getId(), null,null,twoTypes,mobile,"0",deptDto); |
|
|
|
contentSecurityFeign.insertRecords(record); |
|
|
|
} |
|
|
|
} |
|
|
|
|
Jackwang
5 years ago