线元数据问题修复

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/DatumPoint.java

@@ -15,9 +15,9 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class DatumPoint  extends TenantEntity {
     private String name;
-    private Double x=0.0;
-    private Double y=0.0;
-    private Double h=0.0;
+    private Double x;
+    private Double y;
+    private Double h;
     private String level;
     private String remark;
     private Integer type;

blade-service/blade-business/src/main/java/org/springblade/business/controller/DatumPointController.java

@@ -45,13 +45,19 @@ public class DatumPointController {
     private final DatumPointService service;
 
 
-    @PostMapping("/list")
+    @GetMapping("/list")
     public R<IPage<DatumPoint>>  list( String contractId, Query page, String type, String name){
         Map<String, Object> param = new HashMap<>(10);
-        param.put("contractId",contractId);
-        param.put("type",type);
-        param.put("name",name);
-        param.put("remark",name);
+        if(StringUtil.isNotBlank(contractId)){
+            param.put("contractId",contractId);
+        }
+        if(StringUtil.isNotBlank(type)){
+            param.put("type",type);
+        }
+        if(StringUtil.isNotBlank(contractId)){
+            param.put("name",name);
+            param.put("remark",name);
+        }
         return R.data(service.page(Condition.getPage(page),Condition.getQueryWrapper(param,DatumPoint.class)));
     }
 
@@ -70,8 +76,11 @@ public class DatumPointController {
 
 
     @PostMapping("/del")
-    public R del(String id){
-          return R.status(this.service.removeById(id));
+    public R del(String ids){
+          if(StringUtil.isNotBlank(ids)){
+              return R.status(this.service.removeByIds(Func.toLongList(ids)));
+          }
+          return R.status(false);
     }
 
 

blade-service/blade-business/src/main/java/org/springblade/business/utils/FunctionMain.java

@@ -174,7 +174,18 @@ public class FunctionMain {
     public static void main(String[] args)  {
 //        createTable(Formula.class,"公式配置");
 //        System.out.println(builder(Formula.class));
-          getToken();
+//          getToken();
+         DatumPoint dap = new DatumPoint();
+         dap.setH(1.0);
+         dap.setY(2.0);
+         dap.setX(3.0);
+         dap.setType(1);
+         dap.setName("测试");
+         dap.setLevel("一级");
+         dap.setContractId(1L);
+         dap.setProjectId(2L);
+         dap.setRemark("导线点");
+        System.out.println(JSON.toJSONString(dap));
     }