Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/FzxzController.java

@@ -31,6 +31,18 @@ public class FzxzController extends BaseController {
         return list;
     }
 
+    /**
+     * 获取
+     *
+     * @param param 预留
+     * @return
+     */
+    @GetMapping("/GetCascadeList")
+    public RequestResult GetCascadeList(String param) {
+        RequestResult list = fzxzService.GetCascadeList(param);
+        return list;
+    }
+
     /**
      * 获取地类代码树结构
      *
@@ -85,6 +97,7 @@ public class FzxzController extends BaseController {
         RequestResult res = fzxzService.AddTemplate(addFactorTemplateVo);
         return res;
     }
+
     /**
      * 删除模板列表
      */

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/table/TableDataSelectController.java

@@ -5,6 +5,7 @@ import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,7 +27,7 @@ public class TableDataSelectController extends BaseController {
         return RequestResult.success(tableDataSelectService.dataQueryByPoint(sourcePointWkt, sourceLayerId, sourceLayerType, queryTableId));
     }
 
-    @GetMapping("/polygon/GetTableData")
+    @PostMapping("/polygon/GetTableData")
     public RequestResult queryTableListByPolygon(String sourceDataId, String sourcePolygonWkt, String sourceLayerId, String sourceLayerType, String queryTableId) {
         return RequestResult.success(tableDataSelectService.dataQueryByPolygon(sourceDataId, sourcePolygonWkt, sourceLayerId, sourceLayerType, queryTableId));
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FzxzCascadeDTO.java

@@ -0,0 +1,38 @@
+package com.onemap.apply.domain.config.fzss;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+//数据源
+@TableName("t_fzss_fzxz_cascade")
+public class FzxzCascadeDTO {
+    @TableField("table_id")
+    private String tableId;
+    @TableField("table_name")
+    private String tableName;
+    private String sort;
+
+    public String getTableId() {
+        return tableId;
+    }
+
+    public void setTableId(String tableId) {
+        this.tableId = tableId;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FzxzCascadeMapper.java

@@ -0,0 +1,13 @@
+package com.onemap.apply.mapper.fzss;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.config.fzss.FzxzCascadeDTO;
+
+/**
+ * 数据层
+ *
+ * @author onemap
+ */
+public interface FzxzCascadeMapper extends BaseMapper<FzxzCascadeDTO> {
+
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IFzxzService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface IFzxzService {
     RequestResult GetSjyList(String param);
-
+    RequestResult GetCascadeList(String param);
     RequestResult GetDldmTree(String fzbs);
 
     // RequestResult GetFxyzList();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/FzxzServiceImpl.java

@@ -22,6 +22,8 @@ public class FzxzServiceImpl implements IFzxzService {
     @Resource
     private FzxzSjyMapper fzxzSjyMapper;
     @Resource
+    private FzxzCascadeMapper fzxzCascadeMapper;
+    @Resource
     private FzxzYzMapper fzxzYzMapper;
     @Resource
     FzxzFactorMapper fzxzFactorMapper;
@@ -47,6 +49,19 @@ public class FzxzServiceImpl implements IFzxzService {
         }
     }
 
+    @Override
+    public RequestResult GetCascadeList(String param) {
+        try {
+            QueryWrapper<FzxzCascadeDTO> wrapper = new QueryWrapper<>();
+            wrapper.orderByAsc("sort");
+            List<FzxzCascadeDTO> res = fzxzCascadeMapper.selectList(wrapper);
+            return RequestResult.success("查询成功", res);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("查询失败", null);
+        }
+    }
+
     @Override
     public RequestResult GetDldmTree(String fzbs) {
         if (StringUtils.isEmpty(fzbs)) {

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

@@ -836,6 +836,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
             queryTableLayerWrapper.or(wq -> wq.ne("layer_id", layerId).or().isNull("layer_id"));
         }
         queryTableLayerWrapper.eq("pid", "0");
+        queryTableLayerWrapper.eq("state_type", "0");
         queryTableLayerWrapper.orderByAsc("sort");
         retList.addAll(tableLayerMapper.selectList(queryTableLayerWrapper));
         return retList;

onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/service/impl/ImageServiceImpl.java

@@ -151,6 +151,10 @@ public class ImageServiceImpl implements IImageService {
             renderer.setMapContent(mapContent);
             renderer.paint(g2d, outputArea, combinedBounds);
             ImageIO.write(bufferedImage, "png", outputImageFile);
+
+            // Clean up
+            g2d.dispose();
+            mapContent.dispose();
         } catch (IOException ex) {
             System.out.println("生成图片失败");
             System.out.println(ex);