From 7d824c1e0b6fdd5ddb5d2cd783839895c416c75a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 19 四月 2023 09:40:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/PermsController.java | 4 ++--
src/main/java/com/lf/server/service/data/LayerService.java | 6 +++---
src/main/java/com/lf/server/entity/data/LayerEntity.java | 2 +-
src/main/resources/mapper/data/LayerMapper.xml | 10 +++++-----
data/db_cx.sql | 3 +--
src/main/java/com/lf/server/controller/data/LayerController.java | 8 ++++----
src/main/java/com/lf/server/mapper/data/LayerMapper.java | 4 ++--
src/main/resources/application.yml | 12 ++++++------
8 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 13e914b..806583d 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -40,8 +40,7 @@
select sizes,ceil(sizes) from lf.sys_meta order by id desc limit 100
select * from lf.sys_publish order by id desc;
select * from lf.sys_meta where type in ('tif', 'tiff', 'img', 'png', 'jpg') order by type
-
-
+select fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, a.* from lf.sys_meta a order by id desc limit 10;
diff --git a/src/main/java/com/lf/server/controller/all/PermsController.java b/src/main/java/com/lf/server/controller/all/PermsController.java
index 2e4bd15..ba2a378 100644
--- a/src/main/java/com/lf/server/controller/all/PermsController.java
+++ b/src/main/java/com/lf/server/controller/all/PermsController.java
@@ -2,11 +2,11 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.*;
-import com.lf.server.entity.sys.LayerEntity;
+import com.lf.server.entity.data.LayerEntity;
import com.lf.server.entity.sys.MenuEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.service.all.PermsService;
-import com.lf.server.service.sys.LayerService;
+import com.lf.server.service.data.LayerService;
import com.lf.server.service.sys.MenuService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
diff --git a/src/main/java/com/lf/server/controller/sys/LayerController.java b/src/main/java/com/lf/server/controller/data/LayerController.java
similarity index 97%
rename from src/main/java/com/lf/server/controller/sys/LayerController.java
rename to src/main/java/com/lf/server/controller/data/LayerController.java
index 189f4e2..91e96d0 100644
--- a/src/main/java/com/lf/server/controller/sys/LayerController.java
+++ b/src/main/java/com/lf/server/controller/data/LayerController.java
@@ -1,11 +1,11 @@
-package com.lf.server.controller.sys;
+package com.lf.server.controller.data;
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.sys.LayerEntity;
+import com.lf.server.entity.data.LayerEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.service.sys.LayerService;
+import com.lf.server.service.data.LayerService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -21,7 +21,7 @@
* 鍥惧眰绠＄悊
* @author WWW
*/
-@Api(tags = "杩愮淮绠＄悊\\鍥惧眰绠＄悊")
+@Api(tags = "鏁版嵁绠＄悊\\鍥惧眰绠＄悊")
@RestController
@RequestMapping("/layer")
public class LayerController extends BaseController {
diff --git a/src/main/java/com/lf/server/entity/sys/LayerEntity.java b/src/main/java/com/lf/server/entity/data/LayerEntity.java
similarity index 98%
rename from src/main/java/com/lf/server/entity/sys/LayerEntity.java
rename to src/main/java/com/lf/server/entity/data/LayerEntity.java
index 0f99ba2..0f3bbbd 100644
--- a/src/main/java/com/lf/server/entity/sys/LayerEntity.java
+++ b/src/main/java/com/lf/server/entity/data/LayerEntity.java
@@ -1,4 +1,4 @@
-package com.lf.server.entity.sys;
+package com.lf.server.entity.data;
import java.io.Serializable;
import java.sql.Timestamp;
diff --git a/src/main/java/com/lf/server/mapper/sys/LayerMapper.java b/src/main/java/com/lf/server/mapper/data/LayerMapper.java
similarity index 94%
rename from src/main/java/com/lf/server/mapper/sys/LayerMapper.java
rename to src/main/java/com/lf/server/mapper/data/LayerMapper.java
index 4ce1063..9b357c9 100644
--- a/src/main/java/com/lf/server/mapper/sys/LayerMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/LayerMapper.java
@@ -1,6 +1,6 @@
-package com.lf.server.mapper.sys;
+package com.lf.server.mapper.data;
-import com.lf.server.entity.sys.LayerEntity;
+import com.lf.server.entity.data.LayerEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/lf/server/service/sys/LayerService.java b/src/main/java/com/lf/server/service/data/LayerService.java
similarity index 92%
rename from src/main/java/com/lf/server/service/sys/LayerService.java
rename to src/main/java/com/lf/server/service/data/LayerService.java
index a950244..bbb6aa5 100644
--- a/src/main/java/com/lf/server/service/sys/LayerService.java
+++ b/src/main/java/com/lf/server/service/data/LayerService.java
@@ -1,8 +1,8 @@
-package com.lf.server.service.sys;
+package com.lf.server.service.data;
-import com.lf.server.entity.sys.LayerEntity;
+import com.lf.server.entity.data.LayerEntity;
import com.lf.server.helper.StringHelper;
-import com.lf.server.mapper.sys.LayerMapper;
+import com.lf.server.mapper.data.LayerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 20abb2e..ca4547a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,8 +41,8 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
- #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
#url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
password: Postgres!_14_Lf
@@ -147,11 +147,11 @@
# IIS鐨勪富鏈哄湴鍧�
iisHost: 127.0.0.1
# FME鏈嶅姟鍦板潃
- fmeUrl: http://103.85.165.99:8051/
- #fmeUrl: http://192.168.20.205:88/
+ #fmeUrl: http://103.85.165.99:8051/
+ fmeUrl: http://192.168.20.205:88/
# 鍑哄浘鏈嶅姟
- #exportServer: http://127.0.0.1/ExportMap
- exportServer: http://103.85.165.99:8050/ExportMap
+ exportServer: http://127.0.0.1/ExportMap
+ #exportServer: http://103.85.165.99:8050/ExportMap
# Gdal椹卞姩鐩綍
gdal_path: E:\terrait\TianJin\Zip\release-1928-x64-dev\release-1928-x64\bin
# 鐡︾墖鍦板潃
diff --git a/src/main/resources/mapper/sys/LayerMapper.xml b/src/main/resources/mapper/data/LayerMapper.xml
similarity index 89%
rename from src/main/resources/mapper/sys/LayerMapper.xml
rename to src/main/resources/mapper/data/LayerMapper.xml
index c2d4df0..45c9b88 100644
--- a/src/main/resources/mapper/sys/LayerMapper.xml
+++ b/src/main/resources/mapper/data/LayerMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lf.server.mapper.sys.LayerMapper">
+<mapper namespace="com.lf.server.mapper.data.LayerMapper">
<select id="selectCount" resultType="java.lang.Integer">
select count(*) from lf.sys_layer
<where>
@@ -10,7 +10,7 @@
</where>
</select>
- <select id="selectByPage" resultType="com.lf.server.entity.sys.LayerEntity">
+ <select id="selectByPage" resultType="com.lf.server.entity.data.LayerEntity">
select * from lf.sys_layer
<where>
<if test="cnName != null">
@@ -21,17 +21,17 @@
limit #{limit} offset #{offset}
</select>
- <select id="selectAll" resultType="com.lf.server.entity.sys.LayerEntity">
+ <select id="selectAll" resultType="com.lf.server.entity.data.LayerEntity">
select (select ns from lf.sys_dict b where b.field = 'gid' and b.tab = a.en_name) "ns", a.*
from lf.sys_layer a
order by id;
</select>
- <select id="selectById" resultType="com.lf.server.entity.sys.LayerEntity">
+ <select id="selectById" resultType="com.lf.server.entity.data.LayerEntity">
select * from lf.sys_layer where id = #{id}
</select>
- <insert id="insert" parameterType="com.lf.server.entity.sys.LayerEntity">
+ <insert id="insert" parameterType="com.lf.server.entity.data.LayerEntity">
insert into lf.sys_layer
(pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak,serve_type,data_type,elev,is_project)
values
--
Gitblit v1.9.3