From 2523aa20cf55ac78dba71e3aa545e34c699dcbea Mon Sep 17 00:00:00 2001
From: DYL <Dn1332079466>
Date: 星期一, 10 二月 2025 17:54:34 +0800
Subject: [PATCH] 1.上传文件接口修改 2.全厂综合能耗统计问题处理
---
zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java | 14 ++++++++++++++
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java | 2 +-
zhitan-admin/src/main/java/com/zhitan/web/controller/common/CommonController.java | 30 +++++++++++++++++-------------
zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml | 4 ++--
4 files changed, 34 insertions(+), 16 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);
diff --git a/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java b/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java
index c9096ba..04ee184 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java
@@ -30,6 +30,12 @@
/** 楠岃瘉鐮佺被鍨� */
private static String captchaType;
+ /**
+ * 鏂囦欢鍦板潃鍩熷悕
+ */
+ private String domainName;
+
+
public String getName()
{
return name;
@@ -123,4 +129,12 @@
public static String getConfigurePath() {
return getProfile() + "/configure";
}
+
+ public String getDomainName() {
+ return domainName;
+ }
+
+ public void setDomainName(String domainName) {
+ this.domainName = domainName;
+ }
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
index 08777d9..3a4de64 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
@@ -14,7 +14,7 @@
* @date 2020-03-25
*/
public interface DailyComprehensiveMapper {
- public List<DailyComprehensive> getDailyComprehensiveList(@Param("nodeId") String nodeId,
+ List<DailyComprehensive> getDailyComprehensiveList(@Param("nodeId") String nodeId,
@Param("dataList") List<DailyComprehensive> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
diff --git a/zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml
index 0380045..99bdde1 100644
--- a/zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml
@@ -35,7 +35,7 @@
<result column="value0" property="value0"/>
</resultMap>
<!--鍏ㄥ巶鑳借�楃粺璁�-->
- <select id="getdailyComprehensiveList" resultMap="dataItemMap">
+ <select id="getDailyComprehensiveList" resultType="com.zhitan.comprehensivestatistics.domain.DailyComprehensive">
SELECT
aa.index_id,
aa.index_name,
@@ -72,7 +72,7 @@
ORDER BY aa.order_num ASC
</select>
- <select id="getListChart" resultMap="dataItemMap">
+ <select id="getListChart" resultType="com.zhitan.comprehensivestatistics.domain.DailyComprehensive">
SELECT
di.index_id,
ci.name AS "index_name",
--
Gitblit v1.9.3