From 548bb8f71f595ecffb9ab7233f4a2fe709093abb Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 28 二月 2023 11:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 2
src/main/java/com/lf/server/controller/all/FloatServerController.java | 1
src/main/resources/mapper/sys/LayerMapper.xml | 12 +++---
src/main/java/com/lf/server/entity/sys/LayerEntity.java | 10 +++++
data/db_cx.sql | 22 ++++++++++-
data/update.sql | 34 +++++++++++++++++
6 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 512d829..1e58a1a 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -1,3 +1,4 @@
+st_length( st_geographyfromtext( st_astext( st_intersection( ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) ) ) AS acrossLength;
---------------------------------------------------------------------------------------------- 00.鍒涘缓绌洪棿鎵╁睍
create extension postgis;
create extension pgrouting;
@@ -49,8 +50,6 @@
select pg_constraint.conname as pk_name,pg_attribute.attname as colname,pg_type.typname as typename from pg_constraint inner join pg_class
on pg_constraint.conrelid = pg_class.oid inner join pg_attribute on pg_attribute.attrelid = pg_class.oid and pg_attribute.attnum = pg_constraint.conkey[1]
inner join pg_type on pg_type.oid = pg_attribute.atttypid where pg_class.relname = 'sys_user' and pg_constraint.contype='p';
-
-st_length( st_geographyfromtext( st_astext( st_intersection( ST_MakeValid(a.geom), ST_MakeValid(b.geom) ) ) ) ) AS acrossLength
---------------------------------------------------------------------------------------------- 02.閫掑綊鏌ヨ
with recursive rs as(
select * from lf.sys_menu where cn_name='绠￠亾鍩虹澶ф暟鎹钩鍙�'
@@ -367,6 +366,25 @@
select * from lf.sys_menu where cn_name in ('鏁版嵁涓婁紶','淇℃伅绠＄悊','鍊煎煙绠＄悊','瀛楀吀绠＄悊','鏍峰紡绠＄悊','鏁版嵁鏌ヨ') order by order_num;
update lf.sys_menu set pid=86,level=3 where cn_name in ('鏁版嵁涓婁紶','淇℃伅绠＄悊','鍊煎煙绠＄悊','瀛楀吀绠＄悊','鏍峰紡绠＄悊','鏁版嵁鏌ヨ');
+select name,
+ (select count(b.id) from lf.sys_meta b where dircode similar to '(' || (select string_agg(code, '|') from lf.sys_dir c where c.name = a.name) || ')%') "count",
+ (select coalesce(sum(b.sizes), 0) from lf.sys_meta b where dircode similar to '(' || (select string_agg(code, '|') from lf.sys_dir c where c.name = a.name) || ')%') "sizes"
+from lf.sys_dir a
+where code like '01%' and name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+group by name
+order by name;
+
+select modular1, count(*) from lf.sys_operate group by modular1;
+select modular1,modular2,count(*) from lf.sys_operate group by modular1,modular2 order by modular1;
+delete from lf.sys_operate where modular1 not in ('缁煎悎灞曠ず','鏁版嵁璐ㄦ','鏁版嵁绠＄悊','鏁版嵁浜ゆ崲','鏈嶅姟绠＄悊','绯荤粺瀵规帴','杩愮淮绠＄悊');
+
+select id,cn_name,elev from lf.sys_layer where cn_name in ('鐏溅绔�','鍦颁笅绠＄嚎','涓崼绔�','搴嗛槼绔�','鍦板眰绀轰緥');
+
+
+
+
+
+
diff --git a/data/update.sql b/data/update.sql
index af140c1..cb81795 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -269,6 +269,23 @@
group by name
order by name;
-- select * from lf.sys_meta where dircode similar to fn_dir_similar('鍩虹娴嬬粯');
+
+-- 鍗曚釜椤圭洰鐨勪笅杞戒釜鏁般�佷笅杞芥鏁板拰鏁版嵁鎬婚噺
+select count(*) "涓嬭浇涓暟", sum(c.dcount) "涓嬭浇鏁伴噺", round(sum(c.dcount * c.sizes)::numeric, 3) "鏁伴噺鎬婚噺(MB)"
+from lf.sys_meta a inner join lf.sys_meta_down b on a.id = b.metaid
+ inner join lf.sys_download c on b.downid = c.id
+where dircode like '06%';
+
+-- 鎸夌収杈撻�佷粙璐ㄧ粺璁�
+select
+ case medium when 'CPY' then '鎴愬搧娌�' when 'TRQ' then '澶╃劧姘�' when 'YY' then '鍘熸补' else '鍏跺畠' end "杈撻�佷粙璐�",
+ round(sum(st_length(geom))::numeric, 2) "鎬婚噷绋�",
+ count(*) "绠￠亾鏁伴噺",
+ (select count(*) from bs.m_sitepoint b inner join bs.m_pipeline c on b.pipename = c.pipename where c.medium = a.medium) "绔欏満鏁伴噺",
+ (select count(*) from bs.m_valvehousepoint d inner join bs.m_pipeline e on d.pipename = e.pipename where e.medium = a.medium) "闃�瀹ゆ暟閲�"
+from bs.m_pipeline a
+group by medium;
+-- select * from lf.sys_domain where dom_name='dsg0016';
---------------------------------------------------------
select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value"
from lf.sys_dir a
@@ -298,6 +315,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
select a.*, fn_tab_count(a.ns, a.tab, '1=1') "rows" from
(select distinct ns,tab,fn_get_entity(tab) entity,tab_desc,tableType from lf.sys_dict
order by tab
diff --git a/src/main/java/com/lf/server/controller/all/FloatServerController.java b/src/main/java/com/lf/server/controller/all/FloatServerController.java
index 20342a9..47b0a8f 100644
--- a/src/main/java/com/lf/server/controller/all/FloatServerController.java
+++ b/src/main/java/com/lf/server/controller/all/FloatServerController.java
@@ -24,7 +24,6 @@
* FloatServer
* @author WWW
*/
-@Api(tags = "FloatServer")
@RestController
@RequestMapping("/floatserver")
public class FloatServerController extends BaseController {
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
index 9ca687f..07a4635 100644
--- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -34,7 +34,7 @@
* 缁煎悎灞曠ず
* @author WWW
*/
-@Api(tags = "缁煎悎灞曠ず\\缁煎悎灞曠ず")
+@Api(tags = "缁煎悎灞曠ず\\棣栭〉")
@RestController
@RequestMapping("/comprehensive")
public class ComprehensiveController extends BaseController {
diff --git a/src/main/java/com/lf/server/entity/sys/LayerEntity.java b/src/main/java/com/lf/server/entity/sys/LayerEntity.java
index a83e7c0..1cf3086 100644
--- a/src/main/java/com/lf/server/entity/sys/LayerEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/LayerEntity.java
@@ -46,6 +46,8 @@
private String dataType;
+ private double elev;
+
public LayerEntity() {
}
@@ -192,4 +194,12 @@
public void setDataType(String dataType) {
this.dataType = dataType;
}
+
+ public double getElev() {
+ return elev;
+ }
+
+ public void setElev(double elev) {
+ this.elev = elev;
+ }
}
diff --git a/src/main/resources/mapper/sys/LayerMapper.xml b/src/main/resources/mapper/sys/LayerMapper.xml
index 458cf96..a110bd0 100644
--- a/src/main/resources/mapper/sys/LayerMapper.xml
+++ b/src/main/resources/mapper/sys/LayerMapper.xml
@@ -31,17 +31,17 @@
<insert id="insert" parameterType="com.lf.server.entity.sys.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)
+ (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)
values
- (#{pid},#{cnName},#{enName},#{url},#{testUrl},#{type},#{icon},#{level},#{orderNum},#{isShow},#{createUser},now(),#{bak},#{serveType},#{dataType})
+ (#{pid},#{cnName},#{enName},#{url},#{testUrl},#{type},#{icon},#{level},#{orderNum},#{isShow},#{createUser},now(),#{bak},#{serveType},#{dataType},#{elev})
</insert>
<insert id="inserts">
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)
+ (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)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.testUrl},#{item.type},#{item.icon},#{item.level},#{item.orderNum},#{item.isShow},#{item.createUser},now(),#{item.bak},#{item.serveType},#{item.dataType})
+ (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.testUrl},#{item.type},#{item.icon},#{item.level},#{item.orderNum},#{item.isShow},#{item.createUser},now(),#{item.bak},#{item.serveType},#{item.dataType},#{item.elev})
</foreach>
</insert>
@@ -58,7 +58,7 @@
<update id="update">
update lf.sys_layer
- set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},test_url=#{testUrl},type=#{type},icon=#{icon},level=#{level},order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=now(),bak=#{bak},serve_type=#{serveType},data_type=#{dataType}
+ set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},test_url=#{testUrl},type=#{type},icon=#{icon},level=#{level},order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=now(),bak=#{bak},serve_type=#{serveType},data_type=#{dataType},elev=#{elev}
where id=#{id}
</update>
@@ -66,7 +66,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_layer
<set>
- pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},test_url=#{item.testUrl},type=#{item.type},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},is_show=#{item.isShow},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},serve_type=#{item.serveType},data_type=#{item.dataType}
+ pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},test_url=#{item.testUrl},type=#{item.type},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},is_show=#{item.isShow},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},serve_type=#{item.serveType},data_type=#{item.dataType},elev=#{item.elev}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3