From e5f61db766b3eaa28506835e3581cbd2fdc8533d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 05 一月 2023 17:49:31 +0800
Subject: [PATCH] 1.5
---
src/main/java/com/lf/server/entity/ctrl/UploadEntity.java | 7
src/main/java/com/lf/server/controller/show/MarkController.java | 6
src/main/java/com/lf/server/controller/show/InquiryController.java | 4
src/main/java/com/lf/server/service/show/MarkService.java | 6
src/main/java/com/lf/server/controller/data/MetaController.java | 7
data/db_tab.sql | 52 +++++
src/main/java/com/lf/server/entity/all/BaseEntity.java | 10 +
src/main/java/com/lf/server/helper/FileHelper.java | 6
src/main/java/com/lf/server/service/data/MetaService.java | 7
src/main/java/com/lf/server/service/data/DataUploadService.java | 25 +-
src/main/java/com/lf/server/service/show/PipelineService.java | 8
src/main/java/com/lf/server/controller/data/DataUploadController.java | 7
src/main/java/com/lf/server/controller/show/DataLibController.java | 7
src/main/java/com/lf/server/entity/data/MetaEntity.java | 182 ++++++++-----------
/dev/null | 78 --------
src/main/java/com/lf/server/controller/all/BaseUploadController.java | 6
src/main/java/com/lf/server/service/show/InquiryService.java | 6
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 11
src/main/java/com/lf/server/service/data/DataLoaderService.java | 31 +--
src/main/java/com/lf/server/service/all/BaseUploadService.java | 22 +-
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 3
src/main/java/com/lf/server/service/data/DownloadService.java | 12
22 files changed, 216 insertions(+), 287 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index eb37816..d492166 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1098,6 +1098,58 @@
comment on column lf.sys_flow.update_time is '鏇存柊鏃堕棿';
select * from lf.sys_flow;
+----------------------------------------------------------------------------------------------------- 16.鍏冩暟鎹〃-New
+-- DROP TABLE IF EXISTS lf.sys_meta; DROP TABLE IF EXISTS lf.sys_meta_file;
+create table lf.sys_meta (
+ id serial primary key,
+ eventid varchar(38) default new_guid(),
+ metaid integer default 0,
+ dirid integer default 0,
+ depid integer default 0,
+ verid integer default 0,
+ name varchar(256),
+ type varchar(100),
+ guid varchar(38) default new_guid(),
+ path varchar(512),
+ sizes float8 default 0,
+ bstab varchar(50),
+ bsrows integer default 0,
+ mdtab varchar(50),
+ mdrows integer default 0,
+ create_user integer default 1,
+ create_time timestamp(6) without time zone default now(),
+ update_user integer,
+ update_time timestamp(6) without time zone,
+ bak varchar(1024),
+ geom geometry(MultiPolygon, 4490)
+);
+-- drop index index_sys_meta_geom;
+create index index_sys_meta_geom on lf.sys_meta using GIST (geom);
+comment on table lf.sys_meta is '鍏冩暟鎹〃';
+comment on column lf.sys_meta.id is '涓婚敭ID';
+comment on column lf.sys_meta.eventid is 'GUID';
+comment on column lf.sys_meta.metaid is '鐖跺厓鏁版嵁ID锛�0-娌℃湁';
+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.name is '鍚嶇О';
+comment on column lf.sys_meta.type is '绫诲瀷:file-鏂囦欢锛宻hp-ShapeFile锛実db-GDB锛寊ip-鍘嬬缉鍖�';
+comment on column lf.sys_meta.guid is '鏂囦欢GUID';
+comment on column lf.sys_meta.path is '瀛樺偍璺緞';
+comment on column lf.sys_meta.sizes is '澶у皬锛氬崟浣峂B';
+comment on column lf.sys_meta.bstab is '涓氬姟琛ㄥ悕';
+comment on column lf.sys_meta.bsrows is '涓氬姟琛ㄨ鏁�';
+comment on column lf.sys_meta.mdtab is '鍏冩暟鎹〃鍚�';
+comment on column lf.sys_meta.mdrows is '鍏冩暟鎹鏁�';
+comment on column lf.sys_meta.create_user is '鍒涘缓浜篒D';
+comment on column lf.sys_meta.create_time is '鍒涘缓鏃堕棿';
+comment on column lf.sys_meta.update_user is '鏇存柊浜篒D';
+comment on column lf.sys_meta.update_time is '鏇存柊鏃堕棿';
+comment on column lf.sys_meta.bak is '澶囨敞';
+comment on column lf.sys_meta.geom is '绌洪棿浣嶇疆';
+-- insert into lf.sys_meta(dirid,depid,geom,sizes,name,path) values (1,1,ST_PolygonFromText('MultiPolygon (((100 0,120 0,120 20,100 20,100 0)))', 4490),0.001,'a.jpg','c:\a.jpg');
+
+select a.*,st_astext(geom) from lf.sys_meta a;
----------------------------------------------------------------------------------------------------- 鍏冩暟鎹祴璇曡〃 *
-- drop table if exists md.md_zxcg;
create table md.md_zxcg(
diff --git a/src/main/java/com/lf/server/controller/all/BaseUploadController.java b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
index af09edc..378eae1 100644
--- a/src/main/java/com/lf/server/controller/all/BaseUploadController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
@@ -3,7 +3,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.data.DirEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -123,7 +123,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaFileEntity> list = baseUploadService.uploadData(null, path, req, res);
+ List<MetaEntity> list = baseUploadService.uploadData(null, path, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
@@ -141,7 +141,7 @@
})
@ResponseBody
@PostMapping(value = "/deleteFiles")
- public ResponseMsg<Object> deleteFiles(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) {
+ public ResponseMsg<Object> deleteFiles(@RequestBody List<MetaEntity> list, HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
diff --git a/src/main/java/com/lf/server/controller/data/DataLoaderController.java b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
index 30952e6..f9bcfc8 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -13,7 +13,6 @@
import com.lf.server.entity.ctrl.UploadEntity;
import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
@@ -89,9 +88,9 @@
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
})
@GetMapping(value = "/selectFiles")
- public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
+ public ResponseMsg<List<MetaEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, extList);
+ List<MetaEntity> list = baseUploadService.selectFiles(path, extList);
return success(list);
} catch (Exception ex) {
@@ -151,7 +150,7 @@
MetaEntity me = entity.getMetaEntity();
me.setCreateTime(WebHelper.getCurrentTimestamp());
- me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
+ // me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
me.setCreateUser(ue.getId());
dataLoaderService.insertFiles(me, entity.getFileEntities(), entity.getTabEntities());
@@ -178,11 +177,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
diff --git a/src/main/java/com/lf/server/controller/data/DataUploadController.java b/src/main/java/com/lf/server/controller/data/DataUploadController.java
index 21f8af6..bcc5505 100644
--- a/src/main/java/com/lf/server/controller/data/DataUploadController.java
+++ b/src/main/java/com/lf/server/controller/data/DataUploadController.java
@@ -5,7 +5,6 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.UploadEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
@@ -73,9 +72,9 @@
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
})
@GetMapping(value = "/selectFiles")
- public ResponseMsg<List<MetaFileEntity>> selectFiles(String path) {
+ public ResponseMsg<List<MetaEntity>> selectFiles(String path) {
try {
- List<MetaFileEntity> list = baseUploadService.selectFiles(path, null);
+ List<MetaEntity> list = baseUploadService.selectFiles(path, null);
return success(list);
} catch (Exception ex) {
@@ -106,7 +105,7 @@
MetaEntity me = entity.getMetaEntity();
me.setCreateTime(WebHelper.getCurrentTimestamp());
- me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())));
+ // me.setBatch(StringHelper.YMDHMS_FORMAT.format(new Date(me.getCreateTime().getTime())))
me.setCreateUser(ue.getId());
int rows = dataUploadService.insertFiles(me, entity.getFileEntities());
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 bd79283..cdd3493 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -13,7 +13,6 @@
import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.Md5Helper;
@@ -133,11 +132,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
@@ -365,7 +364,7 @@
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
+ List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
}
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index ac1ca88..3a35011 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -12,7 +12,6 @@
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
@@ -107,11 +106,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
@@ -156,7 +155,7 @@
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
+ List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
}
diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java
index cb86011..5a8bebe 100644
--- a/src/main/java/com/lf/server/controller/show/InquiryController.java
+++ b/src/main/java/com/lf/server/controller/show/InquiryController.java
@@ -5,7 +5,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.ShpRecordEntity;
-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.AesHelper;
import com.lf.server.helper.StringHelper;
@@ -49,7 +49,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaFileEntity> list = uploaderService.uploadData(null, null, req, res);
+ List<MetaEntity> list = uploaderService.uploadData(null, null, req, res);
if (list == null || list.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java
index c5826b9..b12a1cf 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -7,7 +7,7 @@
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
@@ -227,14 +227,14 @@
@ApiOperation(value = "涓婁紶ShapeFile鏂囦欢")
@ResponseBody
@PostMapping(value = "/uploadShp", produces = "application/json; charset=UTF-8")
- public ResponseMsg<List<MarkJsonEntity>> uploadShp(HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> uploadShp(HttpServletRequest req, HttpServletResponse res) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaFileEntity> meList = uploaderService.uploadData(null, null, req, res);
+ List<MetaEntity> meList = uploaderService.uploadData(null, null, req, res);
if (meList == null || meList.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
diff --git a/src/main/java/com/lf/server/entity/all/BaseEntity.java b/src/main/java/com/lf/server/entity/all/BaseEntity.java
index 2a63074..f3e7a78 100644
--- a/src/main/java/com/lf/server/entity/all/BaseEntity.java
+++ b/src/main/java/com/lf/server/entity/all/BaseEntity.java
@@ -18,6 +18,8 @@
private String eventid;
+ private String parentid;
+
private Integer dirid;
private Integer depid;
@@ -66,6 +68,14 @@
this.eventid = eventid;
}
+ public String getParentid() {
+ return parentid;
+ }
+
+ public void setParentid(String parentid) {
+ this.parentid = parentid;
+ }
+
public Integer getDirid() {
return dirid;
}
diff --git a/src/main/java/com/lf/server/entity/ctrl/UploadEntity.java b/src/main/java/com/lf/server/entity/ctrl/UploadEntity.java
index ee6b959..06fc37c 100644
--- a/src/main/java/com/lf/server/entity/ctrl/UploadEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/UploadEntity.java
@@ -1,7 +1,6 @@
package com.lf.server.entity.ctrl;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import java.util.List;
@@ -12,7 +11,7 @@
public class UploadEntity {
private MetaEntity metaEntity;
- private List<MetaFileEntity> fileEntities;
+ private List<MetaEntity> fileEntities;
private List<TabMapperEntity> tabEntities;
@@ -27,11 +26,11 @@
this.metaEntity = metaEntity;
}
- public List<MetaFileEntity> getFileEntities() {
+ public List<MetaEntity> getFileEntities() {
return fileEntities;
}
- public void setFileEntities(List<MetaFileEntity> fileEntities) {
+ public void setFileEntities(List<MetaEntity> fileEntities) {
this.fileEntities = fileEntities;
}
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 423e022..b61e1e1 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -8,11 +8,13 @@
* @author WWW
*/
public class MetaEntity implements Serializable {
- private static final long serialVersionUID = -351865749970015936L;
+ private static final long serialVersionUID = -984838663593325184L;
private int id;
- private String name;
+ private String eventid;
+
+ private int metaid;
private int dirid;
@@ -20,25 +22,23 @@
private int verid;
+ private String name;
+
private String type;
+
+ private String guid;
+
+ private String path;
private double sizes;
- private String tab;
+ private String bstab;
- private int rows;
+ private int bsrows;
- private String cs;
+ private String mdtab;
- private String scale;
-
- private String resolution;
-
- private Timestamp gather;
-
- private String batch;
-
- private String descr;
+ private int mdrows;
private int createUser;
@@ -48,15 +48,9 @@
private Timestamp updateTime;
+ private String bak;
+
private String geom;
-
- private String uname;
-
- private String depName;
-
- private String verName;
-
- private String dirName;
public MetaEntity() {
}
@@ -69,12 +63,20 @@
this.id = id;
}
- public String getName() {
- return name;
+ public String getEventid() {
+ return eventid;
}
- public void setName(String name) {
- this.name = name;
+ public void setEventid(String eventid) {
+ this.eventid = eventid;
+ }
+
+ public int getMetaid() {
+ return metaid;
+ }
+
+ public void setMetaid(int metaid) {
+ this.metaid = metaid;
}
public int getDirid() {
@@ -101,12 +103,36 @@
this.verid = verid;
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
}
public double getSizes() {
@@ -117,68 +143,36 @@
this.sizes = sizes;
}
- public String getTab() {
- return tab;
+ public String getBstab() {
+ return bstab;
}
- public void setTab(String tab) {
- this.tab = tab;
+ public void setBstab(String bstab) {
+ this.bstab = bstab;
}
- public int getRows() {
- return rows;
+ public int getBsrows() {
+ return bsrows;
}
- public void setRows(int rows) {
- this.rows = rows;
+ public void setBsrows(int bsrows) {
+ this.bsrows = bsrows;
}
- public String getCs() {
- return cs;
+ public String getMdtab() {
+ return mdtab;
}
- public void setCs(String cs) {
- this.cs = cs;
+ public void setMdtab(String mdtab) {
+ this.mdtab = mdtab;
}
- public String getScale() {
- return scale;
+ public int getMdrows() {
+ return mdrows;
}
- public void setScale(String scale) {
- this.scale = scale;
- }
-
- public String getResolution() {
- return resolution;
- }
-
- public void setResolution(String resolution) {
- this.resolution = resolution;
- }
-
- public Timestamp getGather() {
- return gather;
- }
-
- public void setGather(Timestamp gather) {
- this.gather = gather;
- }
-
- public String getBatch() {
- return batch;
- }
-
- public void setBatch(String batch) {
- this.batch = batch;
- }
-
- public String getDescr() {
- return descr;
- }
-
- public void setDescr(String descr) {
- this.descr = descr;
+ public void setMdrows(int mdrows) {
+ this.mdrows = mdrows;
}
public int getCreateUser() {
@@ -213,43 +207,19 @@
this.updateTime = updateTime;
}
+ public String getBak() {
+ return bak;
+ }
+
+ public void setBak(String bak) {
+ this.bak = bak;
+ }
+
public String getGeom() {
return geom;
}
public void setGeom(String geom) {
this.geom = geom;
- }
-
- public String getUname() {
- return uname;
- }
-
- public void setUname(String uname) {
- this.uname = uname;
- }
-
- public String getDepName() {
- return depName;
- }
-
- public void setDepName(String depName) {
- this.depName = depName;
- }
-
- public String getVerName() {
- return verName;
- }
-
- public void setVerName(String verName) {
- this.verName = verName;
- }
-
- public String getDirName() {
- return dirName;
- }
-
- public void setDirName(String dirName) {
- this.dirName = dirName;
}
}
diff --git a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
deleted file mode 100644
index cf95939..0000000
--- a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.lf.server.entity.data;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * 鍏冩暟鎹枃浠�
- * @author WWW
- */
-public class MetaFileEntity implements Serializable {
- private static final long serialVersionUID = -859236217038350336L;
-
- private int id;
-
- private String name;
-
- private int metaid;
-
- private int fileid;
-
- private String guid;
-
- private String path;
-
- private double sizes;
-
- private int createUser;
-
- private Timestamp createTime;
-
- private int updateUser;
-
- private Timestamp updateTime;
-
- public MetaFileEntity() {
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getMetaid() {
- return metaid;
- }
-
- public void setMetaid(int metaid) {
- this.metaid = metaid;
- }
-
- public int getFileid() {
- return fileid;
- }
-
- public void setFileid(int fileid) {
- this.fileid = fileid;
- }
-
- public String getGuid() {
- return guid;
- }
-
- public void setGuid(String guid) {
- this.guid = guid;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public double getSizes() {
- return sizes;
- }
-
- public void setSizes(double sizes) {
- this.sizes = sizes;
- }
-
- public int getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(int createUser) {
- this.createUser = createUser;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public int getUpdateUser() {
- return updateUser;
- }
-
- public void setUpdateUser(int updateUser) {
- this.updateUser = updateUser;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-}
diff --git a/src/main/java/com/lf/server/helper/FileHelper.java b/src/main/java/com/lf/server/helper/FileHelper.java
index c9d15ee..3cb6415 100644
--- a/src/main/java/com/lf/server/helper/FileHelper.java
+++ b/src/main/java/com/lf/server/helper/FileHelper.java
@@ -1,7 +1,7 @@
package com.lf.server.helper;
import com.lf.server.entity.all.StaticData;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.twmacinta.util.MD5;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.logging.Log;
@@ -222,9 +222,9 @@
/**
* 鍒犻櫎鏂囦欢
*/
- public static void deleteFiles(List<MetaFileEntity> list) {
+ public static void deleteFiles(List<MetaEntity> list) {
try {
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
File f = new File(mf.getPath());
if (f.exists()) {
f.delete();
diff --git a/src/main/java/com/lf/server/mapper/data/MetaFileMapper.java b/src/main/java/com/lf/server/mapper/data/MetaFileMapper.java
deleted file mode 100644
index c9149ea..0000000
--- a/src/main/java/com/lf/server/mapper/data/MetaFileMapper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.lf.server.mapper.data;
-
-import com.lf.server.entity.data.MetaFileEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 鍏冩暟鎹枃浠�
- * @author WWW
- */
-@Mapper
-@Repository
-public interface MetaFileMapper {
- /**
- * 鏌ヨ璁板綍鏁�
- *
- * @param name 鏂囦欢鍚�
- * @return 璁板綍鏁�
- */
- public Integer selectCount(String name);
-
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param name 鏂囦欢鍚�
- * @param limit 璁板綍鏁�
- * @param offset 鍋忕Щ閲�
- * @return 鍒楄〃
- */
- public List<MetaFileEntity> selectByPage(String name, Integer limit, Integer offset);
-
- /**
- * 鏌ヨ鎵�鏈�
- *
- * @return
- */
- public List<MetaFileEntity> selectAll();
-
- /**
- * 鏍规嵁ID鏌ヨ
- *
- * @param id
- * @return
- */
- public MetaFileEntity selectById(int id);
-
- /**
- * 鏍规嵁GUID鏌ヨ
- *
- * @param guid
- * @return
- */
- public MetaFileEntity selectByGuid(String guid);
-
- /**
- * 鎻掑叆涓�鏉�
- *
- * @param entity
- * @return
- */
- public Integer insert(MetaFileEntity entity);
-
- /**
- * 鎻掑叆澶氭潯
- *
- * @param list
- * @return
- */
- public Integer inserts(List<MetaFileEntity> list);
-
- /**
- * 鍒犻櫎涓�鏉�
- *
- * @param id
- * @return
- */
- public Integer delete(int id);
-
- /**
- * 鍒犻櫎澶氭潯
- *
- * @param ids
- * @return
- */
- public Integer deletes(List<Integer> ids);
-
- /**
- * 鏇存柊涓�鏉�
- *
- * @param entity
- * @return
- */
- public Integer update(MetaFileEntity entity);
-
- /**
- * 鏇存柊澶氭潯
- *
- * @param list
- * @return
- */
- public Integer updates(List<MetaFileEntity> list);
-}
diff --git a/src/main/java/com/lf/server/mapper/data/MetaMapper.java b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
index d997bad..d35db88 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -1,7 +1,6 @@
package com.lf.server.mapper.data;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -79,7 +78,7 @@
* @param ids 鍏冩暟鎹甀D闆嗗悎
* @return 鍏冩暟鎹枃浠堕泦鍚�
*/
- public List<MetaFileEntity> selectMetaFiles(List<Integer> ids);
+ public List<MetaEntity> selectMetaFiles(List<Integer> ids);
/**
* 鎻掑叆涓�鏉�
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 6edd901..bd4f342 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -1,6 +1,6 @@
package com.lf.server.service.all;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -33,7 +33,7 @@
/**
* 鏌ヨ鏂囦欢
*/
- public List<MetaFileEntity> selectFiles(String subPath, List<String> extList) throws IOException {
+ public List<MetaEntity> selectFiles(String subPath, List<String> extList) throws IOException {
String root = pathHelper.getConfig().getTempPath() + File.separator + subPath;
File file = new File(root);
@@ -45,7 +45,7 @@
return null;
}
- List<MetaFileEntity> list = new ArrayList<MetaFileEntity>();
+ List<MetaEntity> list = new ArrayList<MetaEntity>();
for (File f : files) {
String fileName = FileHelper.getFileName(f.getPath());
if (null != extList) {
@@ -58,7 +58,7 @@
double sizes = FileHelper.sizeToMb(f.length());
String filePath = subPath + File.separator + fileName;
- MetaFileEntity mf = new MetaFileEntity();
+ MetaEntity mf = new MetaEntity();
mf.setName(fileName);
mf.setSizes(sizes);
mf.setPath(filePath);
@@ -80,7 +80,7 @@
/**
* 涓婁紶鏂囦欢
*/
- public <T> List<MetaFileEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public <T> List<MetaEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest) req;
req.setCharacterEncoding("utf-8");
res.setContentType("application/json;charset=utf-8");
@@ -88,7 +88,7 @@
if (t != null) {
setEntity(t, request);
}
- List<MetaFileEntity> list = getFiles(path, request);
+ List<MetaEntity> list = getFiles(path, request);
return list;
}
@@ -133,8 +133,8 @@
/**
* 鑾峰彇鏂囦欢
*/
- public List<MetaFileEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
- List<MetaFileEntity> list = new ArrayList<MetaFileEntity>();
+ public List<MetaEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
+ List<MetaEntity> list = new ArrayList<MetaEntity>();
String path = pathHelper.getTempPath(subPath);
Iterator<String> iterator = req.getFileNames();
@@ -145,7 +145,7 @@
}
double sizes = FileHelper.sizeToMb(file.getSize());
- MetaFileEntity mf = new MetaFileEntity();
+ MetaEntity mf = new MetaEntity();
mf.setName(file.getOriginalFilename());
mf.setSizes(sizes);
mf.setPath(path + File.separator + mf.getName());
@@ -162,11 +162,11 @@
/**
* 鍒犻櫎鏂囦欢
*/
- public Integer deleteFiles(List<MetaFileEntity> list) {
+ public Integer deleteFiles(List<MetaEntity> list) {
String root = pathHelper.getConfig().getTempPath();
int count = 0;
- for (MetaFileEntity entity : list) {
+ for (MetaEntity entity : list) {
if (!StringHelper.isEmpty(entity.getPath())) {
String file = root + File.separator + entity.getPath();
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index a5bcbcf..8ced799 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -3,7 +3,6 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.ctrl.TabMapperEntity;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
@@ -26,9 +25,6 @@
public class DataLoaderService extends BaseUploadService {
@Autowired
MetaService metaService;
-
- @Autowired
- MetaFileService metaFileService;
private final static String XLS = ".xls";
@@ -208,12 +204,12 @@
/**
* 鎻掑叆鏂囦欢
*/
- public void insertFiles(MetaEntity entity, List<MetaFileEntity> list, List<TabMapperEntity> tabList) {
+ public void insertFiles(MetaEntity entity, List<MetaEntity> list, List<TabMapperEntity> tabList) {
try {
String temp = pathHelper.getConfig().getTempPath();
String upload = pathHelper.getUploadFullPath();
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
File file = new File(temp + File.separator + mf.getPath());
File newFile = new File(upload + File.separator + mf.getGuid());
@@ -230,7 +226,7 @@
continue;
}
- MetaFileEntity old = metaFileService.selectByGuid(mf.getGuid());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid());
String filePath = null == old ? newFile.getPath() : old.getPath();
int count = 0;
@@ -258,8 +254,8 @@
continue;
}
- MetaFileEntity mfe = createMetaFileEntity(me, mf, filePath);
- if (metaFileService.insert(mfe) == 0) {
+ MetaEntity mfe = createMetaFileEntity(me, mf, filePath);
+ if (metaService.insert(mfe) == 0) {
metaService.delete(me.getId());
continue;
}
@@ -280,7 +276,7 @@
/**
* 鑾峰彇 Tabs
*/
- private List<TabMapperEntity> getTabs(MetaFileEntity mfe, List<TabMapperEntity> tabs) {
+ private List<TabMapperEntity> getTabs(MetaEntity mfe, List<TabMapperEntity> tabs) {
List<TabMapperEntity> list = new ArrayList<>();
for (TabMapperEntity tab : tabs) {
if (!tab.getFileName().equals(mfe.getName()) || StringHelper.isEmpty(tab.getEntity())) {
@@ -316,19 +312,16 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf, String tab, int rows) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
me.setVerid(entity.getVerid());
me.setType(getType(mf.getName().toLowerCase()));
- me.setGather(entity.getGather());
- me.setBatch(entity.getBatch());
- me.setDescr(entity.getDescr());
me.setName(mf.getName());
me.setSizes(mf.getSizes());
- me.setTab(tab);
- me.setRows(rows);
+ me.setBstab(tab);
+ me.setBsrows(rows);
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
@@ -338,8 +331,8 @@
/**
* 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
*/
- private MetaFileEntity createMetaFileEntity(MetaEntity me, MetaFileEntity entity, String filePath) {
- MetaFileEntity mfe = new MetaFileEntity();
+ private MetaEntity createMetaFileEntity(MetaEntity me, MetaEntity entity, String filePath) {
+ MetaEntity mfe = new MetaEntity();
mfe.setName(entity.getName());
mfe.setMetaid(me.getId());
mfe.setGuid(entity.getGuid());
@@ -354,7 +347,7 @@
/**
* 鎻掑叆Excel
*/
- private void insertXls(String root, MetaEntity me, MetaFileEntity mf, TabMapperEntity tab) {
+ private void insertXls(String root, MetaEntity me, MetaEntity mf, TabMapperEntity tab) {
BasicMapper basicMapper = ClassHelper.getBasicMapper(tab.getEntity());
if (null == basicMapper) {
return;
diff --git a/src/main/java/com/lf/server/service/data/DataUploadService.java b/src/main/java/com/lf/server/service/data/DataUploadService.java
index 4e368c6..4db0fa7 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -1,7 +1,6 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.service.all.BaseUploadService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,19 +18,16 @@
@Autowired
MetaService metaService;
- @Autowired
- MetaFileService metaFileService;
-
/**
* 鎻掑叆鏂囦欢
*/
- public int insertFiles(MetaEntity entity, List<MetaFileEntity> list) {
+ public int insertFiles(MetaEntity entity, List<MetaEntity> list) {
int count = 0;
try {
String temp = pathHelper.getConfig().getTempPath();
String root = pathHelper.getUploadFullPath();
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
String filePath = getFilePath(temp, root, mf);
// 鍏冩暟鎹�
@@ -41,8 +37,8 @@
}
// 鍏冩暟鎹枃浠�
- MetaFileEntity mfe = createMetaFileEntity(me, mf, filePath);
- if (metaFileService.insert(mfe) > 0) {
+ MetaEntity mfe = createMetaFileEntity(me, mf, filePath);
+ if (metaService.insert(mfe) > 0) {
count++;
}
}
@@ -56,12 +52,12 @@
/**
* 鑾峰彇鏂囦欢璺緞
*/
- private String getFilePath(String temp, String root, MetaFileEntity mf) {
+ private String getFilePath(String temp, String root, MetaEntity mf) {
// 绉诲姩鏂囦欢
File file = new File(temp + File.separator + mf.getPath());
File newFile = new File(root + File.separator + mf.getGuid());
- MetaFileEntity old = metaFileService.selectByGuid(mf.getGuid());
+ MetaEntity old = metaService.selectByGuid(mf.getGuid());
String filePath = null;
if (null == old) {
@@ -78,15 +74,12 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaFileEntity mf) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
me.setVerid(entity.getVerid());
me.setType("file");
- me.setGather(entity.getGather());
- me.setBatch(entity.getBatch());
- me.setDescr(entity.getDescr());
me.setName(mf.getName());
me.setSizes(mf.getSizes());
me.setCreateTime(entity.getCreateTime());
@@ -98,8 +91,8 @@
/**
* 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
*/
- private MetaFileEntity createMetaFileEntity(MetaEntity me, MetaFileEntity entity, String filePath) {
- MetaFileEntity mfe = new MetaFileEntity();
+ private MetaEntity createMetaFileEntity(MetaEntity me, MetaEntity entity, String filePath) {
+ MetaEntity mfe = new MetaEntity();
mfe.setName(entity.getName());
mfe.setMetaid(me.getId());
mfe.setGuid(entity.getGuid());
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 6f2f368..685ddb2 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -2,7 +2,7 @@
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
@@ -184,7 +184,7 @@
* @param pwd 瀵嗙爜
* @return 涓嬭浇鏂囦欢GUID
*/
- public String zipFiles(UserEntity ue, List<MetaFileEntity> list, String pwd) throws Exception {
+ public String zipFiles(UserEntity ue, List<MetaEntity> list, String pwd) throws Exception {
rmRepeatMetaFiles(list);
String downloadPath = pathHelper.getDownloadFullPath();
@@ -205,12 +205,12 @@
/**
* 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
*/
- private void rmRepeatMetaFiles(List<MetaFileEntity> list) {
+ private void rmRepeatMetaFiles(List<MetaEntity> list) {
List<String> guidList = new ArrayList<>();
int i = 0;
while (i < list.size()) {
- MetaFileEntity entity = list.get(i);
+ MetaEntity entity = list.get(i);
if (guidList.contains(entity.getGuid())) {
list.remove(i);
continue;
@@ -224,11 +224,11 @@
/**
* 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
*/
- private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaFileEntity> list) {
+ private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
String uploadPath = pathHelper.getConfig().getUploadPath();
int i = 1;
- for (MetaFileEntity entity : list) {
+ for (MetaEntity entity : list) {
try {
File file = new File(uploadPath + File.separator + entity.getPath());
zip.addFile(file, params);
diff --git a/src/main/java/com/lf/server/service/data/MetaFileService.java b/src/main/java/com/lf/server/service/data/MetaFileService.java
deleted file mode 100644
index 29a7153..0000000
--- a/src/main/java/com/lf/server/service/data/MetaFileService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.lf.server.service.data;
-
-import com.lf.server.entity.data.MetaFileEntity;
-import com.lf.server.helper.StringHelper;
-import com.lf.server.mapper.data.MetaFileMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 鍏冩暟鎹枃浠�
- * @author WWW
- */
-@Service
-public class MetaFileService implements MetaFileMapper {
- @Autowired
- MetaFileMapper metaFileMapper;
-
- @Override
- public Integer selectCount(String name) {
- name = StringHelper.getLikeStr(name);
-
- return metaFileMapper.selectCount(name);
- }
-
- @Override
- public List<MetaFileEntity> selectByPage(String name, Integer limit, Integer offset) {
- name = StringHelper.getLikeStr(name);
-
- return metaFileMapper.selectByPage(name, limit, offset);
- }
-
- @Override
- public List<MetaFileEntity> selectAll() {
- return metaFileMapper.selectAll();
- }
-
- @Override
- public MetaFileEntity selectById(int id) {
- return metaFileMapper.selectById(id);
- }
-
- @Override
- public MetaFileEntity selectByGuid(String guid) {
- return metaFileMapper.selectByGuid(guid);
- }
-
- @Override
- public Integer insert(MetaFileEntity entity) {
- return metaFileMapper.insert(entity);
- }
-
- @Override
- public Integer inserts(List<MetaFileEntity> list) {
- return metaFileMapper.inserts(list);
- }
-
- @Override
- public Integer delete(int id) {
- return metaFileMapper.delete(id);
- }
-
- @Override
- public Integer deletes(List<Integer> ids) {
- return metaFileMapper.deletes(ids);
- }
-
- @Override
- public Integer update(MetaFileEntity entity) {
- return metaFileMapper.update(entity);
- }
-
- @Override
- public Integer updates(List<MetaFileEntity> list) {
- return metaFileMapper.updates(list);
- }
-}
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index bc8d000..e7b0bbd 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -1,7 +1,6 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.data.MetaMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +56,7 @@
}
@Override
- public List<MetaFileEntity> selectMetaFiles(List<Integer> ids) {
+ public List<MetaEntity> selectMetaFiles(List<Integer> ids) {
return metaMapper.selectMetaFiles(ids);
}
@@ -95,4 +94,8 @@
public Integer updates(List<MetaEntity> list) {
return metaMapper.updates(list);
}
+
+ public MetaEntity selectByGuid(String guid){
+ return null;
+ }
}
diff --git a/src/main/java/com/lf/server/service/show/InquiryService.java b/src/main/java/com/lf/server/service/show/InquiryService.java
index 1cadf99..1e8c5f5 100644
--- a/src/main/java/com/lf/server/service/show/InquiryService.java
+++ b/src/main/java/com/lf/server/service/show/InquiryService.java
@@ -1,7 +1,7 @@
package com.lf.server.service.show;
import com.lf.server.entity.ctrl.ShpRecordEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.ShpHelper;
import com.lf.server.helper.StringHelper;
@@ -21,9 +21,9 @@
* @param list
* @return
*/
- public ShpRecordEntity readShpFirstRecord(List<MetaFileEntity> list) {
+ public ShpRecordEntity readShpFirstRecord(List<MetaEntity> list) {
String fileName = null;
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
fileName = mf.getPath();
break;
diff --git a/src/main/java/com/lf/server/service/show/MarkService.java b/src/main/java/com/lf/server/service/show/MarkService.java
index 0da472d..13014fd 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -2,7 +2,7 @@
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
@@ -206,9 +206,9 @@
* @param list ShapeFile鏂囦欢鍒楄〃
* @return Mark瀹炰綋绫婚泦鍚�
*/
- public List<MarkJsonEntity> readShpForMarks(List<MetaFileEntity> list) {
+ public List<MarkJsonEntity> readShpForMarks(List<MetaEntity> list) {
String fileName = null;
- for (MetaFileEntity mf : list) {
+ for (MetaEntity mf : list) {
if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
fileName = mf.getPath();
break;
diff --git a/src/main/java/com/lf/server/service/show/PipelineService.java b/src/main/java/com/lf/server/service/show/PipelineService.java
index 56bcdf4..465770e 100644
--- a/src/main/java/com/lf/server/service/show/PipelineService.java
+++ b/src/main/java/com/lf/server/service/show/PipelineService.java
@@ -1,18 +1,13 @@
package com.lf.server.service.show;
-import com.lf.server.entity.all.BaseGeoEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
-import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.mapper.data.DownloadMapper;
import com.lf.server.mapper.show.PipelineMapper;
-import com.lf.server.service.all.BaseQueryService;
import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.model.FileHeader;
import net.lingala.zip4j.model.ZipParameters;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -23,9 +18,6 @@
import java.io.File;
import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
--
Gitblit v1.9.3