From d17ed74866f890b4cfe1fea2c314871d83999673 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 18 十一月 2022 20:01:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 4 +++-
data/db_tab.sql | 4 +++-
src/main/java/com/lf/server/controller/data/UploaderController.java | 12 +-----------
src/main/java/com/lf/server/entity/data/MetaEntity.java | 14 ++++++++++++--
src/main/resources/mapper/data/MetaMapper.xml | 12 ++++++------
5 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index ea8d878..4392538 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -549,6 +549,7 @@
scale varchar(50),
resolution varchar(50),
gather timestamp(6) without time zone,
+ batch varchar(10),
descr varchar(256),
create_user integer default 1,
create_time timestamp(6) without time zone default now(),
@@ -567,12 +568,13 @@
comment on column lf.sys_meta.dirid is '鐩綍ID';
comment on column lf.sys_meta.depid is '鍗曚綅ID';
comment on column lf.sys_meta.verid is '鐗堟湰ID';
-comment on column lf.sys_meta.type is '鏍煎紡';
+comment on column lf.sys_meta.type is '绫诲瀷:File-鏂囦欢,DB-鏁版嵁';
comment on column lf.sys_meta.sizes is '澶у皬锛氬崟浣峂B';
comment on column lf.sys_meta.cs is '鍧愭爣绯�';
comment on column lf.sys_meta.scale is '姣斾緥灏�';
comment on column lf.sys_meta.resolution is '鍒嗚鲸鐜�';
comment on column lf.sys_meta.gather is '閲囬泦鏃ユ湡';
+comment on column lf.sys_meta.batch is '鎵规';
comment on column lf.sys_meta.descr is '鎻忚堪';
comment on column lf.sys_meta.create_user is '鍒涘缓浜篒D';
comment on column lf.sys_meta.create_time is '鍒涘缓鏃堕棿';
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index c603782..31f647b 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -21,7 +21,7 @@
* 鍏冩暟鎹�
* @author WWW
*/
-@Api(tags = "鏁版嵁绠＄悊\\鍏冩暟鎹鐞�")
+@Api(tags = "鏁版嵁绠＄悊\\鍏冩暟鎹�")
@RestController
@RequestMapping("/meta")
public class MetaController extends BaseController {
@@ -82,10 +82,12 @@
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
+
int count = metaService.selectCount(name);
if (count == 0) {
return success(0, null);
}
+
List<MetaEntity> rs = metaService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
diff --git a/src/main/java/com/lf/server/controller/data/UploaderController.java b/src/main/java/com/lf/server/controller/data/UploaderController.java
index 4c0031d..b448f44 100644
--- a/src/main/java/com/lf/server/controller/data/UploaderController.java
+++ b/src/main/java/com/lf/server/controller/data/UploaderController.java
@@ -4,30 +4,20 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.KeyValueEntity;
-import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.FileHelper;
-import com.lf.server.helper.PathHelper;
-import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.UploaderService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.sql.Timestamp;
import java.util.*;
/**
diff --git a/src/main/java/com/lf/server/entity/data/MetaEntity.java b/src/main/java/com/lf/server/entity/data/MetaEntity.java
index 7a52f64..c2c2c96 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -32,6 +32,8 @@
private Timestamp gather;
+ private String batch;
+
private String descr;
private int createUser;
@@ -135,6 +137,14 @@
this.gather = gather;
}
+ public String getBatch() {
+ return batch;
+ }
+
+ public void setBatch(String batch) {
+ this.batch = batch;
+ }
+
public String getDescr() {
return descr;
}
@@ -179,7 +189,7 @@
return geom;
}
- public void setGeom(String geo) {
- this.geom = geo;
+ public void setGeom(String geom) {
+ this.geom = geom;
}
}
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 3101633..54dd6ec 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -31,17 +31,17 @@
<insert id="insert" parameterType="com.lf.server.entity.data.MetaEntity">
insert into lf.sys_meta
- (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geom)
+ (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,batch,descr,create_user,create_time,geom)
values
- (#{name},#{dirid},#{depid},#{verid},#{type},#{sizes},#{cs},#{scale},#{resolution},now(),#{descr},#{createUser},now(),#{geom})
+ (#{name},#{dirid},#{depid},#{verid},#{type},#{sizes},#{cs},#{scale},#{resolution},now(),#{batch},#{descr},#{createUser},now(),#{geom})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geom)
+ (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,batch,descr,create_user,create_time,geom)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.name},#{item.dirid},#{item.depid},#{item.verid},#{item.type},#{item.sizes},#{item.cs},#{item.scale},#{item.resolution},now(),#{item.descr},#{item.createUser},now(),#{item.geom})
+ (#{item.name},#{item.dirid},#{item.depid},#{item.verid},#{item.type},#{item.sizes},#{item.cs},#{item.scale},#{item.resolution},now(),#{item.batch},#{item.descr},#{item.createUser},now(),#{item.geom})
</foreach>
</insert>
@@ -58,7 +58,7 @@
<update id="update">
update lf.sys_meta
- set name=#{name},dirid=#{dirid},depid=#{depid},verid=#{verid},type=#{type},sizes=#{sizes},cs=#{cs},scale=#{scale},resolution=#{resolution},gather=now(),descr=#{descr},update_user=#{updateUser},update_time=now()
+ set name=#{name},dirid=#{dirid},depid=#{depid},verid=#{verid},type=#{type},sizes=#{sizes},cs=#{cs},scale=#{scale},resolution=#{resolution},gather=now(),batch=#{batch},descr=#{descr},update_user=#{updateUser},update_time=now(),geom=#{geom}
where id=#{id}
</update>
@@ -66,7 +66,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
<set>
- name=#{item.name},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},type=#{item.type},sizes=#{item.sizes},cs=#{item.cs},scale=#{item.scale},resolution=#{item.resolution},gather=now(),descr=#{item.descr},update_user=#{item.updateUser},update_time=now()
+ name=#{item.name},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},type=#{item.type},sizes=#{item.sizes},cs=#{item.cs},scale=#{item.scale},resolution=#{item.resolution},gather=now(),batch=#{item.batch},descr=#{item.descr},update_user=#{item.updateUser},update_time=now(),geom=#{item.geom}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3