From ff912b5a2abd0016cc8afca66cb64d0a0190364d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 09:51:39 +0800
Subject: [PATCH] 1
---
data/db_tab.sql | 21 +++++++
src/main/java/com/lf/server/service/data/UploadService.java | 6 ++
src/main/java/com/lf/server/entity/data/FmeLogEntity.java | 84 ++++++++++++++++++++++++++++
src/main/java/com/lf/server/mapper/data/UploadMapper.java | 9 +++
src/main/resources/mapper/data/UploadMapper.xml | 4 +
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 7 +
6 files changed, 129 insertions(+), 2 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index eedc3ce..defbdbe 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -1148,8 +1148,29 @@
comment on column lf.sys_meta.bak is '澶囨敞';
comment on column lf.sys_meta.geom is '绌洪棿浣嶇疆';
-- insert into lf.sys_meta(dirid,depid,geom,sizes,name,path) values (1,1,ST_PolygonFromText('MultiPolygon (((100 0,120 0,120 20,100 20,100 0)))', 4490),0.001,'a.jpg','c:\a.jpg');
+-- create table lf.sys_meta as select * from lf.sys_meta_new;
select * from lf.sys_meta_new; select a.*,st_astext(geom) from lf.sys_meta a;
+----------------------------------------------------------------------------------------------------- 32.FME鏃ュ織琛�
+create table lf.sys_fme_log (
+ id serial primary key,
+ parentid varchar(38),
+ dirpath varchar(1024),
+ pg_ns varchar(10),
+ tcmc varchar(150),
+ tcdm varchar(50),
+ count integer default 0
+);
+comment on table lf.sys_fme_log is 'FME鏃ュ織琛�';
+comment on column lf.sys_fme_log.id is '涓婚敭ID';
+comment on column lf.sys_fme_log.parentid is '鐖惰〃GUID';
+comment on column lf.sys_fme_log.dirpath is '鏂囦欢璺緞';
+comment on column lf.sys_fme_log.pg_ns is '琛ㄦ灦鏋�';
+comment on column lf.sys_fme_log.tcmc is '鍥惧眰鍚嶇О';
+comment on column lf.sys_fme_log.tcdm is '琛ㄥ悕';
+comment on column lf.sys_fme_log.count is '琛屾暟';
+
+select * from lf.sys_fme_log;
----------------------------------------------------------------------------------------------------- 鍏冩暟鎹祴璇曡〃 *
-- drop table if exists md.md_zxcg;
create table md.md_zxcg(
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 28380aa..8395029 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
@@ -120,11 +120,14 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query")
+ @ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query", example = "20230109010101"),
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectMappers")
- public ResponseMsg<List<TabMapperEntity>> selectMappers(String path) {
+ public ResponseMsg<List<TabMapperEntity>> selectMappers(String path, Integer dirid) {
try {
+
+
List<TabMapperEntity> list = dataLoaderService.selectMappers(path);
return success(list);
diff --git a/src/main/java/com/lf/server/entity/data/FmeLogEntity.java b/src/main/java/com/lf/server/entity/data/FmeLogEntity.java
new file mode 100644
index 0000000..1a708e5
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/data/FmeLogEntity.java
@@ -0,0 +1,84 @@
+package com.lf.server.entity.data;
+
+import java.io.Serializable;
+
+/**
+ * FME鏃ュ織琛�
+ * @author WWW
+ */
+public class FmeLogEntity implements Serializable {
+ private static final long serialVersionUID = -1304153743551710249L;
+
+ public FmeLogEntity() {
+ }
+
+ private Integer id;
+
+ private String parentid;
+
+ private String dirpath;
+
+ private String pgNs;
+
+ private String tcmc;
+
+ private String tcdm;
+
+ private Integer count;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getParentid() {
+ return parentid;
+ }
+
+ public void setParentid(String parentid) {
+ this.parentid = parentid;
+ }
+
+ public String getDirpath() {
+ return dirpath;
+ }
+
+ public void setDirpath(String dirpath) {
+ this.dirpath = dirpath;
+ }
+
+ public String getPgNs() {
+ return pgNs;
+ }
+
+ public void setPgNs(String pgNs) {
+ this.pgNs = pgNs;
+ }
+
+ public String getTcmc() {
+ return tcmc;
+ }
+
+ public void setTcmc(String tcmc) {
+ this.tcmc = tcmc;
+ }
+
+ public String getTcdm() {
+ return tcdm;
+ }
+
+ public void setTcdm(String tcdm) {
+ this.tcdm = tcdm;
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+}
diff --git a/src/main/java/com/lf/server/mapper/data/UploadMapper.java b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
index fc85f15..380517a 100644
--- a/src/main/java/com/lf/server/mapper/data/UploadMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
@@ -2,6 +2,7 @@
import com.lf.server.entity.data.CoordEntity;
import com.lf.server.entity.data.DirEntity;
+import com.lf.server.entity.data.FmeLogEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -28,4 +29,12 @@
* @return
*/
public List<DirEntity> selectProject();
+
+ /**
+ * 鏌ヨFME鏃ュ織
+ *
+ * @param parentid
+ * @return
+ */
+ public List<FmeLogEntity> selectFmeLog(String parentid);
}
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 eaa8f65..eb001b4 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -2,6 +2,7 @@
import com.lf.server.entity.data.CoordEntity;
import com.lf.server.entity.data.DirEntity;
+import com.lf.server.entity.data.FmeLogEntity;
import com.lf.server.mapper.data.UploadMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,4 +27,9 @@
public List<DirEntity> selectProject() {
return uploadMapper.selectProject();
}
+
+ @Override
+ public List<FmeLogEntity> selectFmeLog(String parentid) {
+ return uploadMapper.selectFmeLog(parentid);
+ }
}
diff --git a/src/main/resources/mapper/data/UploadMapper.xml b/src/main/resources/mapper/data/UploadMapper.xml
index 2898ff8..2fa130d 100644
--- a/src/main/resources/mapper/data/UploadMapper.xml
+++ b/src/main/resources/mapper/data/UploadMapper.xml
@@ -15,4 +15,8 @@
<select id="selectProject" resultType="com.lf.server.entity.data.DirEntity">
select * from lf.sys_dir where pid = 0 and id > 1
</select>
+
+ <select id="selectFmeLog" resultType="com.lf.server.entity.data.FmeLogEntity">
+ select * from lf.sys_fme_log where parentid = #{parentid};
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3