Merge branch 'dev' into f-xiaogu

onemap-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-gateway/src/main/resources/bootstrap.yml

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -34,13 +34,13 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 192.168.100.30:8718
 
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 192.168.100.30:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

onemap-modules/onemap-analyse/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/table/TableDataSelectServiceImpl.java

@@ -259,7 +259,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
                         if (StringUtils.isEmpty(geom)) {
                             continue;
                         }
-                        List<List<TableDataVo>> child_ret = queryIntersectionList(geom, tableDataIds, layerDTO.getTableId());
+                        List<List<TableDataVo>> child_ret = queryIntersectionList(geom, null, layerDTO.getTableId());
                         if (child_ret != null && child_ret.size() > 0) {
                             retMapData.put("base", null);
                             v_d01.put("base", null);

onemap-modules/onemap-apply/src/main/resources/bootstrap.yml

@@ -30,11 +30,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-file/src/main/resources/bootstrap.yml

@@ -34,11 +34,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-model/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-spatial/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

sql/pgsql/0_init.sql

@@ -1,83 +1,5 @@
 -- 7.24
 
--- 修改表结构和数据，需要同步到现场
--- 菜单 SQL
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3006','表管理', '1065', '10', 'table', 'system/table/index', 1, 0, 'C', '0', '0', 'system:table:list', '#', 'admin', now(), '', null, '表管理菜单');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3007', '表字段管理', '1065', '11', 'filed', 'system/filed/index', 1, 0, 'C', '0', '0', 'system:filed:list', '#', 'admin', now(), '', null, '表字段管理菜单');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3008', '表与字段关联管理', '1065', '12', 'relation', 'system/relation/index', 1, 0, 'C', '0', '0', 'system:relation:list', '#', 'admin', now(), '', null, '表与字段关联管理菜单');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3024', '表与服务关联管理', '1065', '13', 'layer', 'system/layer/index', 1, 0, 'C', '0', '0', 'system:layer:list', '#', 'admin', now(), '', null, '表与服务关联管理，用于多级查询');
-
-
--- 按钮 SQL
--- 按钮 SQL
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3009','表管理查询', '3006', '1',  '#', '', 1, 0, 'F', '0', '0', 'system:table:query',        '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3010','表管理新增', '3006', '2',  '#', '', 1, 0, 'F', '0', '0', 'system:table:add',          '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3011','表管理修改', '3006', '3',  '#', '', 1, 0, 'F', '0', '0', 'system:table:edit',         '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3012','表管理删除', '3006', '4',  '#', '', 1, 0, 'F', '0', '0', 'system:table:remove',       '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3013','表管理导出', '3006', '5',  '#', '', 1, 0, 'F', '0', '0', 'system:table:export',       '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3014','表字段管理查询', '3007', '1',  '#', '', 1, 0, 'F', '0', '0', 'system:filed:query',        '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3015','表字段管理新增', '3007', '2',  '#', '', 1, 0, 'F', '0', '0', 'system:filed:add',          '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3016','表字段管理修改', '3007', '3',  '#', '', 1, 0, 'F', '0', '0', 'system:filed:edit',         '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3017','表字段管理删除', '3007', '4',  '#', '', 1, 0, 'F', '0', '0', 'system:filed:remove',       '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3018','表字段管理导出', '3007', '5',  '#', '', 1, 0, 'F', '0', '0', 'system:filed:export',       '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3019','表与字段关联管理查询', '3008', '1',  '#', '', 1, 0, 'F', '0', '0', 'system:relation:query',        '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3020','表与字段关联管理新增', '3008', '2',  '#', '', 1, 0, 'F', '0', '0', 'system:relation:add',          '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3021','表与字段关联管理修改', '3008', '3',  '#', '', 1, 0, 'F', '0', '0', 'system:relation:edit',         '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3022','表与字段关联管理删除', '3008', '4',  '#', '', 1, 0, 'F', '0', '0', 'system:relation:remove',       '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3023','表与字段关联管理导出', '3008', '5',  '#', '', 1, 0, 'F', '0', '0', 'system:relation:export',       '#', 'admin', now(), '', null, '');
-
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3025','表与服务关联管理查询', '3024', '1',  '#', '', 1, 0, 'F', '0', '0', 'system:layer:query',        '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3026','表与服务关联管理新增', '3024', '2',  '#', '', 1, 0, 'F', '0', '0', 'system:layer:add',          '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3027','表与服务关联管理修改', '3024', '3',  '#', '', 1, 0, 'F', '0', '0', 'system:layer:edit',         '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3028',,'表与服务关联管理删除', '3024', '4',  '#', '', 1, 0, 'F', '0', '0', 'system:layer:remove',       '#', 'admin', now(), '', null, '');
-
-insert into sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('3029','表与服务关联管理导出', '3024', '5',  '#', '', 1, 0, 'F', '0', '0', 'system:layer:export',       '#', 'admin', now(), '', null, '');
-
 -- 8.8
 -- 添加表
 -- vector.TB_CZKFBJ_ONE
@@ -88,3 +10,8 @@ values('3029','表与服务关联管理导出', '3024', '5',  '#', '', 1, 0, 'F'
 -- base.t_fzss_fzxz_factor_temp
 -- base.t_fzss_fzxz_factor
 -- base.t_fzss_fzxz_factor_use
+
+
+--8.13
+UPDATE base.t_jsc_sql
+SET jsc_sql='SELECT round(coalesce(sum(zy_gdmj),0),2)zy_gdmj,round(coalesce(sum(zy_st),0),2) zy_st,round(coalesce(sum(zy_cn),0)/1000,2) zy_cn, round(coalesce(sum(cb_gdmj),0),2) cb_gdmj,round(coalesce(sum(cb_st),0),2) cb_st,round(coalesce(sum(cb_cn),0)/1000,2) cb_cn, #{id} as id ,#{begin_time} as create_time FROM vector.gdbh_zbph x where xzqhdm like #{id}||''%'' AND pzrq >= #{begin_time} AND pzrq < #{end_time}'