diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 9ef48b062e..7cc723b070 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.constant.DraftConstant; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.ArticleOperateRecordService; @@ -230,12 +231,14 @@ public class ArticleController { if (syncScanResult == null) { log.error("scanContent draftId:{} return result null", draftId); } + if (syncScanResult.isAllPass()) { articleService.scanAllPassPublishArticle(tokenDto, draftId, syncScanResult); } else { articleService.updateAuditStatusFailById(draftId, syncScanResult); } } catch (Exception e) { + articleService.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL); log.error("scanContent exception draftId:{} return result null", e); } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java index 1abca178e0..12d5888c86 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java @@ -51,4 +51,11 @@ public interface DraftContentDao extends BaseDao { List selectScanContentByDraftId(String draftId); int updateAuditStatusById(@Param("id")String id, @Param("auditStatus")String auditStatus); + + /** + * desc:根据草稿Id 物理删除内容 + * @param draftId + * @return + */ + int deleteByDraftId(@Param("draftId") String draftId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java index d9bec5bd34..961d786545 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java @@ -52,4 +52,11 @@ public interface DraftCoverDao extends BaseDao { DraftCoverDTO selectCoverIdAndUrlByDraftId(@Param("draftId")String draftId); int updateAuditStatusById(@Param("id")String id, @Param("auditStatus")String auditStatus); + + /** + * desc:物理删除封面 + * @param draftId + * @return + */ + int deleteByDraftId(@Param("draftId") String draftId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java index fc1968224f..c738d8631f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java @@ -48,4 +48,11 @@ public interface DraftPublishRangeDao extends BaseDao { * @author zxc */ List selectGridIdByDraftId(@Param("draftId")String draftId); + + /** + * desc:物理删除发布范围 + * @param draftId + * @return + */ + int deleteByDraftId(@Param("draftId") String draftId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index be3e9ef287..d93553ee41 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -192,4 +192,12 @@ public interface ArticleService extends BaseService { * @return */ DraftContentSaveResultDTO saveDraft(TokenDto tokenDto, DraftContentFromDTO fromDTO); + + /** + * desc:政府端点审核结果处理异常后 修改草稿审核状态 + * @param draftId + * @param statusFlag + * @return + */ + void updateDraftPublishStatus(String draftId,String statusFlag); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 74915f7882..da75a3b6f8 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -209,10 +209,8 @@ public class ArticleServiceImpl extends BaseServiceImpl draftIdMap = new HashMap<>(); - draftIdMap.put(ModuleConstant.FIELD_DRAFT_ID, fromDTO.getDraftId()); - draftContentDao.deleteByMap(draftIdMap); + //物理删除 草稿内容 + draftContentDao.deleteByDraftId(fromDTO.getDraftId()); if (!CollectionUtils.isEmpty(draftContentList)) { draftContentService.insertBatch(draftContentList); } @@ -271,6 +269,7 @@ public class ArticleServiceImpl extends BaseServiceImpl tagNameList = fromDTO.getTagNameList(); tagNameList = tagNameList.stream().distinct().collect(Collectors.toList()); @@ -342,6 +341,11 @@ public class ArticleServiceImpl extends BaseServiceImpl publishRangeEntityList) { Map draftIdMap = new HashMap<>(); - draftIdMap.put(ModuleConstant.FIELD_DRAFT_ID, draftEntity.getId()); - draftCoverDao.deleteByMap(draftIdMap); + //物理删除 + draftCoverDao.deleteByDraftId(draftEntity.getId()); if (coverEntity != null){ draftCoverDao.insert(coverEntity); } - - draftPublishRangeDao.deleteByMap(draftIdMap); + //物理删除 + draftPublishRangeDao.deleteByDraftId(draftEntity.getId()); if (!CollectionUtils.isEmpty(publishRangeEntityList)){ publishRangeEntityList.forEach(publishRange->draftPublishRangeDao.insert(publishRange)); } @@ -1040,7 +1044,6 @@ public class ArticleServiceImpl extends BaseServiceImpl UPDATE DRAFT_CONTENT SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR} WHERE ID = #{id,jdbcType=VARCHAR} + + DELETE FROM draft_content WHERE DRAFT_ID = #{draftId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml index 740bde510d..a658472bbc 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml @@ -27,5 +27,8 @@ UPDATE DRAFT_COVER SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR} WHERE ID = #{id,jdbcType=VARCHAR} + + DELETE FROM draft_content WHERE DRAFT_ID = #{draftId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml index 179283e897..bece861541 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml @@ -18,7 +18,7 @@ DRAFT_PUBLISH_RANGE WHERE DRAFT_ID = #{draftId} - AND DEL_FLAG = '0' + AND DEL_FLAG = 0 @@ -34,5 +34,8 @@ AND dpr.draft_id = #{draftId} AND dpr.publish_status = "unpublish" + + DELETE FROM draft_publish_range WHERE DRAFT_ID = #{draftId,jdbcType=VARCHAR} + \ No newline at end of file