From 2173a359088f556f94328af9ca225505e6de3fe5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 11 二月 2023 10:35:51 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/StyleMapper.xml | 10 ++--
src/main/resources/mapper/sys/ReportMapper.xml | 2
data/db_tab.sql | 4 ++
src/main/java/com/lf/server/entity/data/StyleEntity.java | 20 ++++++++++
src/main/java/com/lf/server/service/sys/ReportService.java | 44 ++++++++++++++++++++++
5 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index aa54ff7..1c8d8b8 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -708,7 +708,9 @@
status smallint default 1,
precision varchar(50),
descr varchar(256),
+ fname varchar(50),
file_guid varchar(40) default new_guid(),
+ vname varchar(50),
view_guid varchar(40) default new_guid(),
create_user integer default 1,
create_time timestamp(6) without time zone default now(),
@@ -726,7 +728,9 @@
comment on column lf.sys_style.status is '鐘舵�侊細0-鍋滅敤,1-鍚敤';
comment on column lf.sys_style.precision is '绮惧害锛氬 1:1000';
comment on column lf.sys_style.descr is '鎻忚堪';
+comment on column lf.sys_style.fname is '鏍峰紡鏂囦欢鍚�';
comment on column lf.sys_style.file_guid is '鏍峰紡鏂囦欢ID';
+comment on column lf.sys_style.vname is '棰勮鏂囦欢鍚�';
comment on column lf.sys_style.view_guid is '棰勮鏂囦欢ID';
comment on column lf.sys_style.create_user is '鍒涘缓浜篒D';
comment on column lf.sys_style.create_time is '鍒涘缓鏃堕棿';
diff --git a/src/main/java/com/lf/server/entity/data/StyleEntity.java b/src/main/java/com/lf/server/entity/data/StyleEntity.java
index f0ca077..04fa8bd 100644
--- a/src/main/java/com/lf/server/entity/data/StyleEntity.java
+++ b/src/main/java/com/lf/server/entity/data/StyleEntity.java
@@ -30,7 +30,11 @@
private String descr;
+ private String fname;
+
private String fileGuid;
+
+ private String vname;
private String viewGuid;
@@ -191,4 +195,20 @@
public void setBak(String bak) {
this.bak = bak;
}
+
+ public String getFname() {
+ return fname;
+ }
+
+ public void setFname(String fname) {
+ this.fname = fname;
+ }
+
+ public String getVname() {
+ return vname;
+ }
+
+ public void setVname(String vname) {
+ this.vname = vname;
+ }
}
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 2016d46..61e75fa 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -110,4 +110,48 @@
WordHelper.generateWord(inputFile, outPutFile, null, addList);
}
+
+ /**
+ * 鍒涘缓 鏈嶅姟璋冪敤閲忕粺璁� Word
+ */
+ public void createCountServicesWord() {
+ List<CountEntity> list = countServices();
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ int rows = 1;
+ 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()};
+ addList.add(strs);
+ }
+
+ WordHelper.generateWord(inputFile, outPutFile, null, addList);
+ }
+
+ /**
+ * 鍒涘缓 鐢ㄦ埛娴侀噺缁熻 Word
+ */
+ public void createCountOperatesWord() {
+ List<CountEntity> list = countOperates();
+ if (null == list || list.isEmpty()) {
+ return;
+ }
+
+ int rows = 1;
+ 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()};
+ addList.add(strs);
+ }
+
+ WordHelper.generateWord(inputFile, outPutFile, null, addList);
+ }
}
diff --git a/src/main/resources/mapper/data/StyleMapper.xml b/src/main/resources/mapper/data/StyleMapper.xml
index 07c809f..c3072de06 100644
--- a/src/main/resources/mapper/data/StyleMapper.xml
+++ b/src/main/resources/mapper/data/StyleMapper.xml
@@ -31,18 +31,18 @@
<insert id="insertStyle" parameterType="com.lf.server.entity.data.StyleEntity">
insert into lf.sys_style
- (name,type,dirid,depid,ver,status,precision,descr,file_guid,view_guid,create_user,create_time,bak)
+ (name,type,dirid,depid,ver,status,precision,descr,fname,vname,file_guid,view_guid,create_user,create_time,bak)
values
- (#{name},#{type},#{dirid},#{depid},#{ver},#{status},#{precision},#{descr},#{fileGuid},#{viewGuid},#{createUser},
+ (#{name},#{type},#{dirid},#{depid},#{ver},#{status},#{precision},#{descr},#{fname},#{vname},#{fileGuid},#{viewGuid},#{createUser},
now(),#{bak});
</insert>
<insert id="insertStyles">
insert into lf.sys_style
- (name,type,dirid,depid,ver,status,precision,descr,file_guid,view_guid,create_user,create_time,bak)
+ (name,type,dirid,depid,ver,status,precision,descr,fname,vname,file_guid,view_guid,create_user,create_time,bak)
values
<foreach collection="list" item="item" index="index" separator="," >
- (#{item.name},#{item.type},#{item.dirid},#{item.depid},#{item.ver},#{item.status},#{item.precision},#{item.descr},
+ (#{item.name},#{item.type},#{item.dirid},#{item.depid},#{item.ver},#{item.status},#{item.precision},#{item.descr},#{item.fname},#{item.vname},
#{item.fileGuid},#{item.viewGuid},#{item.createUser},now(),#{item.bak})
</foreach>
</insert>
@@ -60,6 +60,6 @@
<update id="updateStyle">
update lf.sys_style set name=#{name},type=#{type},dirid=#{dirid},depid=#{depid},ver=#{ver},status=#{status},precision=#{precision},
- descr=#{descr},file_guid=#{fileGuid},view_guid=#{viewGuid},update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
+ descr=#{descr},fname=#{fname},vname=#{vname},file_guid=#{fileGuid},view_guid=#{viewGuid},update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
</update>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 56f7be6..80b8089 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -81,7 +81,7 @@
</select>
<!-- 鏈嶅姟璋冪敤閲忕粺璁� -->
- <select id="countServices">
+ <select id="countServices" resultType="com.lf.server.entity.ctrl.CountEntity">
select name "m1", count(*) "count"
from lf.sys_serve_log
group by name
--
Gitblit v1.9.3