Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

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);
         }
     }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftContentDao.java

@@ -51,4 +51,11 @@ public interface DraftContentDao extends BaseDao<DraftContentEntity> {
     List<DraftContentEntity> selectScanContentByDraftId(String draftId);
 
     int updateAuditStatusById(@Param("id")String id, @Param("auditStatus")String auditStatus);
+
+    /**
+     * desc：根据草稿Id 物理删除内容
+     * @param draftId
+     * @return
+     */
+	int deleteByDraftId(@Param("draftId") String draftId);
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftCoverDao.java

@@ -52,4 +52,11 @@ public interface DraftCoverDao extends BaseDao<DraftCoverEntity> {
     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);
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java

@@ -48,4 +48,11 @@ public interface DraftPublishRangeDao extends BaseDao<DraftPublishRangeEntity> {
      * @author zxc
      */
     List<String> selectGridIdByDraftId(@Param("draftId")String draftId);
+
+	/**
+	 * desc:物理删除发布范围
+	 * @param draftId
+	 * @return
+	 */
+	int deleteByDraftId(@Param("draftId") String draftId);
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java

@@ -40,7 +40,7 @@ public interface TagCustomerDao extends BaseDao<TagCustomerEntity> {
      * @param formDTO
      * @author zxc
      */
-    void checkTagInfo(UpdateTagFormDTO formDTO);
+    void upsertTagCount(UpdateTagFormDTO formDTO);
 
     /**
      * @Description  初始化默认标签

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java

@@ -192,4 +192,12 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	 * @return
 	 */
 	DraftContentSaveResultDTO saveDraft(TokenDto tokenDto, DraftContentFromDTO fromDTO);
+
+	/**
+	 * desc:政府端点审核结果处理异常后 修改草稿审核状态
+	 * @param draftId
+	 * @param statusFlag
+	 * @return
+	 */
+	void updateDraftPublishStatus(String draftId,String statusFlag);
 }

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<ArticleDao, ArticleEntit
 		String draftId = draftEntity.getId();
 		fromDTO.setDraftId(draftId);
 		draftContentList = buildDraftContent(tokenDto, fromDTO);
-
-		Map<String, Object> 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<ArticleDao, ArticleEntit
 		DraftEntity draftEntity = checkDraftStatus(fromDTO.getDraftId());
 
 		//构建标签
+		draftEntity.setTags(null);
 		if (!CollectionUtils.isEmpty(fromDTO.getTagNameList())) {
 			List<String> tagNameList = fromDTO.getTagNameList();
 			tagNameList = tagNameList.stream().distinct().collect(Collectors.toList());
@@ -342,6 +341,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			log.warn("saveOrUpdateAttr publisher is blank");
 			throw new RenException("发布单位不能为空");
 		}
+
+		if (StringUtils.isBlank(fromDTO.getPublishDate())) {
+			log.warn("saveOrUpdateAttr publishDate is blank");
+			throw new RenException("发布时间不能为空");
+		}
 		return saveDraftAttr(tokenDto, fromDTO);
 	}
 
@@ -360,13 +364,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void executeSaveDraftAttr(DraftEntity draftEntity, DraftCoverEntity coverEntity, List<DraftPublishRangeEntity> publishRangeEntityList) {
 		Map<String,Object> 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<ArticleDao, ArticleEntit
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
 			this.sendMsg(draft.getCustomerId(),draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
 	}
@@ -1093,6 +1096,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public DraftContentSaveResultDTO saveDraft(TokenDto tokenDto, DraftContentFromDTO fromDTO) {
 		return this.saveOrUpdateContent(tokenDto, fromDTO, false);
 	}
@@ -1109,10 +1113,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		return epmetMessageOpenFeignClient.saveUserMessage(formDTO);
 	}
 
-	private void updateDraftPublishStatus(String draftId,String statusFlag){
+	@Override
+	public void updateDraftPublishStatus(String draftId,String statusFlag){
 		draftDao.updateAuditStatusById(draftId,statusFlag);
 	}
 
+
 	/**
 	 * @Description  更新DB的标签使用次数		政府端
 	 * @param draftId

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java

@@ -112,7 +112,7 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
         formDTO.setCustomerId(customerId);
         formDTO.setUpdatedBy(userId);
         formDTO.setTagName(tagName);
-        baseDao.checkTagInfo(formDTO);
+        baseDao.upsertTagCount(formDTO);
         UpdateTagUseCountsResultDTO resultDTO = new UpdateTagUseCountsResultDTO();
         resultDTO.setTagId(formDTO.getId());
         resultDTO.setTagName(tagName);

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftContentDao.xml

@@ -37,5 +37,8 @@
     <update id="updateAuditStatusById">
         UPDATE DRAFT_CONTENT SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR} WHERE ID = #{id,jdbcType=VARCHAR}
     </update>
+    <delete id="deleteByDraftId">
+       DELETE FROM draft_content WHERE DRAFT_ID = #{draftId,jdbcType=VARCHAR}
+    </delete>
 
 </mapper>

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml

@@ -27,5 +27,8 @@
     <update id="updateAuditStatusById">
         UPDATE DRAFT_COVER SET AUDIT_STATUS = #{auditStatus,jdbcType=VARCHAR} WHERE ID = #{id,jdbcType=VARCHAR}
     </update>
+    <delete id="deleteByDraftId">
+        DELETE FROM draft_content WHERE DRAFT_ID = #{draftId,jdbcType=VARCHAR}
+    </delete>
 
 </mapper>

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
     </select>
 
     <!-- 根据草稿id查询发布范围id集合 -->
@@ -34,5 +34,8 @@
             AND dpr.draft_id = #{draftId}
             AND dpr.publish_status = "unpublish"
     </select>
+    <delete id="deleteByDraftId">
+       DELETE FROM draft_publish_range WHERE DRAFT_ID = #{draftId,jdbcType=VARCHAR}
+    </delete>
 
 </mapper>

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml

@@ -3,9 +3,9 @@
 
 <mapper namespace="com.epmet.dao.TagCustomerDao">
 
-    <insert id="checkTagInfo" parameterType="com.epmet.dto.form.UpdateTagFormDTO">
+    <insert id="upsertTagCount" parameterType="com.epmet.dto.form.UpdateTagFormDTO">
         <selectKey keyProperty="id" order="AFTER" resultType="String">
-            select id from tag_customer where tag_name = #{tagName}
+            select id from tag_customer where tag_name = #{tagName} AND CUSTOMER_ID = #{customerId}
         </selectKey>
         INSERT INTO tag_customer ( ID, CUSTOMER_ID, TAG_NAME, USE_COUNT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
@@ -21,7 +21,7 @@
         NOW())
         ON DUPLICATE KEY UPDATE USE_COUNT = ( USE_COUNT + 1 ),
         UPDATED_TIME = NOW(),
-        UPDATED_BY = #{updatedBy};
+        UPDATED_BY = #{updatedBy}
     </insert>
 
     <!-- 初始化默认标签 -->