diff --git a/src/main/java/com/gis/xian/config/QgisProperties.java b/src/main/java/com/gis/xian/config/QgisProperties.java index f3c8096..dc2477f 100644 --- a/src/main/java/com/gis/xian/config/QgisProperties.java +++ b/src/main/java/com/gis/xian/config/QgisProperties.java @@ -5,9 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** - * @author zzw - * @description: QGIS制图服务配置属性 - * @date 2026/6/3 + * QGIS 制图服务配置属性 */ @Data @Component @@ -15,39 +13,7 @@ import org.springframework.stereotype.Component; public class QgisProperties { /** - * QGIS服务URL + * QGIS 服务 URL */ private String url; - - /** - * QGIS基础路径 - */ - private String basePath; - - /** - * 地震专题图模板路径 - */ - private String eqMapsTemplatePath; - - /** - * 暴雨专题图模板路径 - */ - private String rainMapsTemplatePath; - - /** - * 影响场GeoJSON保存路径 - */ - private String intensityGeojsonPath; - - /** - * 地震专题图输出路径 - */ - private String eqMapsOutputPath; - - /** - * 暴雨专题图输出路径 - */ - private String rainMapsOutputPath; - - } diff --git a/src/main/java/com/gis/xian/dto/qgis/base/ProductQuery.java b/src/main/java/com/gis/xian/dto/qgis/base/ProductQuery.java deleted file mode 100644 index 08dd23b..0000000 --- a/src/main/java/com/gis/xian/dto/qgis/base/ProductQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gis.xian.dto.qgis.base; - -import lombok.Data; - -/** - * @author zzw - * @description: 产品查询参数 - * @date 2026/5/26 上午11:00 - */ -@Data -public class ProductQuery { - - private String queueId; // 产品Id,必填项 - - private String code; // A3 A4 专题图尺寸,选填项 - - private String fileType; // 图片 文档 产品类型(图片/文档),选填 - - private String fileName; // 产品名称(模糊查询),选填 - - private String proType; // 暴雨/地震 灾害专题图 暴雨/地震 灾害文档 -} diff --git a/src/main/java/com/gis/xian/dto/qgis/base/QgisArgsParams.java b/src/main/java/com/gis/xian/dto/qgis/base/QgisArgsParams.java deleted file mode 100644 index 2f36800..0000000 --- a/src/main/java/com/gis/xian/dto/qgis/base/QgisArgsParams.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gis.xian.dto.qgis.base; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @author zzw - * @description: Qgis出图参数 - * @date 2026/5/26 上午11:32 - */ -@Data -public class QgisArgsParams implements Serializable { - - private Integer Id; // 记录进度 - private double centerX; - private double centerY; - private String info; // 三要素 - private String event; - private String mapLayout; // 画幅(A3、A4) - private String mapTime; // 制图时间 - private String mapTitle; // 专题图标题 - private String mapUint; // 制图单位 - private String name; // 专题图文件名称 - private String outFile; // 专题图输出路径 - private String path; // qgis模板路径 - private String queueId; // 批次编码 - private String zoomRule; // 缩放规则 - private String zoomValue; // 缩放值 - private String disaster; // 灾害类型 - -} diff --git a/src/main/java/com/gis/xian/dto/qgis/earthquake/EarthquakeProductDTO.java b/src/main/java/com/gis/xian/dto/qgis/earthquake/EarthquakeProductDTO.java deleted file mode 100644 index ad2d0a0..0000000 --- a/src/main/java/com/gis/xian/dto/qgis/earthquake/EarthquakeProductDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gis.xian.dto.qgis.earthquake; - -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * @author zzw - * @description: DZProductDTO - * @date 2026/5/26 上午10:59 - */ -@Data -public class EarthquakeProductDTO { - - - private String eqQueueId; - private Integer templetId; // 模板编码id - private String code; // A3 A4 - private LocalDateTime proTime; - private String fileType; // 图片 文档 - private String fileName; - private String filePath; // 模板路径 查询时设置为空 - private String fileExtension; - private Double fileSize; - private String proType; // 暴雨/地震 灾害专题图 暴雨/地震 灾害文档 - private String sourceFile; // 存储位置 - - -} - diff --git a/src/main/resources/config/qgis/application-qgis-dev.yml b/src/main/resources/config/qgis/application-qgis-dev.yml index 95d09ee..5a3a06f 100644 --- a/src/main/resources/config/qgis/application-qgis-dev.yml +++ b/src/main/resources/config/qgis/application-qgis-dev.yml @@ -1,10 +1,3 @@ # qgis配置 qgis: - # QGIS服务地址 url: http://localhost:18998/qgis/make/map - # 影响场GeoJSON保存路径 - intensity-geojson-path: influence/ - # 地震专题图文件输出路径 - eq-maps-output-path: output/eq/map/ - # 暴雨专题图文件输出路径 - rain-maps-output-path: output/rain/map/ diff --git a/src/main/resources/config/qgis/application-qgis-prod.yml b/src/main/resources/config/qgis/application-qgis-prod.yml index 95d09ee..5a3a06f 100644 --- a/src/main/resources/config/qgis/application-qgis-prod.yml +++ b/src/main/resources/config/qgis/application-qgis-prod.yml @@ -1,10 +1,3 @@ # qgis配置 qgis: - # QGIS服务地址 url: http://localhost:18998/qgis/make/map - # 影响场GeoJSON保存路径 - intensity-geojson-path: influence/ - # 地震专题图文件输出路径 - eq-maps-output-path: output/eq/map/ - # 暴雨专题图文件输出路径 - rain-maps-output-path: output/rain/map/