From 68f3d25001b8c51c778ae199c9019dc3c18cdc9a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 12 四月 2023 15:04:46 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/all/BaseQueryMapper.xml | 2 +-
data/db_fn.sql | 2 +-
src/main/java/com/lf/server/service/show/OneMapService.java | 4 ++--
data/update.sql | 8 ++++----
src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java | 2 +-
src/main/resources/mapper/show/OneMapMapper.xml | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 27afa70..4d82156 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -313,7 +313,7 @@
$$ language plpgsql;
select * from lf.sys_meta where depcode similar to '(00|01|02)%';
-select fn_dir_similar('鍩虹娴嬬粯'); select fn_dir_similar('娴嬮噺锛圗SV锛�'); select * from lf.sys_meta where dircode similar to fn_dir_similar('鍩虹娴嬬粯');
+select fn_dir_similar('鍩虹娴嬬粯'); select fn_dir_similar('娴嬬粯锛圗SV锛�'); select * from lf.sys_meta where dircode similar to fn_dir_similar('鍩虹娴嬬粯');
----------------------------------------------------------------------------------------------------- 14.FME鏃ュ織琛ㄨЕ鍙戝櫒鍑芥暟
-- drop function fn_meta_insert();
create or replace function fn_meta_insert() returns trigger as $$
diff --git a/data/update.sql b/data/update.sql
index 98de2d7..0fce38e 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -234,7 +234,7 @@
-- 鎸夌収涓撲笟缁熻
select code , name "value" from lf.sys_dir a
- where name in ('娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�') group by name order by name;
+ where name in ('娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�') group by name order by name;
select * from lf.sys_meta
where dircode like '040000%' or dircode like '0100000000%' or dircode like '02000000%' or dircode like '030000%';
@@ -262,7 +262,7 @@
(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 name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+where name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
group by name
order by name;
@@ -270,7 +270,7 @@
(select count(b.id) from lf.sys_meta b where dircode similar to fn_dir_similar(a.name)) "count",
(select coalesce(sum(b.sizes), 0) from lf.sys_meta b where dircode similar to fn_dir_similar(a.name)) "sizes"
from lf.sys_dir a
-where name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+where name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
group by name
order by name;
-- select * from lf.sys_meta where dircode similar to fn_dir_similar('鍩虹娴嬬粯');
@@ -278,7 +278,7 @@
-- 鏌ヨ鍒嗙被閿�
select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value"
from lf.sys_dir a
-where name in ('鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+where name in ('鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
group by name
order by key;
diff --git a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
index b2d0903..26d83a3 100644
--- a/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/FmeReqEntity.java
@@ -19,7 +19,7 @@
public String xmmc;
/**
- * 鏁版嵁涓撲笟锛氭祴閲忎笓涓� | 鍕樺療涓撲笟 | 鍦扮伨涓撲笟 | 娲炲簱涓撲笟
+ * 鏁版嵁涓撲笟锛氭祴閲忎笓涓� | 鍕樺療涓撲笟 | 鍦扮伨涓撲笟 | 娲炲簱涓撲笟 | 绾胯矾涓撲笟
*/
public String sjzy;
diff --git a/src/main/java/com/lf/server/service/show/OneMapService.java b/src/main/java/com/lf/server/service/show/OneMapService.java
index cccce80..b01311f 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -20,9 +20,9 @@
OneMapMapper aMapOfPipelineMapper;
/**
- * 娴嬮噺
+ * 娴嬬粯
*/
- private static final String MEASUREMENT = "娴嬮噺锛圗SV锛�";
+ private static final String MEASUREMENT = "娴嬬粯锛圗SV锛�";
/**
* 璋冩煡
*/
diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index 2fdb0d4..6b11f5d 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -71,7 +71,7 @@
select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value"
from lf.sys_dir a
<where>
- name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+ name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
<if test="name != null">
and upper(name) like #{name}
</if>
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index e8eb6ec..a27e53b 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -62,7 +62,7 @@
FROM lf.sys_dir c
WHERE c.name = a.name) || ')%') "sizes"
FROM lf.sys_dir a
- WHERE name IN ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+ WHERE name IN ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
GROUP BY name
ORDER BY name;
</select>
@@ -139,8 +139,8 @@
<!-- 缁熻椤圭洰绫诲瀷 1 -->
- <!-- select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value" from lf.sys_dir a
- where name in ('娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�') group by name order by name;-->
+ <!-- select (select string_agg(code, ',') from lf.sys_dir where name = a.name) "key", name "value" from lf.sys_dir a
+ where name in ('娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�') group by name order by name;-->
<select id="selectProjectType1" resultMap="OneMapResult">
SELECT
(SELECT string_agg(code,
@@ -249,7 +249,7 @@
(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 '${projectCode}%' and name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
+ where code like '${projectCode}%' and name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠＄悊鏁版嵁', '娴嬬粯锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�')
group by name
order by name;
</select>
--
Gitblit v1.9.3