中图代码提交

onemap-modules/onemap-model/src/main/java/com/onemap/sanya/controller/spatial/ZDAnalyseController.java

@@ -570,6 +570,9 @@ public class ZDAnalyseController extends BaseController {
                         item.getJg().equals(jg) &&item.getGrade().equals(finalGrade)).collect(Collectors.toList());
                 if(itemList.size()>0)
                     bcbzItem = cqBcbzItems.get(0);
+                else{
+                    bcbzItem.setBz(0.00);
+                }
                 signalPay = bcbzItem.getBz() * jzmj/10000;
                 signalPay=Double.parseDouble(  String.format("%.2f",signalPay));
             }

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/BdcMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBdcVo">
-        select gid, id, height, floor, st_astext(geom) as geom, cqr, address, jg, grade, zdmj, jzmj from "bdc"
+        select gid, id, height, floor, public.st_astext(geom) as geom, cqr, address, jg, grade, zdmj, jzmj from "bdc"
     </sql>
 
     <select id="selectBdcList" parameterType="com.onemap.sanya.domain.spatial.Bdc" resultMap="BdcResult">
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBdcByPolygon" parameterType="String" resultMap="BdcResult">
         <include refid="selectBdcVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),bdc.geom)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),bdc.geom)
     </select>
         
     <insert id="insertBdc" parameterType="com.onemap.sanya.domain.spatial.Bdc" useGeneratedKeys="true" keyProperty="gid">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C12SfjbMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC12SfjbVo">
-        select id, st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c1_2_sfjb"
+        select id, public.st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c1_2_sfjb"
     </sql>
 
     <select id="selectC12SfjbList" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" resultMap="C12SfjbResult">
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByPolygon" parameterType="String" resultMap="C12SfjbResult">
         <include refid="selectC12SfjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),geom)
+        where public.st_intersects( public.ST_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
         
     <insert id="insertC12Sfjb" parameterType="com.onemap.sanya.domain.spatial.C12Sfjb" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C22ZzjbMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC22ZzjbVo">
-        select id, st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c2_2_zzjb"
+        select id, public.st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c2_2_zzjb"
     </sql>
 
     <select id="selectC22ZzjbList" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" resultMap="C22ZzjbResult">
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByPolygon" parameterType="String" resultMap="C22ZzjbResult">
         <include refid="selectC22ZzjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),geom)
+        where public.st_intersects( public.ST_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
         
     <insert id="insertC22Zzjb" parameterType="com.onemap.sanya.domain.spatial.C22Zzjb" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C32GyjbMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC32GyjbVo">
-        select id, st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c3_2_gyjb"
+        select id, public.st_astext(geom) as geom, objectid, 土地级别, 楼面单价, qpbh from "c3_2_gyjb"
     </sql>
 
     <select id="selectC32GyjbList" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" resultMap="C32GyjbResult">
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByPolygon" parameterType="String" resultMap="C32GyjbResult">
         <include refid="selectC32GyjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),geom)
+        where public.st_intersects( public.st_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
         
     <insert id="insertC32Gyjb" parameterType="com.onemap.sanya.domain.spatial.C32Gyjb" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/C41GfjbMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectC41GfjbVo">
-        select id, st_astext(geom) as geom,  objectid, 土地级别, qpbh, 新闻出版用地, 新闻_地价, 医疗卫生、社会福利用地, 医疗_地价, 教育、科研用地, 教育_地价, 机关团体用地, 机关_地价, 文化设施、体育用地, 文化_地价, 公园与绿地、公用设施用地, 公园_地价 from "c4_1_gfjb"
+        select id, public.st_astext(geom) as geom,  objectid, 土地级别, qpbh, 新闻出版用地, 新闻_地价, 医疗卫生、社会福利用地, 医疗_地价, 教育、科研用地, 教育_地价, 机关团体用地, 机关_地价, 文化设施、体育用地, 文化_地价, 公园与绿地、公用设施用地, 公园_地价 from "c4_1_gfjb"
     </sql>
 
     <select id="selectC41GfjbList" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" resultMap="C41GfjbResult">
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByPolygon" parameterType="String" resultMap="C41GfjbResult">
         <include refid="selectC41GfjbVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),geom)
+        where public.st_intersects( public.st_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
         
     <insert id="insertC41Gfjb" parameterType="com.onemap.sanya.domain.spatial.C41Gfjb" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/DltbMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDltbVo">
-        select id_0,  st_asewkt(geom) as geom, objectid, fid_dltb_2, bsm, ysdm, tbybh, tbbh, dlbm, dlmc, qsxz, qsdwdm, qsdwmc, zldwdm, zldwmc, tbmj, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, xzdwkd, tbxhdm, tbxhmc, zzsxdm, zzsxmc, gddb, frdbs, czcsxm, sjnf, mssm, hdmc, bz, shape_leng, fid_new_sh, id, ss from dltb
+        select id_0,  public.st_asewkt(geom) as geom, objectid, fid_dltb_2, bsm, ysdm, tbybh, tbbh, dlbm, dlmc, qsxz, qsdwdm, qsdwmc, zldwdm, zldwmc, tbmj, kcdlbm, kcxs, kcmj, tbdlmj, gdlx, gdpdjb, xzdwkd, tbxhdm, tbxhmc, zzsxdm, zzsxmc, gddb, frdbs, czcsxm, sjnf, mssm, hdmc, bz, shape_leng, fid_new_sh, id, ss from dltb
     </sql>
 
     <select id="selectDltbList" parameterType="com.onemap.sanya.domain.spatial.Dltb" resultMap="DltbResult">
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDltbByPolygon" parameterType="String" resultMap="DltbResult">
         <include refid="selectDltbVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),dltb.geom)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),dltb.geom)
     </select>
         
     <insert id="insertDltb" parameterType="com.onemap.sanya.domain.spatial.Dltb" useGeneratedKeys="true" keyProperty="id0">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/GhdkMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGhdkVo">
-        select id, st_astext(geom) as geom,  objectid, sjxzqmc, xjxzqmc, xzmc, ghcgmc, bzsj, bzdw, pzwh, pfsj, sjwt, kzxxgyddm, kzxxgydmc, hhydzbsm, dkbm, dkfbm, ydmj, jzmj, rjld, rjlx, rjlsm, jzmdd, jzmdx, jzmdsm, ldld, ldlx, ldlsm, jzxgd, jzxgx, jzxgsm, pjjdcw, pjjdcwsm, pjfjdcw, kzxzbsm, dkbz, jrx, ghsjyq, cssjyd, pjss, jzmjsm, pjfjdcwsm, xzqdm, bz, ydflbz, jzxs, jzxssm from "ghdk"
+        select id, public.st_astext(geom) as geom,  objectid, sjxzqmc, xjxzqmc, xzmc, ghcgmc, bzsj, bzdw, pzwh, pfsj, sjwt, kzxxgyddm, kzxxgydmc, hhydzbsm, dkbm, dkfbm, ydmj, jzmj, rjld, rjlx, rjlsm, jzmdd, jzmdx, jzmdsm, ldld, ldlx, ldlsm, jzxgd, jzxgx, jzxgsm, pjjdcw, pjjdcwsm, pjfjdcw, kzxzbsm, dkbz, jrx, ghsjyq, cssjyd, pjss, jzmjsm, pjfjdcwsm, xzqdm, bz, ydflbz, jzxs, jzxssm from "ghdk"
     </sql>
 
     <select id="selectGhdkList" parameterType="com.onemap.sanya.domain.spatial.Ghdk" resultMap="GhdkResult">
@@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByPolygon" parameterType="String" resultMap="GhdkResult">
         <include refid="selectGhdkVo"/>
-        where st_intersects( ST_Transform(st_geomfromewkt(#{polygon}),4490),geom)
+        where public.st_intersects( public.ST_Transform(public.st_geomfromewkt(#{polygon}),4490),geom)
     </select>
         
     <insert id="insertGhdk" parameterType="com.onemap.sanya.domain.spatial.Ghdk" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/GysyqMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGysyqVo">
-        select id, st_asewkt(geom) as geom,  objectid_1, objectid, districtid, lot_id, lot_number, is_right, cert_no, ref_x, ref_y, atqy, atfg, f_land_loc, mapguid, f_syqlx, f_zdtzm, f_zddm, f_memo, atbmqy, f_use, f_owntype, f_sjly, f_fzmj, f_sjqljs, ztid, iid, qlrbs, f_unit_no, f_xmmc, f_xmxz, f_hydb, f_yhlxa, f_yhlxb, f_yhwzsm, f_zhax, f_hdmc, f_hddm, f_hdwz, f_hdyt, f_ydfw, f_ydmj, f_djbh, f_yhnx, f_syfs, f_jtyt, sytdmj, txmj, yfttdmj, yfgtdmj, f_qlbz, yzbx, export_bz, 处理类型, 坐标变化, 融合方式, objectid_b, created_ti, last_modif, right_owne, lot_numb_1, f_parcel_n, old_cert_n, clearup_st, sjglbsm from "gysyq"
+        select id, public.st_asewkt(geom) as geom,  objectid_1, objectid, districtid, lot_id, lot_number, is_right, cert_no, ref_x, ref_y, atqy, atfg, f_land_loc, mapguid, f_syqlx, f_zdtzm, f_zddm, f_memo, atbmqy, f_use, f_owntype, f_sjly, f_fzmj, f_sjqljs, ztid, iid, qlrbs, f_unit_no, f_xmmc, f_xmxz, f_hydb, f_yhlxa, f_yhlxb, f_yhwzsm, f_zhax, f_hdmc, f_hddm, f_hdwz, f_hdyt, f_ydfw, f_ydmj, f_djbh, f_yhnx, f_syfs, f_jtyt, sytdmj, txmj, yfttdmj, yfgtdmj, f_qlbz, yzbx, export_bz, 处理类型, 坐标变化, 融合方式, objectid_b, created_ti, last_modif, right_owne, lot_numb_1, f_parcel_n, old_cert_n, clearup_st, sjglbsm from "gysyq"
     </sql>
 
     <select id="selectGysyqList" parameterType="com.onemap.sanya.domain.spatial.Gysyq" resultMap="GysyqResult">
@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectGysyqByPolygon" parameterType="String" resultMap="GysyqResult">
         <include refid="selectGysyqVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),gysyq.geom)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),gysyq.geom)
     </select>
         
     <insert id="insertGysyq" parameterType="com.onemap.sanya.domain.spatial.Gysyq" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/JtownerMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJtownerVo">
-        select id,  st_asewkt(geom) as geom, objectid_1, objectid, bsm, ysdm, zdh, zdsz, txdz, tdzl, qsxz, syqlx, scmj, fzmj, jzrjl, jzmd, tdjb, sbdj, qdjg, zdlsh, szxzcmc, ms, jcr, jcrq, jcsftg, jcbtgyy, blr, blrq, blsjjcr, blsjjcrq, blsjjcsftg, fzr, fzrq, sfhg, djh, sjly, tdyt, exportflag, atqy, iid, zdtybm, mapguid, bz, qlr, cert_no, qlrbs, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm from "jtowner"
+        select id,  public.st_asewkt(geom) as geom, objectid_1, objectid, bsm, ysdm, zdh, zdsz, txdz, tdzl, qsxz, syqlx, scmj, fzmj, jzrjl, jzmd, tdjb, sbdj, qdjg, zdlsh, szxzcmc, ms, jcr, jcrq, jcsftg, jcbtgyy, blr, blrq, blsjjcr, blsjjcrq, blsjjcsftg, fzr, fzrq, sfhg, djh, sjly, tdyt, exportflag, atqy, iid, zdtybm, mapguid, bz, qlr, cert_no, qlrbs, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm from "jtowner"
     </sql>
 
     <select id="selectJtownerList" parameterType="com.onemap.sanya.domain.spatial.Jtowner" resultMap="JtownerResult">
@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectJtownerByPolygon" parameterType="String" resultMap="JtownerResult">
         <include refid="selectJtownerVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),jtowner.geom)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),jtowner.geom)
     </select>
         
     <insert id="insertJtowner" parameterType="com.onemap.sanya.domain.spatial.Jtowner" useGeneratedKeys="true" keyProperty="id">

onemap-modules/onemap-model/src/main/resources/mapper/sanya/spatial/JtuseMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJtuseVo">
-        select id, st_asewkt(geom) as geom,  objectid_1, objectid, syqr, zdtybm, zdzl, zdmj, tdyt, ytdzh, mapguid, iid, cert_no, ztid, zdh, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm from "jtuse"
+        select id, public.st_asewkt(geom) as geom,  objectid_1, objectid, syqr, zdtybm, zdzl, zdmj, tdyt, ytdzh, mapguid, iid, cert_no, ztid, zdh, f_lb, f_xb, f_xdm, f_fbf, f_cbqssj, f_cbjssj, f_lqsqm, f_zysz, f_zs, f_sllb, f_zlnd, f_syqx, f_qlbz, f_create_b, f_create_t, yzbx, sjglbsm from "jtuse"
     </sql>
 
     <select id="selectJtuseList" parameterType="com.onemap.sanya.domain.spatial.Jtuse" resultMap="JtuseResult">
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectJtuseByPolygon" parameterType="String" resultMap="JtuseResult">
         <include refid="selectJtuseVo"/>
-        where st_intersects( st_geomfromewkt(#{polygon}),jtuse.geom)
+        where public.st_intersects( public.st_geomfromewkt(#{polygon}),jtuse.geom)
     </select>
         
     <insert id="insertJtuse" parameterType="com.onemap.sanya.domain.spatial.Jtuse" useGeneratedKeys="true" keyProperty="id">