18339543638 il y a 4 ans
Parent
commit
4b9e548688

+ 1 - 10
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/GeoJson.java

@@ -1,19 +1,10 @@
 package org.jetlinks.community.device.entity;
 
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.support.geo.Geometry;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.elasticsearch.common.geo.GeoShapeType;
-import org.h2.util.geometry.GeoJsonUtils;
 import org.jetlinks.core.metadata.types.GeoShape;
-import org.jetlinks.core.metadata.types.GeoType;
-
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.*;
 

+ 6 - 2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/GeoRegionEntity.java

@@ -10,6 +10,7 @@ import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.api.crud.entity.GenericTreeSortSupportEntity;
 import javax.persistence.Column;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import javax.validation.constraints.NotBlank;
 import java.sql.JDBCType;
 import java.util.*;
@@ -18,8 +19,8 @@ import java.util.*;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public  class GeoRegionEntity extends  GenericTreeSortSupportEntity<String> {
-    @Column(unique = true)
-    @Schema(description = "属性名称")
+
+    @Column
     private String name;
 
     @Column
@@ -31,6 +32,9 @@ public  class GeoRegionEntity extends  GenericTreeSortSupportEntity<String> {
     @NotBlank(message = "请绘制坐标区域")
     private GeoJson.Feature region;
 
+//    @Transient
+    private String title;
+
     //子菜单
     private List<GeoRegionEntity> children;