新增common模块，引入swagger，公共类

cql-service/src/main/java/cn/com/taiji/cql/test/EcqlData.java

@@ -71,9 +71,9 @@ public class EcqlData {
         Map<String, Object> mapParams = new HashMap<String, Object>();
         mapParams.put(DBCPDataSourceFactory.DSTYPE.key, "DBCP");
         mapParams.put(DBCPDataSourceFactory.DRIVERCLASS.key, "com.mysql.cj.jdbc.Driver");
-        mapParams.put(DBCPDataSourceFactory.JDBC_URL.key, "jdbc:mysql://172.16.67.23:7306/geo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai");
+        mapParams.put(DBCPDataSourceFactory.JDBC_URL.key, "jdbc:mysql://8.140.240.182:18080/geo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai");
         mapParams.put(DBCPDataSourceFactory.USERNAME.key, "root");
-        mapParams.put(DBCPDataSourceFactory.PASSWORD.key, "Ucsp123#");
+        mapParams.put(DBCPDataSourceFactory.PASSWORD.key, "Taiji@2023#data");
         mapParams.put(DBCPDataSourceFactory.MAXACTIVE.key, Integer.valueOf(10));
         mapParams.put(DBCPDataSourceFactory.MAXIDLE.key, Integer.valueOf(0));
 

pom.xml

@@ -13,6 +13,7 @@
         <module>cql-service</module>
         <module>tile-service</module>
         <module>tile-web</module>
+        <module>tile-common</module>
     </modules>
 
     <properties>
@@ -22,6 +23,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+        <swagger.version>3.0.0</swagger.version>
     </properties>
 
     <dependencyManagement>
@@ -49,6 +51,19 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
             </dependency>
+            <!-- Swagger3依赖 -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-boot-starter</artifactId>
+                <version>${swagger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

tile-common/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.com.taiji</groupId>
+        <artifactId>ecql-service</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>tile-common</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
+    </dependencies>
+</project>

tile-common/src/main/java/cn/com/taiji/cn/com/taiji/common/domain/Result.java

@@ -0,0 +1,83 @@
+package cn.com.taiji.cn.com.taiji.common.domain;
+
+import cn.com.taiji.cn.com.taiji.common.enums.ErrorCodeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzyx 2023/12/14
+ */
+@Data
+public class Result<T> {
+
+
+    @ApiModelProperty("响应码")
+    private int code;
+
+    @ApiModelProperty("消息")
+    private String msg;
+
+    @ApiModelProperty("返回对象")
+    private T data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public static <T> Result<T> ok() {
+        return ok(null);
+    }
+
+    public static <T> Result<T> ok(T data) {
+        return init(data, ErrorCodeEnum.SUCCESS);
+    }
+
+    public static <T> Result<T> error() {
+        return init(null, ErrorCodeEnum.INTERNAL_SERVER_ERROR);
+    }
+
+    public static <T> Result<T> error(int code, String message) {
+        return initByCodeAndMessage(code, message);
+    }
+
+    public static <T> Result<T> error(ErrorCodeEnum codeEnum) {
+        return init(null, codeEnum);
+    }
+
+
+    private static <T> Result<T> init(T data, ErrorCodeEnum codeEnum) {
+        Result<T> result = new Result<>();
+        result.setData(data);
+        result.setMsg(codeEnum.getMessage());
+        result.setCode(codeEnum.getCode());
+        return result;
+    }
+
+    private static <T> Result<T> initByCodeAndMessage(int code, String message) {
+        Result<T> result = new Result<>();
+        result.setData(null);
+        result.setCode(code);
+        result.setMsg(message);
+        return result;
+    }
+}

tile-common/src/main/java/cn/com/taiji/cn/com/taiji/common/enums/ErrorCodeEnum.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.cn.com.taiji.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 错误码枚举
+ * @author 86176
+ */
+@Getter
+public enum ErrorCodeEnum {
+    /**
+     * 操作成功
+     */
+    SUCCESS(200, "操作成功"),
+
+    /**
+     * 内部错误
+     */
+    INTERNAL_SERVER_ERROR(500, "系统繁忙,请稍后再试");
+    private final int code;
+
+    private final String message;
+
+    ErrorCodeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

tile-service/pom.xml

@@ -82,7 +82,11 @@
             <artifactId>cql-service</artifactId>
             <version>1.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>cn.com.taiji</groupId>
+            <artifactId>tile-common</artifactId>
+            <version>1.0</version>
+        </dependency>
 
     </dependencies>
 

tile-service/src/main/java/cn/com/taiji/tile/config/SwaggerConfig.java

@@ -0,0 +1,90 @@
+package cn.com.taiji.tile.config;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Swagger2的接口配置
+ * 
+ * @author seat
+ */
+
+@EnableOpenApi
+@EnableKnife4j
+@Configuration
+public class SwaggerConfig
+{
+    /**
+     * 创建API
+     */
+    @Bean
+    public Docket createRestApi()
+    {
+        return new Docket(DocumentationType.OAS_30)
+                // 是否启用Swagger
+                .enable(true)
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api，用这种方式更灵活
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .paths(PathSelectors.any())
+                .build()
+                /* 设置安全模式，swagger可以设置访问token */
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+
+    /**
+     * 安全模式，这里指定token通过Authorization头请求头传递
+     */
+    private List<SecurityScheme> securitySchemes()
+    {
+        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+        return apiKeyList;
+    }
+
+    /**
+     * 安全上下文
+     */
+    private List<SecurityContext> securityContexts()
+    {
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+                        .build());
+        return securityContexts;
+    }
+
+    /**
+     * 默认的安全上引用
+     */
+    private List<SecurityReference> defaultAuth()
+    {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        List<SecurityReference> securityReferences = new ArrayList<>();
+        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+        return securityReferences;
+    }
+
+}

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

@@ -4,8 +4,20 @@ package cn.com.taiji.tile.service;
 import cn.com.taiji.cql.model.GeoDataSource;
 import cn.com.taiji.cql.model.GeoRequestParam;
 
+import java.util.List;
+
 public interface ITileService {
 
 
     byte[] tileData(GeoRequestParam requestParam, GeoDataSource geoDs);
+
+    /**
+     * 查询要素信息
+     * @param bbox
+     * @param type
+     * @param layerName
+     * @return
+     */
+    List<?> queryElements(String bbox, Integer type, String layerName);
+
 }

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

@@ -56,10 +56,8 @@ public class TileServiceImpl implements ITileService {
         List<Map<String, Object>> cqlDataList = ecqlService.cqlQuery(cqlDsParams,filterCql,sortParams);
 
         if(cqlDataList.size() >0){
-
             //3根据空间地理数据生成图层二进制数据
-            System.out.println("查询条件："+filterCql+"记录数:"+cqlDataList.size()+"===================返回的数据:"+cqlDataList.toString());
-
+            System.out.println("返回的数据:"+cqlDataList.toString());
             return TileUtils.getTile(cqlDataList, requestParam.getBbox());
 
         }else{
@@ -70,5 +68,29 @@ public class TileServiceImpl implements ITileService {
         return new byte[0];
     }
 
+    @Override
+    public List<?> queryElements(String bbox, Integer type, String layerName) {
+        //1. 将bbox转换为四个点位
+
+        return null;
+    }
+
+    public static double[] parseBbox(String bboxString) {
+        String[] bboxValuesStr = bboxString.split(",");
+        if (bboxValuesStr.length != 4) {
+            return new double[0]; // 返回空数组表示无效的 BBOX 格式
+        }
+
+        double[] bboxValues = new double[4];
+        try {
+            for (int i = 0; i < 4; i++) {
+                bboxValues[i] = Double.parseDouble(bboxValuesStr[i]);
+            }
+        } catch (NumberFormatException e) {
+            return new double[0]; // 返回空数组表示无效的 BBOX 格式
+        }
+
+        return bboxValues;
+    }
 
 }

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

@@ -2,13 +2,17 @@ package cn.com.taiji.web.controller;
 
 
 
+import cn.com.taiji.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.service.ITileService;
 import cn.com.taiji.web.service.IGeoDataSourceService;
 import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,6 +22,7 @@ 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;
 
 /**
@@ -28,6 +33,7 @@ import java.util.Map;
  */
 @Slf4j
 @RestController
+@Api("图层通用查询控制器")
 public class TileWebController {
 
     @Autowired
@@ -37,6 +43,15 @@ public class TileWebController {
     private IGeoDataSourceService geoDataSourceService;
 
 
+    @ApiOperation("面向瓦片的点击查询")
+    @GetMapping("/queryElements")
+    public Result<List<?>> queryElements(String bbox,Integer type,String layerName){
+        List<?> list=tileService.queryElements(bbox,type,layerName);
+
+        return Result.ok();
+    }
+
+
     @RequestMapping(value = {"/queryTile"}, method = {RequestMethod.GET, RequestMethod.POST})
     public void queryTile(HttpServletRequest request, HttpServletResponse response) {