From 5c87778c13e3e33bb30edfcc344e5e69754bc9bf Mon Sep 17 00:00:00 2001
From: 张洋洋 <10611411+yang-yang-z@user.noreply.gitee.com>
Date: 星期二, 18 二月 2025 18:04:12 +0800
Subject: [PATCH] [add]服务发布
---
src/main/java/com/se/simu/utils/ProjectionToGeographicUtil.java | 2
src/main/java/com/se/simu/domain/po/SimuPo.java | 22 ++++
src/main/java/com/se/simu/utils/TiffToRGBUtil.java | 1
src/main/java/com/se/simu/service/SimuService.java | 3
src/main/resources/config.json | 14 ++
src/main/java/com/se/simu/utils/EntityLibraryUtils.java | 104 ++++++++++++++++++--
src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java | 6 +
src/main/java/com/se/simu/controller/SimuController.java | 137 +++++++++++++++++++--------
src/main/java/com/se/simu/service/SimuFilesService.java | 2
9 files changed, 236 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index d58c7a1..9374580 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -27,6 +27,7 @@
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -336,7 +337,7 @@
return fail("闃叉睕鑼冨洿涓嶈兘涓虹┖", false);
}
}
- if (StringUtils.isEmpty(vo.getSemUrl())){
+ if (StringUtils.isEmpty(vo.getSemUrl())) {
return fail("sem鏂囦欢鐢熸垚璺緞涓嶈兘涓虹┖锛�", false);
}
List<GridDto> dtos = new ArrayList<>();
@@ -344,7 +345,7 @@
dtos.add(new GridDto(vo.getMaxy(), vo.getMinx()));
dtos.add(new GridDto(vo.getMaxy(), vo.getMaxx()));
dtos.add(new GridDto(vo.getMiny(), vo.getMaxx()));
- createSem(tableName, dtos, vo.getSemUrl());
+ createSem(tableName, dtos, vo);
// 寮�濮嬫ā鎷熻绠�
boolean flag = simuFilesService.createByfiles(vo);
return success(flag, flag ? "鎴愬姛" : "澶辫触");
@@ -353,41 +354,90 @@
}
}
- public R<Boolean> createSem(String tableName, List<GridDto> dtos, String semUrl) throws Exception {
- boolean ends = semUrl.endsWith("\\");
- if (!ends) {
- semUrl = semUrl + "\\";
+ @ApiOperation(value = "鑾峰彇鐐硅矾寰�")
+ @GetMapping("/getPointUrl")
+ public R<String> getPointUrl(@RequestParam("id") Integer id) throws Exception{
+ SimuPo po = simuService.getSimuById(id);
+ String token = EntityLibraryUtils.login();
+ if (po != null) {
+ return success(po.getPointUrl().replace("{token}",token));
}
- File file = new File(semUrl);
+ return success(null);
+ }
+
+ @ApiOperation(value = "鑾峰彇绾胯矾寰�")
+ @GetMapping("/getLineUrl")
+ public R<String> getLineUrl(@RequestParam("id") Integer id) throws Exception{
+ SimuPo po = simuService.getSimuById(id);
+ String token = EntityLibraryUtils.login();
+ if (po != null) {
+ return success(po.getLinkUrl().replace("{token}",token));
+ }
+ return success(null);
+ }
+
+ public R<Boolean> createSem(String tableName, List<GridDto> dtos, CreateFilesSimuVo vo) throws Exception {
+ String name = vo.getSemUrl();
+ vo.setSemUrl(inPath + "\\" + vo.getSemUrl());
+ boolean ends = vo.getSemUrl().endsWith("\\");
+ if (!ends) {
+ vo.setSemUrl(vo.getSemUrl() + "\\");
+ }
+ File file = new File(vo.getSemUrl());
if (!file.exists()) {
file.mkdirs();
}
- //闄嶉洦鏂囦欢鐢熸垚
- saveZarr(tableName,semUrl);
String token = EntityLibraryUtils.login();
+ //闄嶉洦鏂囦欢鐢熸垚
+ saveZarr(tableName, vo.getSemUrl());
//绠＄偣鐢熸垚
- pointTosem(dtos, token,semUrl);
+ pointTosem(dtos, token, vo.getSemUrl());
//绠＄嚎鐢熸垚
- lineToSem(dtos, token,semUrl);
- //鍦板舰鐢熸垚
- terrainToSem(dtos,semUrl);
+ lineToSem(dtos, token, vo.getSemUrl());
//鑼冨洿鐢熸垚
- gridToCityJson(dtos,semUrl);
+ gridToCityJson(dtos, vo.getSemUrl());
//娌虫祦鐢熸垚
- riverToSem(semUrl);
+ riverToSem(vo.getSemUrl());
//鍦熷湴鍒╃敤鐢熸垚
- landuseToSem(semUrl);
+ landuseToSem(vo.getSemUrl());
+ //鍦板舰鐢熸垚
+ terrainToSem(dtos, vo.getSemUrl());
+ String bbox = "";
+ //鐢熸垚鐐瑰拰绾跨殑瀹炰綋搴撴ā鍨嬪苟淇濆瓨璺緞
+ vo.setPointName(name + "-point");
+ vo.setLinkName(name + "-line");
+ JSONArray min = ProjectionToGeographicUtil.get4548Point(dtos.get(0).getLon(), dtos.get(0).getLat());
+ JSONArray max = ProjectionToGeographicUtil.get4548Point(dtos.get(2).getLon(), dtos.get(2).getLat());
+ bbox = bbox + min.getDouble(0) + "," + min.getDouble(1) + "," + max.getDouble(0) + "," + max.getDouble(1);
+ JSONObject point = getModule("layerQueryPointParams.json");
+ String pointUrl = assemble(vo.getPointName(), point.getString("layerid"), bbox, token);
+ vo.setPointName(pointUrl);
+ JSONObject link = getModule("layerQueryParams.json");
+ String linkUrl = assemble(vo.getLinkName(), link.getString("layerid"), bbox, token);
+ vo.setLinkName(linkUrl);
return success(true);
}
- @ApiOperation(value = "tarr鏂囦欢缁勮")
- @GetMapping(value = "/saveZarr", produces = "application/json; charset=UTF-8")
- public R<String> saveZarr(@RequestParam("name") String tableName,String semUrl) throws Exception {
+
+ public String assemble(String name, String layerid, String bbox, String token) throws Exception {
+ JSONObject jsonObject = EntityLibraryUtils.createAssemble(name, token);
+ String packageid = jsonObject.getString("packageid");
+ EntityLibraryUtils.addAssemble(layerid, token, packageid, bbox);
+ JSONObject result = EntityLibraryUtils.submitAssemble(token, packageid);
+ Random random = new Random();
+ int randomNumber = random.nextInt(90000) + 10000;
+ String url = "http://106.120.22.26:8024/geo-service/package/3d/normal/85257774fdb64e5f99f6778696cad02a/" + packageid + "/" + layerid + "//l0/tileset.json?r=" + randomNumber + "&token={token}";
+ return url;
+ }
+
+ public R<String> saveZarr(String tableName, String semUrl) throws Exception {
List<String> list = CsvToSQLiteUtils.getNameList(tableName);
String path = outPath + "\\";
String rainfall = "rainfall\\";
String basePath = path + tableName + "\\" + rainfall;
JSONObject jsonObject = getModule("rainfallmodule.json");
+ String startTime = null;
+ String endTime = null;
for (String src : list
) {
File directories = new File(basePath);
@@ -398,6 +448,12 @@
System.out.println("Directories already exist.");
}
List<StationRainVo> stationRainVos = CsvToSQLiteUtils.getList(tableName, src);
+ if (startTime == null) {
+ startTime = stationRainVos.get(0).getDatetime();
+ }
+ if (endTime == null) {
+ endTime = stationRainVos.get(stationRainVos.size() - 1).getDatetime();
+ }
ZarrUtils.saveZarrRainfall(basePath + src, stationRainVos);
ZarrUtils.saveZarrTime(basePath + src, stationRainVos);
ZipUtils.toZarr(basePath + src, basePath + src + ".zip");
@@ -440,10 +496,24 @@
fileWriter.write(jsonObject.toJSONString());
fileWriter.close();
SemUtils.cityJsonToSem(path + tableName + "\\闄嶉洦閲�.json", semUrl + "raingage.sem");
+ getConfigJson(startTime, endTime, semUrl);
return success(semUrl + "raingage.sem");
}
- public R<String> pointTosem(List<GridDto> dtos, String token,String semUrl) throws Exception {
+ public void getConfigJson(String startTime, String endTime, String semUrl) throws Exception {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ Date start = sdf.parse(startTime);
+ Date end = sdf.parse(endTime);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
+ JSONObject jsonObject = getModule("config.json");
+ jsonObject.put("start_datetime", simpleDateFormat.format(start));
+ jsonObject.put("end_datetime", simpleDateFormat.format(end));
+ FileWriter fileWriter = new FileWriter(semUrl + "\\config.json");
+ fileWriter.write(jsonObject.toJSONString());
+ fileWriter.close();
+ }
+
+ public R<String> pointTosem(List<GridDto> dtos, String token, String semUrl) throws Exception {
String path = outPath + "\\point\\";
String publicKey = EntityLibraryUtils.getPublicKey();
JSONArray jsonArrayList = EntityLibraryUtils.getPointInfo(dtos, token);
@@ -512,9 +582,8 @@
return success(semUrl + "node.sem");
}
- @ApiOperation(value = "绠＄偣杞琧ityjson")
- @GetMapping(value = "/pointToCityJson", produces = "application/json; charset=UTF-8")
- public R<String> pointToCityJson(@RequestParam("shpPath") String shpPath) throws Exception {
+
+ public R<String> pointToCityJson(String shpPath) throws Exception {
String path = outPath + "\\point\\";
List<Map<String, Object>> list = ShpReadUtils.readPointShp(shpPath);
JSONObject jsonObject = getModule("pointmodule.json");
@@ -561,7 +630,7 @@
return success(filePatn + "node.sem");
}
- public R<String> lineToSem(List<GridDto> dtos, String token,String semUrl) throws Exception {
+ public R<String> lineToSem(List<GridDto> dtos, String token, String semUrl) throws Exception {
String path = outPath + "\\line\\";
String publicKey = EntityLibraryUtils.getPublicKey();
JSONArray jsonArrayList = EntityLibraryUtils.getLineInfo(dtos, token);
@@ -656,9 +725,7 @@
return success(semUrl + "link.sem");
}
- @ApiOperation(value = "绠＄嚎杞琧ityjson")
- @GetMapping(value = "/lineToCityJson", produces = "application/json; charset=UTF-8")
- public R<String> lineToCityJson(@RequestParam("shpPath") String shpPath) throws Exception {
+ public R<String> lineToCityJson(String shpPath) throws Exception {
String path = outPath + "\\line\\";
List<Map<String, Object>> list = ShpReadUtils.readPointShp(shpPath);
JSONObject jsonObject = getModule("linemodule.json");
@@ -709,9 +776,7 @@
return success(filePatn + "link.sem");
}
- @ApiOperation(value = "鍦板舰杞瑂em")
- @PostMapping(value = "/terrainToSem", produces = "application/json; charset=UTF-8")
- public R<String> terrainToSem(@RequestBody List<GridDto> dtos,String semUrl) throws Exception {
+ public R<String> terrainToSem(List<GridDto> dtos, String semUrl) throws Exception {
long times = System.currentTimeMillis();
String path = outPath + "\\terrain\\" + times + "\\";
File dirFile = new File(path + "appearance");
@@ -752,9 +817,7 @@
return success(semUrl + "terrain.sem");
}
- @ApiOperation(value = "鍦板舰杞琧ityjson")
- @GetMapping(value = "/terrainToCityJson", produces = "application/json; charset=UTF-8")
- public R<String> terrainToCityJson(@RequestParam("tifPath") String tifPath) throws Exception {
+ public R<String> terrainToCityJson(String tifPath) throws Exception {
long times = System.currentTimeMillis();
String path = outPath + "\\terrain\\" + times + "\\";
File dirFile = new File(path + "appearance");
@@ -777,9 +840,7 @@
return success(filePatn + "terrain.sem");
}
- @ApiOperation(value = "grid杞琧ityjson")
- @PostMapping(value = "/gridToCityJson", produces = "application/json; charset=UTF-8")
- public R<String> gridToCityJson(@RequestBody List<GridDto> dtos,String semUrl) throws Exception {
+ public R<String> gridToCityJson(List<GridDto> dtos, String semUrl) throws Exception {
long times = System.currentTimeMillis();
String path = outPath + "\\grid\\" + times + "\\";
File dirFile = new File(path);
@@ -804,8 +865,6 @@
return success(semUrl + "grid.sem");
}
- @ApiOperation(value = "river杞瑂em")
- @GetMapping(value = "/riverToSem", produces = "application/json; charset=UTF-8")
public R<String> riverToSem(String semUrl) throws Exception {
long times = System.currentTimeMillis();
String path = outPath + "\\river\\" + times + "\\";
@@ -821,8 +880,6 @@
return success(semUrl + "river.sem");
}
- @ApiOperation(value = "landuse杞瑂em")
- @GetMapping(value = "/landuseToSem", produces = "application/json; charset=UTF-8")
public R<String> landuseToSem(String semUrl) throws Exception {
long times = System.currentTimeMillis();
String path = outPath + "\\landuse\\" + times + "\\";
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 76634a6..ed1faef 100644
--- a/src/main/java/com/se/simu/domain/po/SimuPo.java
+++ b/src/main/java/com/se/simu/domain/po/SimuPo.java
@@ -47,6 +47,12 @@
@ApiModelProperty("sem璺緞")
private String semUrl;
+ @ApiModelProperty("鐐规暟鎹矾寰�")
+ private String pointUrl;
+
+ @ApiModelProperty("绾挎暟鎹矾寰�")
+ private String linkUrl;
+
public SimuPo() {
}
@@ -154,4 +160,20 @@
public void setSemUrl(String semUrl) {
this.semUrl = semUrl;
}
+
+ public String getPointUrl() {
+ return pointUrl;
+ }
+
+ public void setPointUrl(String pointUrl) {
+ this.pointUrl = pointUrl;
+ }
+
+ public String getLinkUrl() {
+ return linkUrl;
+ }
+
+ public void setLinkUrl(String linkUrl) {
+ this.linkUrl = linkUrl;
+ }
}
diff --git a/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java b/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java
index d408eca..e7888d1 100644
--- a/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java
+++ b/src/main/java/com/se/simu/domain/vo/CreateFilesSimuVo.java
@@ -88,4 +88,10 @@
@ApiModelProperty("sem璺緞")
private String semUrl;
+ @ApiModelProperty("鐐圭敓鎴愯矾寰�")
+ private String pointName;
+
+ @ApiModelProperty("绾跨敓鎴愯矾寰�")
+ private String linkName;
+
}
diff --git a/src/main/java/com/se/simu/service/SimuFilesService.java b/src/main/java/com/se/simu/service/SimuFilesService.java
index a4473a3..211acac 100644
--- a/src/main/java/com/se/simu/service/SimuFilesService.java
+++ b/src/main/java/com/se/simu/service/SimuFilesService.java
@@ -127,6 +127,8 @@
simu.setServiceName(date);
simu.setCreateTime(new Timestamp(now.getTime()));
simu.setSemUrl(vo.getSemUrl());
+ simu.setPointUrl(vo.getPointName());
+ simu.setLinkUrl(vo.getLinkName());
int rows = simuMapper.insert(simu);
if (rows > 0) {
asyncCall(simu);
diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java
index 666d565..435d1e5 100644
--- a/src/main/java/com/se/simu/service/SimuService.java
+++ b/src/main/java/com/se/simu/service/SimuService.java
@@ -122,6 +122,9 @@
return simuMapper.selectOne(wrapper);
}
+ public SimuPo getSimuById(Integer id) {
+ return simuMapper.selectById(id);
+ }
public SimuPo getSimuByServiceName(String serviceName) {
if (StringHelper.isEmpty(serviceName)) {
diff --git a/src/main/java/com/se/simu/utils/EntityLibraryUtils.java b/src/main/java/com/se/simu/utils/EntityLibraryUtils.java
index 0bbeb30..2fec649 100644
--- a/src/main/java/com/se/simu/utils/EntityLibraryUtils.java
+++ b/src/main/java/com/se/simu/utils/EntityLibraryUtils.java
@@ -8,7 +8,6 @@
import org.springframework.http.*;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriUtils;
import javax.crypto.Cipher;
import java.net.URL;
@@ -116,16 +115,94 @@
return outstn;
}
- public static void main(String[] args) throws Exception {
- String publickey = getPublicKey();
- System.out.println("鍏挜=" + publickey);
- String en = encrypt("id in ('46235','49876')", publickey);
- System.out.println("鍔犲瘑瀛楃涓�=" + en);
- String encode = UriUtils.encode(en, StandardCharsets.UTF_8);
- System.out.println("encode瀛楃涓�=" + encode);
- String decode = UriUtils.decode(encode, StandardCharsets.UTF_8);
- System.out.println("decode瀛楃涓�=" + decode);
- System.out.println("瑙ｅ瘑瀛楃涓�=" + decrypt(decode, "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJiF6WkdgHlimpakWJMvH3Xnjwws7qqoo1rhbg/iLzLGly/EKLvUzD6D7FUFk+GAP/sOKh1cZZEvi1KkGd6OufqMKdDvRvVtGjXExI5MLJDVDaYTsqhzNF8maB2H7dwR+iiDGph2DMPQtuV/k/dalXMxR6O8Q2MPQfaUiOVebKBbAgMBAAECgYARrPs21ldsOdQmfxdQv1ZLCLHYPGDQYEjGIHfr2U+U99TPkVETK38cA5fg5ouTx5QimSqiSnHu2G6x/hiNZUcCJp/1agvsFEI2FLokShYbitOYa07Da1eIKpZA5F+P5j5/QOVpVsWOxvEDA/dkF+vrV4vU/iV7H3QJqBfsLSxEeQJBAO43SVkzJM6dqnRw7sib7SOvguicnr7UKt0Tadc1PwLMWCCFu+4p3iN9Zj/7K5VHjomW+NIv7UAGynDfHBpv1x0CQQCj6ONm+m4FlaTdg+Pc36BBy4Gd6ucm6WfjDTHMaZi3uzINjTPBut6DmrUt68dyHdGpo6OIjCdX3xU27HtmjiPXAkEAwjdhHdCM2cfCCV1p0TUPimC2ImBPLNZefBAv4r4OuYFQ+HMQXYTVD6pViySEzBijJZppEzTwAZuHwa6lgwhcIQJBAI8PBOssSDq3kV2Fb6unwseqR0b9byKXNQUGzyAKSjCSQe1yAGpmHy/eJ6Qc1cbUH9pf6KuVKAGZw3pcjJfGF6ECQQCx9dJ2qJjm2R78/HH0SkOATpMATgewtHH5tRJfCJv7NLveuYNRFH1An4APWYq9IdVfyn+4gyXz3OClteE7jAkt"));
+ /**
+ * 鍒涘缓缁勮
+ *
+ * @param name 缁勮鍚嶇О
+ * @return 鍒涘缓缁撴灉
+ */
+ public static JSONObject createAssemble(String name, String token) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("token", token);
+ jsonObject.put("description", null);
+ jsonObject.put("name", name);
+ jsonObject.put("dbid", "85257774fdb64e5f99f6778696cad02a");
+ RestTemplate restTemplate = new RestTemplate();
+ // 鍙戦�丣SON鏍煎紡鐨凱OST璇锋眰
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ String json = jsonObject.toJSONString();
+ HttpEntity<String> request = new HttpEntity<>(json, headers);
+ ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://106.120.22.26:8024/geo-service/package/self/add", request, String.class);
+ if (responseEntity.getStatusCode().is2xxSuccessful()) {
+ String body = responseEntity.getBody();
+ JSONObject result = JSONObject.parseObject(body);
+ if (result.getInteger("code") == 200) {
+ return result.getJSONObject("data");
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鎻愪氦缁勮
+ * @param token token
+ * @param packageid 缁勮id
+ * @return 鎻愪氦缁撴灉
+ */
+ public static JSONObject submitAssemble(String token, String packageid) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("dbid", "85257774fdb64e5f99f6778696cad02a");
+ jsonObject.put("packageid", packageid);
+ jsonObject.put("token", token);
+ RestTemplate restTemplate = new RestTemplate();
+ // 鍙戦�丣SON鏍煎紡鐨凱OST璇锋眰
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ String json = jsonObject.toJSONString();
+ HttpEntity<String> request = new HttpEntity<>(json, headers);
+ ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://106.120.22.26:8024/geo-service/package/status/complete", request, String.class);
+ if (responseEntity.getStatusCode().is2xxSuccessful()) {
+ String body = responseEntity.getBody();
+ JSONObject result = JSONObject.parseObject(body);
+ if (result.getInteger("code") == 200) {
+ return result.getJSONObject("data");
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鍔犲叆缁勮
+ *
+ * @param layerid 鍥惧眰id
+ * @param token token
+ * @param packageid 缁勮id
+ * @param bbox 鑼冨洿
+ * @return 鏄惁鍔犲叆鎴愬姛
+ */
+ public static Boolean addAssemble(String layerid, String token, String packageid, String bbox) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("dbid", "85257774fdb64e5f99f6778696cad02a");
+ jsonObject.put("layerid", layerid);
+ jsonObject.put("packageid", packageid);
+ jsonObject.put("token", token);
+ jsonObject.put("bbox", bbox);
+ RestTemplate restTemplate = new RestTemplate();
+ // 鍙戦�丣SON鏍煎紡鐨凱OST璇锋眰
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ String json = jsonObject.toJSONString();
+ HttpEntity<String> request = new HttpEntity<>(json, headers);
+ ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://106.120.22.26:8024/geo-service/package/data/add", request, String.class);
+ if (responseEntity.getStatusCode().is2xxSuccessful()) {
+ String body = responseEntity.getBody();
+ JSONObject result = JSONObject.parseObject(body);
+ if (result.getInteger("code") == 200) {
+ return result.getBoolean("data");
+ }
+ }
+ return null;
}
/**
@@ -157,6 +234,7 @@
}
return null;
}
+
/**
* 绠＄嚎鍒楄〃
*
@@ -193,10 +271,10 @@
* @param param 鏌ヨ鍙傛暟
* @return 鍙傛暟鍐呰鎯�
*/
- public static JSONArray getLineDetail(String param,String token) {
+ public static JSONArray getLineDetail(String param, String token) {
JSONObject jsonObject = getModule("layerQueryDetailParams.json");
jsonObject.put("where", param);
- jsonObject.put("token",token);
+ jsonObject.put("token", token);
RestTemplate restTemplate = new RestTemplate();
// 鍙戦�丣SON鏍煎紡鐨凱OST璇锋眰
StringHttpMessageConverter converter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
diff --git a/src/main/java/com/se/simu/utils/ProjectionToGeographicUtil.java b/src/main/java/com/se/simu/utils/ProjectionToGeographicUtil.java
index b68cdac..573c68c 100644
--- a/src/main/java/com/se/simu/utils/ProjectionToGeographicUtil.java
+++ b/src/main/java/com/se/simu/utils/ProjectionToGeographicUtil.java
@@ -51,6 +51,6 @@
}
public static void main(String[] args) {
- System.out.println(get4548Point(116.66,39.8962));
+ System.out.println(getPoint(469257.26224087493,4416938.9521611305));
}
}
diff --git a/src/main/java/com/se/simu/utils/TiffToRGBUtil.java b/src/main/java/com/se/simu/utils/TiffToRGBUtil.java
index 45bda87..224ffb1 100644
--- a/src/main/java/com/se/simu/utils/TiffToRGBUtil.java
+++ b/src/main/java/com/se/simu/utils/TiffToRGBUtil.java
@@ -51,7 +51,6 @@
int g = value / 256;
int b = value % 256;
Color color = new Color(r, g, b);
- System.out.printf("Pixel (%d, %d): R=%d, G=%d, B=%d%n", x, y, r, g, b);
int newRgb = color.getRGB();
// 灏嗗鐞嗗悗鐨勫儚绱犻鑹插�艰缃埌鏂扮殑 PNG 鍥惧儚涓�
pngImage.setRGB(x, y, newRgb);
diff --git a/src/main/resources/config.json b/src/main/resources/config.json
new file mode 100644
index 0000000..5115426
--- /dev/null
+++ b/src/main/resources/config.json
@@ -0,0 +1,14 @@
+{
+ "semfile_node": "node.sem",
+ "semfile_link": "link.sem",
+ "semfile_grid": "grid.sem",
+ "semfile_river": "river.sem",
+ "semfile_terrain": "terrain.sem",
+ "semfile_raingage": "raingage.sem",
+ "semfile_landuse": "landuse.sem",
+ "start_datetime": "07/31/2023 00:00:00",
+ "end_datetime": "07/31/2023 08:00:00",
+ "report_step": "00:01:00",
+ "mesh_size": 10.0,
+ "pixel_size":3.0
+}
\ No newline at end of file
--
Gitblit v1.9.3