Browse Source

耕地保护服务研判中添加结果大于1.5平方米的做算有效数据

DESKTOP-2K9OVK9\siwei 4 months ago
parent
commit
dfe70cbe69

+ 24 - 19
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/GdbhHandleService.java

@@ -112,17 +112,19 @@ public class GdbhHandleService {
                 List<Map> map = httpAnalyseService.targetTable(targetTableVo);
 
                 for (Map map1 : map) {
-                    GdbhRwJgDTO d_dto_0 = new GdbhRwJgDTO();
-                    d_dto_0.setId(StringUtils.getUUID());
-                    d_dto_0.setRwbsm(gdbhDto.getBsm());
-                    d_dto_0.setMx_bsm(mx.getBsm());
-                    d_dto_0.setYz_bsm(d_yz_dto.getId());
-                    d_dto_0.setGroupvalue((map1.get("id")).toString());
-                    d_dto_0.setSumvalue(((Double) map1.get("siweiarea")).toString());
-                    d_dto_0.setGeomvalue((String) map1.get("geom"));
-                    gdbhRwJgMapper.insertGdbhRwJgGeom(d_dto_0);
+                    Double siweiarea = (Double) map1.get("siweiarea");
+                    if (siweiarea > 1.5) {
+                        GdbhRwJgDTO d_dto_0 = new GdbhRwJgDTO();
+                        d_dto_0.setId(StringUtils.getUUID());
+                        d_dto_0.setRwbsm(gdbhDto.getBsm());
+                        d_dto_0.setMx_bsm(mx.getBsm());
+                        d_dto_0.setYz_bsm(d_yz_dto.getId());
+                        d_dto_0.setGroupvalue((map1.get("id")).toString());
+                        d_dto_0.setSumvalue(((Double) map1.get("siweiarea")).toString());
+                        d_dto_0.setGeomvalue((String) map1.get("geom"));
+                        gdbhRwJgMapper.insertGdbhRwJgGeom(d_dto_0);
+                    }
                 }
-
             }
             insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护" + mx.getBsmmc() + "分析结束。。。", "info");
         }
@@ -168,15 +170,18 @@ public class GdbhHandleService {
         List<Map> map = httpAnalyseService.targetTable(targetTableVo);
 
         for (Map map1 : map) {
-            GdbhRwJgDTO d_dto_0 = new GdbhRwJgDTO();
-            d_dto_0.setId(StringUtils.getUUID());
-            d_dto_0.setRwbsm(rwbsm);
-            d_dto_0.setMx_bsm("三调数据");
-            d_dto_0.setYz_bsm("三调数据");
-            d_dto_0.setGroupvalue((map1.get("dlmc")).toString());
-            d_dto_0.setSumvalue(((Double) map1.get("siweiarea")).toString());
-            d_dto_0.setGeomvalue((String) map1.get("geom"));
-            gdbhRwJgMapper.insertGdbhRwJgGeom(d_dto_0);
+            Double siweiarea = (Double) map1.get("siweiarea");
+            if (siweiarea > 1.5) {
+                GdbhRwJgDTO d_dto_0 = new GdbhRwJgDTO();
+                d_dto_0.setId(StringUtils.getUUID());
+                d_dto_0.setRwbsm(rwbsm);
+                d_dto_0.setMx_bsm("三调数据");
+                d_dto_0.setYz_bsm("三调数据");
+                d_dto_0.setGroupvalue((map1.get("dlmc")).toString());
+                d_dto_0.setSumvalue(((Double) map1.get("siweiarea")).toString());
+                d_dto_0.setGeomvalue((String) map1.get("geom"));
+                gdbhRwJgMapper.insertGdbhRwJgGeom(d_dto_0);
+            }
         }
     }
 

+ 2 - 2
onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/GdbhRwJgMapper.xml

@@ -23,7 +23,7 @@
                public.st_asewkt(public.st_union(geomvalue)) geom from  (
            select groupvalue, sum(sumvalue::numeric)::numeric sumvalue,
                    public.st_union(geomvalue) geomvalue FROM t_gdbh_rw_jg
-           WHERE rwbsm = #{rwbsm} and yz_bsm = #{yzbsm} and mx_bsm = #{mxbsm} and groupvalue = #{id} and sumvalue::numeric > 1.5
+           WHERE rwbsm = #{rwbsm} and yz_bsm = #{yzbsm} and mx_bsm = #{mxbsm} and groupvalue = #{id}
            group by groupvalue
        )t1
     </select>
@@ -31,7 +31,7 @@
     <select id="selectGdbhRwJgGroup" resultType="map">
         select groupvalue, round(sum(sumvalue::numeric)::numeric,2) sumvalue,
          public.st_asewkt(public.st_union(geomvalue)) geom FROM t_gdbh_rw_jg
-        WHERE rwbsm = #{rwbsm} and yz_bsm = #{yzbsm} and mx_bsm = #{mxbsm} and sumvalue::numeric > 1.5
+        WHERE rwbsm = #{rwbsm} and yz_bsm = #{yzbsm} and mx_bsm = #{mxbsm}
         group by groupvalue
     </select>