Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

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<UploadImgResultDTO> 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());
 		}

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 # 使用现有网络

epmet-module/gov-access/gov-access-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <version>0.3.26</version>
+    <version>0.3.27</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

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;
+}

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;
 }

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;
 
@@ -73,11 +73,12 @@ public class ArticleController {
      * @param fromDTO
      * @throws Exception
      */
-    @GetMapping("savecontent")
+    @PostMapping("savecontent")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH)
-    public Result<String> saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO  fromDTO) throws Exception {
+    public Result<DraftContentSaveResultDTO> saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO  fromDTO) throws Exception {
         String draftId = articleService.saveOrUpdateContent(tokenDto, fromDTO);
-        return new Result<String>().ok(draftId);
+        DraftContentSaveResultDTO resultDTO = new DraftContentSaveResultDTO(draftId);
+        return new Result<DraftContentSaveResultDTO>().ok(resultDTO);
     }
 
     /**
@@ -171,7 +172,7 @@ public class ArticleController {
      * @param fromDTO
      * @throws Exception
      */
-    @GetMapping("saveattr")
+    @PostMapping("saveattr")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH)
     public Result<Boolean> saveDraftAttr(@LoginUser TokenDto tokenDto,@RequestBody DraftAttrFromDTO fromDTO) throws Exception {
         ValidatorUtils.validateEntity(fromDTO, DefaultGroup.class);
@@ -184,7 +185,7 @@ public class ArticleController {
      * @param fromDTO
      * @throws Exception
      */
-    @GetMapping("previewsaveattr")
+    @PostMapping("previewsaveattr")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH)
     public Result<Boolean> previewSaveDraftAttr(@LoginUser TokenDto tokenDto,@RequestBody DraftAttrFromDTO fromDTO) throws Exception {
         ValidatorUtils.validateEntity(fromDTO, DefaultGroup.class);
@@ -197,7 +198,7 @@ public class ArticleController {
      * @param draftId
      * @throws Exception
      */
-    @GetMapping("publish")
+    @PostMapping("publish")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISH)
     public Result<Boolean> publishArticle(@LoginUser TokenDto tokenDto, String draftId) throws Exception {
         Boolean isSuccess = articleService.publish(tokenDto, draftId);

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<ArticleDao, ArticleEntit
 				throw new RenException("参数错误");
 			}
 			draftEntity.setTitle(draftEntity.getTitle());
-			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() > 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<ArticleDao, ArticleEntit
 			draftEntity.setGridId("");
 			draftEntity.setDepartmentId(loginUserDetails.getData().getCustomerId());
 			draftEntity.setDelFlag(NumConstant.ZERO_STR);
-			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() > 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<ArticleDao, ArticleEntit
 		}
 
 		Map<String, Object> 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<ArticleDao, ArticleEntit
 	@Override
 	public Boolean previewSaveDraftAttr(TokenDto tokenDto, DraftAttrFromDTO fromDTO) {
 		//校验参数
-		if (fromDTO.getIsTop() == 1 && StringUtils.isBlank(fromDTO.getCoverImg())) {
+		if (DraftConstant.TOP.equals(fromDTO.getIsTop()) && StringUtils.isBlank(fromDTO.getCoverImg())) {
 			log.warn("saveOrUpdateAttr isTop=1 but coverImg is blank");
 			throw new RenException("文章封面不能为空");
 		}
@@ -354,7 +351,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	@Transactional(rollbackFor = Exception.class)
 	public void executeSaveDraftAttr(DraftEntity draftEntity, DraftCoverEntity coverEntity, List<DraftPublishRangeEntity> publishRangeEntityList) {
 		Map<String,Object> 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);

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
      * */

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 # 不会创建新的网络

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">
 
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.4</version>
+    <version>0.3.5</version>
     <artifactId>epmet-openapi-scan</artifactId>
     <packaging>jar</packaging>