保存草稿属性接口暂存

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftAttrFromDTO.java

@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 文章属性form
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-02
+ */
+@Data
+public class DraftAttrFromDTO implements Serializable {
+
+
+	private static final long serialVersionUID = 6463906402283515172L;
+	/**
+	 * 草稿ID
+	 */
+	private String draftId;
+
+	/**
+	 * 封面图片地址
+	 */
+	private String coverImg;
+
+	/**
+	 * 标签名称数组
+	 */
+	private List<String> tagNameList;
+
+	/**
+	 * 是否置顶
+	 */
+	private Integer isTop;
+
+	/**
+	 * 网格Id数组
+	 */
+	private List<String> gridIdList;
+
+	/**
+	 * 发布单位Id 类型不同 id含义不同
+	 */
+	private String publisher;
+
+	/**
+	 * 发布日期
+	 */
+	private String publishDate;
+
+	/**
+	 * 发布者类型 机关:agency；发布类型 部门：department；网格：grid
+	 */
+	private String publisherType;
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -120,7 +120,7 @@ public class ArticleController {
     }
 
     /**
-     * desc:保存或修改文章内容
+     * desc:保存或修改草稿内容
      * @param fromDTO
      * @throws Exception
      */
@@ -216,4 +216,15 @@ public class ArticleController {
         return new Result();
     }
 
+    /**
+     * desc:保存草稿属性
+     * @param fromDTO
+     * @throws Exception
+     */
+    @GetMapping("saveattr")
+    public Result<Boolean> saveOrUpdateAttr(@LoginUser TokenDto tokenDto,@RequestBody DraftAttrFromDTO fromDTO) throws Exception {
+        Boolean isSuccess = articleService.saveOrUpdateAttr(tokenDto, fromDTO);
+        return new Result<Boolean>().ok(isSuccess);
+    }
+
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ArticleDTO;
+import com.epmet.dto.form.DraftAttrFromDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
 import com.epmet.dto.form.OffLineArticleFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
@@ -141,4 +142,12 @@ public interface ArticleService extends BaseService<ArticleEntity> {
      * @Description 党建声音-政府端-下线文章
      **/
     void offLineArticle(OffLineArticleFormDTO formDTO);
+
+    /**
+     * desc:保存或修改文章属性
+     * @param tokenDto
+     * @param fromDTO
+     * @return
+     */
+    Boolean saveOrUpdateAttr(TokenDto tokenDto, DraftAttrFromDTO fromDTO);
 }

epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql

@@ -1,4 +1,11 @@
-DROP TABLE tag_default;/*SkipError*/
+/*
+ Date: 2/06/2020 16:13:38
+*/
+
+-- SET NAMES utf8mb4;
+-- #SET FOREIGN_KEY_CHECKS = 0;
+
+CREATE DATABASE `epmet_gov_access` DEFAULT CHARACTER SET utf8mb4;
 CREATE TABLE tag_default(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     TAG_NAME VARCHAR(32) NOT NULL   COMMENT '标签名称' ,
@@ -12,7 +19,6 @@ 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' ,
@@ -29,7 +35,6 @@ 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' ,
@@ -47,7 +52,6 @@ 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' ,
@@ -65,14 +69,13 @@ 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 '是否置顶 1是；0否；' ,
-    PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL   COMMENT '发布范围描述 所有发布范围集合' ,
+    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' ,
@@ -93,7 +96,6 @@ 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' ,
@@ -113,7 +115,6 @@ 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' ,
@@ -132,7 +133,6 @@ 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' ,
@@ -150,7 +150,6 @@ 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' ,
@@ -180,7 +179,6 @@ 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' ,
@@ -200,7 +198,6 @@ 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' ,
@@ -218,7 +215,6 @@ 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' ,
@@ -226,7 +222,7 @@ CREATE TABLE article_publish_range(
     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' ,
+    PUBLISH_STATUS VARCHAR(32) NOT NULL   COMMENT '发布状态 已发布:published;已下线：offline' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
     REVISION INT NOT NULL   COMMENT '乐观锁' ,
     CREATED_BY VARCHAR(32) NOT NULL   COMMENT '创建人' ,
@@ -238,7 +234,6 @@ 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' ,
@@ -257,7 +252,6 @@ 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' ,

epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java

@@ -1,6 +1,6 @@
 package com.epmet;
-
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.DraftAttrFromDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
 import com.epmet.service.ArticleService;
 import org.junit.Test;
@@ -10,6 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
@@ -22,7 +23,7 @@ public class ArticleServiceTest {
     private ArticleService articleService;
 
     @Test
-    public void genToken() {
+    public void saveOrUpdateContent() {
         TokenDto tokenDto = new TokenDto();
         tokenDto.setCustomerId("1");
         tokenDto.setUserId("1");
@@ -42,4 +43,23 @@ public class ArticleServiceTest {
         String s = articleService.saveOrUpdateContent(tokenDto, draftContentFromDTO);
         System.out.println(s);
     }
+
+    @Test
+    public void saveOrUpdateAttr() {
+        TokenDto tokenDto = new TokenDto();
+        tokenDto.setCustomerId("1");
+        tokenDto.setUserId("1");
+        DraftAttrFromDTO draftAttrFromDTO = new DraftAttrFromDTO();
+        draftAttrFromDTO.setDraftId("f93b9fa4e78eadc97164fb5203aa580a");
+        draftAttrFromDTO.setCoverImg("http://www.baidu.com");
+        draftAttrFromDTO.setTagNameList(Arrays.asList("标签1","标签2"));
+        draftAttrFromDTO.setIsTop(0);
+        draftAttrFromDTO.setGridIdList(Arrays.asList("b3f5c5464ad3634982116c174b22ee35"));
+        draftAttrFromDTO.setPublisher("1");
+        draftAttrFromDTO.setPublishDate("2020-06-03");
+        draftAttrFromDTO.setPublisherType("agency");
+
+        Boolean aBoolean = articleService.saveOrUpdateAttr(tokenDto, draftAttrFromDTO);
+        System.out.println(aBoolean);
+    }
 }