|
@ -23,9 +23,15 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.NumConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.redis.RedisKeys; |
|
|
import com.elink.esua.epdc.commons.tools.redis.RedisKeys; |
|
|
import com.elink.esua.epdc.commons.tools.redis.RedisUtils; |
|
|
import com.elink.esua.epdc.commons.tools.redis.RedisUtils; |
|
|
|
|
|
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.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.security.user.SecurityUser; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
@ -59,6 +65,7 @@ import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; |
|
|
import com.elink.esua.epdc.modules.events.service.EpdcEventsService; |
|
|
import com.elink.esua.epdc.modules.events.service.EpdcEventsService; |
|
|
import com.elink.esua.epdc.modules.events.service.ImgService; |
|
|
import com.elink.esua.epdc.modules.events.service.ImgService; |
|
|
import com.elink.esua.epdc.modules.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.modules.feign.AdminFeignClient; |
|
|
|
|
|
import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; |
|
|
import com.elink.esua.epdc.modules.feign.GroupFeignClient; |
|
|
import com.elink.esua.epdc.modules.feign.GroupFeignClient; |
|
|
import com.elink.esua.epdc.modules.issue.dao.IssueDao; |
|
|
import com.elink.esua.epdc.modules.issue.dao.IssueDao; |
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueEntity; |
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueEntity; |
|
@ -69,6 +76,8 @@ import com.elink.esua.epdc.modules.item.service.ItemService; |
|
|
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; |
|
|
import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; |
|
|
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; |
|
|
import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
@ -117,6 +126,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv |
|
|
@Autowired |
|
|
@Autowired |
|
|
private RedisUtils redisUtils; |
|
|
private RedisUtils redisUtils; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private ContentSecurityFeignClient contentSecurityFeign; |
|
|
|
|
|
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(EpdcEventsServiceImpl.class); |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) { |
|
|
public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) { |
|
|
IPage<EpdcEventsDTO> page = getPage(params); |
|
|
IPage<EpdcEventsDTO> page = getPage(params); |
|
@ -157,6 +171,27 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv |
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto) { |
|
|
public EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto) { |
|
|
|
|
|
//内容审核
|
|
|
|
|
|
List<String> textList = new ArrayList<>(); |
|
|
|
|
|
textList.add(dto.getEventContent()); |
|
|
|
|
|
CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); |
|
|
|
|
|
CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages()); |
|
|
|
|
|
if (contentResult != null && imgResult != null |
|
|
|
|
|
&& 200 == contentResult.getDetails().get(0).getCode() |
|
|
|
|
|
&& 200 == imgResult.getDetails().get(0).getCode()) { |
|
|
|
|
|
if (!contentResult.getAllPass() || !imgResult.getAllPass()) { |
|
|
|
|
|
//组装要保存的信息
|
|
|
|
|
|
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(), |
|
|
|
|
|
dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList, |
|
|
|
|
|
dto.getImages(), null,contentResult, imgResult,null); |
|
|
|
|
|
contentSecurityFeign.insertViolationsRecord(record); |
|
|
|
|
|
throw new RenException(CheckDataUtils.violations_message); |
|
|
|
|
|
// return new Result().error(CheckDataUtils.violations_message);
|
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
logger.error("解析审核结果异常contentResult:" + contentResult + "---imgResult:" + imgResult); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class); |
|
|
EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class); |
|
|
insert(entity); |
|
|
insert(entity); |
|
|
|
|
|
|
|
@ -168,6 +203,20 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv |
|
|
|
|
|
|
|
|
//短信通知 所有有菜单权限的议题审核员
|
|
|
//短信通知 所有有菜单权限的议题审核员
|
|
|
issueOverseeResultsTask.getSysGridLeaderPhone(dto.getGridId()); |
|
|
issueOverseeResultsTask.getSysGridLeaderPhone(dto.getGridId()); |
|
|
|
|
|
|
|
|
|
|
|
//保存待审核记录
|
|
|
|
|
|
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())) { |
|
|
|
|
|
//组装要保存的信息
|
|
|
|
|
|
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(), |
|
|
|
|
|
dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList, |
|
|
|
|
|
dto.getImages(), entity.getId(),null,null, twoTypes); |
|
|
|
|
|
contentSecurityFeign.insertRecords(record); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
return entity; |
|
|
return entity; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|