From 08f0397e719a0b02bfefd6a3bed5aff12a872e3d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 10 二月 2023 10:00:01 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/sys/ReportMapper.xml | 18 ++++----
data/db_tab.sql | 8 ++-
src/main/java/com/lf/server/entity/sys/ReportEntity.java | 50 ++++++++++++++++++++-----
src/main/java/com/lf/server/controller/sys/ReportController.java | 13 ------
4 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 0667776..7eb90a9 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -938,8 +938,9 @@
id serial primary key,
name varchar(100),
type varchar(50),
- path varchar(512),
code varchar(50),
+ fname varchar(256),
+ guid varchar(38),
create_user integer default 1,
create_time timestamp(6) without time zone default now(),
update_user integer,
@@ -950,14 +951,15 @@
comment on column lf.sys_report.id is '涓婚敭ID';
comment on column lf.sys_report.name is '鍚嶇О';
comment on column lf.sys_report.type is '鏂囦欢绫诲瀷锛�1-Word妯℃澘锛�2-Excel妯℃澘';
-comment on column lf.sys_report.path is '璺緞';
comment on column lf.sys_report.code is '缂栫爜';
+comment on column lf.sys_report.fname is '鏂囦欢鍚�';
+comment on column lf.sys_report.guid is '鏂囦欢GUID';
comment on column lf.sys_report.create_user is '鍒涘缓浜篿d';
comment on column lf.sys_report.create_time is '鍒涘缓鏃堕棿';
comment on column lf.sys_report.update_user is '鏇存柊浜篿d';
comment on column lf.sys_report.update_time is '鏇存柊鏃堕棿';
comment on column lf.sys_report.bak is '澶囨敞';
--- insert into lf.sys_report (name,type,path,code) values ('缁熻鐢ㄦ埛閲�',2,'1\aa.xlsx','');
+-- insert into lf.sys_report (name,type,guid,code) values ('缁熻鐢ㄦ埛閲�',2,'1\aa.xlsx','');
select * from lf.sys_report;
----------------------------------------------------------------------------------------------------- 28.涓嬭浇鏃ュ織琛�
diff --git a/src/main/java/com/lf/server/controller/sys/ReportController.java b/src/main/java/com/lf/server/controller/sys/ReportController.java
index 37918ec..a854cc9 100644
--- a/src/main/java/com/lf/server/controller/sys/ReportController.java
+++ b/src/main/java/com/lf/server/controller/sys/ReportController.java
@@ -67,19 +67,6 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectAll")
- public ResponseMsg<List<ReportEntity>> selectAll() {
- try {
- List<ReportEntity> list = reportService.selectAll();
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鏍规嵁ID鏌ヨ")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
diff --git a/src/main/java/com/lf/server/entity/sys/ReportEntity.java b/src/main/java/com/lf/server/entity/sys/ReportEntity.java
index e715f4e..aa3f971 100644
--- a/src/main/java/com/lf/server/entity/sys/ReportEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/ReportEntity.java
@@ -16,9 +16,11 @@
private String type;
- private String path;
-
private String code;
+
+ private String fname;
+
+ private String guid;
private int createUser;
@@ -29,6 +31,10 @@
private Timestamp updateTime;
private String bak;
+
+ private String createName;
+
+ private String updateName;
public ReportEntity() {
}
@@ -57,20 +63,28 @@
this.type = type;
}
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
+ }
+
+ public String getFname() {
+ return fname;
+ }
+
+ public void setFname(String fname) {
+ this.fname = fname;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
}
public int getCreateUser() {
@@ -112,4 +126,20 @@
public void setBak(String bak) {
this.bak = bak;
}
+
+ public String getCreateName() {
+ return createName;
+ }
+
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
+
+ public String getUpdateName() {
+ return updateName;
+ }
+
+ public void setUpdateName(String updateName) {
+ this.updateName = updateName;
+ }
}
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index bca5da8..4cb6c5c 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -11,18 +11,18 @@
</select>
<select id="selectByPage" resultType="com.lf.server.entity.sys.ReportEntity">
- select * from lf.sys_report
+ select a.*,fn_uname(a.create_user) createName,fn_uname(a.update_user) updateName from lf.sys_report a
<where>
<if test="name != null">
name like #{name}
</if>
</where>
- order by id
+ order by a.id desc
limit #{limit} offset #{offset}
</select>
<select id="selectAll" resultType="com.lf.server.entity.sys.ReportEntity">
- select * from lf.sys_report order by id;
+ select * from lf.sys_report order by id desc;
</select>
<select id="selectById" resultType="com.lf.server.entity.sys.ReportEntity">
@@ -31,17 +31,17 @@
<insert id="insert" parameterType="com.lf.server.entity.sys.ReportEntity">
insert into lf.sys_report
- (name,type,path,code,create_user,create_time,bak)
+ (name,type,fname,guid,code,create_user,create_time,bak)
values
- (#{name},#{type},#{path},#{code},#{createUser},now(),#{bak})
+ (#{name},#{type},#{fname},#{guid},#{code},#{createUser},now(),#{bak})
</insert>
<insert id="inserts">
insert into lf.sys_report
- (name,type,path,code,create_user,create_time,bak)
+ (name,type,fname,guid,code,create_user,create_time,bak)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.name},#{item.type},#{item.path},#{item.code},#{item.createUser},now(),#{item.bak})
+ (#{item.name},#{item.type},#{item.fname},#{item.guid},#{item.code},#{item.createUser},now(),#{item.bak})
</foreach>
</insert>
@@ -58,7 +58,7 @@
<update id="update">
update lf.sys_report
- set name=#{name},type=#{type},path=#{path},code=#{code},update_user=#{updateUser},update_time=now(),bak=#{bak}
+ set name=#{name},type=#{type},fname=#{fname},guid=#{guid},code=#{code},update_user=#{updateUser},update_time=now(),bak=#{bak}
where id=#{id}
</update>
@@ -66,7 +66,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_report
<set>
- name=#{item.name},type=#{item.type},path=#{item.path},code=#{item.code},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
+ name=#{item.name},type=#{item.type},fname=#{item.fname},guid=#{item.guid},code=#{item.code},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3