修改

cql-service/src/main/java/cn/com/taiji/cql/model/GeoRequestParam.java

@@ -35,4 +35,8 @@ public class GeoRequestParam implements Serializable {
     private String styles;
 
     private String bbox;
+
+    private int x;
+
+    private int y;
 }

tile-service/src/main/java/cn/com/taiji/tile/mapper/LayerGroupMapper.java

@@ -0,0 +1,10 @@
+package cn.com.taiji.tile.mapper;
+
+import cn.com.taiji.tile.model.LayerGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author zzyx 2024/1/12
+ */
+public interface LayerGroupMapper extends BaseMapper<LayerGroup> {
+}

tile-service/src/main/java/cn/com/taiji/tile/mapper/LayerMapper.java

@@ -0,0 +1,10 @@
+package cn.com.taiji.tile.mapper;
+
+import cn.com.taiji.tile.model.Layer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author zzyx 2024/1/12
+ */
+public interface LayerMapper extends BaseMapper<Layer> {
+}

tile-service/src/main/java/cn/com/taiji/tile/model/Layer.java

@@ -0,0 +1,41 @@
+package cn.com.taiji.tile.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author zzyx 2024/1/12
+ */
+/**
+    * 图层
+    */
+@Data
+@TableName(value = "layer")
+public class Layer {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    @TableField(value = "`type`")
+    private Boolean type;
+
+    @TableField(value = "title")
+    private String title;
+
+    @TableField(value = "`name`")
+    private String name;
+
+    @TableField(value = "storage_warehouse")
+    private Integer storageWarehouse;
+
+    @TableField(value = "is_group")
+    private Boolean isGroup;
+
+    @TableField(value = "style_id")
+    private Long styleId;
+
+    @TableField(value = "del_flag")
+    private Byte delFlag;
+}

tile-service/src/main/java/cn/com/taiji/tile/model/LayerGroup.java

@@ -0,0 +1,26 @@
+package cn.com.taiji.tile.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author zzyx 2024/1/12
+ */
+/**
+    * 图层组关联表
+    */
+@Data
+@TableName(value = "layer_group")
+public class LayerGroup {
+    @TableField(value = "group_id")
+    private Long groupId;
+
+    @TableField(value = "layer_id")
+    private Long layerId;
+
+    @TableField(value = "sort_number")
+    private Integer sortNumber;
+}

tile-service/src/main/java/cn/com/taiji/tile/service/LayerGroupService.java

@@ -0,0 +1,11 @@
+package cn.com.taiji.tile.service;
+
+import cn.com.taiji.tile.model.LayerGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * @author zzyx 2024/1/12
+ */
+public interface LayerGroupService extends IService<LayerGroup>{
+
+
+}

tile-service/src/main/java/cn/com/taiji/tile/service/LayerService.java

@@ -0,0 +1,13 @@
+package cn.com.taiji.tile.service;
+
+import cn.com.taiji.tile.model.Layer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author zzyx 2024/1/12
+ */
+public interface LayerService extends IService<Layer> {
+
+
+    Layer getOneByName(String layers);
+}

tile-service/src/main/java/cn/com/taiji/tile/service/impl/LayerGroupServiceImpl.java

@@ -0,0 +1,16 @@
+package cn.com.taiji.tile.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.com.taiji.tile.mapper.LayerGroupMapper;
+import cn.com.taiji.tile.model.LayerGroup;
+import cn.com.taiji.tile.service.LayerGroupService;
+/**
+ * @author zzyx 2024/1/12
+ */
+@Service
+public class LayerGroupServiceImpl extends ServiceImpl<LayerGroupMapper, LayerGroup> implements LayerGroupService{
+
+}

tile-service/src/main/java/cn/com/taiji/tile/service/impl/LayerServiceImpl.java

@@ -0,0 +1,21 @@
+package cn.com.taiji.tile.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.com.taiji.tile.mapper.LayerMapper;
+import cn.com.taiji.tile.model.Layer;
+import cn.com.taiji.tile.service.LayerService;
+/**
+ * @author zzyx 2024/1/12
+ */
+@Service
+public class LayerServiceImpl extends ServiceImpl<LayerMapper, Layer> implements LayerService{
+
+    @Override
+    public Layer getOneByName(String layerName) {
+        return this.getOne(new LambdaQueryWrapper<Layer>().eq(Layer::getName,layerName));
+    }
+}

tile-service/src/main/java/cn/com/taiji/tile/util/ShapeUtils.java

@@ -35,7 +35,7 @@ public class ShapeUtils {
      */
     public static byte[] getTileByte(String bboxStr, List<POI> dataList, ShapeStyle shapeStyle) {
         BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_ARGB);
-        renderAndDetectClick(image, bboxStr, dataList, shapeStyle);
+        renderShape(image, bboxStr, dataList, shapeStyle);
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try {
             ImageIO.write(image, "png", buffer);
@@ -182,23 +182,11 @@ public class ShapeUtils {
         }
     }
 
-    /**
-     * Converts a hexadecimal color string to RGBA format.
-     *
-     * @param hexColor The hexadecimal color string (e.g., "#2860F1").
-     * @param alpha    The alpha value (0-255) for opacity.
-     * @return An array containing the RGBA values.
-     */
     public static int[] hexToRgba(String hexColor, int alpha) {
-        // Remove the hash (#) sign if it exists
         hexColor = hexColor.replace("#", "");
-
-        // Parse the string
         int red = Integer.valueOf(hexColor.substring(0, 2), 16);
         int green = Integer.valueOf(hexColor.substring(2, 4), 16);
         int blue = Integer.valueOf(hexColor.substring(4, 6), 16);
-
-        // Return the RGBA values
         return new int[]{red, green, blue, alpha};
     }
 
@@ -250,15 +238,7 @@ public class ShapeUtils {
         dataList.parallelStream().forEach(poi -> {
             BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_ARGB);
             Graphics2D graphics = image.createGraphics();
-            Geometry shape = GeoUtils.getGeoUtils().createGeometry(poi.getShape());
-//            //判断数据点线面
-            if (StringUtils.equals(shape.getGeometryType(), "Polygon")) {
-                drawPolygonShape(bbox, graphics, shape, poi, shapeStyle);
-            } else if (StringUtils.equalsAny(shape.getGeometryType(), "LinearRing", "LineString", "MultiLineString")) {
-                drawLineShape(bbox, graphics, shape, shapeStyle);
-            } else if (StringUtils.equals(shape.getGeometryType(), "Point")) {
-                drawPointShape(bbox, graphics, shape, poi, shapeStyle);
-            }
+            drawShape(shapeStyle, poi, bbox, graphics);
             //如果选中
             int rgb = image.getRGB(x, y);
             int alpha = (rgb >> 24) & 0xff; // 提取alpha值
@@ -270,16 +250,19 @@ public class ShapeUtils {
         return clickSelectedDataList;
     }
 
-    public static void renderAndDetectClick(BufferedImage image, String bboxStr, List<POI> dataList, ShapeStyle shapeStyle) {
+    public static void renderShape(BufferedImage image, String bboxStr, List<POI> dataList, ShapeStyle shapeStyle) {
         String[] split = bboxStr.split(",");
         double[] bbox = new double[split.length];
         for (int i = 0; i < split.length; i++) {
             bbox[i] = Double.parseDouble(split[i]);
         }
         Graphics2D graphics = image.createGraphics();
-        dataList.parallelStream().forEach(poi -> {
-            Geometry shape = GeoUtils.getGeoUtils().createGeometry(poi.getShape());
-//            //判断数据点线面
+        dataList.parallelStream().forEach(poi -> drawShape(shapeStyle, poi, bbox, graphics));
+    }
+
+    private static void drawShape(ShapeStyle shapeStyle, POI poi, double[] bbox, Graphics2D graphics) {
+        Geometry shape = GeoUtils.getGeoUtils().createGeometry(poi.getShape());
+        if(shape!=null) {
             if (StringUtils.equals(shape.getGeometryType(), "Polygon")) {
                 drawPolygonShape(bbox, graphics, shape, poi, shapeStyle);
             } else if (StringUtils.equalsAny(shape.getGeometryType(), "LinearRing", "LineString", "MultiLineString")) {
@@ -287,7 +270,7 @@ public class ShapeUtils {
             } else if (StringUtils.equals(shape.getGeometryType(), "Point")) {
                 drawPointShape(bbox, graphics, shape, poi, shapeStyle);
             }
-        });
+        }
     }
 
 }

tile-service/src/main/resources/mapper/LayerGroupMapper.xml

@@ -0,0 +1,13 @@
+<?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="cn.com.taiji.tile.mapper.LayerGroupMapper">
+  <resultMap id="BaseResultMap" type="cn.com.taiji.tile.model.LayerGroup">
+    <!--@Table layer_group-->
+    <result column="group_id" jdbcType="BIGINT" property="groupId" />
+    <result column="layer_id" jdbcType="BIGINT" property="layerId" />
+    <result column="sort_number" jdbcType="INTEGER" property="sortNumber" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    group_id, layer_id, sort_number
+  </sql>
+</mapper>

tile-service/src/main/resources/mapper/LayerMapper.xml

@@ -0,0 +1,18 @@
+<?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="cn.com.taiji.tile.mapper.LayerMapper">
+  <resultMap id="BaseResultMap" type="cn.com.taiji.tile.model.Layer">
+    <!--@Table layer-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="type" jdbcType="BOOLEAN" property="type" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="storage_warehouse" jdbcType="INTEGER" property="storageWarehouse" />
+    <result column="is_group" jdbcType="BOOLEAN" property="isGroup" />
+    <result column="style_id" jdbcType="BIGINT" property="styleId" />
+    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, `type`, title, `name`, storage_warehouse, is_group, style_id, del_flag
+  </sql>
+</mapper>

tile-web/src/main/java/cn/com/taiji/web/controller/TileWebController.java

@@ -5,17 +5,18 @@ package cn.com.taiji.web.controller;
 import cn.com.taiji.common.domain.Result;
 import cn.com.taiji.cql.model.GeoDataSource;
 import cn.com.taiji.cql.model.GeoRequestParam;
-import cn.com.taiji.tile.model.Lgsqy;
-import cn.com.taiji.tile.model.StgViewDeviceinfoDf;
-import cn.com.taiji.tile.service.ITileService;
-import cn.com.taiji.tile.service.LgsqyService;
-import cn.com.taiji.tile.service.StgViewDeviceinfoDfService;
+import cn.com.taiji.tile.model.*;
+import cn.com.taiji.tile.service.*;
+import cn.com.taiji.tile.util.ShapeUtils;
 import cn.com.taiji.web.service.IGeoDataSourceService;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,10 +27,8 @@ import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * 图层通用查询控制器
@@ -55,6 +54,15 @@ public class TileWebController {
     @Resource
     private StgViewDeviceinfoDfService stgViewDeviceinfoDfService;
 
+    @Resource
+    public LayerService layerService;
+
+    @Resource
+    private ShapeStyleService shapeStyleService;
+
+    @Resource
+    private LayerGroupService layerGroupService;
+
     @GetMapping("/getDevices")
     public List<StgViewDeviceinfoDf> getDevices(){
         return stgViewDeviceinfoDfService.list();
@@ -75,7 +83,36 @@ public class TileWebController {
     }
 
     @GetMapping("/queryTile2")
-    public void queryTile2(){
+    public void queryTile2(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        GeoRequestParam param = JSONObject.parseObject(JSONObject.toJSONString(getParameterMap(request)), GeoRequestParam.class);
+        //根据图层名称查询样式
+        Layer layer=this.layerService.getOneByName(param.getLayers());
+        //判断是不是图层组
+        if(layer.getIsGroup()){
+            //查询所有样式
+//            this.layerGroupService.listByGroupId().
+        }else{
+            //根据图层id查询样式
+            ShapeStyle shapeStyle = this.shapeStyleService.getById(layer.getStyleId());
+//            BeanUtils.copyProperties(shapeStyle,ShapeStyle.class);
+            if (StringUtils.equals(param.getRequest(), "GetFeatureInfo")) {
+                ArrayList<POI> pointDataLIST = new ArrayList<>();;
+                List<POI> poiList = ShapeUtils.detectClick(param.getBbox(), pointDataLIST, null, param.getX(), param.getY());
+                // 转换List为JSON
+                ObjectMapper mapper = new ObjectMapper();
+                String json = mapper.writeValueAsString(poiList);
+                // 设置响应类型和编码
+                response.setContentType("application/json");
+                response.setCharacterEncoding("UTF-8");
+                // 将JSON写入响应
+                response.getWriter().write(json);
+            } else {
+                byte[] ret = ShapeUtils.getTileByte(param.getBbox(), null, null);
+                responseWrite(response, "image/png", ret);
+            }
+
+        }
+
 
     }