浏览代码

附件修改

wangliang 4 年之前
父节点
当前提交
4e433ef9d8

+ 9 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.themis.backend.config.DictionaryConfig;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.dto.response.TEExamActivityDto;
 import com.qmth.themis.business.entity.*;
 import com.qmth.themis.business.enums.DownloadFileEnum;
 import com.qmth.themis.business.enums.RoleEnum;
@@ -115,10 +114,19 @@ public class SysController {
         if (Objects.isNull(tbAttachment)) {
             throw new BusinessException(ExceptionResultEnum.ATTACHMENT_ERROR);
         }
+        JSONObject jsonObject = JSONObject.parseObject(tbAttachment.getRemark());
+        String attachmentType = String.valueOf(jsonObject.get("type"));
+        String url = null;
+        if (Objects.equals(attachmentType, SystemConstant.LOCAL)) {
+            url = "http://" + dictionaryConfig.sysDomain().getFileHost() + File.separator + jsonObject.get("path");
+        } else {
+            url = dictionaryConfig.aliYunOssDomain().getUrl() + File.separator + jsonObject.get("path");
+        }
         Map map = new HashMap();
         map.put(SystemConstant.ID, tbAttachment.getId());
         map.put("name", tbAttachment.getName());
         map.put(SystemConstant.TYPE, tbAttachment.getType());
+        map.put("url", url);
         return ResultUtil.ok(map);
     }
 

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBAttachmentServiceImpl.java

@@ -129,7 +129,7 @@ public class TBAttachmentServiceImpl extends ServiceImpl<TBAttachmentMapper, TBA
             } else {
                 jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
             }
-            jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
+            jsonObject.put(SystemConstant.PATH, stringJoiner.toString().replaceAll(SystemConstant.FILES_DIR + File.separator, ""));
             jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.valueOf(uploadType).ordinal());
             tbAttachment.setRemark(jsonObject.toJSONString());
             tbAttachment.setCreateId(userId);