整治预检接口更改

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/TTdzzyjJg.java

@@ -7,104 +7,111 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 土地整治预检结果表对象 t_tdzzyj_jg
- * 
+ *
  * @author ruoyi
  * @date 2024-11-20
  */
-public class TTdzzyjJg extends BaseEntity
-{
+public class TTdzzyjJg extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private String id;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String rwbsm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String mxBsm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String yzBsm;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String groupvalue;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String sumvalue;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String geomvalue;
 
+    private String nationaltype;
+
     private Integer countvalue;
 
-    public void setId(String id) 
-    {
+    public void setId(String id) {
         this.id = id;
     }
 
-    public String getId() 
-    {
+    public String getId() {
         return id;
     }
-    public void setRwbsm(String rwbsm) 
-    {
+
+    public void setRwbsm(String rwbsm) {
         this.rwbsm = rwbsm;
     }
 
-    public String getRwbsm() 
-    {
+    public String getRwbsm() {
         return rwbsm;
     }
-    public void setMxBsm(String mxBsm) 
-    {
+
+    public void setMxBsm(String mxBsm) {
         this.mxBsm = mxBsm;
     }
 
-    public String getMxBsm() 
-    {
+    public String getMxBsm() {
         return mxBsm;
     }
-    public void setYzBsm(String yzBsm) 
-    {
+
+    public void setYzBsm(String yzBsm) {
         this.yzBsm = yzBsm;
     }
 
-    public String getYzBsm() 
-    {
+    public String getYzBsm() {
         return yzBsm;
     }
-    public void setGroupvalue(String groupvalue) 
-    {
+
+    public void setGroupvalue(String groupvalue) {
         this.groupvalue = groupvalue;
     }
 
-    public String getGroupvalue() 
-    {
+    public String getGroupvalue() {
         return groupvalue;
     }
-    public void setSumvalue(String sumvalue) 
-    {
+
+    public void setSumvalue(String sumvalue) {
         this.sumvalue = sumvalue;
     }
 
-    public String getSumvalue() 
-    {
+    public String getSumvalue() {
         return sumvalue;
     }
-    public void setGeomvalue(String geomvalue) 
-    {
+
+    public void setGeomvalue(String geomvalue) {
         this.geomvalue = geomvalue;
     }
 
-    public String getGeomvalue() 
-    {
+    public String getGeomvalue() {
         return geomvalue;
     }
 
@@ -116,16 +123,24 @@ public class TTdzzyjJg extends BaseEntity
         this.countvalue = countvalue;
     }
 
+    public String getNationaltype() {
+        return nationaltype;
+    }
+
+    public void setNationaltype(String nationaltype) {
+        this.nationaltype = nationaltype;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("rwbsm", getRwbsm())
-            .append("mxBsm", getMxBsm())
-            .append("yzBsm", getYzBsm())
-            .append("groupvalue", getGroupvalue())
-            .append("sumvalue", getSumvalue())
-            .append("geomvalue", getGeomvalue())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("rwbsm", getRwbsm())
+                .append("mxBsm", getMxBsm())
+                .append("yzBsm", getYzBsm())
+                .append("groupvalue", getGroupvalue())
+                .append("sumvalue", getSumvalue())
+                .append("geomvalue", getGeomvalue())
+                .toString();
     }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/qytdzz/TTdzzyjSjy.java

@@ -0,0 +1,76 @@
+package com.onemap.apply.domain.qytdzz;
+
+import com.onemap.common.core.web.domain.BaseEntity;
+
+/**
+ * 土地整治预检表对象 t_tdzzyj
+ *
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public class TTdzzyjSjy extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private String id;
+    private String firsttype;
+    private String twotype;
+    private String sjy;
+    private String fileds;
+    private String store;
+    private String nationaltype;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFirsttype() {
+        return firsttype;
+    }
+
+    public void setFirsttype(String firsttype) {
+        this.firsttype = firsttype;
+    }
+
+    public String getTwotype() {
+        return twotype;
+    }
+
+    public void setTwotype(String twotype) {
+        this.twotype = twotype;
+    }
+
+    public String getSjy() {
+        return sjy;
+    }
+
+    public void setSjy(String sjy) {
+        this.sjy = sjy;
+    }
+
+    public String getFileds() {
+        return fileds;
+    }
+
+    public void setFileds(String fileds) {
+        this.fileds = fileds;
+    }
+
+    public String getStore() {
+        return store;
+    }
+
+    public void setStore(String store) {
+        this.store = store;
+    }
+
+    public String getNationaltype() {
+        return nationaltype;
+    }
+
+    public void setNationaltype(String nationaltype) {
+        this.nationaltype = nationaltype;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/qytdzz/TTdzzyjSjyMapper.java

@@ -0,0 +1,23 @@
+package com.onemap.apply.mapper.qytdzz;
+
+import com.onemap.apply.domain.qytdzz.TTdzzyjSjy;
+
+import java.util.List;
+
+/**
+ * 土地整治预检数据源表Mapper接口
+ * @author ruoyi
+ * @date 2024-11-20
+ */
+public interface TTdzzyjSjyMapper
+{
+
+    /**
+     * 查询土地整治预检结果表列表
+     *
+     * @param tTdzzyjJg 土地整治预检结果表
+     * @return 土地整治预检结果表集合
+     */
+    public List<TTdzzyjSjy> selectTTdzzyjSjyList(TTdzzyjSjy tTdzzyjJg);
+
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/qytdzz/TTdzzyjServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.onemap.apply.mapper.qytdzz.TTdzzyjSjyMapper;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.system.api.RemoteFileService;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/qytdzz/TdzzyjHandleService.java

@@ -6,12 +6,14 @@ import com.onemap.apply.domain.config.fzss.FxrwrzDTO;
 import com.onemap.apply.domain.gdbh.*;
 import com.onemap.apply.domain.qytdzz.TTdzzyj;
 import com.onemap.apply.domain.qytdzz.TTdzzyjJg;
+import com.onemap.apply.domain.qytdzz.TTdzzyjSjy;
 import com.onemap.apply.mapper.fzss.FxrwrzMapper;
 import com.onemap.apply.mapper.gdbh.GdbhMapper;
 import com.onemap.apply.mapper.gdbh.GdbhRwJgMapper;
 import com.onemap.apply.mapper.gdbh.GdbhYzMapper;
 import com.onemap.apply.mapper.qytdzz.TTdzzyjJgMapper;
 import com.onemap.apply.mapper.qytdzz.TTdzzyjMapper;
+import com.onemap.apply.mapper.qytdzz.TTdzzyjSjyMapper;
 import com.onemap.apply.service.analyse.HttpAnalyseService;
 import com.onemap.apply.service.gdbh.impl.GdbhJgService;
 import com.onemap.common.core.utils.StringUtils;
@@ -34,10 +36,12 @@ public class TdzzyjHandleService {
     private TTdzzyjJgMapper tTdzzyjJgMapper;
     @Autowired
     private HttpAnalyseService httpAnalyseService;
-    @Resource
-    private AnalyseService analyseService;
+    //    @Resource
+//    private AnalyseService analyseService;
     @Resource
     private FxrwrzMapper fxrwrzMapper;
+    @Resource
+    private TTdzzyjSjyMapper tTdzzyjSjyMapper;
 
     public void tdzzyjAnalysisHandle(TTdzzyj tTdzzyj) {
         //获取范围
@@ -45,6 +49,22 @@ public class TdzzyjHandleService {
         insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析开始。。。", "info");
         updateTdzzyj(tTdzzyj.getBsm(), 1, new Date(), null, null);
 
+        List<TTdzzyjSjy> listsjy = tTdzzyjSjyMapper.selectTTdzzyjSjyList(null);
+        for (TTdzzyjSjy sjyObj : listsjy) {
+            List<String> columns = new ArrayList<String>();
+            String fileds = sjyObj.getFileds();
+            if (StringUtils.isNotEmpty(fileds)) {
+                String[] filedss = fileds.split("@");
+                columns = Arrays.asList(filedss);
+            }
+
+            insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析中" + sjyObj.getFirsttype() + "-" + sjyObj.getTwotype() + "分析开始。。。", "info");
+            intersectionDataStore(tTdzzyj.getGeom(), sjyObj.getSjy(), tTdzzyj.getBsm(), sjyObj.getFirsttype(), sjyObj.getTwotype(), columns, sjyObj.getStore());
+            insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析中" + sjyObj.getFirsttype() + "-" + sjyObj.getTwotype() + "分析结束。。。", "info");
+
+
+        }
+
         //计算三调结果
 //        List<String> columns3d = new ArrayList<String>();
 //        columns3d.add("dlbm dlbmc,substr(a.dlbm,1,2) dlbm");
@@ -54,46 +74,46 @@ public class TdzzyjHandleService {
 
 
         //计算三线数据中的永久基本农田
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析永久基本农田分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "TB_YJJBNTBH", tTdzzyj.getBsm(), "SQSX", "YJJBNT", null, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析永久基本农田分析结束。。。", "info");
-
-
-        //计算三线数据中的生态保护红线
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析生态保护红线分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "TB_STBHHX", tTdzzyj.getBsm(), "SQSX", "STBHHX", null, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析生态保护红线分析结束。。。", "info");
-
-        //计算三线数据中的城市开发边界
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析城镇开发边界分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "TB_CZKFBJ", tTdzzyj.getBsm(), "SQSX", "CZKFBJ", null, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析城镇开发边界分析结束。。。", "info");
-
-        //计算新增耕地
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析新增耕地分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "t_qytdzz_xzgd", tTdzzyj.getBsm(), "XZGD", null, null, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析新增耕地分析结束。。。", "info");
-
-        //计算整治整治前土地利用结构
-        List<String> columnszzq = new ArrayList<String>();
-        columnszzq.add("dlbm");
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治前土地利用结构分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "tb_qytdzz_sd_zzq", tTdzzyj.getBsm(), "ZZQ", null, columnszzq, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治前土地利用结构分析结束。。。", "info");
-
-        //计算整治整治后土地利用结构
-        List<String> columnszzh = new ArrayList<String>();
-        columnszzh.add("zzhdlbm");
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治后土地利用结构分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "tb_qytdzz_sd_zzh", tTdzzyj.getBsm(), "ZZH", null, columnszzh, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治后土地利用结构分析结束。。。", "info");
-
-        //计算整治整治后土地利用结构
-        List<String> columnsghdk = new ArrayList<String>();
-        columnsghdk.add("lbmc");
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析开始。。。", "info");
-        intersectionDataStore(tTdzzyj.getGeom(), "TB_GHDK", tTdzzyj.getBsm(), "GHDK", null, columnsghdk, null);
-        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析结束。。。", "info");
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析永久基本农田分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "TB_YJJBNTBH", tTdzzyj.getBsm(), "SQSX", "YJJBNT", null, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析永久基本农田分析结束。。。", "info");
+//
+//
+//        //计算三线数据中的生态保护红线
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析生态保护红线分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "TB_STBHHX", tTdzzyj.getBsm(), "SQSX", "STBHHX", null, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析生态保护红线分析结束。。。", "info");
+//
+//        //计算三线数据中的城市开发边界
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析城镇开发边界分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "TB_CZKFBJ", tTdzzyj.getBsm(), "SQSX", "CZKFBJ", null, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析城镇开发边界分析结束。。。", "info");
+//
+//        //计算新增耕地
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析新增耕地分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "t_qytdzz_xzgd", tTdzzyj.getBsm(), "XZGD", null, null, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析新增耕地分析结束。。。", "info");
+//
+//        //计算整治整治前土地利用结构
+//        List<String> columnszzq = new ArrayList<String>();
+//        columnszzq.add("dlbm");
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治前土地利用结构分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "tb_qytdzz_sd_zzq", tTdzzyj.getBsm(), "ZZQ", null, columnszzq, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治前土地利用结构分析结束。。。", "info");
+//
+//        //计算整治整治后土地利用结构
+//        List<String> columnszzh = new ArrayList<String>();
+//        columnszzh.add("zzhdlbm");
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治后土地利用结构分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "tb_qytdzz_sd_zzh", tTdzzyj.getBsm(), "ZZH", null, columnszzh, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析整治后土地利用结构分析结束。。。", "info");
+//
+//        //计算整治整治后土地利用结构
+//        List<String> columnsghdk = new ArrayList<String>();
+//        columnsghdk.add("lbmc");
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析开始。。。", "info");
+//        intersectionDataStore(tTdzzyj.getGeom(), "TB_GHDK", tTdzzyj.getBsm(), "GHDK", null, columnsghdk, null);
+//        insertFxrwrz(StringUtils.getUUID(), tTdzzyj.getBsm(), tTdzzyj.getXmmc(), "整治预判分析规划地块分析结束。。。", "info");
 
 
         updateTdzzyj(tTdzzyj.getBsm(), 2, null, new Date(), null);
@@ -103,60 +123,70 @@ public class TdzzyjHandleService {
 
     public Map<String, Object> tdzzyjAnalysisJg(TTdzzyj tTdzzyj) {
         Map<String, Object> retMap = new HashMap<>();
-        retMap.put("SQSX", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "SQSX", null));
-        retMap.put("GHDK", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "GHDK", null));
-        retMap.put("XZGD", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "XZGD", null));
-        List<TTdzzyjJg> zzqList = tdzzyjAnalysisJg(tTdzzyj.getBsm(), "ZZQ", null);
-        List<TTdzzyjJg> zzhList = tdzzyjAnalysisJg(tTdzzyj.getBsm(), "ZZH", null);
+        List<TTdzzyjSjy> listsjy = tTdzzyjSjyMapper.selectTTdzzyjSjyList(null);
+        for (TTdzzyjSjy sjyObj : listsjy) {
+            retMap.put(sjyObj.getFirsttype(), tdzzyjAnalysisJg(tTdzzyj.getBsm(), sjyObj.getFirsttype(), null,sjyObj.getNationaltype()));
+        }
+
+//        retMap.put("SQSX", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "SQSX", null));
+//        retMap.put("GHDK", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "GHDK", null));
+//        retMap.put("XZGD", tdzzyjAnalysisJg(tTdzzyj.getBsm(), "XZGD", null));
+//        List<TTdzzyjJg> zzqList = tdzzyjAnalysisJg(tTdzzyj.getBsm(), "ZZQ", null);
+//        List<TTdzzyjJg> zzhList = tdzzyjAnalysisJg(tTdzzyj.getBsm(), "ZZH", null);
+        List<TTdzzyjJg> zzqList = (List<TTdzzyjJg>) retMap.get("ZZQ");
+        List<TTdzzyjJg> zzhList = (List<TTdzzyjJg>) retMap.get("ZZH");
         Map<String, TTdzzyjJg> zzqMap = new HashMap<>();
         Map<String, TTdzzyjJg> zzhMap = new HashMap<>();
         Set<String> sdset = new HashSet<>();
-        for (TTdzzyjJg obj : zzqList) {
-            sdset.add(obj.getGroupvalue());
-            zzqMap.put(obj.getGroupvalue(), obj);
+        if (zzqList != null && zzqList.size() > 0) {
+            for (TTdzzyjJg obj : zzqList) {
+                sdset.add(obj.getGroupvalue());
+                zzqMap.put(obj.getGroupvalue(), obj);
+            }
         }
-        for (TTdzzyjJg obj : zzhList) {
-            sdset.add(obj.getGroupvalue());
-            zzhMap.put(obj.getGroupvalue(), obj);
+        if (zzhList != null && zzhList.size() > 0) {
+            for (TTdzzyjJg obj : zzhList) {
+                sdset.add(obj.getGroupvalue());
+                zzhMap.put(obj.getGroupvalue(), obj);
+            }
         }
-
         List<Map<String, Object>> sdList = new ArrayList<>();
         for (String obj : sdset) {
             TTdzzyjJg zzq = zzqMap.get(obj);
-            TTdzzyjJg zzh = zzqMap.get(obj);
+            TTdzzyjJg zzh = zzhMap.get(obj);
             Map<String, Object> objMap = new HashMap<>();
             objMap.put("key", obj);
             Double zzqarea = 0d;
             Double zzharea = 0d;
             if (null != zzq) {
                 zzqarea = Double.parseDouble(zzq.getSumvalue());
-                objMap.put("zzq_area", zzq.getSumvalue());
                 objMap.put("zzq_geom", zzq.getGeomvalue());
             } else {
-                objMap.put("zzq_area", null);
                 objMap.put("zzq_geom", null);
             }
             if (null != zzh) {
                 zzharea = Double.parseDouble(zzh.getSumvalue());
-                objMap.put("zzh_area", zzh.getSumvalue());
                 objMap.put("zzh_geom", zzh.getGeomvalue());
             } else {
-                objMap.put("zzh_area", null);
                 objMap.put("zzh_geom", null);
             }
+            objMap.put("zzq_area", zzqarea);
+            objMap.put("zzh_area", zzharea);
             objMap.put("ce_area", zzqarea - zzharea);
             sdList.add(objMap);
         }
         retMap.put("3D", sdList);
+        retMap.remove("ZZQ");
+        retMap.remove("ZZH");
         return retMap;
     }
 
-    public List<TTdzzyjJg> tdzzyjAnalysisJg(String bsm, String mxBsm, String yzBsm) {
-        Map<String, Object> retMap = new HashMap<>();
+    public List<TTdzzyjJg> tdzzyjAnalysisJg(String bsm, String mxBsm, String yzBsm,String nationaltype) {
         TTdzzyjJg tTdzzyjJg = new TTdzzyjJg();
         tTdzzyjJg.setRwbsm(bsm);
         tTdzzyjJg.setMxBsm(mxBsm);
         tTdzzyjJg.setYzBsm(yzBsm);
+        tTdzzyjJg.setNationaltype(nationaltype);
         return tTdzzyjJgMapper.selectTTdzzyjJgSumByRwBsm(tTdzzyjJg);
     }
 
@@ -177,24 +207,35 @@ public class TdzzyjHandleService {
         targetTableVo.setRawTableName(tablename);
         targetTableVo.setColumns(columns);
         List<Map> map = httpAnalyseService.targetTable(targetTableVo);
-
-        for (Map map1 : map) {
-            TTdzzyjJg d_dto_0 = new TTdzzyjJg();
-            d_dto_0.setId(StringUtils.getUUID());
-            d_dto_0.setRwbsm(rwbsm);
-            d_dto_0.setMxBsm(mxBsm);
-            d_dto_0.setYzBsm(yzBsm);
-            if (null != columns && columns.size() >= 1) {
-                if (StringUtils.isNotEmpty(getFields)) {
-                    d_dto_0.setGroupvalue((map1.get(getFields)).toString());
-                } else {
-                    d_dto_0.setGroupvalue((map1.get(columns.get(0))).toString());
+        if (map == null || map.isEmpty() || map.size() == 0) {
+//            TTdzzyjJg d_dto_0 = new TTdzzyjJg();
+//            d_dto_0.setId(StringUtils.getUUID());
+//            d_dto_0.setRwbsm(rwbsm);
+//            d_dto_0.setMxBsm(mxBsm);
+//            d_dto_0.setYzBsm(yzBsm);
+////            d_dto_0.setGroupvalue("0");
+//            d_dto_0.setSumvalue("0");
+//            tTdzzyjJgMapper.insertTTdzzyjJg(d_dto_0);
+        } else {
+            for (Map map1 : map) {
+                TTdzzyjJg d_dto_0 = new TTdzzyjJg();
+                d_dto_0.setId(StringUtils.getUUID());
+                d_dto_0.setRwbsm(rwbsm);
+                d_dto_0.setMxBsm(mxBsm);
+                d_dto_0.setYzBsm(yzBsm);
+                if (null != columns && columns.size() >= 1) {
+                    if (StringUtils.isNotEmpty(getFields)) {
+                        d_dto_0.setGroupvalue((map1.get(getFields)).toString());
+                    } else {
+                        d_dto_0.setGroupvalue((map1.get(columns.get(0))).toString());
+                    }
                 }
+                d_dto_0.setSumvalue(String.valueOf(map1.get("siweiarea")));
+                d_dto_0.setGeomvalue((String) map1.get("geom"));
+                tTdzzyjJgMapper.insertTTdzzyjJg(d_dto_0);
             }
-            d_dto_0.setSumvalue(String.valueOf(map1.get("siweiarea")));
-            d_dto_0.setGeomvalue((String) map1.get("geom"));
-            tTdzzyjJgMapper.insertTTdzzyjJg(d_dto_0);
         }
+
     }
 
     private void insertFxrwrz(String bsm, String rwbsm, String scxName, String rznr, String rzlx) {

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/qytdzz/TTdzzyjJgMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectTTdzzyjJgSumByRwBsm" parameterType="TTdzzyjJg" resultMap="TTdzzyjJgResult">
+    <sql id="selectTTdzzyjJgSumVo">
         select mx_bsm,yz_bsm,groupvalue, ROUND(coalesce(sum(sumvalue::numeric),0),2) sumvalue, public.st_asewkt(public.st_union(geomvalue)) geomvalue,count(*) countvalue from t_tdzzyj_jg
         <where>
             <if test="rwbsm != null  and rwbsm != ''"> and rwbsm = #{rwbsm}</if>
@@ -42,6 +42,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="geomvalue != null  and geomvalue != ''"> and geomvalue = #{geomvalue}</if>
         </where>
         group by mx_bsm,yz_bsm,groupvalue
+    </sql>
+    <select id="selectTTdzzyjJgSumByRwBsm" parameterType="TTdzzyjJg" resultMap="TTdzzyjJgResult">
+        <choose>
+            <when test="nationaltype!=null and nationaltype != '' ">
+                select t1.mx_bsm,t1.yz_bsm,t2.dict_value groupvalue,  t1.sumvalue,  t1.geomvalue, t1.countvalue from (
+                <include refid="selectTTdzzyjJgSumVo"/> ) t1
+                left join national_code_dict t2 on t2.dict_label =t1.groupvalue and t2.dict_type =  #{nationaltype}
+            </when>
+            <otherwise>
+                <include refid="selectTTdzzyjJgSumVo"/>
+            </otherwise>
+        </choose>
     </select>
     
     <select id="selectTTdzzyjJgById" parameterType="String" resultMap="TTdzzyjJgResult">

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/qytdzz/TTdzzyjSjyMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.onemap.apply.mapper.qytdzz.TTdzzyjSjyMapper">
+    
+    <resultMap type="TTdzzyjSjy" id="TTdzzyjSjyResult">
+        <result property="id"    column="id"    />
+        <result property="firsttype"    column="firsttype"    />
+        <result property="twotype"    column="twotype"    />
+        <result property="sjy"    column="sjy"    />
+        <result property="fileds"    column="fileds"    />
+        <result property="store"    column="store"    />
+        <result property="nationaltype"    column="nationaltype"    />
+    </resultMap>
+
+    <sql id="selectTTdzzyjSjyVo">
+        select id, firsttype, twotype, sjy, fileds, store,nationaltype from t_tdzzyj_sjy
+    </sql>
+
+    <select id="selectTTdzzyjSjyList" parameterType="TTdzzyjSjy" resultMap="TTdzzyjSjyResult">
+        <include refid="selectTTdzzyjSjyVo"/>
+        <where>
+            <if test="firsttype != null  and firsttype != ''"> and firsttype = #{firsttype}</if>
+            <if test="twotype != null  and twotype != ''"> and twotype = #{twotype}</if>
+            <if test="sjy != null  and sjy != ''"> and sjy = #{sjy}</if>
+        </where>
+    </select>
+
+</mapper>