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 d99d0a4f2..3c5a4c607 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 @@ -33,6 +33,12 @@ 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.StrConstant; 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.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.DateUtils; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; @@ -53,9 +59,12 @@ import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; import com.elink.esua.epdc.modules.activity.service.ActBannerService; import com.elink.esua.epdc.modules.activity.service.ActInfoService; import com.elink.esua.epdc.modules.async.NewsTask; +import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.JobFeignClient; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -84,6 +93,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl page(Map params) { @@ -126,6 +139,36 @@ public class ActInfoServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); + textList.add(dto.getTitle()); + textList.add(dto.getActContent()); + List imgList = new ArrayList<>(); + imgList.add(dto.getHeadPic()); + imgList.add(dto.getBannerUrl()); + CheckResultDTO contentResult = CheckDataUtils.checkContent(imgList); + CheckResultDTO imgResult = CheckDataUtils.checkImgs(imgList); + 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(userId, + userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList, + imgList, null,contentResult, imgResult,null); + contentSecurityFeign.insertViolationsRecord(record); + return new Result().error(CheckDataUtils.violations_message); + } + } else { + logger.error("解析审核结果异常contentResult:" + contentResult + "---imgResult:" + imgResult); + } + ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class); if (insert(entity)) { if (NumConstant.ONE_STR.equals(dto.getIsBanner())) { @@ -136,6 +179,19 @@ public class ActInfoServiceImpl extends BaseServiceImpl