From 51ad6b41ea7720758b9126b2b1a30a466077223d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 9 Jun 2020 10:29:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/OssController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java index 9b8419b384..ba393cba85 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java @@ -55,7 +55,6 @@ public class OssController { private ParamsRemoteService paramsRemoteService; private final static String KEY = ModuleConstant.CLOUD_STORAGE_CONFIG_KEY; - public static final String IMAGE_JPG_VALUE = "image/jpg"; @GetMapping("page") @ApiOperation(value = "分页") @@ -191,7 +190,7 @@ public class OssController { public Result uploadArticleImg(@RequestParam("file") MultipartFile file) { // 校验文件类型 - if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType()) && !IMAGE_JPG_VALUE.equals(file.getContentType())) { + if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType()) && !MediaType.IMAGE_JPEG_VALUE.equals(file.getContentType())) { throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode() , EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg()); } From 6a02168d8f5046caa742766b7e66ab807e840f8c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Jun 2020 10:49:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=87=E7=AB=A0=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BApost=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ArticleController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 3ec18dd5ed..8327b0a137 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 @@ -73,7 +73,7 @@ public class ArticleController { * @param fromDTO * @throws Exception */ - @GetMapping("savecontent") + @PostMapping("savecontent") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH) public Result saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO fromDTO) throws Exception { String draftId = articleService.saveOrUpdateContent(tokenDto, fromDTO); @@ -171,7 +171,7 @@ public class ArticleController { * @param fromDTO * @throws Exception */ - @GetMapping("saveattr") + @PostMapping("saveattr") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH) public Result saveDraftAttr(@LoginUser TokenDto tokenDto,@RequestBody DraftAttrFromDTO fromDTO) throws Exception { ValidatorUtils.validateEntity(fromDTO, DefaultGroup.class); @@ -184,7 +184,7 @@ public class ArticleController { * @param fromDTO * @throws Exception */ - @GetMapping("previewsaveattr") + @PostMapping("previewsaveattr") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH) public Result previewSaveDraftAttr(@LoginUser TokenDto tokenDto,@RequestBody DraftAttrFromDTO fromDTO) throws Exception { ValidatorUtils.validateEntity(fromDTO, DefaultGroup.class); @@ -197,7 +197,7 @@ public class ArticleController { * @param draftId * @throws Exception */ - @GetMapping("publish") + @PostMapping("publish") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH) public Result publishArticle(@LoginUser TokenDto tokenDto, String draftId) throws Exception { Boolean isSuccess = articleService.publish(tokenDto, draftId); From 23905ca1b9b9d8bdc8167dd843d5c6d31f90f2b9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Jun 2020 11:04:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ArticleController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 8327b0a137..c00846c8eb 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 @@ -20,14 +20,11 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.enums.RequirePermissionEnum; -import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; 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.dto.ArticleContentDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.ArticleOperateRecordService; @@ -35,7 +32,10 @@ import com.epmet.service.ArticleService; import com.epmet.service.DraftService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; From 6ad6ccb96ea5f5e28ce38ab2c45cd915177cc88d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Jun 2020 11:06:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml index e95a0705e1..9dcf0b0bcc 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.4 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.5 ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index d3a8250d82..08f4e24a50 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ 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.4 + 0.3.5 epmet-openapi-scan jar From f0c722f203ee6578659f44d0a163a5188ac702f7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Jun 2020 13:32:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=A9=BA=E5=80=BC=EF=BC=9B=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=97=B6=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/DraftContentSaveResultDTO.java | 23 ++++++++++ .../com/epmet/constant/DraftConstant.java | 5 +++ .../epmet/controller/ArticleController.java | 5 ++- .../service/impl/ArticleServiceImpl.java | 43 +++++++++---------- .../java/com/epmet/utils/ModuleConstant.java | 5 +++ 5 files changed, 56 insertions(+), 25 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentSaveResultDTO.java diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentSaveResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentSaveResultDTO.java new file mode 100644 index 0000000000..dadde8373d --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentSaveResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 政府端：保存文章内容 返回结果 + */ +@Data +public class DraftContentSaveResultDTO implements Serializable { + public DraftContentSaveResultDTO() { + super(); + } + public DraftContentSaveResultDTO(String draftId) { + this.draftId = draftId; + } + + /** + *草稿Id + */ + private String draftId; +} 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 6788069282..25dbb4b000 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 @@ -61,4 +61,9 @@ public interface DraftConstant { * 内容类型-文字 */ String TEXT = "text"; + + /** + * 草稿预览内容大小长度 + */ + Integer PREVIEW_CONTENT_MAX_LENGTH = 50; } 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 c00846c8eb..0be96038f4 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 @@ -75,9 +75,10 @@ public class ArticleController { */ @PostMapping("savecontent") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH) - public Result saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO fromDTO) throws Exception { + public Result saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO fromDTO) throws Exception { String draftId = articleService.saveOrUpdateContent(tokenDto, fromDTO); - return new Result().ok(draftId); + DraftContentSaveResultDTO resultDTO = new DraftContentSaveResultDTO(draftId); + return new Result().ok(resultDTO); } /** 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 f4013ebd58..d03f674c46 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 @@ -179,16 +179,8 @@ public class ArticleServiceImpl extends BaseServiceImpl 50) { - content = content.substring(0, 50); - } - draftEntity.setPreviewContent(content); - break; - } - } + draftEntity.setPreviewContent(""); + buildPreviewContent(fromDTO, draftEntity); draftDao.updateById(draftEntity); } else { @@ -211,16 +203,8 @@ public class ArticleServiceImpl extends BaseServiceImpl 50) { - content = content.substring(0, 50); - } - draftEntity.setPreviewContent(content); - break; - } - } + draftEntity.setPreviewContent(""); + buildPreviewContent(fromDTO, draftEntity); draftDao.insert(draftEntity); } @@ -233,12 +217,25 @@ public class ArticleServiceImpl extends BaseServiceImpl draftIdMap = new HashMap<>(); - draftIdMap.put("DRAFT_ID", fromDTO.getDraftId()); + draftIdMap.put(ModuleConstant.FIELD_DRAFT_ID, fromDTO.getDraftId()); draftContentDao.deleteByMap(draftIdMap); draftContentService.insertBatch(draftContentList); return draftId; } + private void buildPreviewContent(DraftContentFromDTO fromDTO, DraftEntity draftEntity) { + for (int i = 0; i < fromDTO.getContentList().size(); i++) { + if (DraftConstant.TEXT.equals(fromDTO.getContentList().get(i).getContentType())) { + String content = fromDTO.getContentList().get(i).getContent(); + if (content.length() > DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) { + content = content.substring(NumConstant.ZERO, DraftConstant.PREVIEW_CONTENT_MAX_LENGTH); + } + draftEntity.setPreviewContent(content); + break; + } + } + } + @Override public GovArticleDetailResultDTO queryGovArticleDetail(String articleId) { GovArticleDetailResultDTO articleDetail = baseDao.queryGovArticleDetail(articleId); @@ -323,7 +320,7 @@ public class ArticleServiceImpl extends BaseServiceImpl publishRangeEntityList) { Map draftIdMap = new HashMap<>(); - draftIdMap.put("DRAFT_ID", draftEntity.getId()); + draftIdMap.put(ModuleConstant.FIELD_DRAFT_ID, draftEntity.getId()); draftCoverDao.deleteByMap(draftIdMap); if (coverEntity != null){ draftCoverDao.insert(coverEntity); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java index d9cc1d429c..9da980ea8f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java @@ -39,6 +39,11 @@ public interface ModuleConstant { * */ String FIELD_ARTICLE_ID = "ARTICLE_ID"; + /** + * 数据库列名 - 草稿ID + * */ + String FIELD_DRAFT_ID = "DRAFT_ID"; + /** * 实体属性名 - 文章ID * */ From c40b65adb7a0a7eb2583d4a255732003d09dc4b5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Jun 2020 13:47:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 9a9aa6ec3e..8289777a7a 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.26 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.27 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 777ca5e39d..cad1ea3769 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.26 + 0.3.27 gov-access com.epmet