From 880c67067f5049e2783321f1460be09ca99e30f3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 3 Jun 2020 09:44:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/ArticlePublishRangeDTO.java | 8 +- .../com/epmet/dto/DraftPublishRangeDTO.java | 8 +- .../epmet/dto/form/DraftContentFromDTO.java | 20 +---- .../epmet/controller/ArticleController.java | 8 +- .../entity/ArticlePublishRangeEntity.java | 5 ++ .../epmet/entity/DraftPublishRangeEntity.java | 5 ++ .../com/epmet/service/ArticleService.java | 4 +- .../service/impl/ArticleServiceImpl.java | 84 ++++++++----------- .../resources/migration/epmet_gov_voice.sql | 50 ++++++----- .../java/com/epmet/ArticleServiceTest.java | 45 ++++++++++ 10 files changed, 142 insertions(+), 95 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticlePublishRangeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticlePublishRangeDTO.java index 84a24f947b..02106d920b 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticlePublishRangeDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticlePublishRangeDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -53,6 +54,11 @@ public class ArticlePublishRangeDTO implements Serializable { */ private String gridId; + /** + * 组织-网格名称 + */ + private String agencyGridName; + /** * 下线时间 */ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftPublishRangeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftPublishRangeDTO.java index b0c57bb112..8457b400ea 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftPublishRangeDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftPublishRangeDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -53,6 +54,11 @@ public class DraftPublishRangeDTO implements Serializable { */ private String gridId; + /** + * 组织-网格名称 + */ + private String agencyGridName; + /** * 下线时间 */ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java index 81d39fa698..5d933697d7 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java @@ -35,15 +35,7 @@ public class DraftContentFromDTO implements Serializable { private static final long serialVersionUID = -4206020151361420221L; - /** - * 文章ID 重新编辑时必填 - */ - private String articleId; - /** - * 客户ID - */ - private String customerId; /** * 草稿ID @@ -69,7 +61,7 @@ public class DraftContentFromDTO implements Serializable { /** * 内容Id */ - private String draftId; + private String draftContentId; /** * 内容 */ @@ -80,16 +72,6 @@ public class DraftContentFromDTO implements Serializable { */ private String contentType; - /** - * 审核状态 通过:pass；失败:fail； - */ - private String auditStatus; - - /** - * 审核理由 - */ - private String auditReason; - /** * 内容顺序 从1开始 */ 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 e72213a34d..48b7096595 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 @@ -28,10 +28,8 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ArticleDTO; -import com.epmet.dto.form.LatestListFormDTO; -import com.epmet.dto.result.ArticleGridResultDTO; -import com.epmet.dto.result.LatestListResultDTO; import com.epmet.dto.form.DraftContentFromDTO; +import com.epmet.dto.result.ArticleGridResultDTO; import com.epmet.excel.ArticleExcel; import com.epmet.service.ArticleService; import org.springframework.beans.factory.annotation.Autowired; @@ -114,8 +112,8 @@ public class ArticleController { * @throws Exception */ @GetMapping("savecontent") - public Result savecontent(@RequestBody DraftContentFromDTO fromDTO) throws Exception { - String draftId = articleService.saveOrUpdateContent(fromDTO); + public Result saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO fromDTO) throws Exception { + String draftId = articleService.saveOrUpdateContent(tokenDto, fromDTO); return new Result().ok(draftId); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java index 9ee3aa1afa..de4911067c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java @@ -53,6 +53,11 @@ public class ArticlePublishRangeEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 组织-网格名称 + */ + private String agencyGridName; + /** * 下线时间 */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java index 93833228cf..fb3233cbb1 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java @@ -53,6 +53,11 @@ public class DraftPublishRangeEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 组织-网格名称 + */ + private String agencyGridName; + /** * 下线时间 */ 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 9cae7ed196..dd166a0b51 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 @@ -106,8 +106,10 @@ public interface ArticleService extends BaseService { /** * desc:保存或修改文章内容 + * + * @param tokenDto * @param fromDTO * @return */ - String saveOrUpdateContent(DraftContentFromDTO fromDTO); + String saveOrUpdateContent(TokenDto tokenDto, DraftContentFromDTO fromDTO); } \ 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 3b082d2776..778a08b7b4 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 @@ -16,17 +16,16 @@ */ package com.epmet.service.impl; - import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; @@ -36,8 +35,8 @@ import com.epmet.dao.DraftContentDao; import com.epmet.dao.DraftDao; import com.epmet.dto.ArticleDTO; import com.epmet.dto.feign.GovOrgSelfFeignClient; -import com.epmet.dto.result.ArticleGridResultDTO; import com.epmet.dto.form.DraftContentFromDTO; +import com.epmet.dto.result.ArticleGridResultDTO; import com.epmet.entity.ArticleEntity; import com.epmet.entity.DraftContentEntity; import com.epmet.entity.DraftEntity; @@ -49,11 +48,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.stream.Collectors; /** * 文章表 @@ -63,14 +60,12 @@ import java.util.stream.Collectors; */ @Service public class ArticleServiceImpl extends BaseServiceImpl implements ArticleService { - + private final Log logger = LogFactory.getLog(getClass()); @Autowired private ArticleRedis articleRedis; @Autowired private GovOrgSelfFeignClient govOrgSelfFeignClient; - private final Log logger = LogFactory.getLog(getClass()); - @Autowired - private ArticleRedis articleRedis; + @Autowired private DraftDao draftDao; @@ -145,25 +140,13 @@ public class ArticleServiceImpl extends BaseServiceImpl articleParamMap = new HashMap<>(); - articleParamMap.put("ARTICLE_ID", fromDTO.getArticleId()); - articleParamMap.put("ARTICLE_ID", fromDTO.getArticleId()); - articleDao.selectByMap(articleParamMap); - } DraftEntity draftEntity = null; List draftContentList = null; if (StringUtils.isNotBlank(fromDTO.getDraftId())) { - //TODO - draftEntity = draftDao.selectById(fromDTO.getDraftId()); if (draftEntity == null) { logger.warn("saveOrUpdateContent draftId is not exist in db"); @@ -176,56 +159,63 @@ public class ArticleServiceImpl extends BaseServiceImpl draftIdMap = new HashMap<>(); + draftIdMap.put("DRAFT_ID", fromDTO.getDraftId()); + draftContentDao.deleteByMap(draftIdMap); //TODO 改为批量插入 draftContentList.forEach(content -> draftContentDao.insert(content)); - String draftId = draftEntity.getId(); - - - return null; + return draftId; } /** * desc：构建 内容对象 * + * + * @param tokenDto * @param fromDTO - * @param havePublished * @return */ - private List buildDraftContent(DraftContentFromDTO fromDTO, boolean havePublished) { + private List buildDraftContent(TokenDto tokenDto, DraftContentFromDTO fromDTO) { //如果已发布 则需要校验内容是否更改过 没有更改则 不对审核状态进行重置 List newContentList = new ArrayList<>(); - Map oldContentMap = null; - Map draftIdMap = new HashMap<>(); - draftIdMap.put("DRAFT_ID", fromDTO.getDraftId()); - if (havePublished) { - List oldContentEntities = draftContentDao.selectByMap(draftIdMap); - oldContentMap = oldContentEntities.stream().collect(Collectors.toMap(DraftContentEntity::getId, content -> content)); - //删掉所有 - draftContentDao.deleteByMap(draftIdMap); - } + List contentList = fromDTO.getContentList(); - Map finalOldContentMap = oldContentMap; Set orderNumSet = new HashSet<>(); contentList.forEach(content -> { - if (finalOldContentMap != null && finalOldContentMap.get(content.getDraftId()) != null) { - DraftContentEntity oldContent = finalOldContentMap.get(content.getDraftId()); - if (oldContent.getContent().equals(content.getContent())) { - content.setAuditReason(oldContent.getAuditReason()); - content.setAuditStatus(oldContent.getAuditStatus()); - } - } DraftContentEntity entity = ConvertUtils.sourceToTarget(content, DraftContentEntity.class); - entity.setId(content.getDraftId()); + entity.setId(content.getDraftContentId()); + entity.setCustomerId(tokenDto.getCustomerId()); + entity.setDraftId(fromDTO.getDraftId()); orderNumSet.add(content.getOrderNum()); newContentList.add(entity); }); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql index d616dd51e2..3a38eaa980 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql @@ -1,11 +1,4 @@ -/* - Date: 2/06/2020 16:13:38 -*/ - --- SET NAMES utf8mb4; --- #SET FOREIGN_KEY_CHECKS = 0; - -CREATE DATABASE `epmet_gov_access` DEFAULT CHARACTER SET utf8mb4; +DROP TABLE tag_default;/*SkipError*/ CREATE TABLE tag_default( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , TAG_NAME VARCHAR(32) NOT NULL COMMENT '标签名称' , @@ -19,6 +12,7 @@ CREATE TABLE tag_default( ) COMMENT = '默认标签表 默认标签表'; ALTER TABLE tag_default COMMENT '默认标签表'; +DROP TABLE tag_customer;/*SkipError*/ CREATE TABLE tag_customer( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , @@ -35,6 +29,7 @@ CREATE TABLE tag_customer( ALTER TABLE tag_customer ADD INDEX INX_TAG_NAME(TAG_NAME); ALTER TABLE tag_customer COMMENT '客户标签表'; +DROP TABLE tag_grid;/*SkipError*/ CREATE TABLE tag_grid( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , @@ -52,6 +47,7 @@ CREATE TABLE tag_grid( ) COMMENT = '网格标签表 网格标签表'; ALTER TABLE tag_grid COMMENT '网格标签表'; +DROP TABLE article_tags;/*SkipError*/ CREATE TABLE article_tags( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , @@ -69,18 +65,19 @@ CREATE TABLE article_tags( ALTER TABLE article_tags ADD INDEX IDX_ARTICLE_ID(ARTICLE_ID); ALTER TABLE article_tags COMMENT '文章标签表'; +DROP TABLE draft;/*SkipError*/ CREATE TABLE draft( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , TITLE VARCHAR(128) NOT NULL COMMENT '文章标题' , PREVIEW_CONTENT VARCHAR(512) NOT NULL COMMENT '文章内容 精简内容' , - IS_TOP INT NOT NULL COMMENT '是否置顶' , + IS_TOP INT NOT NULL COMMENT '是否置顶 1是；0否；' , PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL COMMENT '发布范围描述 所有发布范围集合' , PUBLISHER_ID VARCHAR(64) NOT NULL COMMENT '发布单位ID' , PUBLISHER_NAME VARCHAR(128) NOT NULL COMMENT '发布单位名称' , PUBLISHER_TYPE VARCHAR(32) NOT NULL COMMENT '发布单位类型 机关:agency；部门：department；网格：grid' , PUBLISH_DATE DATE NOT NULL COMMENT '发布时间' , - STATUS_FLAG VARCHAR(32) NOT NULL COMMENT '发布状态 未发布：unpublish ；已发布:published，审核中：auditing，审核失败：auditfail' , + STATUS_FLAG VARCHAR(32) NOT NULL COMMENT '发布状态 未发布：unpublish ；已发布:published，审核中：auditing；审核失败：auditfail' , TAGS VARCHAR(512) NOT NULL COMMENT '文章标签串 竖杠分割的标签名称' , ORG_ID VARCHAR(64) COMMENT '组织ID' , ORG_ID_PATH VARCHAR(512) COMMENT '组织ID路径 eg：字段为def:abc' , @@ -96,14 +93,15 @@ CREATE TABLE draft( ) COMMENT = '草稿表 草稿表'; ALTER TABLE draft COMMENT '草稿表'; +DROP TABLE draft_content;/*SkipError*/ CREATE TABLE draft_content( ID VARCHAR(64) NOT NULL COMMENT '主键ID 主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , DRAFT_ID VARCHAR(64) NOT NULL COMMENT '草稿ID' , CONTENT VARCHAR(1024) NOT NULL COMMENT '内容' , CONTENT_TYPE VARCHAR(32) NOT NULL COMMENT '内容类型 图片：img；文字：text' , - AUDIT_STATUS VARCHAR(32) NOT NULL COMMENT '审核状态 通过:pass；失败:fail；' , - AUDIT_REASON VARCHAR(128) NOT NULL COMMENT '审核理由' , + AUDIT_STATUS VARCHAR(32) COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing;' , + AUDIT_REASON VARCHAR(128) COMMENT '审核理由' , ORDER_NUM INT NOT NULL COMMENT '内容顺序 从1开始' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , REVISION INT NOT NULL COMMENT '乐观锁' , @@ -115,11 +113,13 @@ CREATE TABLE draft_content( ) COMMENT = '草稿内容表 草稿内容表'; ALTER TABLE draft_content COMMENT '草稿内容表'; +DROP TABLE draft_publish_range;/*SkipError*/ CREATE TABLE draft_publish_range( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , DRAFT_ID VARCHAR(64) NOT NULL COMMENT 'ID草稿' , GRID_ID VARCHAR(64) NOT NULL COMMENT '网格ID' , + AGENCY_GRID_NAME VARCHAR(64) NOT NULL COMMENT '组织-网格名称' , OFF_LINE_TIME DATETIME COMMENT '下线时间' , PUBLISH_STATUS VARCHAR(32) NOT NULL COMMENT '发布状态 未发布：unpublish ；已发布:published' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , @@ -132,13 +132,14 @@ CREATE TABLE draft_publish_range( ) COMMENT = '草稿发布范围表 草稿发布范围表'; ALTER TABLE draft_publish_range COMMENT '草稿发布范围表'; +DROP TABLE draft_cover;/*SkipError*/ CREATE TABLE draft_cover( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , DRAFT_ID VARCHAR(64) NOT NULL COMMENT '草稿ID' , IMG_URL VARCHAR(512) NOT NULL COMMENT '封面图片地址 url地址' , - AUDIT_STATUS VARCHAR(32) NOT NULL COMMENT '审核状态 通过:pass；失败:fail；' , - AUDIT_REASON VARCHAR(128) NOT NULL COMMENT '审核理由' , + AUDIT_STATUS VARCHAR(32) COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing;' , + AUDIT_REASON VARCHAR(128) COMMENT '审核理由' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , REVISION INT NOT NULL COMMENT '乐观锁' , CREATED_BY VARCHAR(32) NOT NULL COMMENT '创建人' , @@ -149,14 +150,15 @@ CREATE TABLE draft_cover( ) COMMENT = '草稿封面表 草稿封面表'; ALTER TABLE draft_cover COMMENT '草稿封面表'; +DROP TABLE article;/*SkipError*/ CREATE TABLE article( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , DRAFT_ID VARCHAR(64) NOT NULL COMMENT '草稿ID' , TITLE VARCHAR(128) NOT NULL COMMENT '文章标题' , PREVIEW_CONTENT VARCHAR(512) NOT NULL COMMENT '文章内容 精简内容' , - IS_TOP INT NOT NULL COMMENT '是否置顶' , - PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL COMMENT '发布范围描述 所有发布范围集合' , + IS_TOP INT NOT NULL COMMENT '是否置顶 1是；0否；' , + PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL COMMENT '发布范围描述 所有发布范围集合，顿号隔开' , PUBLISHER_ID VARCHAR(64) NOT NULL COMMENT '发布单位ID' , PUBLISHER_NAME VARCHAR(128) NOT NULL COMMENT '发布单位名称' , PUBLISHER_TYPE VARCHAR(32) NOT NULL COMMENT '发布单位类型 机关:agency；部门：department；网格：grid' , @@ -178,14 +180,15 @@ CREATE TABLE article( ) COMMENT = '文章表 正式文章表'; ALTER TABLE article COMMENT '文章表'; +DROP TABLE article_content;/*SkipError*/ CREATE TABLE article_content( ID VARCHAR(64) NOT NULL COMMENT '主键ID 主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , ARTICLE_ID VARCHAR(64) NOT NULL COMMENT '文章ID' , CONTENT VARCHAR(1024) NOT NULL COMMENT '内容' , CONTENT_TYPE VARCHAR(32) NOT NULL COMMENT '内容类型 图片：img；文字：text' , - AUDIT_STATUS VARCHAR(32) NOT NULL COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing' , - AUDIT_REASON VARCHAR(128) NOT NULL COMMENT '审核理由' , + AUDIT_STATUS VARCHAR(32) COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing;' , + AUDIT_REASON VARCHAR(128) COMMENT '审核理由' , ORDER_NUM INT NOT NULL COMMENT '内容顺序 从1开始' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , REVISION INT NOT NULL COMMENT '乐观锁' , @@ -197,13 +200,14 @@ CREATE TABLE article_content( ) COMMENT = '文章内容表 文章内容表'; ALTER TABLE article_content COMMENT '文章内容表'; +DROP TABLE article_cover;/*SkipError*/ CREATE TABLE article_cover( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , ARTICLE_ID VARCHAR(64) NOT NULL COMMENT '文章ID' , IMG_URL VARCHAR(512) NOT NULL COMMENT '封面图片地址 url地址' , - AUDIT_STATUS VARCHAR(32) NOT NULL COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing' , - AUDIT_REASON VARCHAR(128) NOT NULL COMMENT '审核理由' , + AUDIT_STATUS VARCHAR(32) COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing' , + AUDIT_REASON VARCHAR(128) COMMENT '审核理由' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , REVISION INT NOT NULL COMMENT '乐观锁' , CREATED_BY VARCHAR(32) NOT NULL COMMENT '创建人' , @@ -214,13 +218,15 @@ CREATE TABLE article_cover( ) COMMENT = '文章封面表 文章封面表'; ALTER TABLE article_cover COMMENT '文章封面表'; +DROP TABLE article_publish_range;/*SkipError*/ CREATE TABLE article_publish_range( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , ARTICLE_ID VARCHAR(64) NOT NULL COMMENT '文章ID' , GRID_ID VARCHAR(64) NOT NULL COMMENT '网格ID' , + AGENCY_GRID_NAME VARCHAR(64) NOT NULL COMMENT '组织-网格名称' , OFF_LINE_TIME DATETIME COMMENT '下线时间' , - PUBLISH_STATUS VARCHAR(32) NOT NULL COMMENT '发布状态' , + PUBLISH_STATUS VARCHAR(32) NOT NULL COMMENT '发布状态 未发布：unpublish ；已发布:published' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , REVISION INT NOT NULL COMMENT '乐观锁' , CREATED_BY VARCHAR(32) NOT NULL COMMENT '创建人' , @@ -232,6 +238,7 @@ CREATE TABLE article_publish_range( ALTER TABLE article_publish_range ADD INDEX IDX_ARTICLE_ID(ARTICLE_ID); ALTER TABLE article_publish_range COMMENT '文章发布范围表'; +DROP TABLE article_operate_record;/*SkipError*/ CREATE TABLE article_operate_record( ID VARCHAR(64) NOT NULL COMMENT '主键ID 主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , @@ -250,6 +257,7 @@ CREATE TABLE article_operate_record( ) COMMENT = '文章操作记录表 文章操作记录表'; ALTER TABLE article_operate_record COMMENT '文章操作记录表'; +DROP TABLE article_visit_record;/*SkipError*/ CREATE TABLE article_visit_record( ID VARCHAR(64) NOT NULL COMMENT '主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , diff --git a/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java b/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java new file mode 100644 index 0000000000..6d0903be34 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java @@ -0,0 +1,45 @@ +package com.epmet; + +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.form.DraftContentFromDTO; +import com.epmet.service.ArticleService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ArticleServiceTest { + + + + @Autowired + private ArticleService articleService; + + @Test + public void genToken() { + TokenDto tokenDto = new TokenDto(); + tokenDto.setCustomerId("1"); + tokenDto.setUserId("1"); + DraftContentFromDTO draftContentFromDTO = new DraftContentFromDTO(); + //draftContentFromDTO.setDraftId("1"); + draftContentFromDTO.setTitle("testTitle"); + List list = new ArrayList<>(); + for (int i = 0; i <2 ; i++) { + DraftContentFromDTO.DraftContentDTO contentDTO = new DraftContentFromDTO.DraftContentDTO(); + contentDTO.setDraftContentId(""); + contentDTO.setContent("内容"+i); + contentDTO.setContentType("text"); + contentDTO.setOrderNum(1+i); + list.add(contentDTO); + } + draftContentFromDTO.setContentList(list); + String s = articleService.saveOrUpdateContent(tokenDto, draftContentFromDTO); + System.out.println(s); + } +} From 5f7215306b160d8654308e25d48777d2fcbf4b58 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 3 Jun 2020 10:08:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) 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 778a08b7b4..d8ca414445 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 @@ -16,6 +16,7 @@ */ package com.epmet.service.impl; + import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -61,10 +62,10 @@ import java.util.*; @Service public class ArticleServiceImpl extends BaseServiceImpl implements ArticleService { private final Log logger = LogFactory.getLog(getClass()); - @Autowired - private ArticleRedis articleRedis; - @Autowired - private GovOrgSelfFeignClient govOrgSelfFeignClient; + @Autowired + private ArticleRedis articleRedis; + @Autowired + private GovOrgSelfFeignClient govOrgSelfFeignClient; @Autowired @@ -126,17 +127,17 @@ public class ArticleServiceImpl extends BaseServiceImpl result = govOrgSelfFeignClient.getAgencyGridList(tokenDTO.getUserId()); - return result.getData(); - } + /** + * @param tokenDTO + * @return + * @Author sun + * @Description 党建声音-政府端-可选发布范围 + **/ + @Override + public ArticleGridResultDTO agencyGridList(TokenDto tokenDTO) { + Result result = govOrgSelfFeignClient.getAgencyGridList(tokenDTO.getUserId()); + return result.getData(); + } @Override @Transactional(rollbackFor = Exception.class) @@ -181,7 +182,7 @@ public class ArticleServiceImpl extends BaseServiceImpl buildDraftContent(TokenDto tokenDto, DraftContentFromDTO fromDTO) { - //如果已发布 则需要校验内容是否更改过 没有更改则 不对审核状态进行重置 List newContentList = new ArrayList<>(); List contentList = fromDTO.getContentList(); - Set orderNumSet = new HashSet<>(); - contentList.forEach(content -> { + for (int i = 0; i < contentList.size(); i++) { + DraftContentFromDTO.DraftContentDTO content = contentList.get(i); DraftContentEntity entity = ConvertUtils.sourceToTarget(content, DraftContentEntity.class); entity.setId(content.getDraftContentId()); entity.setCustomerId(tokenDto.getCustomerId()); entity.setDraftId(fromDTO.getDraftId()); - orderNumSet.add(content.getOrderNum()); + entity.setOrderNum(i + 1); newContentList.add(entity); - }); - if (orderNumSet.size() != newContentList.size()) { - logger.warn("saveOrUpdateContent contentList orderNum is repeat"); - throw new RenException("参数错误"); } + return newContentList; }