Merge remote-tracking branch 'origin/dev_tzl' into dev_lijing

# Conflicts:
#	app/src/main/java/com/yiring/app/service/message/impl/PositionMessageServiceImpl.java

app/src/main/java/com/yiring/app/domain/workArea/WorkArea.java

@@ -11,6 +11,8 @@ import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Comment;
+import org.hibernate.annotations.Type;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * @author tzl
@@ -52,4 +54,9 @@ public class WorkArea extends BasicEntity implements Serializable {
     @Comment("监控设备")
     @OneToOne
     Video video;
+
+    @Comment("位置信息")
+    @Type(type = "jts_geometry")
+    @Column(columnDefinition = "geometry(Geometry,4326)")
+    private Geometry geometry;
 }

app/src/main/java/com/yiring/app/param/workArea/WorkAreaParam.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * @author tzl
@@ -49,4 +50,7 @@ public class WorkAreaParam implements Serializable {
 
     @ApiModelProperty(value = "摄像头id", example = "1", required = true)
     Long videoId;
+
+    @ApiModelProperty(value = "位置信息", example = "1")
+    private Geometry geometry;
 }

app/src/main/java/com/yiring/app/web/workArea/WorkAreaController.java

@@ -16,10 +16,7 @@ import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author tzl
@@ -40,7 +37,7 @@ public class WorkAreaController {
 
     @ApiOperation(value = "新增工区信息")
     @PostMapping("saveWorkArea")
-    public Result<String> saveWorkArea(@Valid WorkAreaParam workAreaParam) {
+    public Result<String> saveWorkArea(@Valid @RequestBody WorkAreaParam workAreaParam) {
         return workAreaService.saveWorkArea(workAreaParam);
     }