From f6f45ab76d146069452682ab0ee54fb9da26d1e4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 七月 2025 11:10:54 +0800
Subject: [PATCH] 开发资源代理功能
---
se-system/src/main/java/com/terra/system/service/sys/ReportService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
index f7e40fc..93fb021 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
@@ -1,6 +1,9 @@
package com.terra.system.service.sys;
-import com.terra.system.entity.all.RedisCacheKey;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
+import com.terra.common.entity.all.RedisCacheKey;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.CoordinateEntity;
import com.terra.system.entity.ctrl.CountEntity;
@@ -10,14 +13,13 @@
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.*;
import com.terra.system.mapper.sys.ReportMapper;
-import com.terra.system.service.all.RedisService;
+import com.terra.common.service.RedisService;
import com.terra.system.service.data.DirService;
import com.terra.system.service.data.DownloadService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -251,7 +253,7 @@
@Override
public List<CountEntity> countVariousDataByPrj(String code) {
- code = StringUtils.isEmpty(code) || "ALL".equals(code) ? null : StringHelper.getRightLike(code);
+ code = StringHelper.isEmpty(code) || "ALL".equals(code) ? null : StringHelper.getRightLike(code);
return reportMapper.countVariousDataByPrj(code);
}
@@ -434,7 +436,7 @@
Double allSize = 0d, allArea = 0d, allLen = 0d;
for (CountEntity ce : list) {
ce.setNo(rows++);
- if (StringUtils.isEmpty(ce.getM2())) {
+ if (StringHelper.isEmpty(ce.getM2())) {
ce.setM2(FileHelper.getSizes(ce.getSizes()));
}
ce.setM3(FileHelper.getSquareMeter(ce.getArea()));
@@ -448,7 +450,7 @@
ce.setNo(rows);
ce.setM1("鎬昏");
ce.setCount(allCount);
- if (StringUtils.isEmpty(list.get(0).getM2())) {
+ if (StringHelper.isEmpty(list.get(0).getM2())) {
ce.setM2(FileHelper.getSizes(allSize));
}
ce.setM3(FileHelper.getSquareMeter(allArea));
--
Gitblit v1.9.3