From f2878af9a5edf96407e5a6740d8e89fe4f4c27c1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 14:46:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/data/MetaFileEntity.java | 13 ++++
src/main/java/com/lf/server/controller/all/BaseUploadController.java | 1
src/main/java/com/lf/server/service/data/FmeService.java | 92 ++++++++++++++++++++++++++++++
src/main/java/com/lf/server/config/PropertiesConfig.java | 35 +++++++----
src/main/resources/application.yml | 13 +++-
src/main/java/com/lf/server/entity/ctrl/KeyValueEntity.java | 6 +-
6 files changed, 140 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/lf/server/config/PropertiesConfig.java b/src/main/java/com/lf/server/config/PropertiesConfig.java
index 3a8b1ac..4770547 100644
--- a/src/main/java/com/lf/server/config/PropertiesConfig.java
+++ b/src/main/java/com/lf/server/config/PropertiesConfig.java
@@ -10,6 +10,9 @@
@Configuration
@SuppressWarnings("AlibabaCommentsMustBeJavadocFormat")
public class PropertiesConfig {
+ @Value("${sys.fme.url}")
+ private String fmeUrl;
+
@Value("${sys.path.download}")
private String downloadPath;
@@ -28,20 +31,12 @@
// @Value("${spring.datasource.druid.stat-view-servlet.login-password}")
private String druidPwd;
- public String getDruidUser() {
- return druidUser;
+ public String getFmeUrl() {
+ return fmeUrl;
}
- public void setDruidUser(String druidUser) {
- this.druidUser = druidUser;
- }
-
- public String getDruidPwd() {
- return druidPwd;
- }
-
- public void setDruidPwd(String druidPwd) {
- this.druidPwd = druidPwd;
+ public void setFmeUrl(String fmeUrl) {
+ this.fmeUrl = fmeUrl;
}
public String getDownloadPath() {
@@ -75,4 +70,20 @@
public void setTempPath(String tempPath) {
this.tempPath = tempPath;
}
+
+ public String getDruidUser() {
+ return druidUser;
+ }
+
+ public void setDruidUser(String druidUser) {
+ this.druidUser = druidUser;
+ }
+
+ public String getDruidPwd() {
+ return druidPwd;
+ }
+
+ public void setDruidPwd(String druidPwd) {
+ this.druidPwd = druidPwd;
+ }
}
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 82949b5..60f23a4 100644
--- a/src/main/java/com/lf/server/controller/all/BaseUploadController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
@@ -7,7 +7,6 @@
import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.StringHelper;
import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.data.DirService;
import com.lf.server.service.data.MetaService;
diff --git a/src/main/java/com/lf/server/entity/ctrl/KeyValueEntity.java b/src/main/java/com/lf/server/entity/ctrl/KeyValueEntity.java
index d7cf424..7404bb9 100644
--- a/src/main/java/com/lf/server/entity/ctrl/KeyValueEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/KeyValueEntity.java
@@ -7,7 +7,7 @@
public class KeyValueEntity {
private String key;
- private String value;
+ private Object value;
public KeyValueEntity() {
}
@@ -20,11 +20,11 @@
this.key = key;
}
- public String getValue() {
+ public Object getValue() {
return value;
}
- public void setValue(String value) {
+ public void setValue(Object value) {
this.value = value;
}
}
diff --git a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
new file mode 100644
index 0000000..e31697e
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
@@ -0,0 +1,13 @@
+package com.lf.server.entity.data;
+
+import java.io.Serializable;
+
+/**
+ * 鍏冩暟鎹枃浠�
+ * @author WWW
+ */
+public class MetaFileEntity implements Serializable {
+ private static final long serialVersionUID = -3688958480700165163L;
+
+
+}
diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
new file mode 100644
index 0000000..7057092
--- /dev/null
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -0,0 +1,92 @@
+package com.lf.server.service.data;
+
+import com.lf.server.config.PropertiesConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * FME鏈嶅姟绫�
+ * @author WWW
+ */
+@Service
+public class FmeService {
+ @Autowired
+ PropertiesConfig propertiesConfig;
+
+ /**
+ * OSGB妫�鏌ワ細.osgb + .xls/.xlsx
+ */
+ public void checkOsgb(){
+
+ }
+
+ /**
+ * 琛ㄦ牸鏁版嵁妫�鏌ワ細.xls/.xlsx
+ */
+ public void checkXls(){
+
+ }
+
+ /**
+ * 鐐逛簯妫�鏌ワ細.laz + .xls/.xlsx
+ */
+ public void checkLaz(){
+
+ }
+
+ /**
+ * 楂樼▼妫�鏌ワ細.tif/.tfw/.tif.ovr + .dwg
+ */
+ public void checkDem(){
+
+ }
+
+ /**
+ * 灞炴�ф鏌ワ細.dwg, *dlg.gdb
+ */
+ public void checkAttrs(){
+
+ }
+
+ /**
+ * 鎷撴墤妫�鏌ワ細*鍦板舰鍥�.dwg
+ */
+ public void checkTopology(){
+
+ }
+
+ /**
+ * 鍥鹃潰鏁撮グ妫�鏌ワ細.dwg
+ */
+ public void checkDecorate(){
+
+ }
+
+ /**
+ * 鍘熺偣妫�鏌ワ細鍓栭潰鍥�.dwg
+ */
+ public void checkOrigin(){
+
+ }
+
+ /**
+ * 鏍呮牸妫�鏌ワ細.tif/.tfw/.tif.ovr + .xls/.xlsx
+ */
+ public void checkDom(){
+
+ }
+
+ /**
+ * 鏁板鍩虹妫�鏌ワ細.shp, .gdb, .xls/.xlsx
+ */
+ public void checkMath(){
+
+ }
+
+ /**
+ * 鍏冩暟鎹鏌ワ細.xls/.xlsx
+ */
+ public void checkMeta(){
+
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index abdceb2..ef96aa6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,8 +12,8 @@
# redis
redis:
database: 0
- host: 192.168.20.39
- port: 6379
+ host: pipe.cppe.com
+ port: 6369
password: rediS_5L#F4_Server
timeout: 6000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
pool:
@@ -41,9 +41,11 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- url: jdbc:postgresql://192.168.20.39:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://pipe.cppe.com:5433/langfang?useAffectedRows=true
username : postgres
- password: postgres
+ password: Postgres!_14_Lf
+ #password: postgres
driver-class-name: org.postgresql.Driver
paltform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
@@ -141,6 +143,9 @@
# 绯荤粺閰嶇疆
sys:
+ fme:
+ # FME鏈嶅姟璺緞
+ url: http://pipe.cppe.com:88/
path:
# 涓嬭浇鐩綍锛堜笅杞芥枃浠讹級
download: D:\LF\download
--
Gitblit v1.9.3