From 35a5eec0d176b550fb0d7c5a0a5421b66f3b26c4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 11 二月 2023 11:36:42 +0800
Subject: [PATCH] 1
---
data/ts.sql | 14 +++++---------
src/main/resources/mapper/sys/ReportMapper.xml | 2 +-
data/db_tab.sql | 2 ++
src/main/java/com/lf/server/helper/FileHelper.java | 18 ++++++++++++++++++
src/main/java/com/lf/server/service/sys/ReportService.java | 15 ++++++++-------
5 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 1c8d8b8..84d51df 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1,3 +1,5 @@
+create sequence lf.sys_meta_id_seq increment by 1 minvalue 1 maxvalue 2147483647 start 1 cache 1;
+alter sequence lf.sys_layer_id_seq restart with 1;
----------------------------------------------------------------------------------------------------- 01.鑿滃崟琛�
-- DROP TABLE IF EXISTS lf.sys_menu;
create table lf.sys_menu(
diff --git a/data/ts.sql b/data/ts.sql
index 2935359..1a6c9cc 100644
--- a/data/ts.sql
+++ b/data/ts.sql
@@ -131,15 +131,15 @@
select * from lf.sys_operate order by id desc limit 20;
select * from lf.sys_report;
-select fn_rec_query(depid, 'dep') "m1" , count(sizes) "sizes"
+select fn_rec_query(depid, 'dep') "m1", count(sizes) "sizes"
from lf.sys_meta
group by depid
order by depid;
-select name "m1", count(*) "count"
-from lf.sys_serve_log
-group by name
-order by name;
+select fn_rec_query(depid, 'dep') "m1", count(sizes) "sizes"
+from lf.sys_meta
+group by depid
+order by depid;
select modular1 "m1", modular2 "m2", count(*) "count"
from lf.sys_operate
@@ -148,10 +148,6 @@
select * from lf.sys_operate where modular2 = '' or modular2 = '2' or modular2 is null;
delete from lf.sys_operate where modular2 = '' or modular2 = '2' or modular2 is null;
-
-
-
-
diff --git a/src/main/java/com/lf/server/helper/FileHelper.java b/src/main/java/com/lf/server/helper/FileHelper.java
index 1f19c9a..abc4e4e 100644
--- a/src/main/java/com/lf/server/helper/FileHelper.java
+++ b/src/main/java/com/lf/server/helper/FileHelper.java
@@ -186,6 +186,24 @@
}
/**
+ * 鑾峰彇鏂囦欢澶у皬
+ */
+ public static String getSizes(double mbNumber) {
+ if (mbNumber < StaticData.D1024) {
+ return new DecimalFormat("#.##MB").format(mbNumber);
+ }
+
+ double gbNumber = mbNumber / StaticData.D1024;
+ if (gbNumber < StaticData.D1024) {
+ return new DecimalFormat("#.##GB").format(gbNumber);
+ }
+
+ double tbNumber = gbNumber / StaticData.D1024;
+
+ return new DecimalFormat("#.##TB").format(tbNumber);
+ }
+
+ /**
* byte杞琈B
*/
public static double sizeToMb(long size) {
diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index 61e75fa..63c40b0 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -2,6 +2,7 @@
import com.lf.server.entity.ctrl.CountEntity;
import com.lf.server.entity.sys.ReportEntity;
+import com.lf.server.helper.FileHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WordHelper;
import com.lf.server.mapper.sys.ReportMapper;
@@ -92,7 +93,7 @@
/**
* 鍒涘缓 鐢ㄦ埛娴侀噺缁熻 Word
*/
- public void createCountSizesWord() {
+ public void createCountOperatesWord() {
List<CountEntity> list = countOperates();
if (null == list || list.isEmpty()) {
return;
@@ -134,21 +135,21 @@
}
/**
- * 鍒涘缓 鐢ㄦ埛娴侀噺缁熻 Word
+ * 鍒涘缓 鏁版嵁閲忕粺璁� Word
*/
- public void createCountOperatesWord() {
- List<CountEntity> list = countOperates();
+ public void createCountSizesWord() {
+ List<CountEntity> list = countSizes();
if (null == list || list.isEmpty()) {
return;
}
int rows = 1;
- String inputFile = "D:\\LF\\鏈嶅姟璋冪敤閲忕粺璁�.docx";
- String outPutFile = "D:\\LF\\鏈嶅姟璋冪敤閲忕粺璁new.docx";
+ String inputFile = "D:\\LF\\鏁版嵁閲忕粺璁�.docx";
+ String outPutFile = "D:\\LF\\鏁版嵁閲忕粺璁new.docx";
ArrayList<String[]> addList = new ArrayList<>();
for (CountEntity ce : list) {
- String[] strs = new String[]{"" + rows++, ce.getM1(), ce.getCount().toString()};
+ String[] strs = new String[]{"" + rows++, ce.getM1(), FileHelper.getSizes(ce.getSizes())};
addList.add(strs);
}
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 80b8089..ccfe7a1 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -74,7 +74,7 @@
<!-- 鏁版嵁閲忕粺璁� -->
<select id="countSizes" resultType="com.lf.server.entity.ctrl.CountEntity">
- select fn_rec_query(depid, 'dep') "m1" , count(sizes) "sizes"
+ select fn_rec_query(depid, 'dep') "m1", count(sizes) "sizes"
from lf.sys_meta
group by depid
order by depid;
--
Gitblit v1.9.3