co

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/utils/StringUtils.java

@@ -704,7 +704,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
                 return name.endsWith(endsWith);
             }
         });
-        if (files.length > 0) {
+        if (files != null && files.length > 0) {
             return files[0].getAbsolutePath();
         } else {
             return null;

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

@@ -17,6 +17,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/fzss/HgxfxMapper.xml

@@ -49,7 +49,7 @@
         sum(xz.mj) as "mj"
          from (select * from t_fzss_hgxfx_jg_gis t where t.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm})) t
-        inner join (select * from KJGH_QY.XZYDYH x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
+        inner join (select * from SDE.XZYDYH x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm}))
         ) xz on xz.objectid = t.objid
         group by xz.ydyhfldm,xz.ydyhflmc

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fzss/HgxfxMapper.xml

@@ -58,7 +58,7 @@
         sum(xz.mj) as "mj"
          from (select * from t_fzss_hgxfx_jg_gis t where t.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm})) t
-        inner join (select * from KJGH_QY.XZYDYH x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
+        inner join (select * from SDE.XZYDYH x where x.objectid in (select objid from t_fzss_hgxfx_jg_gis gis where gis.scxbsm = (select hgscx.bsm from t_fzss_hgxfx_hgscx hgscx left join t_fzss_hgxfx_scx scx on scx.bsm = hgscx.scxbsm where scx.kzxjb = 0
         and hgscx.rwbsm = #{bsm}))
         ) xz on xz.objectid = t.objid
         group by xz.ydyhfldm,xz.ydyhflmc

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/yzt/ZymlMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.onemap.apply.mapper.yzt.ZymlMapper">
+<mapper namespace="com.onemap.apply.mapper.yzt.ZymlGetMyCollectMapper">
 
 
     <select id="GetList" parameterType="java.lang.String" resultType="com.onemap.apply.domain.yzt.ZymlDTO">
@@ -10,7 +10,7 @@
         (select count(1) from t_yzt_zyml cou where cou.parent = 0
         <if test="resources != null and resources != ''">
             and  cou.bsm in (
-            with temp as
+            with temp asGetMyCollect
             (select #{resources} value from  dual t)
             select regexp_substr(replace(value, ' ,', ','), '[^,]+', 1, level)
             from temp

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

@@ -34,6 +34,8 @@ spring:
     active: dev
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
         server-addr: 127.0.0.1:8848

onemap-modules/pom.xml

@@ -10,7 +10,7 @@
 
     <modules>
         <module>onemap-system</module>
-        <module>onemap-gen</module>
+<!--        <module>onemap-gen</module>-->
 <!--        <module>onemap-job</module>-->
         <module>onemap-file</module>
         <module>onemap-api</module>