From 2523aa20cf55ac78dba71e3aa545e34c699dcbea Mon Sep 17 00:00:00 2001 From: DYL <Dn1332079466> Date: 星期一, 10 二月 2025 17:54:34 +0800 Subject: [PATCH] 1.上传文件接口修改 2.全厂综合能耗统计问题处理 --- zhitan-admin/src/main/java/com/zhitan/web/controller/common/CommonController.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/common/CommonController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/common/CommonController.java index 7eb390d..c00de71 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/common/CommonController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/common/CommonController.java @@ -1,10 +1,12 @@ package com.zhitan.web.controller.common; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.zhitan.common.config.BaseConfig; +import com.zhitan.common.constant.Constants; +import com.zhitan.common.core.domain.AjaxResult; +import com.zhitan.common.utils.StringUtils; +import com.zhitan.common.utils.file.FileUploadUtils; +import com.zhitan.common.utils.file.FileUtils; +import com.zhitan.framework.config.ServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; @@ -13,13 +15,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.zhitan.common.config.BaseConfig; -import com.zhitan.common.constant.Constants; -import com.zhitan.common.core.domain.AjaxResult; -import com.zhitan.common.utils.StringUtils; -import com.zhitan.common.utils.file.FileUploadUtils; -import com.zhitan.common.utils.file.FileUtils; -import com.zhitan.framework.config.ServerConfig; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 閫氱敤璇锋眰澶勭悊 @@ -36,6 +37,9 @@ private ServerConfig serverConfig; private static final String FILE_DELIMETER = ","; + + @Resource + private BaseConfig baseConfig; /** * 閫氱敤涓嬭浇璇锋眰 @@ -81,7 +85,7 @@ String filePath = BaseConfig.getUploadPath(); // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + fileName; + String url = baseConfig.getDomainName() + fileName; AjaxResult ajax = AjaxResult.success(); ajax.put("url", url); ajax.put("fileName", fileName); -- Gitblit v1.9.3