From 3e1416bffcb3761d06261e327edcbfe10a5443fb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 二月 2023 12:42:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 4 +-
src/main/java/com/lf/server/entity/data/MetaFileEntity.java | 2
src/main/java/com/lf/server/service/show/MarkService.java | 3 +
src/main/java/com/lf/server/controller/data/MetaController.java | 23 ++---------
src/main/java/com/lf/server/service/show/ExportService.java | 1
data/db_tab.sql | 2
src/main/java/com/lf/server/service/data/UploadService.java | 10 ++--
src/main/java/com/lf/server/service/data/MetaService.java | 2
src/main/java/com/lf/server/service/show/PipelineService.java | 2
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 6 +-
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 14 +++---
src/main/java/com/lf/server/service/sys/ReportService.java | 1
src/main/java/com/lf/server/controller/show/DataLibController.java | 14 +++---
src/main/java/com/lf/server/entity/data/MetaEntity.java | 2
src/main/java/com/lf/server/service/show/DataLibService.java | 2
src/main/java/com/lf/server/service/all/BaseUploadService.java | 4 +-
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 14 +++---
src/main/java/com/lf/server/service/data/DownloadService.java | 10 ++--
18 files changed, 53 insertions(+), 63 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index c5d46d5..17d9282 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -577,7 +577,7 @@
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.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.depcode 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 27ef3d3..79d1831 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -38,7 +38,7 @@
import java.util.List;
/**
- * 鍏冩暟鎹�
+ * 婧愭暟鎹�
* @author WWW
*/
@Api(tags = "鏁版嵁绠＄悊\\婧愭暟鎹鐞�")
@@ -117,19 +117,6 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectAll")
- public ResponseMsg<List<MetaEntity>> selectAll() {
- try {
- List<MetaEntity> list = metaService.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")
@@ -148,7 +135,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
+ @ApiImplicitParam(name = "id", value = "婧愭暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
@@ -157,12 +144,12 @@
// noinspection AlibabaRemoveCommentedCode
try {
if (null == id || id < 0) {
- return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
+ return fail("婧愭暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
MetaEntity meta = metaService.selectById(id);
if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
- return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
+ return fail("鎵句笉鍒版簮鏁版嵁淇℃伅", null);
}
String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
@@ -388,7 +375,7 @@
List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
+ return fail("娌℃湁鎵惧埌婧愭暟鎹�");
}
UserEntity ue = tokenService.getCurrentUser(req);
diff --git a/src/main/java/com/lf/server/controller/data/upload/CheckController.java b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
index a08764f..f0837a5 100644
--- a/src/main/java/com/lf/server/controller/data/upload/CheckController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
@@ -394,7 +394,7 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鍏冩暟鎹鏌�")
+ @ApiOperation(value = "鏌ヨ婧愭暟鎹鏌�")
@GetMapping(value = "/selectCheckMeta")
public ResponseMsg<Object> selectCheckMeta(HttpServletRequest req) {
try {
@@ -402,7 +402,7 @@
fme.name = StringHelper.getGuid();
fme.xmmc = "瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116BT02锛�";
fme.sjzy = "娴嬮噺涓撲笟";
- fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\鍏冩暟鎹鏌�.zip";
+ fme.zipPath = "D:\\Project\\Data\\LF\\temp\\20230107010101\\婧愭暟鎹鏌�.zip";
String rs = fmeService.checkMeta(fme, req);
if (StringHelper.isEmpty(rs)) {
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index e5ea773..ff25858 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -168,7 +168,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
+ @ApiImplicitParam(name = "id", value = "婧愭暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
@@ -177,12 +177,12 @@
// noinspection AlibabaRemoveCommentedCode
try {
if (null == id || id < 0) {
- return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
+ return fail("婧愭暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
MetaEntity meta = metaService.selectById(id);
if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
- return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
+ return fail("鎵句笉鍒版簮鏁版嵁淇℃伅", null);
}
String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index 3850d3c..a9798bf 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -82,7 +82,7 @@
@ApiOperation(value = "涓婁紶Excel闄勪欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query"),
- @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹泦鍚�", dataType = "Integer", paramType = "query")
+ @ApiImplicitParam(name = "ids", value = "婧愭暟鎹泦鍚�", dataType = "Integer", paramType = "query")
})
@ResponseBody
@PostMapping(value = "/uploadXlsAnnex")
@@ -93,12 +93,12 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
if (null == ids || ids.length == 0) {
- return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
+ return fail("鎵句笉鍒版簮鏁版嵁鐨処D闆嗗悎");
}
List<MetaEntity> ms = metaService.selectXlsAnnex(ids, UploadAttachService.getTabs());
if (null == ms || ms.isEmpty()) {
- return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勫厓鏁版嵁");
+ return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勬簮鏁版嵁");
}
List<MetaFileEntity> list = uploadService.uploadData(null, path, req, res);
@@ -108,7 +108,7 @@
List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
if (null == rs || rs.size() == 0) {
- return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
+ return fail("娌℃湁瑕佹洿鏂扮殑婧愭暟鎹�");
}
return success(rs);
@@ -196,7 +196,7 @@
@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "鍏冩暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "list", value = "婧愭暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/insertFiles")
@@ -207,7 +207,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
if (null == list || list.isEmpty()) {
- return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
+ return fail("婧愭暟鎹枃浠堕泦鍚堜负绌�", null);
}
uploadService.insertFiles(ue, list, req);
@@ -219,7 +219,7 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
+ @ApiOperation(value = "鍒犻櫎婧愭暟鎹�")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
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 5544df2..054f814 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -67,7 +67,7 @@
VerService verService;
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹� *")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ婧愭暟鎹� *")
@ApiImplicitParams({
@ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"),
@@ -120,7 +120,7 @@
}
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ婧愭暟鎹�")
@ApiImplicitParams({
@ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
@@ -152,7 +152,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
+ @ApiImplicitParam(name = "id", value = "婧愭暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
@@ -161,12 +161,12 @@
// noinspection AlibabaRemoveCommentedCode
try {
if (null == id || id < 0) {
- return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
+ return fail("婧愭暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
MetaEntity meta = metaService.selectById(id);
if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
- return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
+ return fail("鎵句笉鍒版簮鏁版嵁淇℃伅", null);
}
String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
@@ -189,7 +189,7 @@
}
@SysLog()
- @ApiOperation(value = "璇锋眰鍏冩暟鎹笅杞�")
+ @ApiOperation(value = "璇锋眰婧愭暟鎹笅杞�")
@ApiImplicitParams({
@ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@@ -212,7 +212,7 @@
List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
+ return fail("娌℃湁鎵惧埌婧愭暟鎹�");
}
UserEntity ue = tokenService.getCurrentUser(req);
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 f2c9536..5af175e 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -4,7 +4,7 @@
import java.sql.Timestamp;
/**
- * 鍏冩暟鎹�
+ * 婧愭暟鎹�
* @author WWW
*/
public class MetaEntity implements Serializable {
diff --git a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
index 30bf89d..acd826a 100644
--- a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
@@ -4,7 +4,7 @@
import java.sql.Timestamp;
/**
- * 鍏冩暟鎹枃浠�
+ * 婧愭暟鎹枃浠�
* @author WWW
*/
public class MetaFileEntity implements Serializable {
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 462e859..cd37b48 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -7,7 +7,7 @@
import java.util.List;
/**
- * 鍏冩暟鎹�
+ * 婧愭暟鎹�
* @author WWW
*/
@Mapper
@@ -106,19 +106,19 @@
public MetaEntity selectByGuid(String guid, String tab);
/**
- * 鏌ヨ鍏冩暟鎹枃浠�
+ * 鏌ヨ婧愭暟鎹枃浠�
*
- * @param ids 鍏冩暟鎹甀D闆嗗悎
- * @return 鍏冩暟鎹枃浠堕泦鍚�
+ * @param ids 婧愭暟鎹甀D闆嗗悎
+ * @return 婧愭暟鎹枃浠堕泦鍚�
*/
public List<MetaEntity> selectMetaFiles(List<Integer> ids);
/**
- * 鏌ヨExcel鍏冩暟鎹�
+ * 鏌ヨExcel婧愭暟鎹�
*
- * @param ids 鍏冩暟鎹甀D闆嗗悎
+ * @param ids 婧愭暟鎹甀D闆嗗悎
* @param tabs 琛ㄥ悕瀛楃涓�
- * @return 鍏冩暟鎹枃浠堕泦鍚�
+ * @return 婧愭暟鎹枃浠堕泦鍚�
*/
public List<MetaEntity> selectXlsAnnex(Integer[] ids, String tabs);
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 8e0fdb6..478c8c0 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -327,7 +327,7 @@
}
/**
- * 鍒涘缓鍏冩暟鎹枃浠跺疄浣撶被
+ * 鍒涘缓婧愭暟鎹枃浠跺疄浣撶被
*/
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
@@ -486,7 +486,7 @@
}
/**
- * 璁剧疆鍏冩暟鎹枃浠剁殑绫诲瀷
+ * 璁剧疆婧愭暟鎹枃浠剁殑绫诲瀷
*/
private void setMetaType(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
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 3fa051a..708df7e 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -181,7 +181,7 @@
* 鎵撳寘鏂囦欢
*
* @param ue 鐢ㄦ埛瀹炰綋
- * @param list 鍏冩暟鎹枃浠堕泦鍚�
+ * @param list 婧愭暟鎹枃浠堕泦鍚�
* @param pwd 瀵嗙爜
* @return 涓嬭浇鏂囦欢GUID
*/
@@ -204,7 +204,7 @@
}
/**
- * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
+ * 绉婚櫎閲嶅鐨勬簮鏁版嵁鏂囦欢
*/
private void rmRepeatMetaFiles(List<MetaEntity> list) {
List<String> guidList = new ArrayList<>();
@@ -223,7 +223,7 @@
}
/**
- * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
+ * 娣诲姞婧愭暟鎹枃浠惰嚦Zip鍖�
*/
private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
int i = 1;
@@ -318,14 +318,14 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹�
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(3);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
de.setDcount(0);
de.setPwd(pwd);
de.setUrl(FileHelper.getRelativePath(file));
- de.setDescr("鍏冩暟鎹枃浠�");
+ de.setDescr("婧愭暟鎹枃浠�");
de.setGuid(FileHelper.getFileMd5(file));
de.setCreateUser(ue.getId());
// de.setGeom(null)
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 03abf03..97faf79 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -9,7 +9,7 @@
import java.util.List;
/**
- * 鍏冩暟鎹�
+ * 婧愭暟鎹�
* @author WWW
*/
@Service
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 3749d34..51ced2a 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -75,7 +75,7 @@
}
/**
- * 妫�鏌ュ厓鏁版嵁鏂囦欢
+ * 妫�鏌ユ簮鏁版嵁鏂囦欢
*/
private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
Timestamp createTime = WebHelper.getCurrentTimestamp();
@@ -121,7 +121,7 @@
}
/**
- * 鑾峰彇Excel鍏冩暟鎹枃浠�
+ * 鑾峰彇Excel婧愭暟鎹枃浠�
*/
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
@@ -138,7 +138,7 @@
}
/**
- * 鑾峰彇Excel鐨勫厓鏁版嵁
+ * 鑾峰彇Excel鐨勬簮鏁版嵁
*/
private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
List<String> pathList = new ArrayList<>();
@@ -518,7 +518,7 @@
}
/**
- * 鎻掑叆鍏冩暟鎹�
+ * 鎻掑叆婧愭暟鎹�
*/
private void insertMetas(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
@@ -534,7 +534,7 @@
}
/**
- * 鍒涘缓鍏冩暟鎹�
+ * 鍒涘缓婧愭暟鎹�
*/
private MetaEntity createMeta(MetaFileEntity mf) {
MetaEntity me = new MetaEntity();
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index 0239259..c5dca3d 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -189,7 +189,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(4);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
diff --git a/src/main/java/com/lf/server/service/show/ExportService.java b/src/main/java/com/lf/server/service/show/ExportService.java
index b3ea46c..c407262 100644
--- a/src/main/java/com/lf/server/service/show/ExportService.java
+++ b/src/main/java/com/lf/server/service/show/ExportService.java
@@ -100,6 +100,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, ExportEntity entity, String file) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(2);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
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 d6ce01e..9f59bd0 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -189,13 +189,14 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(1);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
de.setDcount(0);
// de.setPwd(null)
de.setUrl(FileHelper.getRelativePath(file));
- de.setDescr("shp鏂囦欢");
+ de.setDescr("Shp鏂囦欢");
de.setGuid(FileHelper.getFileMd5(file));
de.setCreateUser(ue.getId());
// de.setGeom(null)
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 2b57813..e1f552d 100644
--- a/src/main/java/com/lf/server/service/show/PipelineService.java
+++ b/src/main/java/com/lf/server/service/show/PipelineService.java
@@ -207,7 +207,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(5);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
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 1232962..9523a91 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -289,6 +289,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(6);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
--
Gitblit v1.9.3