From 138b959cc11dc9a73b0c766030b99ba1180d8650 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 十一月 2024 14:32:48 +0800
Subject: [PATCH] 11
---
src/main/java/com/se/simu/domain/dto/GeDb.java | 6
src/main/java/com/se/simu/helper/WebHelper.java | 87 -----
src/main/java/com/se/simu/domain/dto/WaterDto.java | 7
src/main/java/com/se/simu/service/SimuService.java | 18 -
src/main/java/com/se/simu/service/UwService.java | 21 -
src/main/java/com/se/simu/SimuApplication.java | 10
src/main/java/com/se/simu/domain/dto/GeFile.java | 7
src/main/java/com/se/simu/domain/po/DataPo.java | 7
src/main/java/com/se/simu/helper/CaffeineHelper.java | 9
src/main/java/com/se/simu/domain/dto/ResultDto.java | 7
src/main/java/com/se/simu/helper/ShpHelper.java | 9
src/main/java/com/se/simu/helper/StringHelper.java | 100 ------
src/main/java/com/se/simu/config/CorsConfig.java | 9
src/main/java/com/se/simu/domain/dto/ExtensionDto.java | 7
src/main/java/com/se/simu/service/ResultService.java | 29 -
src/main/java/com/se/simu/domain/dto/ConfigDto.java | 27 -
src/main/java/com/se/simu/config/RestTemplateConfig.java | 31 -
src/main/java/com/se/simu/domain/vo/R.java | 6
src/main/java/com/se/simu/domain/vo/SimuVo.java | 6
src/main/java/com/se/simu/mapper/SimuMapper.java | 12
src/main/java/com/se/simu/domain/vo/CreateSimuVo.java | 6
src/main/java/com/se/simu/domain/dto/TerrainDto.java | 7
src/main/java/com/se/simu/helper/FileHelper.java | 169 ----------
src/main/java/com/se/simu/config/PropertiesConfig.java | 6
src/main/java/com/se/simu/controller/BaseController.java | 7
src/main/java/com/se/simu/domain/dto/GeField.java | 7
src/main/java/com/se/simu/controller/WaterController.java | 7
src/main/java/com/se/simu/config/Knife4jConfig.java | 16
src/main/java/com/se/simu/domain/dto/LayerDto.java | 7
src/main/java/com/se/simu/domain/vo/PondingVo.java | 6
src/main/java/com/se/simu/domain/dto/BuildingDto.java | 7
src/main/java/com/se/simu/helper/GdalHelper.java | 42 --
src/main/java/com/se/simu/helper/RsaHelper.java | 77 ----
src/main/java/com/se/simu/domain/vo/BuildingDepthVo.java | 6
src/main/java/com/se/simu/service/GedbService.java | 24
src/main/java/com/se/simu/domain/po/SimuPo.java | 6
src/main/java/com/se/simu/controller/TestController.java | 6
src/main/java/com/se/simu/domain/dto/DurationDto.java | 7
src/main/java/com/se/simu/domain/dto/GeLayer.java | 7
src/main/java/com/se/simu/service/WaterService.java | 35 --
src/main/java/com/se/simu/config/InitConfig.java | 7
src/main/java/com/se/simu/config/WebConfig.java | 14
src/main/java/com/se/simu/config/MybatisPlusConfig.java | 12
src/main/java/com/se/simu/controller/SimuController.java | 10
44 files changed, 41 insertions(+), 872 deletions(-)
diff --git a/src/main/java/com/se/simu/SimuApplication.java b/src/main/java/com/se/simu/SimuApplication.java
index 87604e9..d0df150 100644
--- a/src/main/java/com/se/simu/SimuApplication.java
+++ b/src/main/java/com/se/simu/SimuApplication.java
@@ -6,14 +6,8 @@
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-/**
- * 鍚姩绋嬪簭绫�
- *
- * @author WWW
- * @date 2024-07-16
- *
- * exclude = {DataSourceAutoConfiguration.class},
- */
+@SuppressWarnings("ALL")
+// exclude = {DataSourceAutoConfiguration.class},
@SpringBootApplication(scanBasePackages = {"com.se.simu"})
public class SimuApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
diff --git a/src/main/java/com/se/simu/config/CorsConfig.java b/src/main/java/com/se/simu/config/CorsConfig.java
index 6fc92df..bccd724 100644
--- a/src/main/java/com/se/simu/config/CorsConfig.java
+++ b/src/main/java/com/se/simu/config/CorsConfig.java
@@ -13,19 +13,10 @@
import org.springframework.web.server.WebFilterChain;
import reactor.core.publisher.Mono;
-/**
- * 璺ㄥ煙閰嶇疆
- *
- * @author se
- * @date 2024-08-28
- */
//@Configuration
@SuppressWarnings("ALL")
public class CorsConfig
{
- /**
- * 杩欓噷涓烘敮鎸佺殑璇锋眰澶达紝濡傛灉鏈夎嚜瀹氫箟鐨刪eader瀛楁璇疯嚜宸辨坊鍔�
- */
// private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token"
private static final String ALLOWED_HEADERS = "*";
private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD";
diff --git a/src/main/java/com/se/simu/config/InitConfig.java b/src/main/java/com/se/simu/config/InitConfig.java
index 82d5bea..44a9cf3 100644
--- a/src/main/java/com/se/simu/config/InitConfig.java
+++ b/src/main/java/com/se/simu/config/InitConfig.java
@@ -12,14 +12,9 @@
import javax.annotation.Resource;
-/**
- * 鍒濆鍖栭厤缃被
- *
- * @author WWW
- * @date 2024-09-12
- */
@Slf4j
@Component
+@SuppressWarnings("ALL")
public class InitConfig implements ApplicationRunner {
@Resource
Environment env;
diff --git a/src/main/java/com/se/simu/config/Knife4jConfig.java b/src/main/java/com/se/simu/config/Knife4jConfig.java
index 4074d08..5eeaedd 100644
--- a/src/main/java/com/se/simu/config/Knife4jConfig.java
+++ b/src/main/java/com/se/simu/config/Knife4jConfig.java
@@ -15,14 +15,9 @@
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
-/**
- * Knife4j閰嶇疆绫�
- *
- * @author WWW
- * @date 2024-09-12
- */
@Configuration
@EnableKnife4j
+@SuppressWarnings("ALL")
public class Knife4jConfig extends WebMvcConfigurationSupport {
@Value("${server.port}")
String serverPort;
@@ -50,29 +45,20 @@
@Bean
public Docket createRestApi() {
return new Docket(new DocumentationType("openApi", "3.0"))
- // 鏄惁鍚敤Swagger
.enable(enabled)
- // 鐢ㄦ潵鍒涘缓璇PI鐨勫熀鏈俊鎭紝灞曠ず鍦ㄦ枃妗ｇ殑椤甸潰涓紙鑷畾涔夊睍绀虹殑淇℃伅锛�
.apiInfo(apiInfo())
- // 鍒嗙粍鍚嶇О
.groupName("鏈嶅姟")
- // 璁剧疆鍝簺鎺ュ彛鏆撮湶缁橲wagger灞曠ず
.select()
- // 鎵弿鎵�鏈夋湁娉ㄨВ鐨刟pi锛岀敤杩欑鏂瑰紡鏇寸伒娲�
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
- // 鎵弿鎸囧畾鍖呬腑鐨剆wagger娉ㄨВ
// .apis(RequestHandlerSelectors.basePackage("com.cn.project.tool.swagger"))
- // 鎵弿鎵�鏈� .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any())
.build()
- /* 璁剧疆瀹夊叏妯″紡锛宻wagger鍙互璁剧疆璁块棶token */
// .securitySchemes(securitySchemes())
.pathMapping(pathMapping);
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
- //鎻忚堪瀛楁鏀寔Markdown璇硶
.description("鎺ュ彛鏂囨。")
.contact(new Contact("WuWeiwei", "http://127.0.0.1:" + serverPort + contextPath + "/doc.html", "252740454@qq.com"))
.version("0.2")
diff --git a/src/main/java/com/se/simu/config/MybatisPlusConfig.java b/src/main/java/com/se/simu/config/MybatisPlusConfig.java
index c57dd70..1b41697 100644
--- a/src/main/java/com/se/simu/config/MybatisPlusConfig.java
+++ b/src/main/java/com/se/simu/config/MybatisPlusConfig.java
@@ -11,21 +11,11 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-/**
- * Mybatis-Plus鍒嗛〉閰嶇疆
- *
- * @author WWW
- * @date 2024-09-12
- */
@EnableTransactionManagement
@Configuration
@MapperScan("com.se.simu.mapper")
+@SuppressWarnings("ALL")
public class MybatisPlusConfig {
- /**
- * 鏂扮殑鍒嗛〉鎻掍欢,涓�缂撳拰浜岀紦閬靛惊mybatis鐨勮鍒�,闇�瑕佽缃�
- * MybatisConfiguration#useDeprecatedExecutor = false
- * 閬垮厤缂撳瓨鍑虹幇闂(璇ュ睘鎬т細鍦ㄦ棫鎻掍欢绉婚櫎鍚庝竴鍚岀Щ闄�)
- */
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
diff --git a/src/main/java/com/se/simu/config/PropertiesConfig.java b/src/main/java/com/se/simu/config/PropertiesConfig.java
index ffc5789..e3b0959 100644
--- a/src/main/java/com/se/simu/config/PropertiesConfig.java
+++ b/src/main/java/com/se/simu/config/PropertiesConfig.java
@@ -5,12 +5,6 @@
import java.util.List;
-/**
- * 灞炴�ч厤缃被
- *
- * @author WWW
- * @date 2024-09-26
- */
@Configuration
@SuppressWarnings("ALL")
@ConfigurationProperties(prefix = "config")
diff --git a/src/main/java/com/se/simu/config/RestTemplateConfig.java b/src/main/java/com/se/simu/config/RestTemplateConfig.java
index d30a9d8..45e534c 100644
--- a/src/main/java/com/se/simu/config/RestTemplateConfig.java
+++ b/src/main/java/com/se/simu/config/RestTemplateConfig.java
@@ -16,43 +16,21 @@
import java.nio.charset.StandardCharsets;
import java.util.List;
-/**
- * RestTemplate閰嶇疆绫�
- *
- * @author WWW
- * @date 2024-09-12
- */
@Configuration
+@SuppressWarnings("ALL")
public class RestTemplateConfig {
- /**
- * 杩炴帴姹犵殑鏈�澶ц繛鎺ユ暟榛樿涓�0锛屼笉闄愬埗
- */
@Value("${remote.maxTotalConnect:0}")
private int maxTotalConnect;
- /**
- * 鍗曚釜涓绘満鐨勬渶澶ц繛鎺ユ暟
- */
@Value("${remote.maxConnectPerRoute:1000}")
private int maxConnectPerRoute;
- /**
- * 杩炴帴瓒呮椂榛樿5s锛�-1涓轰笉闄愬埗
- */
@Value("${remote.connectTimeout:5000}")
private int connectTimeout;
- /**
- * 璇诲彇瓒呮椂榛樿30s锛�-1涓轰笉闄愬埗
- */
@Value("${remote.readTimeout:30000}")
private int readTimeout;
- /**
- * 鍒涘缓HTTP瀹㈡埛绔伐鍘�
- *
- * @return 瀹㈡埛绔伐鍘�
- */
private ClientHttpRequestFactory createFactory() {
if (this.maxTotalConnect <= 0) {
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
@@ -70,19 +48,12 @@
return factory;
}
- /**
- * 鍒濆鍖朢estTemplate,骞跺姞鍏pring鐨凚ean宸ュ巶锛岀敱spring缁熶竴绠＄悊
- * 蹇呴』鍔犳敞瑙LoadBalanced
- *
- * @return
- */
@Bean
@ConditionalOnMissingBean(RestTemplate.class)
public RestTemplate getRestTemplate() {
RestTemplate restTemplate = new RestTemplate(this.createFactory());
List<HttpMessageConverter<?>> converterList = restTemplate.getMessageConverters();
- // 閲嶆柊璁剧疆StringHttpMessageConverter瀛楃闆嗕负UTF-8锛岃В鍐充腑鏂囦贡鐮侀棶棰�
HttpMessageConverter<?> converterTarget = null;
for (HttpMessageConverter<?> item : converterList) {
if (StringHttpMessageConverter.class == item.getClass()) {
diff --git a/src/main/java/com/se/simu/config/WebConfig.java b/src/main/java/com/se/simu/config/WebConfig.java
index 1c3b467..ee88159 100644
--- a/src/main/java/com/se/simu/config/WebConfig.java
+++ b/src/main/java/com/se/simu/config/WebConfig.java
@@ -13,17 +13,9 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * Web閰嶇疆绫�
- *
- * @author WWW
- * @date 2024-07-17
- */
@Configuration
+@SuppressWarnings("ALL")
public class WebConfig extends WebMvcConfigurationSupport {
- /**
- * 璺ㄥ煙璇锋眰
- */
@Override
protected void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
@@ -35,9 +27,6 @@
.maxAge(3600);
}
- /**
- * 澶勭悊json鏍煎紡锛屽�糿ull鐨勮浆鎹负""
- */
@Override
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
@@ -48,7 +37,6 @@
SerializerFeature.WriteNullStringAsEmpty,
SerializerFeature.WriteNullNumberAsZero,
SerializerFeature.WriteNullBooleanAsFalse);
- // 缁撴灉鏄惁鏍煎紡鍖�,榛樿涓篺alse
//SerializerFeature.PrettyFormat);
List<MediaType> supportedMediaTypes = new ArrayList<>();
diff --git a/src/main/java/com/se/simu/controller/BaseController.java b/src/main/java/com/se/simu/controller/BaseController.java
index 07b1db8..41cbd22 100644
--- a/src/main/java/com/se/simu/controller/BaseController.java
+++ b/src/main/java/com/se/simu/controller/BaseController.java
@@ -4,13 +4,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
-/**
- * 鍩虹鎺у埗鍣�
- *
- * @author WWW
- * @date 2024-07-30
- */
@Slf4j
+@SuppressWarnings("ALL")
public class BaseController {
public <T> R<T> success(T data) {
return new R<T>(HttpStatus.OK, data);
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 274004c..20c39b0 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,6 +1,5 @@
package com.se.simu.controller;
-import cn.hutool.json.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.se.simu.domain.dto.GeDb;
import com.se.simu.domain.dto.GeLayer;
@@ -23,12 +22,6 @@
import java.util.Date;
import java.util.List;
-/**
- * 浠跨湡绠＄悊
- *
- * @author WWW
- * @date 2024-09-18
- */
@Api(tags = "浠跨湡绠＄悊")
@Slf4j
@RestController
@@ -148,9 +141,6 @@
}
}
- /**
- * 浣跨敤绌洪棿鑼冨洿鏌ヨ 绠＄偣,绠＄嚎,寤虹瓚鐗� 3涓浘灞傦紝涓旀瘡涓浘灞傜殑鏁伴噺澶т簬0锛岃繑鍥� true銆�
- */
@ApiOperation(value = "闄嶆按鑼冨洿鏍￠獙")
@GetMapping("/rangeVerify")
public R<Object> rangeVerify(@RequestParam @ApiParam("鏈�灏廥") double minx,
diff --git a/src/main/java/com/se/simu/controller/TestController.java b/src/main/java/com/se/simu/controller/TestController.java
index 1b7ab7c..a72d913 100644
--- a/src/main/java/com/se/simu/controller/TestController.java
+++ b/src/main/java/com/se/simu/controller/TestController.java
@@ -19,12 +19,6 @@
import javax.annotation.Resource;
-/**
- * Test鎺у埗鍣�
- *
- * @author WWW
- * @date 2024-10-30
- */
@Api(tags = "Test")
@Slf4j
@RestController
diff --git a/src/main/java/com/se/simu/controller/WaterController.java b/src/main/java/com/se/simu/controller/WaterController.java
index 4df2535..6e94a11 100644
--- a/src/main/java/com/se/simu/controller/WaterController.java
+++ b/src/main/java/com/se/simu/controller/WaterController.java
@@ -21,15 +21,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-/**
- * 鍐呮稘绠＄悊
- *
- * @author WWW
- * @date 2024-07-16
- */
@Api(tags = "鍐呮稘绠＄悊")
@Slf4j
@RestController
+@SuppressWarnings("ALL")
@RequestMapping("/waterlogging")
public class WaterController extends BaseController {
@Resource
diff --git a/src/main/java/com/se/simu/domain/dto/BuildingDto.java b/src/main/java/com/se/simu/domain/dto/BuildingDto.java
index 0e829b1..59ca972 100644
--- a/src/main/java/com/se/simu/domain/dto/BuildingDto.java
+++ b/src/main/java/com/se/simu/domain/dto/BuildingDto.java
@@ -2,12 +2,7 @@
import org.gdal.ogr.Geometry;
-/**
- * 寤虹瓚鐗╂暟鎹疄浣撶被
- *
- * @author WWW
- * @date 2024-10-17
- */
+@SuppressWarnings("ALL")
public class BuildingDto {
private String id;
diff --git a/src/main/java/com/se/simu/domain/dto/ConfigDto.java b/src/main/java/com/se/simu/domain/dto/ConfigDto.java
index d86a28b..bae05a0 100644
--- a/src/main/java/com/se/simu/domain/dto/ConfigDto.java
+++ b/src/main/java/com/se/simu/domain/dto/ConfigDto.java
@@ -7,43 +7,23 @@
import java.util.Calendar;
import java.util.Date;
-/**
- * uwsolver閰嶇疆绫�
- *
- * @author WWW
- * @date 2024-09-26
- */
@SuppressWarnings("ALL")
public class ConfigDto {
public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
- // 妗堜緥鏂囦欢澶癸紝蹇呴』鎸囧畾锛屽彲浠ユ槸鐩稿璺緞锛岄粯璁ゅ湪姹傝В鍣ㄥ綋鍓嶇洰褰曚笅
private String casedir = "case";
- // 鍦板舰鏂囦欢锛屼粎闇�鎸囧畾鏂囦欢鍚嶏紙鍚屼笅锛夛紝鏃犻渶鎸囧畾璺緞锛岄粯璁よ矾寰勫湪妗堜緥鏂囦欢澶逛笅
private String terrain_file = "DEM4548.tif";
- // 缃戞牸鏂囦欢锛屽湪涓嶆彁渚涚殑鎯呭喌涓嬮粯璁ら�氳繃studyzone_file杩涜鐢熸垚
private String mesh_file = "tongzhou-mini.msh";
- // 婕旂畻鍖哄煙鏂囦欢锛屽湪涓嶆彁渚涚綉鏍兼枃浠剁殑鍓嶆彁涓嬪繀椤绘寚瀹�
private String studyzone_file = "studyzone_difference.shp";
- // 缁嗗寲鍖哄煙鏂囦欢锛岄�氳繃studyzone_file鐢熸垚缃戞牸鏂囦欢鏃朵娇鐢紝鍙笉鎻愪緵锛屽垯榛樿鍧囧寑缃戞牸灏哄
private String refinezones_file = "refinezones.shp";
- // 寤虹瓚鍖哄煙鏂囦欢锛岄�氳繃studyzone_file鐢熸垚缃戞牸鏂囦欢鏃朵娇鐢紝鍙笉鎻愪緵
private String buildings_file = "buildings_inside.shp";
- // 绠＄綉鑺傜偣鏂囦欢锛屽繀椤绘寚瀹氾紝鐢ㄤ簬鐢熸垚姹傝В鏂囦欢
private String nodes_file = "pipeline-demo-point.shp";
- // 绠＄綉绠℃鏂囦欢锛屽繀椤绘寚瀹氾紝鐢ㄤ簬鐢熸垚姹傝В鏂囦欢
private String links_file = "pipeline-demo-conduit.shp";
- // 绠＄綉闆嗘按鐐规枃浠讹紝鍗冲叿鏈夋眹闆嗕竴瀹氳寖鍥村唴闄嶆按鐨勯洦姘寸畢銆侀洦姘翠簳绛夛紝蹇呴』鎸囧畾锛岀敤浜庣敓鎴愭眰瑙ｆ枃浠�
private String junctions_file = "pipeline-demo-point-junctions.shp";
- // 闄嶉洦鏂囦欢锛屽繀椤绘寚瀹氾紝鐢ㄤ簬鐢熸垚姹傝В鏂囦欢
private String raingage_file = "RainGage.dat";
- // 闃叉椽闅滅鐗╂枃浠讹紝鍙笉鎻愪緵
private String barrier_file = "barrier.shp";
- // 鎺掓按绯荤粺缁撴灉鏂囦欢锛岀敤浜庝繚瀛樼娈�/绠＄偣鐨勬按浣嶃�佹祦閲忕瓑淇℃伅
private String drainage_outfile = "tongzhou-mini-drainage.h5";
- // 鍦伴潰姘翠綅缁撴灉鏂囦欢锛岀敤浜庝繚瀛樺湴闈㈡按浣嶄俊鎭�
private String sww_outfile = "tongzhou-mini.sww";
- // 娴侀噺鍗曚綅锛屼粎鎻愪緵LPS锛堝崌/绉掞級銆丆MS锛堢珛鏂圭背/绉�)銆丆FS(绔嬫柟鑻卞昂/绉�)涓夌鍗曚綅
private String flow_units = "LPS";
private String infiltration = "HORTON";
private String link_offsets = "DEPTH";
@@ -51,15 +31,10 @@
private String allow_ponding = "NO";
private String skip_steady_state = "NO";
private String flow_routing = "DYNWAVE";
- // 婕旂畻寮�濮嬫椂鍒�
private String start_datetime = "06/12/2024 12:00:00";
- // 婕旂畻缁撴潫鏃跺埢
private String end_datetime = "06/12/2024 13:00:00";
- // 缁撴灉淇濆瓨鐨勮捣濮嬫椂鍒�
private String report_start_datetime = "06/12/2024 00:00:00";
- // 缁撴灉淇濆瓨鏃堕棿闂撮殧
private String report_step = "00:01:00";
- // 鎺掓按绠＄綉婕旂畻鏃堕棿姝ラ暱锛岄粯璁ゅ崟浣嶄负s
private String routing_step = "00:00:10";
private String inertial_damping = "PARTIAL";
private String normal_flow_limited = "BOTH";
@@ -80,9 +55,7 @@
private Double friction = 0.01;
private Double terrain_smoothing = 0.1;
private String flow_algorithm = "DE1";
- // 缃戞牸鍗曞厓鏈�澶ч潰绉紝榛樿鍗曚綅涓簃
private Integer mesh_size = 5;
- // 缁撴灉淇濆瓨棰戠巼锛岀浉瀵箁eport_step鏉ヨ锛屾瘮濡俿ave_step=3灏辫〃绀烘瘡闂撮殧2涓猺eport_step淇濆瓨涓�娆＄粨鏋�
private Integer save_step = 1;
public void setProperties(String dirName, Date startTime, Integer minutes, PropertiesConfig config) {
diff --git a/src/main/java/com/se/simu/domain/dto/DurationDto.java b/src/main/java/com/se/simu/domain/dto/DurationDto.java
index 09f055a..803c928 100644
--- a/src/main/java/com/se/simu/domain/dto/DurationDto.java
+++ b/src/main/java/com/se/simu/domain/dto/DurationDto.java
@@ -1,11 +1,6 @@
package com.se.simu.domain.dto;
-/**
- * 鎸佺画鏃堕棿瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-30
- */
+@SuppressWarnings("ALL")
public class DurationDto {
private long start;
diff --git a/src/main/java/com/se/simu/domain/dto/ExtensionDto.java b/src/main/java/com/se/simu/domain/dto/ExtensionDto.java
index 3daa647..41f855e 100644
--- a/src/main/java/com/se/simu/domain/dto/ExtensionDto.java
+++ b/src/main/java/com/se/simu/domain/dto/ExtensionDto.java
@@ -1,11 +1,6 @@
package com.se.simu.domain.dto;
-/**
- * 鑼冨洿瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-30
- */
+@SuppressWarnings("ALL")
public class ExtensionDto {
private double minx;
diff --git a/src/main/java/com/se/simu/domain/dto/GeDb.java b/src/main/java/com/se/simu/domain/dto/GeDb.java
index b2ea5df..a72a41e 100644
--- a/src/main/java/com/se/simu/domain/dto/GeDb.java
+++ b/src/main/java/com/se/simu/domain/dto/GeDb.java
@@ -3,12 +3,6 @@
import org.gdal.osr.SpatialReference;
import org.gdal.osr.osr;
-/**
- * GEDB鏁版嵁搴撳疄浣撶被
- *
- * @author WWW
- * @date 2024-09-13
- */
@SuppressWarnings("ALL")
public class GeDb {
private String dbid;
diff --git a/src/main/java/com/se/simu/domain/dto/GeField.java b/src/main/java/com/se/simu/domain/dto/GeField.java
index 64c02d8..5102005 100644
--- a/src/main/java/com/se/simu/domain/dto/GeField.java
+++ b/src/main/java/com/se/simu/domain/dto/GeField.java
@@ -1,11 +1,6 @@
package com.se.simu.domain.dto;
-/**
- * GEDB瀛楁瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-13
- */
+@SuppressWarnings("ALL")
public class GeField {
String name;
diff --git a/src/main/java/com/se/simu/domain/dto/GeFile.java b/src/main/java/com/se/simu/domain/dto/GeFile.java
index d00fa6c..56774a3 100644
--- a/src/main/java/com/se/simu/domain/dto/GeFile.java
+++ b/src/main/java/com/se/simu/domain/dto/GeFile.java
@@ -1,11 +1,6 @@
package com.se.simu.domain.dto;
-/**
- * GEDB鏂囦欢瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-14
- */
+@SuppressWarnings("ALL")
public class GeFile {
String name;
diff --git a/src/main/java/com/se/simu/domain/dto/GeLayer.java b/src/main/java/com/se/simu/domain/dto/GeLayer.java
index eb35cc5..b39f15e 100644
--- a/src/main/java/com/se/simu/domain/dto/GeLayer.java
+++ b/src/main/java/com/se/simu/domain/dto/GeLayer.java
@@ -6,12 +6,7 @@
import java.util.List;
-/**
- * GEDB鍥惧眰瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-13
- */
+@SuppressWarnings("ALL")
public class GeLayer {
private String id;
diff --git a/src/main/java/com/se/simu/domain/dto/LayerDto.java b/src/main/java/com/se/simu/domain/dto/LayerDto.java
index b5afe43..a4f70cc 100644
--- a/src/main/java/com/se/simu/domain/dto/LayerDto.java
+++ b/src/main/java/com/se/simu/domain/dto/LayerDto.java
@@ -2,12 +2,7 @@
import java.util.List;
-/**
- * 鍥惧眰瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-30
- */
+@SuppressWarnings("ALL")
public class LayerDto {
private String version;
diff --git a/src/main/java/com/se/simu/domain/dto/ResultDto.java b/src/main/java/com/se/simu/domain/dto/ResultDto.java
index 378dfd5..61534a3 100644
--- a/src/main/java/com/se/simu/domain/dto/ResultDto.java
+++ b/src/main/java/com/se/simu/domain/dto/ResultDto.java
@@ -7,12 +7,7 @@
import java.io.File;
import java.util.*;
-/**
- * 缁撴灉瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-30
- */
+@SuppressWarnings("ALL")
public class ResultDto {
private String serviceName;
diff --git a/src/main/java/com/se/simu/domain/dto/TerrainDto.java b/src/main/java/com/se/simu/domain/dto/TerrainDto.java
index 92814ff..474e984 100644
--- a/src/main/java/com/se/simu/domain/dto/TerrainDto.java
+++ b/src/main/java/com/se/simu/domain/dto/TerrainDto.java
@@ -6,12 +6,7 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * 鑼冨洿瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-30
- */
+@SuppressWarnings("ALL")
public class TerrainDto {
private List<int[]> size;
diff --git a/src/main/java/com/se/simu/domain/dto/WaterDto.java b/src/main/java/com/se/simu/domain/dto/WaterDto.java
index 2573963..4c5b66f 100644
--- a/src/main/java/com/se/simu/domain/dto/WaterDto.java
+++ b/src/main/java/com/se/simu/domain/dto/WaterDto.java
@@ -5,12 +5,7 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * 姘撮潰瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-30
- */
+@SuppressWarnings("ALL")
public class WaterDto {
@JSONField(serialize = false)
private List<String> files;
diff --git a/src/main/java/com/se/simu/domain/po/DataPo.java b/src/main/java/com/se/simu/domain/po/DataPo.java
index 5ebcc99..d962bda 100644
--- a/src/main/java/com/se/simu/domain/po/DataPo.java
+++ b/src/main/java/com/se/simu/domain/po/DataPo.java
@@ -8,12 +8,7 @@
import java.util.Date;
-/**
- * 浠跨湡鏁版嵁瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-18
- */
+@SuppressWarnings("ALL")
public class DataPo {
@ApiModelProperty("鐖禝D")
private Integer pid;
diff --git a/src/main/java/com/se/simu/domain/po/SimuPo.java b/src/main/java/com/se/simu/domain/po/SimuPo.java
index df621b2..786cea2 100644
--- a/src/main/java/com/se/simu/domain/po/SimuPo.java
+++ b/src/main/java/com/se/simu/domain/po/SimuPo.java
@@ -7,12 +7,6 @@
import java.sql.Timestamp;
-/**
- * 浠跨湡瀹炰綋绫�
- *
- * @author WWW
- * @date 2024-09-18
- */
@TableName("bs.simu")
@SuppressWarnings("ALL")
public class SimuPo {
diff --git a/src/main/java/com/se/simu/domain/vo/BuildingDepthVo.java b/src/main/java/com/se/simu/domain/vo/BuildingDepthVo.java
index 6ccfea1..0d7a7a6 100644
--- a/src/main/java/com/se/simu/domain/vo/BuildingDepthVo.java
+++ b/src/main/java/com/se/simu/domain/vo/BuildingDepthVo.java
@@ -5,12 +5,6 @@
import lombok.EqualsAndHashCode;
import lombok.ToString;
-/**
- * 寤虹瓚鐗╂秹姘存繁搴﹁鍥剧被
- *
- * @author WWW
- * @date 2024-11-01
- */
@ToString
@SuppressWarnings("ALL")
@ApiModel(value = "寤虹瓚鐗╂秹姘存繁搴﹁鍥剧被")
diff --git a/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java b/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java
index d671d6c..d435922 100644
--- a/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java
+++ b/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java
@@ -9,12 +9,6 @@
import java.util.Date;
-/**
- * 鍒涘缓浠跨湡瑙嗗浘绫�
- *
- * @author WWW
- * @date 2024-09-18
- */
@ToString
@SuppressWarnings("ALL")
@ApiModel(value = "鍒涘缓浠跨湡瑙嗗浘绫�")
diff --git a/src/main/java/com/se/simu/domain/vo/PondingVo.java b/src/main/java/com/se/simu/domain/vo/PondingVo.java
index 7c484d2..9be60be 100644
--- a/src/main/java/com/se/simu/domain/vo/PondingVo.java
+++ b/src/main/java/com/se/simu/domain/vo/PondingVo.java
@@ -2,12 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/**
- * 绉按瑙嗗浘绫�
- *
- * @author WWW
- * @date 2024-11-06
- */
@SuppressWarnings("ALL")
public class PondingVo {
@ApiModelProperty("绉按娣卞害")
diff --git a/src/main/java/com/se/simu/domain/vo/R.java b/src/main/java/com/se/simu/domain/vo/R.java
index 1897406..be2b119 100644
--- a/src/main/java/com/se/simu/domain/vo/R.java
+++ b/src/main/java/com/se/simu/domain/vo/R.java
@@ -3,12 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import org.springframework.http.HttpStatus;
-/**
- * 鍝嶅簲瑙嗗浘绫�
- *
- * @author WWW
- * @date 2024-07-30
- */
@SuppressWarnings("ALL")
public class R<T> {
@ApiModelProperty("鐘舵�佺爜锛�200-姝ｅ父锛�400-璇锋眰閿欒锛�500-鏈嶅姟鍣ㄩ敊璇�")
diff --git a/src/main/java/com/se/simu/domain/vo/SimuVo.java b/src/main/java/com/se/simu/domain/vo/SimuVo.java
index 9f427e3..0103702 100644
--- a/src/main/java/com/se/simu/domain/vo/SimuVo.java
+++ b/src/main/java/com/se/simu/domain/vo/SimuVo.java
@@ -5,12 +5,6 @@
import java.util.List;
-/**
- * 浠跨湡瑙嗗浘绫�
- *
- * @author WWW
- * @date 2024-09-18
- */
@TableName("bs.simu")
@SuppressWarnings("ALL")
public class SimuVo {
diff --git a/src/main/java/com/se/simu/helper/CaffeineHelper.java b/src/main/java/com/se/simu/helper/CaffeineHelper.java
index 1357c56..a84ffd9 100644
--- a/src/main/java/com/se/simu/helper/CaffeineHelper.java
+++ b/src/main/java/com/se/simu/helper/CaffeineHelper.java
@@ -9,13 +9,8 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-/**
- * Caffeine甯姪绫�
- *
- * @author WWW
- * @date 2024-11-05
- */
@Slf4j
+@SuppressWarnings("ALL")
public class CaffeineHelper {
private static Cache<String, Object> cache;
@@ -70,10 +65,8 @@
BigInteger bigInt = new BigInteger(1, byteArray);
- // 鍙傛暟16琛ㄧず16杩涘埗
String result = bigInt.toString(16);
- // 涓嶈冻32浣嶉珮浣嶈ˉ闆�
while (result.length() < 32) {
result = "0" + result;
}
diff --git a/src/main/java/com/se/simu/helper/FileHelper.java b/src/main/java/com/se/simu/helper/FileHelper.java
index a2357e3..6f239fb 100644
--- a/src/main/java/com/se/simu/helper/FileHelper.java
+++ b/src/main/java/com/se/simu/helper/FileHelper.java
@@ -12,13 +12,8 @@
import java.text.DecimalFormat;
import java.util.List;
-/**
- * 鏂囦欢甯姪绫�
- *
- * @author WWW
- * @date 2024-09-12
- */
@Slf4j
+@SuppressWarnings("ALL")
public class FileHelper {
public final static String POINT = ".";
@@ -32,9 +27,6 @@
public static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
- /**
- * 鑾峰彇鏂囦欢鍚�
- */
public static String getFileName(String file) {
int idx = file.lastIndexOf(File.separator);
if (idx > -1) {
@@ -44,9 +36,6 @@
return "";
}
- /**
- * 鑾峰彇鏂囦欢鍚嶇О
- */
public static String getName(String file) {
String fileName = getFileName(file);
int idx = fileName.lastIndexOf(".");
@@ -57,9 +46,6 @@
return fileName;
}
- /**
- * 鑾峰彇鏂囦欢鎵╁睍鍚�
- */
public static String getExtension(File file) {
if (file == null) {
return null;
@@ -75,9 +61,6 @@
return fileName.substring(idx);
}
- /**
- * 鑾峰彇鏂囦欢鎵╁睍鍚�
- */
public static String getExtension(String fileName) {
if (StringHelper.isEmpty(fileName)) {
return "";
@@ -91,96 +74,6 @@
return fileName.substring(idx).toLowerCase();
}
- /**
- * 鑾峰彇澶氱敤閫斾簰鑱旂綉閭欢鎵╁睍绫诲瀷
- */
- public static String getMime(String ext) {
- switch (ext) {
- // 鍥剧墖
- case ".tif":
- case ".tiff":
- return "image/tiff";
- case ".img":
- return "application/x-img";
- case ".gif":
- return "image/gif";
- case ".jpg":
- case ".jpeg":
- return "image/jpeg";
- case ".png":
- return "image/png";
- // 闊�/瑙嗛
- case ".mp3":
- return "audio/mp3";
- case ".mp4":
- return "video/mpeg4";
- case ".avi":
- return "video/avi";
- case ".mpg":
- case ".mpeg":
- return "video/mpg";
- case ".wav":
- return "audio/wav";
- case ".wma":
- return "audio/x-ms-wma";
- case ".swf":
- return "application/x-shockwave-flash";
- case ".wmv":
- return "video/x-ms-wmv";
- case ".rm":
- return "application/vnd.rn-realmedia";
- case ".rmvb":
- return "application/vnd.rn-realmedia-vbr";
- // 缃戦〉
- case ".js":
- return "application/x-javascript";
- case ".css":
- return "text/css";
- case ".asp":
- return "text/asp";
- case ".mht":
- return "message/rfc822";
- case ".jsp":
- case ".htm":
- case ".html":
- case ".xhtml":
- return "text/html";
- case ".xml":
- case ".svg":
- return "text/xml";
- // 鏂囦欢
- case ".txt":
- return "text/plain";
- case ".dbf":
- return "application/x-dbf";
- case ".mdb":
- return "application/msaccess";
- case ".pdf":
- return "application/pdf";
- case ".ppt":
- case ".pptx":
- return "application/x-ppt";
- case ".doc":
- case ".docx":
- return "application/msword";
- case ".xls":
- case ".xlsx":
- return "application/vnd.ms-excel";
- case ".dgn":
- return "application/x-dgn";
- case ".dwg":
- return "application/x-dwg";
- case ".ext":
- return "application/x-msdownload";
- // 榛樿
- default:
- return "application/octet-stream";
- }
- }
-
- /**
- * 瀛楄妭鍗曚綅鎹㈢畻
- */
public static String formatByte(long byteNumber) {
double kbNumber = byteNumber / D1024;
if (kbNumber < D1024) {
@@ -199,9 +92,6 @@
return new DecimalFormat("#.##TB").format(tbNumber);
}
- /**
- * 鑾峰彇骞虫柟绫�
- */
public static String getSquareMeter(double num) {
if (num < I1000000) {
return new DecimalFormat("#.##骞虫柟绫�").format(num);
@@ -212,9 +102,6 @@
return new DecimalFormat("#.##骞虫柟鍗冪背").format(knum);
}
- /**
- * byte杞琈B
- */
public static double sizeToMb(long size) {
if (size < D1050) {
return 0.001;
@@ -225,9 +112,6 @@
return Double.parseDouble(str);
}
- /**
- * 3.鑾峰彇鏂囦欢MD5鐮侊紙JDK锛�
- */
public static String getMd5ByJdk(String filePath) throws IOException {
FileInputStream fileStream = new FileInputStream(filePath);
String md5 = DigestUtils.md5Hex(fileStream);
@@ -236,9 +120,6 @@
return md5;
}
- /**
- * 2.鑾峰彇蹇�� MD5 鐮�
- */
public static String getFastMd5(String filePath) throws IOException {
String hash = MD5.asHex(MD5.getHash(new File(filePath)));
@@ -248,22 +129,12 @@
return md5.asHex();
}
- /**
- * 鍒犻櫎鏂囦欢澶�
- *
- * @param dir 鏂囦欢澶�
- */
public static void deleteDir(String dir) {
File file = new File(dir);
deleteFiles(file);
}
- /**
- * 绾ц仈鍒犻櫎鏂囦欢
- *
- * @param file 鏂囦欢
- */
public static void deleteFiles(File file) {
if (null == file || !file.exists()) {
return;
@@ -285,12 +156,6 @@
file.delete();
}
- /**
- * 鑾峰彇鐩稿璺緞
- *
- * @param file 鏂囦欢
- * @return 鐩稿璺緞
- */
public static String getRelativePath(String file) {
if (StringHelper.isEmpty(file)) {
return null;
@@ -302,12 +167,6 @@
return file.substring(start + 1);
}
- /**
- * 鑾峰彇璺緞
- *
- * @param file 鏂囦欢
- * @return 鏂囦欢璺緞
- */
public static String getPath(String file) {
if (StringHelper.isEmpty(file)) {
return null;
@@ -318,9 +177,6 @@
return file.substring(0, end);
}
- /**
- * 1.鑾峰彇鏂囦欢鐨凪D5
- */
@SuppressWarnings("unused")
public static String getFileMd5(String filePath) {
FileInputStream fis = null;
@@ -353,31 +209,19 @@
}
}
- /**
- * 瀛楄妭鐮佽浆16杩涘埗
- */
public static String byteToHexString(byte[] tmp) {
- // 姣忎釜瀛楄妭鐢� 16 杩涘埗琛ㄧず鐨勮瘽锛屼娇鐢ㄤ袱涓瓧绗︼紝
char[] str = new char[16 * 2];
- // 鎵�浠ヨ〃绀烘垚 16 杩涘埗闇�瑕� 32 涓瓧绗︼紝琛ㄧず杞崲缁撴灉涓搴旂殑瀛楃浣嶇疆
int k = 0;
- // 浠庣涓�涓瓧鑺傚紑濮嬶紝瀵� MD5 鐨勬瘡涓�涓瓧鑺�
for (int i = 0; i < I16; i++) {
- // 杞崲鎴� 16 杩涘埗瀛楃鐨勮浆鎹�
byte byte0 = tmp[i];
- // 鍙栧瓧鑺備腑楂� 4 浣嶇殑鏁板瓧杞崲
str[k++] = HEX_DIGITS[byte0 >>> 4 & 0xf];
- // >>> 涓洪�昏緫鍙崇Щ锛屽皢绗﹀彿浣嶄竴璧峰彸绉伙紝 鍙栧瓧鑺備腑浣� 4 浣嶇殑鏁板瓧杞崲
str[k++] = HEX_DIGITS[byte0 & 0xf];
}
- // 鎹㈠悗鐨勭粨鏋滆浆鎹负瀛楃涓�
+
return new String(str);
}
- /**
- * 鑾峰彇瀛楃涓茬殑MD5鐮�
- */
public static String getStringMd5(String text) {
StringBuilder builder = new StringBuilder();
try {
@@ -394,9 +238,6 @@
return builder.toString();
}
- /**
- * 鏍规嵁璺緞鑾峰彇鏂囦欢
- */
public static void getFilesByPath(List<String> list, String path) {
File file = new File(path);
if (file.isDirectory()) {
@@ -417,12 +258,6 @@
}
}
- /**
- * 澶嶅埗鏂囦欢
- *
- * @param src 婧愭枃浠�
- * @param dest 鐩綍鏂囦欢
- */
public static void copyFile(File src, File dest) throws IOException {
InputStream is = null;
OutputStream os = null;
diff --git a/src/main/java/com/se/simu/helper/GdalHelper.java b/src/main/java/com/se/simu/helper/GdalHelper.java
index 536b226..a10d0d4 100644
--- a/src/main/java/com/se/simu/helper/GdalHelper.java
+++ b/src/main/java/com/se/simu/helper/GdalHelper.java
@@ -12,12 +12,6 @@
import java.io.File;
-/**
- * GDAL甯姪绫�
- *
- * @author WWW
- * @date 2024-09-12
- */
@Slf4j
@SuppressWarnings("ALL")
public class GdalHelper {
@@ -52,29 +46,20 @@
}
}
- // 鏀寔涓枃璺緞
gdal.SetConfigOption("GDAL_FILENAME_IS_UTF8", "YES");
- // 灞炴�ц〃鏀寔涓枃锛欳P936
gdal.SetConfigOption("SHAPE_ENCODING", "");
gdal.SetConfigOption("PGEO_DRIVER_TEMPLATE", "DRIVER=Microsoft Access Driver (*.mdb, *.accdb);DBQ=%s");
gdal.SetConfigOption("MDB_DRIVER_TEMPLATE", "DRIVER=Microsoft Access Driver (*.mdb, *.accdb);DBQ=%s");
- // 娉ㄥ唽鎵�鏈夌殑椹卞姩
gdal.AllRegister();
ogr.RegisterAll();
initSr();
}
- /**
- * 鍒濆鍖栧潗鏍囩郴
- * <p>
- * https://blog.csdn.net/CallmeAdo/article/details/127558139
- */
public static void initSr() {
try {
SR4326 = new SpatialReference();
SR4326.ImportFromEPSG(I4326);
- // 瀵逛簬lat/long椤哄簭鐨勫湴鐞咰RS锛屾暟鎹粛鐒舵槸long/lat椤哄簭鐨�
SR4326.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER);
SR4490 = new SpatialReference();
@@ -93,9 +78,6 @@
return sr;
}
- /**
- * 鍒涘缓閲戝瓧濉�
- */
public static void createPyramid(String file) {
Dataset ds = null;
try {
@@ -109,7 +91,6 @@
return;
}
- // 鍒涘缓閲戝瓧濉�
Band band = ds.GetRasterBand(1);
if (0 == band.GetOverviewCount()) {
ds.BuildOverviews("nearest", new int[]{2, 4, 6, 8, 16}, null);
@@ -123,9 +104,6 @@
}
}
- /**
- * 閿�姣佽祫婧�
- */
public static void delete(Layer layer, DataSource dataSource, Driver driver) {
try {
if (null != layer) {
@@ -166,15 +144,6 @@
public static Geometry getMaxPoint(Dataset ds)
{
- /*
- * transform[0] 宸︿笂瑙抶鍧愭爣
- * transform[1] 涓滆タ鏂瑰悜鍒嗚鲸鐜�
- * transform[2] 鏃嬭浆瑙掑害, 0琛ㄧず鍥惧儚 "鍖楁柟鏈濅笂"
- *
- * transform[3] 宸︿笂瑙抷鍧愭爣
- * transform[4] 鏃嬭浆瑙掑害, 0琛ㄧず鍥惧儚 "鍖楁柟鏈濅笂"
- * transform[5] 鍗楀寳鏂瑰悜鍒嗚鲸鐜�
- */
double[] transform = new double[6];
ds.GetGeoTransform(transform);
@@ -209,9 +178,6 @@
return point;
}
- /**
- * 杞崲涓篧GS84鍧愭爣
- */
public static Geometry toWgs84(SpatialReference sr, double x, double y) {
Geometry point = new Geometry(ogr.wkbPoint);
point.AssignSpatialReference(sr);
@@ -223,11 +189,7 @@
return point;
}
- /**
- * WGS84杞崲涓虹洰鏍囧潗鏍�
- */
public static double[] fromWgs84(SpatialReference sr, double x, double y) {
- // https://blog.csdn.net/weixin_34910922/article/details/129208661
CoordinateTransformation ct = new CoordinateTransformation(GdalHelper.SR4326, sr);
if (sr.IsProjected() != 1) {
sr.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER);
@@ -236,11 +198,7 @@
return ct.TransformPoint(x, y);
}
- /**
- * WGS84杞崲涓虹洰鏍囧潗鏍�
- */
public static int fromWgs84(SpatialReference sr, Geometry g) {
- // https://blog.csdn.net/weixin_34910922/article/details/129208661
CoordinateTransformation ct = new CoordinateTransformation(GdalHelper.SR4326, sr);
if (sr.IsProjected() != 1) {
sr.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER);
diff --git a/src/main/java/com/se/simu/helper/RsaHelper.java b/src/main/java/com/se/simu/helper/RsaHelper.java
index 646e48e..c7a70eb 100644
--- a/src/main/java/com/se/simu/helper/RsaHelper.java
+++ b/src/main/java/com/se/simu/helper/RsaHelper.java
@@ -20,49 +20,23 @@
import java.util.HashMap;
import java.util.Map;
-/**
- * RSA宸ュ叿绫�
- *
- * @author WWW
- * @date 2024-09-13
- */
@Slf4j
+@SuppressWarnings("ALL")
public class RsaHelper {
- /**
- * 绉侀挜
- */
private static String privateKey;
- /**
- * 鍏挜
- */
private static String publicKey;
- /**
- * 瀵嗛挜绠楁硶
- */
private static final String KEY_ALGORITHM = "RSA";
- /**
- * RSA瀵嗛挜闀垮害锛�1024 鎴� 2048
- */
private static final int DEFAULT_RSA_KEY_SIZE = 1024;
- /**
- * 鐢熸垚鍏閽�
- */
public static void generate() {
Map<String, String> result = generateRsaKey(DEFAULT_RSA_KEY_SIZE);
System.out.println("鍏挜涓猴細" + result.get("publicKey"));
System.out.println("绉侀挜涓猴細" + result.get("privateKey"));
}
- /**
- * 鑾峰彇RSA鍔犲瘑绉侀挜
- *
- * @return
- * @throws IOException
- */
public static String getPrivateKey() throws IOException {
if (privateKey == null) {
InputStream inPrivate = new ClassPathResource("config" + File.separator + "rsa_private_key.txt").getInputStream();
@@ -77,12 +51,6 @@
publicKey = key;
}
- /**
- * 鑾峰彇RSA鍔犲瘑鍏挜
- *
- * @return
- * @throws IOException
- */
public static String getPublicKey() throws IOException {
if (publicKey == null) {
InputStream inPrivate = new ClassPathResource("config" + File.separator + "rsa_public_key.txt").getInputStream();
@@ -93,13 +61,6 @@
return publicKey;
}
- /**
- * 璇诲彇鏂囨湰鏂囦欢
- *
- * @param fileName 鏂囦欢璺緞
- * @return
- * @throws IOException
- */
public static String readFile(String fileName) throws IOException {
File file = new File(fileName);
BufferedReader br = new BufferedReader(new FileReader(file));
@@ -115,13 +76,6 @@
return result.toString();
}
- /**
- * 鎶奿nputStream杞垚String
- *
- * @param is
- * @return
- * @throws IOException
- */
private static String inputStream2String(InputStream is) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -136,28 +90,18 @@
return str;
}
- /**
- * 鐢熸垚RSA鐨勫叕绉侀挜
- *
- * @param keySize 1025 鎴� 2048
- * @return
- */
public static Map<String, String> generateRsaKey(int keySize) {
Map<String, String> result = new HashMap<>(2);
try {
KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
- // 鍒濆鍖栧瘑閽ュ鐢熸垚鍣紝瀵嗛挜澶у皬涓�1024 2048浣�
keyPairGen.initialize(keySize, new SecureRandom());
- // 鐢熸垚涓�涓瘑閽ュ锛屼繚瀛樺湪keyPair涓�
KeyPair keyPair = keyPairGen.generateKeyPair();
- // 寰楀埌鍏挜瀛楃涓�
String pub = new String(Base64.encodeBase64(keyPair.getPublic().getEncoded()));
result.put("publicKey", pub);
- // 寰楀埌绉侀挜瀛楃涓�
String pri = new String(Base64.encodeBase64(keyPair.getPrivate().getEncoded()));
result.put("privateKey", pri);
} catch (Exception ex) {
@@ -167,22 +111,12 @@
return result;
}
- /**
- * RSA绉侀挜瑙ｅ瘑
- *
- * @param str 鍔犲瘑鐨勫瓧绗︿覆
- * @return 瑙ｅ瘑瀛楃涓�
- * @throws Exception 鍔犲瘑杩囩▼涓殑寮傚父淇℃伅
- */
public static String decrypt(String str) throws Exception {
- // 64浣嶈В鐮佸姞瀵嗗悗鐨勫瓧绗︿覆
byte[] inputByte = Base64.decodeBase64(str.getBytes(StandardCharsets.UTF_8));
- // Base64缂栫爜鐨勭閽�
byte[] decoded = Base64.decodeBase64(getPrivateKey());
RSAPrivateKey priKey = (RSAPrivateKey) KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(decoded));
- // RSA瑙ｅ瘑锛歊SA/ECB/NoPadding
Cipher cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.DECRYPT_MODE, priKey);
@@ -191,20 +125,11 @@
return outStr;
}
- /**
- * RSA鍏挜鍔犲瘑
- *
- * @param str 闇�瑕佸姞瀵嗙殑瀛楃涓�
- * @return 瀵嗘枃
- * @throws Exception 鍔犲瘑杩囩▼涓殑寮傚父淇℃伅
- */
public static String encrypt(String str) throws Exception {
- // Base64缂栫爜鐨勫叕閽�
byte[] decoded = Base64.decodeBase64(getPublicKey());
RSAPublicKey pubKey = (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(decoded));
- // RSA鍔犲瘑锛歊SA/ECB/NoPadding
Cipher cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.ENCRYPT_MODE, pubKey);
diff --git a/src/main/java/com/se/simu/helper/ShpHelper.java b/src/main/java/com/se/simu/helper/ShpHelper.java
index 391d1d0..c205727 100644
--- a/src/main/java/com/se/simu/helper/ShpHelper.java
+++ b/src/main/java/com/se/simu/helper/ShpHelper.java
@@ -18,12 +18,6 @@
import java.util.Map;
import java.util.Vector;
-/**
- * ShapeFile甯姪绫�
- *
- * @author WWW
- * @date 2024-09-13
- */
@Slf4j
@SuppressWarnings("ALL")
public class ShpHelper {
@@ -217,9 +211,6 @@
f.SetField(i, local.getYear(), local.getMonthValue(), local.getDayOfMonth(), local.getHour(), local.getMinute(), local.getSecond(), 8);
}
- /**
- * 鍒涘缓Geometry瀵硅薄
- */
public static Geometry createGeometry(GeLayer geLayer, JSONObject geom) {
String type = geom.getStr("type");
JSONArray cs = geom.getJSONArray("coordinates");
diff --git a/src/main/java/com/se/simu/helper/StringHelper.java b/src/main/java/com/se/simu/helper/StringHelper.java
index 11f63d4..d556979 100644
--- a/src/main/java/com/se/simu/helper/StringHelper.java
+++ b/src/main/java/com/se/simu/helper/StringHelper.java
@@ -9,76 +9,38 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- * 瀛楃涓插府鍔╃被
- *
- * @author WWW
- * @date 2024-09-12
- */
+@SuppressWarnings("ALL")
public class StringHelper {
public final static String COMMA = ",";
public final static String PWD_REG = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\\W!@#$%^&*`~()\\-_+=,.?;<>]{12,20}$";
- /**
- * 鏁板瓧姝ｅ垯
- */
public static final Pattern NUMBER_PATTERN = Pattern.compile("-?\\d+(\\.\\d+)?");
- /**
- * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 1
- */
public static final SimpleDateFormat YMD_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
- /**
- * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 2
- */
public static final SimpleDateFormat YMDHMS_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- /**
- * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 3
- */
public static final SimpleDateFormat YMD2_FORMAT = new SimpleDateFormat("yyyyMMdd");
- /**
- * 鏍煎紡鍖栧綋鍓嶇郴缁熸棩鏈� 4
- */
public static final SimpleDateFormat YMDHMS2_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
- /**
- * 鍒ゆ柇瀛楃涓�,鏄惁涓烘暣鏁�
- */
public static boolean isInteger(String str) {
return str != null && str.matches("[0-9]+");
}
- /**
- * 鍒ゆ柇瀛楃涓�,鏄惁涓烘诞鐐规暟
- */
public static boolean isNumeric(String str) {
return str != null && str.matches("-?\\d+(\\.\\d+)?");
}
- /**
- * 鍒ゆ柇瀛楃涓�,鏄惁涓烘诞鐐规暟
- */
public static boolean isNumeric2(String str) {
return str != null && NUMBER_PATTERN.matcher(str).matches();
}
- /**
- * 鏃ユ湡姝ｅ垯
- */
public static Pattern datePattern = Pattern.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/]((((0?[13578])|(1[02]))[\\-\\/]((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/]((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/]((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/]((((0?[13578])|(1[02]))[\\-\\/]((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/]((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/]((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
- /**
- * SQL姝ｅ垯
- */
public static Pattern sqlPattern = Pattern.compile("|and|exec|execute|insert|select|delete|update|count|drop|\\*|%|chr|mid|master|truncate|char|declare|sitename|net user|xp_cmdshell|;|or|-|\\+|,|like");
- /**
- * 瀛楃涓茶浆涓烘棩鏈�
- */
public static Date parseDate(String str) {
try {
return YMD_FORMAT.parse(str);
@@ -87,9 +49,6 @@
}
}
- /**
- * 瀛楃涓茶浆涓烘棩鏈熸椂闂�
- */
public static Date parseTime(String str) {
try {
return YMDHMS_FORMAT.parse(str);
@@ -98,54 +57,33 @@
}
}
- /**
- * 鍒ゆ柇鍊兼槸鍚︿负鏃ユ湡鏍煎紡
- */
public static boolean isDate(String strDate) {
Matcher m = datePattern.matcher(strDate);
return m.matches();
}
- /**
- * 瀛楃涓诧紝鏄惁涓簄ull 鎴� ""
- */
public static boolean isNull(String str) {
return null == str || str.length() == 0;
}
- /**
- * 瀛楃涓�,鏄惁涓虹┖null鍜岀┖鏍�
- */
public static boolean isEmpty(String str) {
// return null == str || "".equals(str)
return null == str || "".equals(str.trim());
}
- /**
- * 鑾峰彇 like 瀛楃涓�
- */
public static String getLikeStr(String str) {
return isEmpty(str) ? null : "%" + str.trim() + "%";
}
- /**
- * 鑾峰彇 like 瀛楃涓�
- */
public static String getLikeUpperStr(String str) {
return isEmpty(str) ? null : "%" + str.trim().toUpperCase() + "%";
}
- /**
- * 鑾峰彇 鍙砽ike 瀛楃涓�
- */
public static String getRightLike(String str) {
return isEmpty(str) ? null : str.trim() + "%";
}
- /**
- * 鑾峰彇鍥惧舰鐨刉KT瀛楃涓�
- */
public static String getGeomWkt(String wkt) {
if (isEmpty(wkt)) {
return "null";
@@ -154,26 +92,14 @@
return String.format("ST_GeomFromText('%s')", wkt);
}
- /**
- * 棣栧瓧姣嶅ぇ鍐�
- */
public static String firstCharToUpperCase(String str) {
return str.substring(0, 1).toUpperCase() + str.substring(1);
}
- /**
- * 棣栧瓧姣嶅皬鍐�
- */
public static String firstCharToLowerCase(String str) {
return str.substring(0, 1).toLowerCase() + str.substring(1);
}
- /**
- * 鍒ゆ柇鍊兼槸鍚﹀瓨鍦⊿QL娉ㄥ叆
- *
- * @param str 瀛楃涓�
- * @return 鏄�/鍚�
- */
public static boolean isSqlInjection(String str) {
if (null == str) {
return false;
@@ -184,38 +110,18 @@
return m.matches();
}
- /**
- * 鏍￠獙瀵嗙爜鏄�/鍚﹀悎娉�
- *
- * @param pwd 瀵嗙爜
- * @return 鏄�/鍚︿负鏃犳晥鐨�
- */
public static boolean isPwdInvalid(String pwd) {
return !Pattern.matches(PWD_REG, pwd);
}
- /**
- * 鑾峰彇GUID
- */
public static String getGuid() {
return UUID.randomUUID().toString();
}
- /**
- * 鑾峰彇鍒嗛挓宸暟
- */
public static long getMinuteDifference(Timestamp ts) {
return (ts.getTime() - System.currentTimeMillis()) / 1000 / 60;
}
- /**
- * 杩炴帴List闆嗗悎
- *
- * @param list list 鏁存暟闆嗗悎
- * @param join join 杩炴帴瀛楃
- * @param <T> 娉涘瀷绫�
- * @return 瀛楃涓�
- */
public static <T> String join(List<T> list, String join) {
if (null == list || list.isEmpty()) {
return "";
@@ -229,16 +135,12 @@
}
if (sb.length() > 0 && sb.lastIndexOf(join) == sb.length() - join.length()) {
- // 鍒犻櫎浠庣储寮� start 寮�濮嬪埌 end 涔嬮棿鐨勫瓧绗︼紝鍗� 鍓嶅寘鎷� 鍚庝笉鍖呮嫭銆�
sb.delete(sb.length() - join.length(), sb.length());
}
return sb.toString();
}
- /**
- * 瀛楃涓茶浆鏁存暟闆嗗悎
- */
public static List<Integer> strToIntegers(String str) {
if (isEmpty(str)) {
return null;
diff --git a/src/main/java/com/se/simu/helper/WebHelper.java b/src/main/java/com/se/simu/helper/WebHelper.java
index e386684..85e0781 100644
--- a/src/main/java/com/se/simu/helper/WebHelper.java
+++ b/src/main/java/com/se/simu/helper/WebHelper.java
@@ -17,13 +17,8 @@
import java.text.SimpleDateFormat;
import java.util.*;
-/**
- * Web甯姪绫�
- *
- * @author WWW
- * @date 2024-07-16
- */
@Slf4j
+@SuppressWarnings("ALL")
public class WebHelper {
public final static String POINT = ".";
@@ -37,35 +32,20 @@
return osName.startsWith("Windows");
}
- /**
- * 鑾峰彇CPU鏍稿績鏁�
- */
public static int getCpuCores() {
return Runtime.getRuntime().availableProcessors();
}
- /**
- * 鏍煎紡鍖栨棩鏈�
- */
public final static SimpleDateFormat YMDHMS = new SimpleDateFormat("yyyyMMddHHmmss");
- /**
- * 瀛楃涓�,鏄惁涓虹┖null鍜岀┖鏍�
- */
public static boolean isEmpty(String str) {
return null == str || "".equals(str.trim());
}
- /**
- * 鑾峰彇GUID
- */
public static String getGuid() {
return UUID.randomUUID().toString();
}
- /**
- * 鑾峰彇涓绘満IP
- */
public static String getHostIp() {
try {
return InetAddress.getLocalHost().getHostAddress();
@@ -75,9 +55,6 @@
return "127.0.0.1";
}
- /**
- * 鑾峰彇鐢ㄦ埛IP
- */
public static String getIpAddress(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
@@ -120,43 +97,28 @@
return ip;
}
- /**
- * 鑾峰彇褰撳墠鏃堕棿鐨凾imestamp
- */
public static Timestamp getCurrentTimestamp() {
return new Timestamp(System.currentTimeMillis());
}
- /**
- * 鑾峰彇Request
- */
public static HttpServletRequest getRequest() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return servletRequestAttributes.getRequest();
}
- /**
- * 鑾峰彇Response
- */
public static HttpServletResponse getResponse() {
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return servletRequestAttributes.getResponse();
}
- /**
- * 杈撳嚭JSON鑷抽〉闈�
- */
public static boolean writeJson2Page(HttpServletResponse res, HttpStatus status, Object obj) {
res.setStatus(status.value());
return writeStr2Page(res, JSON.toJSONString(obj));
}
- /**
- * 杈撳嚭JSON鑷抽〉闈�
- */
public static boolean writeJson2Page(HttpServletResponse res, HttpStatus status, String str) {
res.setStatus(status.value());
@@ -167,18 +129,12 @@
return writeStr2Page(res, JSON.toJSONString(map));
}
- /**
- * 杈撳嚭str鑷抽〉闈�
- */
public static boolean writeStr2Page(HttpServletResponse res, HttpStatus status, String str) {
res.setStatus(status.value());
return writeStr2Page(res, str);
}
- /**
- * 杈撳嚭str鑷抽〉闈�
- */
public static boolean writeStr2Page(HttpServletResponse res, String str) {
try {
res.setContentType("application/json;charset=UTF-8");
@@ -198,9 +154,6 @@
return false;
}
- /**
- * 杈撳嚭瀛楄妭鏁扮粍
- */
public static void writeBytes(byte[] bytes, HttpServletResponse res) throws IOException {
res.setContentType("application/octet-stream");
@@ -214,9 +167,6 @@
os.close();
}
- /**
- * 杈撳嚭Png鏂囦欢
- */
public static void writePng(String filePath, HttpServletResponse res) throws IOException {
File file = new File(filePath);
if (!file.exists() || file.isDirectory()) {
@@ -232,28 +182,14 @@
writeFile(filePath, res);
}
- /**
- * 鑾峰彇闅忔満鏁存暟
- */
public static int getRandomInt(int min, int max) {
return new Random().nextInt(max) % (max - min + 1) + min;
}
- /**
- * 涓嬭浇鏂囦欢
- */
public static void download(String file, String fileName, HttpServletResponse res) throws Exception {
download(file, fileName, false, res);
}
- /**
- * 涓嬭浇鏂囦欢
- *
- * @param file 鏂囦欢
- * @param fileName 鏂囦欢鍚�
- * @param res 鍝嶅簲
- * @throws Exception 寮傚父
- */
public static void download(String file, String fileName, boolean inline, HttpServletResponse res) throws Exception {
if (isEmpty(fileName)) {
fileName = YMDHMS.format(new Date());
@@ -261,12 +197,9 @@
fileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20");
String dispose = inline ? "inline" : "attachment";
- // 璁剧疆鍝嶅簲澶翠腑鏂囦欢鐨勪笅杞芥柟寮忎负闄勪欢鏂瑰紡锛屼互鍙婅缃枃浠跺悕
res.setHeader("Content-Disposition", dispose + "; filename*=UTF-8''" + fileName);
- // 璁剧疆鍝嶅簲澶寸殑缂栫爜鏍煎紡涓� UTF-8
res.setCharacterEncoding("UTF-8");
- // 閫氳繃response瀵硅薄璁剧疆鍝嶅簲鏁版嵁鏍煎紡(濡傦細"text/plain; charset=utf-8")
String ext = getExtension(file);
String mime = getMime(ext);
res.setContentType(mime);
@@ -274,31 +207,21 @@
writeFile(file, res);
}
- /**
- * 鍐欐枃浠�
- */
private static void writeFile(String file, HttpServletResponse res) throws IOException {
- // 閫氳繃response瀵硅薄锛岃幏鍙栧埌杈撳嚭娴�
ServletOutputStream outputStream = res.getOutputStream();
- // 瀹氫箟杈撳叆娴侊紝閫氳繃杈撳叆娴佽鍙栨枃浠跺唴瀹�
FileInputStream fileInputStream = new FileInputStream(file);
int len = 0;
byte[] bytes = new byte[1024];
while ((len = fileInputStream.read(bytes)) != -1) {
- // 閫氳繃杈撳叆娴佽鍙栨枃浠舵暟鎹紝鐒跺悗閫氳繃涓婅堪鐨勮緭鍑烘祦鍐欏洖娴忚鍣�
outputStream.write(bytes, 0, len);
outputStream.flush();
}
- // 鍏抽棴璧勬簮
fileInputStream.close();
outputStream.close();
}
- /**
- * 鑾峰彇鏂囦欢鎵╁睍鍚�
- */
public static String getExtension(String fileName) {
if (isEmpty(fileName)) {
return "";
@@ -312,12 +235,8 @@
return fileName.substring(idx).toLowerCase();
}
- /**
- * 鑾峰彇澶氱敤閫斾簰鑱旂綉閭欢鎵╁睍绫诲瀷
- */
public static String getMime(String ext) {
switch (ext) {
- // 鍥剧墖
case ".tif":
case ".tiff":
return "image/tiff";
@@ -330,7 +249,6 @@
return "image/jpeg";
case ".png":
return "image/png";
- // 闊�/瑙嗛
case ".mp3":
return "audio/mp3";
case ".mp4":
@@ -352,7 +270,6 @@
return "application/vnd.rn-realmedia";
case ".rmvb":
return "application/vnd.rn-realmedia-vbr";
- // 缃戦〉
case ".js":
return "application/x-javascript";
case ".css":
@@ -369,7 +286,6 @@
case ".xml":
case ".svg":
return "text/xml";
- // 鏂囦欢
case ".txt":
return "text/plain";
case ".dbf":
@@ -393,7 +309,6 @@
return "application/x-dwg";
case ".ext":
return "application/x-msdownload";
- // 榛樿
default:
return "application/octet-stream";
}
diff --git a/src/main/java/com/se/simu/mapper/SimuMapper.java b/src/main/java/com/se/simu/mapper/SimuMapper.java
index 84ae72b..635f613 100644
--- a/src/main/java/com/se/simu/mapper/SimuMapper.java
+++ b/src/main/java/com/se/simu/mapper/SimuMapper.java
@@ -5,19 +5,9 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
-/**
- * 浠跨湡Mapper
- *
- * @author WWW
- * @date 2024-09-18
- */
@Mapper
@Repository
+@SuppressWarnings("ALL")
public interface SimuMapper extends BaseMapper<SimuPo> {
- /**
- * 鏌ヨ鏈�澶D
- *
- * @return 鏈�澶D
- */
Integer selectMaxId();
}
diff --git a/src/main/java/com/se/simu/service/GedbService.java b/src/main/java/com/se/simu/service/GedbService.java
index 35e5d3c..81dd818 100644
--- a/src/main/java/com/se/simu/service/GedbService.java
+++ b/src/main/java/com/se/simu/service/GedbService.java
@@ -35,12 +35,6 @@
import java.util.*;
import java.util.stream.Collectors;
-/**
- * GEDB鏈嶅姟绫�
- *
- * @author WWW
- * @date 2024-09-12
- */
@Slf4j
@Service
@SuppressWarnings("ALL")
@@ -52,6 +46,8 @@
@Resource
RestTemplate restTemplate;
+
+ private final static String DB_KEY = "gedb_db";
private final static String TOKEN_KEY = "gedb_token";
@@ -128,17 +124,25 @@
return db;
}
- private GeDb getSeDb(String token) {
+ public GeDb getSeDb(String token) {
+ Object obj = CaffeineHelper.get(DB_KEY);
+ if (obj instanceof GeDb) {
+ return (GeDb) obj;
+ }
+
Map<String, Object> map = new HashMap<>(1);
map.put("token", token);
- JSONObject obj = restTemplate.postForObject(config.getHost() + "geo-service/entitydb/list/canview", map, JSONObject.class);
- JSONArray data = obj.getJSONArray("data");
+ JSONObject jsonObject = restTemplate.postForObject(config.getHost() + "geo-service/entitydb/list/canview", map, JSONObject.class);
+ JSONArray data = jsonObject.getJSONArray("data");
List<GeDb> list = JSONUtil.toList(data, GeDb.class);
if (CollectionUtils.isEmpty(list)) return null;
- return list.stream().filter(db -> null != db.getName() && db.getName().contains(config.getDbName())).findFirst().orElse(null);
+ GeDb gedb = list.stream().filter(db -> null != db.getName() && db.getName().contains(config.getDbName())).findFirst().orElse(null);
+ if (null != gedb) CaffeineHelper.put(DB_KEY, gedb);
+
+ return gedb;
}
public List<GeLayer> getLayers(String token, GeDb db) {
diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index b5c5b2a..d6a980b 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -34,12 +34,6 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-/**
- * 澶勭悊缁撴灉鏈嶅姟绫�
- *
- * @author WWW
- * @date 2024-09-29
- */
@Slf4j
@Service
@SuppressWarnings("ALL")
@@ -82,9 +76,6 @@
}
}
- /**
- * 鍦板舰
- */
private void copeTerrain(ResultDto dto, LayerDto layer) {
Dataset ds = null;
try {
@@ -138,9 +129,6 @@
}
}
- /**
- * 閲嶉噰鏍�: https://blog.51cto.com/u_16099346/6691820
- */
private static void Resample(Dataset ds, String dest, int width, int height, LayerDto layer) {
Vector<String> vector = new Vector<>();
//vector.add("-s_srs");
@@ -224,9 +212,6 @@
}
}
- /**
- * 寤虹瓚
- */
private void copeBuilding(ResultDto dto, LayerDto layer) {
Driver driver = null;
DataSource dataSource = null;
@@ -256,9 +241,6 @@
}
}
- /**
- * 姘撮潰
- */
private void setWaterInfo(ResultDto dto, LayerDto layer) {
List<String> files = getFiles(dto.getWaterPath(), ".tif");
layer.getWaters().setFiles(files);
@@ -434,10 +416,6 @@
}
}
- /**
- * 鏄惁鐩镐氦
- * https://blog.csdn.net/flyingshineangel/article/details/135423025
- */
private static BuildingDto intersects(ResultDto dto, double x, double y) {
Geometry p = new Geometry(ogr.wkbPoint);
p.AddPoint_2D(x, y);
@@ -566,7 +544,6 @@
private static void createFlowPng(float[] vxBuffer, float[] vyBuffer, String png, int width, int height) {
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
- // 鐢� R閫氶亾琛ㄧず锛屾祦鍚戜负褰掍竴鍖栫殑浜岀淮鍚戦噺锛坸,y锛夛紝G閫氶亾琛ㄧず涓� x *255 , B閫氶亾琛ㄧず涓� y * 255
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
int offset = x + y * width;
@@ -600,9 +577,6 @@
return val;
}
- /**
- * 鍏冩暟鎹�
- */
private void copeLayerJson(ResultDto dto, LayerDto layer) throws IOException {
layer.getWaters().setFiles(null);
layer.getTerrain().setEpsg(null);
@@ -614,9 +588,6 @@
writeJson(filePath, json);
}
- /**
- * 澶勭悊闄嶆按鏇茬嚎鏂囦欢鏇茬嚎鍥�
- */
public void copeRainFallJson(ResultDto dto, LayerDto layer) throws IOException, ParseException {
String rainGageFilePath = config.getInPath() + File.separator + dto.getServiceName() + File.separator + "RainGage.dat";
String filePath = dto.getOutPath() + File.separator + "rainfall.json";
diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java
index 2f0edef..666d565 100644
--- a/src/main/java/com/se/simu/service/SimuService.java
+++ b/src/main/java/com/se/simu/service/SimuService.java
@@ -29,12 +29,6 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-/**
- * 浠跨湡鏈嶅姟绫�
- *
- * @author WWW
- * @date 2024-09-18
- */
@Slf4j
@Service
@SuppressWarnings("ALL")
@@ -54,9 +48,6 @@
@Resource
ResultService resultService;
- /**
- * 鑾峰彇
- */
public IPage<SimuPo> get(SimuVo vo) {
QueryWrapper<SimuPo> wrapper = getPageWrapper(vo);
@@ -89,9 +80,6 @@
return wrapper;
}
- /**
- * 鍒犻櫎
- */
public int del(List<Integer> ids) {
List<SimuPo> list = simuMapper.selectBatchIds(ids);
if (null != list && list.size() > 0) {
@@ -195,12 +183,6 @@
executor.shutdown();
}
- /**
- * 澶勭悊鏁版嵁锛岀姸鎬佹爣璇嗭細
- * 0-鍒涘缓浠跨湡浠诲姟锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�
- * 4-鐢熸垚闄嶉洦鏂囦欢锛�5-鐢熸垚閰嶇疆鏂囦欢锛�6-妯℃嫙鍐呮稘浠跨湡锛�7-澶勭悊姘翠綅鏂囦欢锛�
- * 8-澶勭悊鎺掓按鏂囦欢锛�9-澶勭悊浠跨湡缁撴灉锛�10-瀹屾垚锛�-10-鍑洪敊
- */
private void cope(SimuPo simu) {
try {
DataPo data = JSONUtil.toBean(simu.getData(), DataPo.class);
diff --git a/src/main/java/com/se/simu/service/UwService.java b/src/main/java/com/se/simu/service/UwService.java
index fd477b5..f6edbc6 100644
--- a/src/main/java/com/se/simu/service/UwService.java
+++ b/src/main/java/com/se/simu/service/UwService.java
@@ -13,12 +13,6 @@
import javax.annotation.Resource;
import java.io.*;
-/**
- * 鍐呮稘姹傝В鍣ㄦ湇鍔＄被
- *
- * @author WWW
- * @date 2024-09-29
- */
@Slf4j
@Service
@SuppressWarnings("ALL")
@@ -36,12 +30,6 @@
return _rainfall;
}
- /**
- * 鍒涘缓闄嶉洦鏂囦欢
- * <p>
- * https://blog.csdn.net/Dark_Drgon/article/details/139739924
- * C:\Program Files\matlab\R2020a\runtime\win64
- */
public void createRainFile(DataPo data) throws Exception {
String filePath = config.getInPath() + File.separator + data.getInPath() + File.separator + config.getRaingage();
String startTime = StringHelper.YMDHMS_FORMAT.format(data.getStartTime());
@@ -105,7 +93,6 @@
log.error(errorLine);
}
- // 绛夊緟绋嬪簭鎵ц缁撴潫骞惰緭鍑虹姸鎬�
int exitCode = process.waitFor();
return sb.toString();
@@ -138,14 +125,6 @@
}
}
- /**
- * 鎵ц鍛戒护琛�,骞剁瓑寰呭懡浠ゆ墽琛屽畬姣�
- *
- * https://www.cnblogs.com/stars-one/p/16482964.html
- * @param cmd 鍛戒护,window璁板緱瑕佷娇鐢╟md /c寮�澶�,濡俢md /c ipconfig
- * @throws IOException
- * @throws InterruptedException
- */
private String execCmdLine(String cmd) throws IOException, InterruptedException {
Process process = Runtime.getRuntime().exec(cmd);
diff --git a/src/main/java/com/se/simu/service/WaterService.java b/src/main/java/com/se/simu/service/WaterService.java
index b20879e..afc9fe3 100644
--- a/src/main/java/com/se/simu/service/WaterService.java
+++ b/src/main/java/com/se/simu/service/WaterService.java
@@ -20,17 +20,9 @@
import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
-/**
- * 鍐呮稘鏈嶅姟绫�
- *
- * @author WWW
- * @date 2024-07-16
- */
@Slf4j
@Service
@SuppressWarnings("ALL")
@@ -38,9 +30,6 @@
@Resource
PropertiesConfig config;
- /**
- * 鑾峰彇鍏冩暟鎹俊鎭�
- */
public byte[] getson(String serviceName, String json) {
try {
String filePath = config.getOutPath() + File.separator + serviceName + File.separator + json;
@@ -63,30 +52,18 @@
}
}
- /**
- * 鑾峰彇鍦板舰楂樺害鍥�
- */
public String getTerraMap(String serviceName, Integer width, Integer height) {
return config.getOutPath() + File.separator + serviceName + File.separator + "terrain" + File.separator + width + "_" + height + ".png";
}
- /**
- * 鑾峰彇姘撮潰楂樺害鍥�
- */
public String getWaterMap(String serviceName, Integer width, Integer height, Long timestamp) {
return config.getOutPath() + File.separator + serviceName + File.separator + "waters" + File.separator + timestamp + File.separator + width + "_" + height + ".png";
}
- /**
- * 鑾峰彇姘存祦鍚戞祦閫熷浘
- */
public String getFlowMap(String serviceName, Integer width, Integer height, Long timestamp) {
return config.getOutPath() + File.separator + serviceName + File.separator + "flows" + File.separator + timestamp + File.separator + width + "_" + height + ".png";
}
- /**
- * 鏍规嵁鍧愭爣鏌ヨ绉按娣卞害:gdalconst.GA_Update
- */
public Double getWaterHeight(SimuPo simu, double x, double y, Long timestamp) {
String filePath = config.getOutPath() + File.separator + simu.getServiceName() + File.separator + "waters"
+ File.separator + timestamp + File.separator + "water.tif";
@@ -128,16 +105,7 @@
return data.getSpatialReference();
}
- /**
- * 灏嗗湴鍥惧潗鏍囪浆鎹负鏍呮牸鍍忕礌鍧愭爣
- *
- * @param gt 浠垮皠鍙樻崲鍙傛暟
- * @param x 妯潗鏍�
- * @param y 绾靛潗鏍�
- * @return 鍍忕礌鍧愭爣
- */
public int[] coordinates2ColRow(double[] gt, double x, double y) {
- // 鍚戜笅鍙栨暣,濡傛灉鍚戜笂鍙栨暣浼氬鑷磋绠楃粨鏋滃亸澶э紝浠庤�屽湪鍚庨潰璇诲彇鍒伴偦杩戝儚鍏冪殑鏁版嵁
//Double col = Math.floor(((y - gt[3]) * gt[1] - (x - gt[0]) * gt[4]) / (gt[5] * gt[1] - gt[2] * gt[4]));
Double col = Math.floor((y * gt[1] - x * gt[4] + gt[0] * gt[4] - gt[3] * gt[1]) / (gt[5] * gt[1] - gt[2] * gt[4]));
Double row = Math.floor((x - gt[0] - col * gt[2]) / gt[1]);
@@ -192,9 +160,6 @@
}
}
- /**
- * 鏍规嵁seid鏌ヨ寤虹瓚鐗╂秹姘存繁搴�
- */
public List<BuildingDepthVo> getBuildingDepthBySeid(String serviceName, String seid) {
List<BuildingDepthVo> list = readBuildingJson(serviceName);
if (CollectionUtils.isEmpty(list)) return null;
--
Gitblit v1.9.3