From 498fbeb391e2077e4df72ced5284a4adcfd9077f Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期日, 22 一月 2023 19:22:45 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/service/data/UploadService.java | 7 +++++++ 说明.txt | 35 ++++++++++++++++++++++------------- data/update.sql | 5 +++-- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/data/update.sql b/data/update.sql index ce275a0..b439825 100644 --- a/data/update.sql +++ b/data/update.sql @@ -127,8 +127,9 @@ select * from lf.sys_user select * from lf.sys_menu where cn_name='鏁版嵁绠$悊' - - +delete from lf.sys_menu +select * from lf.sys_menu +select * from lf.sys_fme_log 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 6827384..0fb3a77 100644 --- a/src/main/java/com/lf/server/service/data/UploadService.java +++ b/src/main/java/com/lf/server/service/data/UploadService.java @@ -372,6 +372,9 @@ if (mf.getRows() > 0) { me.setTab(mf.getTab()); } + if (StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName())) { + me.setLayer(mf.getEntity()); + } me.setRows(mf.getRows()); me.setCreateUser(mf.getCreateUser()); me.setCreateTime(mf.getCreateTime()); @@ -410,6 +413,10 @@ MetaEntity old = metaService.selectByGuid(mf.getGuid()); if (null == old) { xlsList.add(mf); + } else { + mf.setTab(old.getTab()); + mf.setEntity(old.getLayer()); + mf.setRows(old.getRows()); } } } diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt" index 248a200..5c3f43b 100644 --- "a/\350\257\264\346\230\216.txt" +++ "b/\350\257\264\346\230\216.txt" @@ -24,24 +24,33 @@ http://localhost:12316/sign/toIndex http://localhost:12316/sign/toLogin http://127.0.0.1:12316/sign/toLogin?service=http://www.sina.com.cn - -.gdb > HFCP+LRRL + TFCA -.shp > F5004_WT.shp + F5004_WL.shp + F5004.shp +------------------------------------------------------------------------------- 闂璁板綍 +1.鏁版嵁涓婁紶锛氭湁鎸夐挳澶у皬涓嶄竴 +2.鏁版嵁绠$悊锛氬乏鍙冲竷灞�鍏佽宸﹀彸鎷栧姩鏀瑰彉澶у皬 +3.鏁版嵁妫�绱細鍘婚櫎琛ㄥ悕锛屾坊鍔犺〃鍚嶆悳绱� +4.鍊煎煙绠$悊锛氬幓闄よ〃鍚� +5.椤圭洰绠$悊锛氭坊鍔犻」鐩┗鍦颁綅缃紝鑷姩鍖归厤鐪併�佸競銆佸幙淇℃伅 +6.鍦ㄧ嚎鍒跺浘锛氭坊鍔犳洿澶氱殑鍥惧眰锛屽挨鍏舵槸绀轰緥鏁版嵁鐨勫睍绀� +7.绯荤粺鐩戞帶锛氱姸鎬佷俊鎭厑璁稿鍑鸿〃鏍� * +8.鍦颁笅妯″紡锛氭寕杞藉湴涓嬫ā鍨� +9.涓夌淮鐗瑰畾鏍煎紡锛�3dm锛宔ff +10.鍦ㄧ嚎鍒跺浘锛氬嚭鍥炬垚鍔熻鎻愮ず淇℃伅锛岃姹傝兘澶熷畾鍒跺瓧浣撳ぇ灏忋�佺鍙锋樉绀虹瓑銆� +11.鏁版嵁鍙戝竷锛氭彁渚沇MS鏈嶅姟鍦板潃锛�100.10.1.169锛�103.85.165.99:8050 ------------------------------------------------------------------------------- Java涓嶱ostgres绫诲瀷瀵瑰簲 - java8 postgreSQL + java8 postgreSQL 1 LocalDate date 2 LocalTime time 3 LocalDateTime timestamp without timezone 4 OffsetDateTime timestamp with timezone -5 String varchar -6 String text -7 Integer int2 -8 Integer int4 -9 Long int8 -10 Float float4 -11 Double float8 -12 BigDecimal numeric -13 Boolean bool +5 String varchar +6 String text +7 Integer int2 +8 Integer int4 +9 Long int8 +10 Float float4 +11 Double float8 +12 BigDecimal numeric +13 Boolean bool ------------------------------------------------------------------------------- 鏈搴旂殑Controller data/DownloadController data/MetaFileController -- Gitblit v1.9.3