From 86c61baa66da3c124cb104c50c921c30fa5b3992 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 22 十二月 2022 11:15:38 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/data/DownloadMapper.xml | 2 +-
src/main/java/com/lf/server/service/show/ExportService.java | 7 ++++---
data/db_fn.sql | 2 +-
data/日报.txt | 35 +++++++++++++++++++++++++++++++++++
src/main/java/com/lf/server/entity/data/DownloadEntity.java | 10 ++++++++++
5 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 92cb711..374ed40 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -339,7 +339,7 @@
select ns,tab,tab_desc,field,type from lf.sys_dict;
select type from lf.sys_dict group by type;
select * from lf.sys_dict where ns='bd' and tab='dlg_agnp';
-
+select count(distinct tab) from lf.sys_dict where tab like '%b_b%';
diff --git "a/data/\346\227\245\346\212\245.txt" "b/data/\346\227\245\346\212\245.txt"
index 2ecdb0c..012b47e 100644
--- "a/data/\346\227\245\346\212\245.txt"
+++ "b/data/\346\227\245\346\212\245.txt"
@@ -264,4 +264,39 @@
2 鏈嶅姟寮�鍙戯細
淇敼绠￠亾璧勬枡棣嗘帴鍙�
寮�鍙戜竴寮犲浘鎺ュ彛
+=========================================2022-12-15
+鏈懆锛�
+1 Web寮�鍙戯細
+1锛夌患鍚堝睍绀猴細
+1.1 绯荤粺鐧诲綍榛樿鐣岄潰涓虹患鍚堝睍绀猴紝鏄剧ず鍥惧眰绠＄悊锛屽簳鍥炬洿鏀逛负楂樺痉鍦板浘
+1.2 淇敼鍦ㄧ嚎鍒跺浘鐣岄潰锛屽鍔熻兘杩涜浼樺寲
+1.3 淇敼涓撻鍥剧晫闈紝瀵瑰姛鑳借繘琛屼紭鍖�
+1.4 璧勬枡棣嗘坊鍔犵┖闂存煡璇㈠拰鏁版嵁涓嬭浇锛坺ip鍔犲瘑锛夊姛鑳�
+
+2锛夋暟鎹鐞�
+1.5 淇敼鏁版嵁涓婁紶銆佹暟鎹叆搴撻〉闈紝瀵瑰姛鑳借繘琛屼紭鍖�
+1.6 淇敼椤圭洰绠＄悊鍔熻兘锛岃В鍐虫洿鏂板紓甯�
+
+2 鏈嶅姟寮�鍙戯細
+2.1 淇敼鍏冩暟鎹鐞嗙殑鏌ヨ琛ㄦ暟鎹�佹煡璇㈠瓧娈典俊鎭帴鍙�
+2.2 鏁版嵁妫�绱㈡坊鍔犳牴鎹〃鍚嶅垎椤垫煡璇㈣〃銆佽姹侱B鏁版嵁涓嬭浇鎺ュ彛
+2.3 淇敼椤圭洰绠＄悊鐨勬彃鍏ヤ竴鏉″拰淇敼涓�鏉¤褰曟帴鍙�
+2.4 璧勬枡棣嗘坊鍔犳暟鎹墦鍖呬笅杞藉姛鑳斤紝鍒嗛〉鏌ヨ娣诲姞瀵硅繃婊ゆ潯浠剁殑鏀寔
+
+3 绯荤粺鍙戝竷锛�
+3.1 淇敼鍦ㄧ嚎鍒跺浘鐨凲GIS妯℃澘锛屽皢鍥惧眰鏈嶅姟鏇存敼涓篏eoServer鐨刉MS鏈嶅姟
+3.2 淇敼Jre鐨勬墿灞曞簱锛屾坊鍔犲FileGDB鍐欐搷浣滅殑鏀寔
+
+涓嬪懆锛�
+1 Web寮�鍙戯細
+缁煎悎灞曠ず寮�鍙戞暟鎹墦鍖呫�佹暟鎹笂浼犮�佹紨绀烘柟妗堝姛鑳�
+淇敼绠￠亾璧勬枡棣嗛〉锛屽紑鍙戝姩鎬佽繃婊ゆ潯浠�
+鏁版嵁涓婁紶銆佹暟鎹叆搴撴坊鍔犱笂浼犺繘搴�
+鍦ㄧ嚎鍒跺浘淇敼鐣岄潰鍙婂嚭鍥炬ā鏉�
+
+2 鏈嶅姟寮�鍙戯細
+淇敼绠￠亾璧勬枡棣嗘帴鍙ｆ坊鍔犳暟鎹敵璇锋帴鍙�
+鍏冩暟鎹鐞嗗紑鍙戞牴鎹崟浣嶃�佺洰褰曟煡璇㈠叾瀛愮骇鏁版嵁鍔熻兘
+寮�鍙戜笅杞芥棩蹇楀姛鑳芥帴鍙�
=========================================
+
diff --git a/src/main/java/com/lf/server/entity/data/DownloadEntity.java b/src/main/java/com/lf/server/entity/data/DownloadEntity.java
index b77aef7..eb14014 100644
--- a/src/main/java/com/lf/server/entity/data/DownloadEntity.java
+++ b/src/main/java/com/lf/server/entity/data/DownloadEntity.java
@@ -42,6 +42,8 @@
private String bak;
+ private String createName;
+
public DownloadEntity() {
}
@@ -172,4 +174,12 @@
public void setBak(String bak) {
this.bak = bak;
}
+
+ public String getCreateName() {
+ return createName;
+ }
+
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
}
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 9d51ef0..3365b10 100644
--- a/src/main/java/com/lf/server/service/show/ExportService.java
+++ b/src/main/java/com/lf/server/service/show/ExportService.java
@@ -63,7 +63,7 @@
return null;
}
- DownloadEntity de = getDownloadEntity(ue, file);
+ DownloadEntity de = getDownloadEntity(ue, entity, file);
int rows = downloadService.insert(de);
return rows > 0 ? de.getGuid() : null;
@@ -97,7 +97,7 @@
/**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
- private DownloadEntity getDownloadEntity(UserEntity ue, String file) throws Exception {
+ private DownloadEntity getDownloadEntity(UserEntity ue, ExportEntity entity, String file) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
de.setType(2);
@@ -106,7 +106,8 @@
de.setDcount(0);
// de.setPwd(null)
de.setUrl(FileHelper.getRelativePath(file));
- de.setDescr("涓撻鍥炬枃浠�");
+ // de.setDescr("涓撻鍥炬枃浠�")
+ de.setDescr(StringHelper.isEmpty(entity.getTitle()) ? "涓撻鍥炬枃浠�" : entity.getTitle().trim());
de.setGuid(FileHelper.getFileMd5(file));
de.setCreateUser(ue.getId());
// de.setGeom(null)
diff --git a/src/main/resources/mapper/data/DownloadMapper.xml b/src/main/resources/mapper/data/DownloadMapper.xml
index 6fc52ee..59d1663 100644
--- a/src/main/resources/mapper/data/DownloadMapper.xml
+++ b/src/main/resources/mapper/data/DownloadMapper.xml
@@ -32,7 +32,7 @@
</select>
<select id="selectByPageForUser" resultType="com.lf.server.entity.data.DownloadEntity">
- select * from lf.sys_download
+ select *, fn_uname(create_user) createName from lf.sys_download
<where>
create_user = #{createUser} and type = #{type}
<if test="name != null">
--
Gitblit v1.9.3