添加图片服务

onemap-api/onemap-api-system/pom.xml

@@ -22,7 +22,12 @@
             <groupId>com.onemap</groupId>
             <artifactId>onemap-common-core</artifactId>
         </dependency>
-        
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/SpatialService.java

@@ -0,0 +1,18 @@
+package com.onemap.system.api;
+
+import com.onemap.common.core.constant.ServiceNameConstants;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.domain.WktsVo;
+import com.onemap.system.api.factory.SpatialFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 分析服务
+ */
+@FeignClient(contextId = "spatialService", value = ServiceNameConstants.SPATIAL_SERVICE, fallbackFactory = SpatialFallbackFactory.class)
+public interface SpatialService {
+    @PostMapping("/spatial/image/sensing")
+    RequestResult getImage(@RequestBody WktsVo wktsVo);
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/WktsVo.java

@@ -0,0 +1,26 @@
+package com.onemap.system.api.domain;
+
+
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class WktsVo {
+    @NotNull
+    List<WktInfo> wktInfos = new ArrayList<>();
+
+
+    @Data
+    public static class WktInfo {
+        private String wkt;
+        private String borderColor = "#ff0000";
+        private float borderOpacity = 1;
+
+        private String fillColor = "#0000ff";
+        private float fillOpacity = 0.5F;
+    }
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/factory/SpatialFallbackFactory.java

@@ -0,0 +1,24 @@
+package com.onemap.system.api.factory;
+
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.SpatialService;
+import com.onemap.system.api.domain.WktsVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpatialFallbackFactory implements FallbackFactory<SpatialService> {
+    private static final Logger log = LoggerFactory.getLogger(SpatialFallbackFactory.class);
+
+    @Override
+    public SpatialService create(Throwable cause) {
+        return new SpatialService() {
+            @Override
+            public RequestResult getImage(WktsVo wktsVo) {
+                return RequestResult.error("内部错误");
+            }
+        };
+    }
+}

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/constant/ServiceNameConstants.java

@@ -26,4 +26,9 @@ public class ServiceNameConstants
      * 分析服务的serviceid
      */
     public static final String ANALYSE_SERVICE = "onemap-analyse";
+
+    /**
+     * 空间服务的serviceid
+     */
+    public static final String SPATIAL_SERVICE = "spatial-analyse";
 }

onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/service/IImageService.java

@@ -3,8 +3,6 @@ package com.onemap.spatial.service;
 
 import com.onemap.spatial.domain.WktsVo;
 
-import java.util.List;
-
 public interface IImageService {
     String getSensingImage(WktsVo wktsVo) throws Exception;
 }

sql/pgsql/0_init.sql

@@ -11,6 +11,8 @@ WHERE id='3cfe4498-b451-4833-bb9e-7ff55b10472c';
 
 -- 新增表
 vector."TB_GDZL"
+vector."TB_HDGLX"
+vector."TB_GYL"
 
 -- 修改表结构和数据，需要同步到现场
 vector."AFTER_JCSH"
@@ -19,4 +21,7 @@ vector."AFTER_JCSH"
 --  D:/onemapfile/15影像.tif
 
 --修改表数据，需要同步到现场
-vector."AFTER_BJXM_SZ"
+vector."AFTER_BJXM_SZ"
+
+-- 只同步数据
+base."t_fzss_fzxz_factor"