From 514705c874699fb016ca405961e50dcb15af2648 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 十一月 2023 10:28:16 +0800
Subject: [PATCH] 栅格分析返回值添加图层单位字段

---
 src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 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 4a6a83a..8f64e3b 100644
--- a/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
+++ b/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
@@ -22,11 +22,16 @@
         this.points = new ArrayList<>();
     }
 
+    public AnalysisResultEntity(String token) {
+        this();
+        this.token = token;
+    }
+
     /**
      * 娣诲姞鐐�
      */
-    public void addPoint(Double x, Double y, List<Double> vals) {
-        Point point = new Point(x, y, vals);
+    public void addPoint(double x, double y, double len, List<Double> vals) {
+        Point point = new Point(x, y, len, vals);
         this.points.add(point);
     }
 
@@ -38,6 +43,8 @@
         this.avgList.add(WebHelper.round(avg, 3));
         this.maxList.add(WebHelper.round(max, 3));
     }
+
+    private String token;
 
     private String layerName;
 
@@ -51,7 +58,17 @@
 
     private String info;
 
+    private String unit;
+
     private List<Point> points;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
 
     public String getLayerName() {
         return layerName;
@@ -101,6 +118,14 @@
         this.info = info;
     }
 
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     public List<Point> getPoints() {
         return points;
     }
@@ -110,37 +135,48 @@
     }
 
     public static class Point {
-        private Double x;
+        private double x;
 
-        private Double y;
+        private double y;
+
+        private double len;
 
         private List<Double> vals;
 
         public Point() {
         }
 
-        public Point(Double x, Double y, List<Double> vals) {
+        public Point(double x, double y, double len, List<Double> vals) {
             this.x = x;
             this.y = y;
+            this.len = WebHelper.round(len, 3);
             this.vals = vals;
         }
 
-        public Double getX() {
+        public double getX() {
             return x;
         }
 
-        public void setX(Double x) {
+        public void setX(double x) {
             this.x = x;
         }
 
-        public Double getY() {
+        public double getY() {
             return y;
         }
 
-        public void setY(Double y) {
+        public void setY(double y) {
             this.y = y;
         }
 
+        public double getLen() {
+            return len;
+        }
+
+        public void setLen(double len) {
+            this.len = len;
+        }
+
         public List<Double> getVals() {
             return vals;
         }

--
Gitblit v1.9.3