Xu·LinPeng пре 5 месеци
родитељ
комит
6b95ace24e

+ 1 - 1
src/main/java/com/jwkj/qsydw/controller/ApiController.java

@@ -101,7 +101,7 @@ public class ApiController {
     @PostMapping("dataV2")
     public BaseResponse<List<ReadResults>> test(@RequestBody Params params) {
 
-        String var = params.getPointPosition();
+        String var =  pointPosition.getPointPosition(params.getPointPosition());
 
         if (var == null || var.isEmpty()){
             return new BaseResponse<>(400,"Bad Request",null,"没有匹配项");

+ 15 - 41
src/main/java/com/jwkj/qsydw/vo/Params.java

@@ -1,5 +1,10 @@
 package com.jwkj.qsydw.vo;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import java.util.List;
 
 /**
@@ -13,65 +18,34 @@ import java.util.List;
  *   ],
  *   "pointPosition":"666"
  * }
- *
+ * <p>
  * 使用此接口类型可以传点位的代码(PointPosition.class中维护的),
  * 也可以传一个点位数组(需要升级控制层)
  *
  * @author Xu·LinPeng
  */
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Params {
     public String pointPosition;
     public List<String> pointPositions;
 
-    public Params() {
-
-    }
-
-    public Params(String pointPosition) {
-
-        this.pointPosition = pointPosition;
-    }
-
-    public Params(List<String> pointPositions) {
-
-        this.pointPositions = pointPositions;
-    }
-
-    public Params(String pointPosition, List<String> pointPositions) {
-
-        this.pointPosition = pointPosition;
-        this.pointPositions = pointPositions;
-    }
-
-    public String getPointPosition() {
-
-        return pointPosition;
-    }
-
-    public void setPointPosition(String pointPosition) {
-
-        this.pointPosition = pointPosition;
-    }
-
     public String getPointPositions() {
 
         if (pointPositions == null) {
             return null;
         }
-        String var = "[";
+        StringBuilder var = new StringBuilder("[");
         for (String p : pointPositions) {
-            var += "\"" + p + "\",";
+            var.append("\"").append(p).append("\",");
         }
-        var = var.substring(0, var.length() - 1);
-
-        var += "]";
-
-        return var;
-    }
+        var = new StringBuilder(var.substring(0, var.length() - 1));
 
-    public void setPointPositions(List<String> pointPositions) {
+        var.append("]");
 
-        this.pointPositions = pointPositions;
+        return var.toString();
     }
 
 }