diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index cd6dd829f4..e5b762a6de 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.47 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.49 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index decf6a4a41..60cc1020f1 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.47 + 0.3.49 gov-voice com.epmet diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java index bae61d92f1..ff89979fb8 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleOperateRecordEntity.java @@ -18,7 +18,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -48,6 +47,11 @@ public class ArticleOperateRecordEntity extends BaseEpmetEntity { */ private String articleId; + /** + * 网格ID,下线文章时,多个以英文:隔开 + */ + private String gridIds; + /** * 执行人 xx街道-xx中心-姓名 */ 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 537cae21c2..0b3fe16099 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 @@ -551,6 +551,7 @@ public class ArticleServiceImpl extends BaseServiceImpl { + offLineGridId.append(StrConstant.COLON).append(off.getGridId()); + }); + recordEntity.setGridIds(offLineGridId.toString().replaceFirst(StrConstant.COLON,"")); recordEntity.setContent(content); recordEntity.setOpType(ArticleConstant.OFFLINE); recordEntity.setOpTime(date); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql new file mode 100644 index 0000000000..09b724ce63 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql @@ -0,0 +1,3 @@ +ALTER TABLE `epmet_gov_voice`.`article_operate_record` +ADD COLUMN `GRID_IDS` varchar(1024) NULL DEFAULT NULL COMMENT '网格ID,下线文章时,多个以英文:隔开' AFTER `ARTICLE_ID`, +MODIFY COLUMN `OP_TYPE` varchar(32) NOT NULL COMMENT '操作类型 发布文章:publish;取消文章置顶:canceltop;设置置顶:settop;下线文章:offline;修改文章发布范围:updatepublishrange' AFTER `CONTENT`; \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql index c102c4d0e5..dceb9fca9b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/epmet_gov_voice.sql @@ -250,6 +250,7 @@ CREATE TABLE article_operate_record( ID VARCHAR(64) NOT NULL COMMENT '主键ID 主键ID' , CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , ARTICLE_ID VARCHAR(64) NOT NULL COMMENT '文章ID' , + GRID_IDS VARCHAR(1024) NOT NULL COMMENT '网格ID,下线文章时,多个以英文:隔开' , OP_USER VARCHAR(128) NOT NULL COMMENT '执行人 xx街道-xx中心-姓名' , CONTENT VARCHAR(512) NOT NULL COMMENT '操作内容 操作内容,eg:重新编辑文章;' , OP_TYPE VARCHAR(32) NOT NULL COMMENT '操作类型 发布文章:publish;取消文章置顶:canceltop;设置置顶:settom;下线文章:offline;修改文章发布范围:updatepublishrange' ,