From 52cffc4ab8e9787a6f233295502c7c9788dddae1 Mon Sep 17 00:00:00 2001
From: fxl <473369119@qq.com>
Date: 星期二, 07 三月 2023 10:45:17 +0800
Subject: [PATCH] 3.7
---
src/main/java/com/hxzkoa/json/tb_fence.java | 127 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/hxzkoa/json/tb_fence.java b/src/main/java/com/hxzkoa/json/tb_fence.java
index 4a56f83..4fde8c1 100644
--- a/src/main/java/com/hxzkoa/json/tb_fence.java
+++ b/src/main/java/com/hxzkoa/json/tb_fence.java
@@ -17,6 +17,61 @@
private String addtime;
private String color;
private String baoliu1;
+ private String baoliu2;
+ private String baoliu3;
+ private String baoliu4;
+ private String baoliu5;
+ private String baoliu6;
+ private String baoliu7;
+
+
+ public String getBaoliu7() {
+ return baoliu7;
+ }
+
+ public void setBaoliu7(String baoliu7) {
+ this.baoliu7 = baoliu7;
+ }
+
+ public String getBaoliu6() {
+ return baoliu6;
+ }
+
+ public void setBaoliu6(String baoliu6) {
+ this.baoliu6 = baoliu6;
+ }
+
+ public String getBaoliu2() {
+ return baoliu2;
+ }
+
+ public void setBaoliu2(String baoliu2) {
+ this.baoliu2 = baoliu2;
+ }
+
+ public String getBaoliu3() {
+ return baoliu3;
+ }
+
+ public void setBaoliu3(String baoliu3) {
+ this.baoliu3 = baoliu3;
+ }
+
+ public String getBaoliu4() {
+ return baoliu4;
+ }
+
+ public void setBaoliu4(String baoliu4) {
+ this.baoliu4 = baoliu4;
+ }
+
+ public String getBaoliu5() {
+ return baoliu5;
+ }
+
+ public void setBaoliu5(String baoliu5) {
+ this.baoliu5 = baoliu5;
+ }
public String getBaoliu1() {
return baoliu1;
@@ -114,41 +169,41 @@
this.color = color;
}
- public Vector<Point2D.Double> getPts() {
- Vector<Point2D.Double> pts = new Vector<Point2D.Double>();
- String zuobiao = this.getZuobiao();// 鍧愭爣瀛楃涓�
- String shape = this.getShape();
- String ju_xing = "鐭╁舰";
- if (ju_xing.equals(shape)) {
- String[] zb = zuobiao.split("\\,");// 鐢ㄩ�楀彿鍒嗗壊
- Double x0 = Double.parseDouble(zb[0]);
- Double y0 = Double.parseDouble(zb[1]);
- Double x2 = Double.parseDouble(zb[2]);
- Double y2 = Double.parseDouble(zb[3]);
- Double x1 = x2;
- Double y1 = y0;
- Double x3 = x0;
- Double y3 = y2;
- Point2D.Double p0 = new Point2D.Double(x0, y0);
- Point2D.Double p1 = new Point2D.Double(x1, y1);
- Point2D.Double p2 = new Point2D.Double(x2, y2);
- Point2D.Double p3 = new Point2D.Double(x3, y3);
- pts.add(p0);
- pts.add(p1);
- pts.add(p2);
- pts.add(p3);
- } else {
- String[] zb = zuobiao.split("\\,");// 鐢ㄩ�楀彿鍒嗗壊
- int bian = zb.length/2;
- for (int i = 0; i < bian; i++) {
-// String zbxy = zb[i];
- String[] xy = Arrays.copyOfRange(zb,2*i,2*i+2);// 浠モ��,鈥濆垎鍓插瓧绗︿覆浠庤�岃幏寰楁瘡涓偣鐨剎鍜寉
- Point2D.Double p = new Point2D.Double(Double.parseDouble(xy[0]), Double.parseDouble(xy[1]));
- pts.add(p);
- }
-
- }
- return pts;
- }
+// public Vector<Point2D.Double> getPts() {
+// Vector<Point2D.Double> pts = new Vector<Point2D.Double>();
+// String zuobiao = this.getZuobiao();// 鍧愭爣瀛楃涓�
+// String shape = this.getShape();
+// String ju_xing = "鐭╁舰";
+// if (ju_xing.equals(shape)) {
+// String[] zb = zuobiao.split("\\,");// 鐢ㄩ�楀彿鍒嗗壊
+// Double x0 = Double.parseDouble(zb[0]);
+// Double y0 = Double.parseDouble(zb[1]);
+// Double x2 = Double.parseDouble(zb[2]);
+// Double y2 = Double.parseDouble(zb[3]);
+// Double x1 = x2;
+// Double y1 = y0;
+// Double x3 = x0;
+// Double y3 = y2;
+// Point2D.Double p0 = new Point2D.Double(x0, y0);
+// Point2D.Double p1 = new Point2D.Double(x1, y1);
+// Point2D.Double p2 = new Point2D.Double(x2, y2);
+// Point2D.Double p3 = new Point2D.Double(x3, y3);
+// pts.add(p0);
+// pts.add(p1);
+// pts.add(p2);
+// pts.add(p3);
+// } else {
+// String[] zb = zuobiao.split("\\,");// 鐢ㄩ�楀彿鍒嗗壊
+// int bian = zb.length/2;
+// for (int i = 0; i < bian; i++) {
+//// String zbxy = zb[i];
+// String[] xy = Arrays.copyOfRange(zb,2*i,2*i+2);// 浠モ��,鈥濆垎鍓插瓧绗︿覆浠庤�岃幏寰楁瘡涓偣鐨剎鍜寉
+// Point2D.Double p = new Point2D.Double(Double.parseDouble(xy[0]), Double.parseDouble(xy[1]));
+// pts.add(p);
+// }
+//
+// }
+// return pts;
+// }
}
--
Gitblit v1.10.0