【3.0】11-1迭代：修改请求方式，修改数据模型

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/BatchAddMaterialDTO.java

@@ -132,14 +132,26 @@ public class BatchAddMaterialDTO implements Serializable {
         /**
          * 素材路径
          */
-        String url;
+        private String mediaUrl;
+        /**
+         * 素材名
+         */
+        private String mediaName;
+
+        public String getMediaUrl() {
+            return mediaUrl;
+        }
+
+        public void setMediaUrl(String mediaUrl) {
+            this.mediaUrl = mediaUrl;
+        }
 
-        public String getUrl() {
-            return url;
+        public String getMediaName() {
+            return mediaName;
         }
 
-        public void setUrl(String url) {
-            this.url = url;
+        public void setMediaName(String mediaName) {
+            this.mediaName = mediaName;
         }
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaterialApiServiceImpl.java

@@ -402,12 +402,18 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 			materialDTO.setMaterialId(StringUtil.randomUUID());
 			// 传入字段
 			materialDTO.setCategoryId(material.getCategoryId());
-			materialDTO.setMaterialTitle(material.getMaterialTitle());
 			materialDTO.setMaterialType(material.getMaterialType());
 			materialDTO.setWxEnterpriseId(material.getWxEnterpriseId());
 			materialDTO.setStaffId(material.getStaffId());
 			materialDTO.setStaffName(material.getStaffName());
-			String mediaId = uploadMediaToWx(enterprise.getCorpid(), one.getUrl());
+            // 图片类型素材标题为图片实际名称
+            if (material.getMaterialType() == 2) {
+                materialDTO.setMaterialTitle(one.getMediaName());
+            } else {
+                materialDTO.setMaterialTitle(material.getMaterialTitle());
+            }
+            materialDTO.setImgUrl(one.getMediaUrl());
+            String mediaId = uploadMediaToWx(enterprise.getCorpid(), one.getMediaUrl());
 			if (StringUtils.isNotEmpty(mediaId)) {
 				materialDTO.setWxLastUploadTime(new Date());
 				materialDTO.setMediaId(mediaId);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

@@ -11,6 +11,7 @@ import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -143,7 +144,7 @@ public class MaterialController extends WebBaseController {
      * @return res
      */
 	@RequestMapping("/material-batch-add")
-    public HaobanResponse batchAddMaterial(BatchAddMaterialDTO dto) {
+    public HaobanResponse batchAddMaterial(@RequestBody BatchAddMaterialDTO dto) {
         if (Objects.isNull(dto) || Objects.isNull(dto.getMaterial())) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/UploadController.java

 package com.gic.haoban.manage.web.controller;
 
-import java.io.File;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashSet;
-import java.util.Set;
-
-import cn.hutool.core.util.HexUtil;
 import cn.hutool.crypto.SecureUtil;
-import com.gic.commons.util.ToolUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.DateUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.qcloud.BucketNameEnum;
+import com.gic.qcloud.FileUploadUtil;
 import org.apache.commons.io.FileUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,12 +14,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.alibaba.fastjson.JSONObject;
-import com.gic.commons.util.DateUtil;
-import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.qcloud.BucketNameEnum;
-import com.gic.qcloud.FileUploadUtil;
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashSet;
+import java.util.Set;
 
 @RestController
 public class UploadController extends WebBaseController{
@@ -40,6 +37,8 @@ public class UploadController extends WebBaseController{
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String name = file.getOriginalFilename();
+        // 未加密前文件名称
+        String mediaName = file.getOriginalFilename();
         String suffix = name.substring(name.lastIndexOf(".") + 1);
         name = SecureUtil.md5(name) + "." + suffix;
         String location = System.getProperty( "user.dir" )+"/data/tmp/";
@@ -61,6 +60,7 @@ public class UploadController extends WebBaseController{
 
         JSONObject res = new JSONObject(  );
         res.put( "name",name );
+        res.put( "mediaName",mediaName );
         res.put( "ext", suffix );
         res.put( "size",len );
         res.put( "key",key );