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 02106d920b..ace8e48edd 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 @@ -59,6 +59,21 @@ public class ArticlePublishRangeDTO implements Serializable { */ private String agencyGridName; + /** + * 组织ID + */ + private String agencyId; + + /** + * 所有上级组织机构ID 以英文:隔开 + */ + private String pids; + + /** + * 所有上级名称 以横杠隔开 + */ + private String allParentName; + /** * 下线时间 */ 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 8457b400ea..5bd39c480b 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 @@ -59,6 +59,21 @@ public class DraftPublishRangeDTO implements Serializable { */ private String agencyGridName; + /** + * 组织ID + */ + private String agencyId; + + /** + * 所有上级组织机构ID 以英文:隔开 + */ + private String pids; + + /** + * 所有上级名称 以横杠隔开 + */ + private String allParentName; + /** * 下线时间 */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java index dfab2106a0..26bbba7918 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java @@ -30,4 +30,15 @@ public interface DraftConstant { * 审核中:auditing */ String AUDITING = "auditing"; + + //是否置顶 + /** + * 置顶:1 + */ + Integer TOP = 1; + + /** + * 不置顶:0 + */ + Integer UN_TOP = 0; } 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 de4911067c..1328aa6f1e 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 @@ -58,6 +58,21 @@ public class ArticlePublishRangeEntity extends BaseEpmetEntity { */ private String agencyGridName; + /** + * 组织ID + */ + private String agencyId; + + /** + * 所有上级组织机构ID 以英文:隔开 + */ + private String pids; + + /** + * 所有上级名称 以横杠隔开 + */ + private String allParentName; + /** * 下线时间 */ 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 fb3233cbb1..861b80c239 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 @@ -58,6 +58,21 @@ public class DraftPublishRangeEntity extends BaseEpmetEntity { */ private String agencyGridName; + /** + * 组织ID + */ + private String agencyId; + + /** + * 所有上级组织机构ID 以英文:隔开 + */ + private String pids; + + /** + * 所有上级名称 以横杠隔开 + */ + private String allParentName; + /** * 下线时间 */ 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 a648a84f99..3e6b5f587d 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 @@ -75,13 +75,13 @@ CREATE TABLE draft( 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 '发布范围描述 所有发布范围集合,顿号隔开' , - 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 '发布时间' , + PUBLISH_RANGE_DESC VARCHAR(512) COMMENT '发布范围描述 所有发布范围集合,顿号隔开' , + PUBLISHER_ID VARCHAR(64) COMMENT '发布单位ID' , + PUBLISHER_NAME VARCHAR(128) COMMENT '发布单位名称' , + PUBLISHER_TYPE VARCHAR(32) COMMENT '发布单位类型 机关:agency;部门:department;网格:grid' , + PUBLISH_DATE DATE COMMENT '发布时间' , STATUS_FLAG VARCHAR(32) NOT NULL COMMENT '发布状态 未发布:unpublish ;已发布:published,审核中:auditing;审核失败:auditfail' , - TAGS VARCHAR(512) NOT NULL COMMENT '文章标签串 竖杠分割的标签名称' , + TAGS VARCHAR(512) COMMENT '文章标签串 竖杠分割的标签名称' , ORG_ID VARCHAR(64) COMMENT '组织ID' , ORG_ID_PATH VARCHAR(512) COMMENT '组织ID路径 eg:字段为def:abc' , GRID_ID VARCHAR(64) COMMENT '网格ID 数据权限使用' , @@ -121,6 +121,9 @@ CREATE TABLE draft_publish_range( DRAFT_ID VARCHAR(64) NOT NULL COMMENT 'ID草稿' , GRID_ID VARCHAR(64) NOT NULL COMMENT '网格ID' , AGENCY_GRID_NAME VARCHAR(64) NOT NULL COMMENT '组织-网格名称' , + AGENCY_ID VARCHAR(64) NOT NULL COMMENT '组织ID' , + PIDS VARCHAR(1024) NOT NULL COMMENT '所有上级组织机构ID 以英文:隔开' , + ALL_PARENT_NAME VARCHAR(1024) 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.已删除' , @@ -221,6 +224,9 @@ CREATE TABLE article_publish_range( ARTICLE_ID VARCHAR(64) NOT NULL COMMENT '文章ID' , GRID_ID VARCHAR(64) NOT NULL COMMENT '网格ID' , AGENCY_GRID_NAME VARCHAR(64) NOT NULL COMMENT '组织-网格名称' , + AGENCY_ID VARCHAR(64) NOT NULL COMMENT '组织ID' , + PIDS VARCHAR(1024) NOT NULL COMMENT '所有上级组织机构ID 以英文:隔开' , + ALL_PARENT_NAME VARCHAR(1024) NOT NULL COMMENT '所有上级名称 以横杠隔开' , OFF_LINE_TIME DATETIME COMMENT '下线时间' , PUBLISH_STATUS VARCHAR(32) NOT NULL COMMENT '发布状态 已发布:published;已下线:offline' , DEL_FLAG INT NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' , @@ -269,3 +275,4 @@ CREATE TABLE article_visit_record( ALTER TABLE article_visit_record ADD UNIQUE UNX_INDEX(ARTICLE_ID,GRID_ID,USER_ID); ALTER TABLE article_visit_record COMMENT '文章访问记录表'; +