From 236b037b0d8d2673bb8f1f00013983459c6e669c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 14 九月 2023 16:57:24 +0800
Subject: [PATCH] 修改栅格分析的线分析功能-2
---
src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java b/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
index d73a689..a1c1d1b 100644
--- a/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
+++ b/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
@@ -23,8 +23,8 @@
/**
* 娣诲姞鐐�
*/
- public void addPoint(Double x, Double y, Double val) {
- Point point = new Point(x, y, val);
+ public void addPoint(Double x, Double y, List<Double> vals) {
+ Point point = new Point(x, y, vals);
this.points.add(point);
}
@@ -63,7 +63,7 @@
}
public void setAvg(Double avg) {
- this.avg = WebHelper.round(avg, 3);
+ this.avg = avg;
}
public Double getMax() {
@@ -71,7 +71,7 @@
}
public void setMax(Double max) {
- this.max = WebHelper.round(max, 3);
+ this.max = max;
}
public int getCode() {
@@ -90,20 +90,28 @@
this.info = info;
}
- public class Point {
+ public List<Point> getPoints() {
+ return points;
+ }
+
+ public void setPoints(List<Point> points) {
+ this.points = points;
+ }
+
+ public static class Point {
private Double x;
private Double y;
- private Double val;
+ private List<Double> vals;
public Point() {
}
- public Point(Double x, Double y, Double val) {
+ public Point(Double x, Double y, List<Double> vals) {
this.x = x;
this.y = y;
- this.val = val;
+ this.vals = vals;
}
public Double getX() {
@@ -122,12 +130,12 @@
this.y = y;
}
- public Double getVal() {
- return val;
+ public List<Double> getVals() {
+ return vals;
}
- public void setVal(Double val) {
- this.val = val;
+ public void setVals(List<Double> vals) {
+ this.vals = vals;
}
}
}
--
Gitblit v1.9.3