From c565deb6ad9903ddc7fb09647adf4fc2cc31ef49 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期一, 27 二月 2023 17:21:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 4
data/db_tab.sql | 14 ++--
src/main/java/com/lf/server/service/data/UploadService.java | 12 ++--
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 14 ++--
src/main/java/com/lf/server/service/sys/ReportService.java | 2
src/main/java/com/lf/server/entity/data/MetaEntity.java | 2
src/main/java/com/lf/server/service/show/DataLibService.java | 2
data/update.sql | 7 +-
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 14 ++--
src/main/java/com/lf/server/service/data/DownloadService.java | 12 ++--
src/main/java/com/lf/server/entity/data/MetaFileEntity.java | 2
src/main/java/com/lf/server/mapper/sys/MetaDownMapper.java | 6 +-
src/main/java/com/lf/server/service/show/MarkService.java | 2
src/main/java/com/lf/server/controller/data/MetaController.java | 12 ++--
src/main/java/com/lf/server/service/show/ExportService.java | 2
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 2
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 | 8 +-
src/main/java/com/lf/server/controller/show/DataLibController.java | 14 ++--
src/main/java/com/lf/server/entity/sys/MetaDownEntity.java | 2
src/main/java/com/lf/server/service/sys/MetaDownService.java | 2
src/main/java/com/lf/server/controller/show/OneMapController.java | 2
data/表结构变更说明.txt | 6 +-
data/db_cx.sql | 1
src/main/java/com/lf/server/service/all/BaseUploadService.java | 4
src/main/resources/mapper/show/OneMapMapper.xml | 4
27 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 0dbe4b0..922aaa7 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -357,4 +357,3 @@
-
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 46aa77a..42972da 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -547,7 +547,7 @@
--insert into lf.sys_role_menu_auth (roleid,menu_auth_id) values (1,1);
select * from lf.sys_role_menu_auth;
------------------------------------------------------------------------------------------------------ 16.婧愭暟鎹〃
+----------------------------------------------------------------------------------------------------- 16.鍏冩暟鎹〃
-- DROP TABLE IF EXISTS lf.sys_meta;
create table lf.sys_meta (
id serial primary key,
@@ -576,10 +576,10 @@
);
-- 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 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.ismeta is '鏄惁涓哄厓鏁版嵁';
comment on column lf.sys_meta.dirid is '鐩綍ID';
comment on column lf.sys_meta.depid is '鍗曚綅ID';
@@ -783,7 +783,7 @@
comment on table lf.sys_download is '涓嬭浇琛�';
comment on column lf.sys_download.id is '涓婚敭ID';
comment on column lf.sys_download.name is '鍚嶇О';
-comment on column lf.sys_download.type is '绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡';
+comment on column lf.sys_download.type is '绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡';
comment on column lf.sys_download.depid is '鍗曚綅ID';
comment on column lf.sys_download.sizes is '鏂囦欢澶у皬锛氬崟浣峂B';
comment on column lf.sys_download.dcount is '涓嬭浇娆℃暟';
@@ -1183,7 +1183,7 @@
comment on column lf.sys_coord.remarks is '澶囨敞';
select * from lf.sys_coord;
------------------------------------------------------------------------------------------------------ 35.婧愭暟鎹�-涓嬭浇琛�
+----------------------------------------------------------------------------------------------------- 35.鍏冩暟鎹�-涓嬭浇琛�
-- drop table if exists lf.sys_meta_down;
create table lf.sys_meta_down(
id serial primary key,
@@ -1192,9 +1192,9 @@
create_user integer default 1,
create_time timestamp(6) without time zone default now()
);
-comment on table lf.sys_meta_down is '婧愭暟鎹�-涓嬭浇琛�';
+comment on table lf.sys_meta_down is '鍏冩暟鎹�-涓嬭浇琛�';
comment on column lf.sys_meta_down.id is '涓婚敭ID';
-comment on column lf.sys_meta_down.metaid is '婧愭暟鎹甀D';
+comment on column lf.sys_meta_down.metaid is '鍏冩暟鎹甀D';
comment on column lf.sys_meta_down.downid is '涓嬭浇ID';
comment on column lf.sys_meta_down.create_user is '鍒涘缓浜篒D';
comment on column lf.sys_meta_down.create_time is '鍒涘缓鏃堕棿';
diff --git a/data/update.sql b/data/update.sql
index 628100c..1306483 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -67,7 +67,7 @@
select * from lf.sys_menu where cn_name = '璧勬簮瀹℃牳';
update lf.sys_menu set url = 'http://10.7.0.186:88/resm/#/resapproval?embed=true&token=' where cn_name = '璧勬簮瀹℃牳';
---------------------------------------------------------- 鍒濆鍖栨簮鏁版嵁
+--------------------------------------------------------- 鍒濆鍖栧厓鏁版嵁
insert into lf.sys_meta (name,dirid) values ('椤圭洰WBS瀵煎嚭.xlsx',57);
insert into lf.sys_meta (name,dirid) values ('00116BT02-CR001#ESV-DW-0101 灏侀潰.docx',62);
insert into lf.sys_meta (name,dirid) values ('00116BT02-CR001#ESV-DW-0101锛堝ぇ娌虫部娌崇┛瓒婂湴褰㈠浘锛�0.dwg',62);
@@ -107,7 +107,8 @@
update lf.sys_dict set type='integer' where field='updateuser' and type='text';
--------------------------------------------------------- 01 lf.sys_dep
-- alter sequence lf.sys_meta_id_seq restart with 1;
-update lf.sys_operate set modular2='婧愭暟鎹鐞�' where modular2='鍏冩暟鎹�';
+update lf.sys_operate set modular2='鍏冩暟鎹鐞�' where modular2='婧愭暟鎹鐞�';
+select modular1,modular2 from lf.sys_operate group by modular1,modular2;
delete from lf.sys_dep where id = 59;
update lf.sys_dep set bak = null where bak = ' ';
@@ -222,7 +223,7 @@
-- 鎸夋枃浠剁被鍨嬬粺璁�
select type,count(*),sum(sizes) from lf.sys_meta group by type;
--- type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+-- type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
select * from lf.sys_download;
select * from lf.sys_serve_log
diff --git "a/data/\350\241\250\347\273\223\346\236\204\345\217\230\346\233\264\350\257\264\346\230\216.txt" "b/data/\350\241\250\347\273\223\346\236\204\345\217\230\346\233\264\350\257\264\346\230\216.txt"
index f8c814a..ba3cedd 100644
--- "a/data/\350\241\250\347\273\223\346\236\204\345\217\230\346\233\264\350\257\264\346\230\216.txt"
+++ "b/data/\350\241\250\347\273\223\346\236\204\345\217\230\346\233\264\350\257\264\346\230\216.txt"
@@ -4,8 +4,8 @@
3.鐢ㄦ埛琛� lf.sys_user 娣诲姞浜� depcode锛屽搴� lf.sys_dep.code锛屼负鍑忓皯鍙樻洿 lf.sys_user.depid 浠嶇劧瀛樺湪銆�
-4.婧愭暟鎹〃 lf.sys_meta 鐨� depid锛堟暣鏁帮級 鏀逛负 depcode锛堝瓧绗︼級瀵瑰簲 lf.sys_dep.code锛宒irid锛堟暣鏁帮級 鏀逛负 dircode锛堝瓧绗︼級瀵瑰簲 lf.sys_dir.code銆�
-娉細鏃у悕涓� 鍏冩暟鎹紝搴旂敤鎴疯姹傛敼涓� 婧愭暟鎹��
+4.鍏冩暟鎹〃 lf.sys_meta 鐨� depid锛堟暣鏁帮級 鏀逛负 depcode锛堝瓧绗︼級瀵瑰簲 lf.sys_dep.code锛宒irid锛堟暣鏁帮級 鏀逛负 dircode锛堝瓧绗︼級瀵瑰簲 lf.sys_dir.code銆�
+娉細鏃у悕涓� 鍏冩暟鎹紝搴旂敤鎴疯姹傛敼涓� 鍏冩暟鎹��
5.瀹屾暣鍚嶇О锛�
-- 鏌ヨ鍗曚綅瀹屾暣鍚嶏紝00030701 涓� lf.sys_dep.id = 55 鐨刢ode鍊�
@@ -14,7 +14,7 @@
-- 鏌ヨ鐩綍瀹屾暣鍚嶏紝01000000020000 涓� lf.sys_dir.id = 90 鐨刢ode鍊�
select fn_rec_query(90, 'dir'); 鍙互鏀逛负 select fn_get_fullname('01000000020000', 2);
-6.閫掑綊鏌ヨ浼樺寲锛堜互鏌ヨ婧愭暟鎹负渚嬶級锛�
+6.閫掑綊鏌ヨ浼樺寲锛堜互鏌ヨ鍏冩暟鎹负渚嬶級锛�
鏃э細select * from lf.sys_meta where depid = ANY(fn_rec_array(1, 'dep'));
鏂帮細select * from lf.sys_meta where depcode like '00%'; -- 00 涓� lf.sys_dep.id = 1 鐨刢ode
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 4f82715..e9ad8fa 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -612,7 +612,7 @@
}
@SysLog()
- @ApiOperation(value = "鏍规嵁婧愭暟鎹甀D鏌ヨ")
+ @ApiOperation(value = "鏍规嵁鍏冩暟鎹甀D鏌ヨ")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
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 6ee6e9a..6a99062 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -38,10 +38,10 @@
import java.util.List;
/**
- * 婧愭暟鎹�
+ * 鍏冩暟鎹�
* @author WWW
*/
-@Api(tags = "鏁版嵁绠＄悊\\婧愭暟鎹鐞�")
+@Api(tags = "鏁版嵁绠＄悊\\鍏冩暟鎹鐞�")
@RestController
@RequestMapping("/meta")
public class MetaController extends BaseController {
@@ -166,7 +166,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")
})
@@ -175,12 +175,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();
@@ -406,7 +406,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 953e83c..2b39f23 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 09ca93e..cf9f4d5 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
@@ -199,7 +199,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")
})
@@ -208,12 +208,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();
@@ -265,7 +265,7 @@
}
@SysLog()
- @ApiOperation(value = "鏍规嵁婧愭暟鎹甀D鏌ヨ")
+ @ApiOperation(value = "鏍规嵁鍏冩暟鎹甀D鏌ヨ")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
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 e3bf925..a850243 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
@@ -83,7 +83,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")
@@ -94,12 +94,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, false, req, res);
@@ -109,7 +109,7 @@
List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
if (null == rs || rs.size() == 0) {
- return fail("娌℃湁瑕佹洿鏂扮殑婧愭暟鎹�");
+ return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
}
return success(rs);
@@ -197,7 +197,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")
@@ -208,7 +208,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
if (null == list || list.isEmpty()) {
- return fail("婧愭暟鎹枃浠堕泦鍚堜负绌�", null);
+ return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
}
uploadService.insertFiles(ue, list, req);
@@ -220,7 +220,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 18aed6b..c48fc2f 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/controller/show/OneMapController.java b/src/main/java/com/lf/server/controller/show/OneMapController.java
index 10a37f0..916ac9b 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -180,7 +180,7 @@
/**
* 涓嬭浇閲忕粺璁�
* Download statistics
- * <p>type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡<p/>
+ * <p>type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡<p/>
*/
@SysLog()
@ApiOperation(value = "涓嬭浇閲忕粺璁�")
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 3e3142a..1439618 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 9f47514..84b2728 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/entity/sys/MetaDownEntity.java b/src/main/java/com/lf/server/entity/sys/MetaDownEntity.java
index 307150b..1c3f0ad 100644
--- a/src/main/java/com/lf/server/entity/sys/MetaDownEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/MetaDownEntity.java
@@ -4,7 +4,7 @@
import java.sql.Timestamp;
/**
- * 婧愭暟鎹�-涓嬭浇
+ * 鍏冩暟鎹�-涓嬭浇
* @author WWW
*/
public class MetaDownEntity 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 129db33..5f5c823 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
@@ -119,19 +119,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/mapper/sys/MetaDownMapper.java b/src/main/java/com/lf/server/mapper/sys/MetaDownMapper.java
index 02b56c9..835bc2c 100644
--- a/src/main/java/com/lf/server/mapper/sys/MetaDownMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/MetaDownMapper.java
@@ -7,7 +7,7 @@
import java.util.List;
/**
- * 婧愭暟鎹�-涓嬭浇
+ * 鍏冩暟鎹�-涓嬭浇
* @author WWW
*/
@Mapper
@@ -16,7 +16,7 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param metaid 婧愭暟鎹甀D
+ * @param metaid 鍏冩暟鎹甀D
* @return 璁板綍鏁�
*/
public Integer selectCount(Integer metaid);
@@ -24,7 +24,7 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param metaid 婧愭暟鎹甀D
+ * @param metaid 鍏冩暟鎹甀D
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
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 414654a..59d474e 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -329,7 +329,7 @@
}
/**
- * 鍒涘缓婧愭暟鎹枃浠跺疄浣撶被
+ * 鍒涘缓鍏冩暟鎹枃浠跺疄浣撶被
*/
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
@@ -490,7 +490,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 d32f903..86fe8e1 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -186,7 +186,7 @@
* 鎵撳寘鏂囦欢
*
* @param ue 鐢ㄦ埛瀹炰綋
- * @param list 婧愭暟鎹枃浠堕泦鍚�
+ * @param list 鍏冩暟鎹枃浠堕泦鍚�
* @param pwd 瀵嗙爜
* @return 涓嬭浇鏂囦欢GUID
*/
@@ -213,7 +213,7 @@
}
/**
- * 绉婚櫎閲嶅鐨勬簮鏁版嵁鏂囦欢
+ * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
*/
private void rmRepeatMetaFiles(List<MetaEntity> list) {
List<String> guidList = new ArrayList<>();
@@ -232,7 +232,7 @@
}
/**
- * 娣诲姞婧愭暟鎹枃浠惰嚦Zip鍖�
+ * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
*/
private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
int i = 1;
@@ -327,14 +327,14 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 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)
@@ -343,7 +343,7 @@
}
/**
- * 鎻掑叆婧愭暟鎹�-涓嬭浇琛�
+ * 鎻掑叆鍏冩暟鎹�-涓嬭浇琛�
*/
private void insertMetaDown(UserEntity ue, List<MetaEntity> metas, DownloadEntity de) {
List<MetaDownEntity> list = new ArrayList<>();
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 73598d8..e26fe94 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 dd49923..6fd4452 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) {
int metaId = insertParentMeta(list);
@@ -535,7 +535,7 @@
}
/**
- * 鍒涘缓婧愭暟鎹�
+ * 鍒涘缓鍏冩暟鎹�
*/
private MetaEntity createMeta(MetaFileEntity mf, int metaId) {
MetaEntity me = new MetaEntity();
@@ -563,7 +563,7 @@
}
/**
- * 鎻掑叆鐖舵簮鏁版嵁
+ * 鎻掑叆鐖跺厓鏁版嵁
*/
private int insertParentMeta(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
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 9fca96d..39a578b 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -199,7 +199,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-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 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 c407262..1717eb8 100644
--- a/src/main/java/com/lf/server/service/show/ExportService.java
+++ b/src/main/java/com/lf/server/service/show/ExportService.java
@@ -100,7 +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-缁熻鎶ュ憡
+ // 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 9f59bd0..58b9a51 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -189,7 +189,7 @@
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-缁熻鎶ュ憡
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(1);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
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 e1f552d..6c9b75d 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-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 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/MetaDownService.java b/src/main/java/com/lf/server/service/sys/MetaDownService.java
index 03bf279..1205b4c 100644
--- a/src/main/java/com/lf/server/service/sys/MetaDownService.java
+++ b/src/main/java/com/lf/server/service/sys/MetaDownService.java
@@ -9,7 +9,7 @@
import java.util.List;
/**
- * 婧愭暟鎹�-涓嬭浇
+ * 鍏冩暟鎹�-涓嬭浇
* @author WWW
*/
@Service
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 76ad2ac..8e0bfaa 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -289,7 +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-缁熻鎶ュ憡
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(6);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index faa611c..ce90215 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -96,7 +96,7 @@
select modular1,count(*) from lf.sys_operate group by modular1 order by modular1;
</select>
- <!-- 鏁版嵁缁熻 涓嬭浇閲忕粺璁� type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡 -->
+ <!-- 鏁版嵁缁熻 涓嬭浇閲忕粺璁� type绫诲瀷锛�1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡 -->
<!-- 鏁版嵁缁熻 select type,count(*) from lf.sys_download group by type; -->
<select id="countDownloads" resultType="java.util.Map">
SELECT type,
@@ -104,7 +104,7 @@
case type
WHEN '1' THEN 'Shp鏂囦欢'
WHEN '2' THEN '涓撻鍥�'
- WHEN '3' THEN '婧愭暟鎹�'
+ WHEN '3' THEN '鍏冩暟鎹�'
WHEN '4' THEN '涓氬姟鏁版嵁'
WHEN '5' THEN '绠￠亾鍒嗘瀽'
WHEN '6' THEN '缁熻鎶ュ憡'
--
Gitblit v1.9.3