From 2ecba122da738bcee26e27a1bd0f06e6c7c7f690 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 十月 2024 17:42:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/service/ResultService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index 6d51d76..428d3f6 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -1,7 +1,7 @@
package com.se.simu.service;
import cn.hutool.core.io.FileUtil;
-import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
import com.se.simu.config.PropertiesConfig;
import com.se.simu.domain.dto.ExtensionDto;
import com.se.simu.domain.dto.LayerDto;
@@ -160,7 +160,7 @@
//band.ReadRaster(0, 0, width, height, buffer, width, height, 0, 0);
band.ReadRaster(0, 0, width, height, buffer);
- BufferedImage image = createImage(width, height);
+ BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
double differ = layer.getExtension().getMaxHeight() - layer.getExtension().getMinHeight(), minHeight = layer.getExtension().getMinHeight();
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
@@ -257,6 +257,7 @@
private static List<String> getFiles(String path, String suffix) {
List<String> files = new ArrayList<>();
getFiles(files, new File(path), suffix);
+ files.sort((a, b) -> a.compareToIgnoreCase(b));
return files;
}
@@ -367,7 +368,7 @@
band.ReadRaster(0, 0, width, height, buffer);
float[] building = dto.getBuildings().get(width + "_" + height);
- BufferedImage image = createImage(width, height);
+ BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
double differ = layer.getExtension().getMaxHeight() - layer.getExtension().getMinHeight(), minHeight = layer.getExtension().getMinHeight();
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
@@ -399,8 +400,8 @@
List<String> vyFiles = new ArrayList<>();
List<String> files = getFiles(dto.getFlowPath(), ".tif");
for (String file : files) {
- if (file.startsWith("vx")) vxFiles.add(file);
- if (file.startsWith("vy")) vyFiles.add(file);
+ if (file.contains(File.separator + "vx")) vxFiles.add(file);
+ if (file.contains(File.separator + "vy")) vyFiles.add(file);
}
if (null == vxFiles || null == vyFiles || vxFiles.size() != vyFiles.size() || vxFiles.size() != layer.getWaters().getData().size())
return;
@@ -460,7 +461,7 @@
}
private static void createFlowPng(float[] vxBuffer, float[] vyBuffer, String png, int width, int height) {
- BufferedImage image = createImage(width, 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++) {
@@ -499,7 +500,9 @@
* 鍏冩暟鎹�
*/
private void copeLayerJson(ResultDto dto, LayerDto layer) throws IOException {
- String json = JSONUtil.toJsonPrettyStr(layer);
+ layer.getWaters().setFiles(null);
+ //String json = JSONUtil.toJsonPrettyStr(layer);
+ String json = JSON.toJSONString(layer);
String filePath = dto.getOutPath() + File.separator + "layer.json";
FileWriter fw = new FileWriter(filePath);
--
Gitblit v1.9.3