Merge branch 'master' of http://114.244.114.158:8802/siwei/sanya-data-management-back

onemap-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-gateway/src/main/resources/bootstrap.yml

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -39,7 +39,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 192.168.100.30:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/DsmController.java

@@ -0,0 +1,26 @@
+package com.onemap.analyse.controller.analyse;
+
+import com.onemap.analyse.service.IDsmService;
+import com.onemap.analyse.service.ISlopService;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.datasource.annotation.Slave;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/dsm")
+public class DsmController {
+    @Resource
+    private IDsmService iDsmService;
+
+    @GetMapping("")
+    @Slave
+    public RequestResult getDsm(@RequestParam(value = "geom") String geom,
+                                @RequestParam(value = "type") String type) {
+        return RequestResult.success(iDsmService.getDsm(geom,type));
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/SlopController.java

@@ -0,0 +1,25 @@
+package com.onemap.analyse.controller.analyse;
+
+import com.onemap.analyse.service.ISlopService;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.datasource.annotation.Slave;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@RequestMapping("/slop")
+public class SlopController {
+    @Resource
+    private ISlopService iSlopService;
+
+    @GetMapping("/average")
+    @Slave
+    public RequestResult getAveSlop(@RequestParam(value = "geom") String geom) {
+        return RequestResult.success(iSlopService.getAveSlop(geom));
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/raster/DsmMapper.java

@@ -0,0 +1,9 @@
+package com.onemap.analyse.mapper.raster;
+
+public interface DsmMapper {
+    Double getMinDsm(String geomWkt);
+
+    Double getMaxDsm(String geomWkt);
+
+    Double getAveDsm(String geomWkt);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/raster/SlopMapper.java

@@ -0,0 +1,6 @@
+package com.onemap.analyse.mapper.raster;
+
+public interface SlopMapper {
+
+    Double getAveSlop(String geomWkt);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IDsmService.java

@@ -0,0 +1,8 @@
+package com.onemap.analyse.service;
+
+/**
+ * 高程分析
+ */
+public interface IDsmService {
+    Double getDsm(String geomWkt, String type);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/ISlopService.java

@@ -0,0 +1,8 @@
+package com.onemap.analyse.service;
+
+/**
+ * 坡度分析
+ */
+public interface ISlopService {
+    double getAveSlop(String geomWkt);
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/DsmServiceImpl.java

@@ -0,0 +1,31 @@
+package com.onemap.analyse.service.impl;
+
+import com.onemap.analyse.mapper.raster.DsmMapper;
+import com.onemap.analyse.service.IDsmService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 高程分析服务
+ */
+@Service
+public class DsmServiceImpl implements IDsmService {
+    @Resource
+    private DsmMapper dsmMapper;
+
+    @Override
+    public Double getDsm(@Valid @NotNull String geomWkt, @Valid @NotNull String type) {
+        Double dsm = (double) 0;
+        if (type.equals("min")) {
+            dsm = dsmMapper.getMinDsm(geomWkt);
+        } else if (type.equals("max")) {
+            dsm = dsmMapper.getMaxDsm(geomWkt);
+        } else if (type.equals("ave")) {
+            dsm = dsmMapper.getAveDsm(geomWkt);
+        }
+        return dsm;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/SlopServiceImpl.java

@@ -0,0 +1,28 @@
+package com.onemap.analyse.service.impl;
+
+import com.onemap.analyse.mapper.raster.SlopMapper;
+import com.onemap.analyse.service.ISlopService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 坡度分析服务
+ */
+@Service
+public class SlopServiceImpl implements ISlopService {
+    @Resource
+    private SlopMapper slopMapper;
+
+    /**
+     * 根据给定区域获取平均坡度
+     *
+     * @param geomWkt
+     * @return
+     */
+    @Override
+    public double getAveSlop(String geomWkt) {
+        Double d = slopMapper.getAveSlop(geomWkt);
+        return d;
+    }
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FzxzPlanSchedule.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Component
 public class FzxzPlanSchedule {
-    private static String dbUrl = "192.168.100.30:5432";
+    private static String dbUrl = "127.0.0.1:5432";
     private static String dbName = "real";
     private static String dbUser = "postgres";
     private static String dbPwd = "postgis";

onemap-modules/onemap-analyse/src/main/resources/bootstrap.yml

@@ -20,16 +20,13 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    inetutils:
-      preferred-networks:
-        - 192.168.100
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/raster/DsmMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.onemap.analyse.mapper.raster.DsmMapper">
+    <select id="getAveDsm" resultType="Double">
+        WITH poly AS (SELECT public.st_geomfromtext(#{geomWkt}, 4326) AS geom)
+        SELECT AVG((gv).val) AS avg_dsm
+        FROM (SELECT public.st_clip(rast, 1, geom, false) AS clipped_rast
+              FROM raster.sy_dsm,
+                   poly
+              WHERE public.st_intersects(rast, geom)) AS clipped,
+             LATERAL public.st_pixelaspoints(clipped_rast) AS gv
+        WHERE (gv).val IS NOT NULL;
+    </select>
+    <select id="getMaxDsm" resultType="Double">
+        WITH poly AS (SELECT public.st_geomfromtext(#{geomWkt}, 4326) AS geom)
+        SELECT MAX((gv).val) AS max_dsm
+        FROM (SELECT public.st_clip(rast, 1, geom, false) AS clipped_rast
+              FROM raster.sy_dsm,
+                   poly
+              WHERE public.st_intersects(rast, geom)) AS clipped,
+             LATERAL public.st_pixelaspoints(clipped_rast) AS gv
+        WHERE (gv).val IS NOT NULL;
+    </select>
+    <select id="getMinDsm" resultType="Double">
+        WITH poly AS (SELECT public.st_geomfromtext(#{geomWkt}, 4326) AS geom)
+        SELECT MIN((gv).val) AS min_dsm
+        FROM (SELECT public.st_clip(rast, 1, geom, false) AS clipped_rast
+              FROM raster.sy_dsm,
+                   poly
+              WHERE public.st_intersects(rast, geom)) AS clipped,
+             LATERAL public.st_pixelaspoints(clipped_rast) AS gv
+        WHERE (gv).val IS NOT NULL;
+    </select>
+</mapper>

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/raster/SlopMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.onemap.analyse.mapper.raster.SlopMapper">
+    <select id="getAveSlop" resultType="Double">
+        WITH poly AS (SELECT public.st_geomfromtext(#{geomWkt}, 4326) AS geom)
+        SELECT AVG((gv).val) AS avg_slope
+        FROM (SELECT public.st_clip(rast, 1, geom, false) AS clipped_rast
+              FROM raster.sy_slop,
+                   poly
+              WHERE public.st_intersects(rast, geom)) AS clipped,
+             LATERAL public.st_pixelaspoints(clipped_rast) AS gv
+        WHERE (gv).val IS NOT NULL;
+    </select>
+</mapper>

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/HgxfxServiceImpl.java

@@ -6,6 +6,7 @@ import com.onemap.apply.mapper.fzss.*;
 import com.onemap.apply.service.fzss.IHgxfxService;
 import com.onemap.apply.service.impl.fzss.hgxfxjg.HgxfxHandleService;
 import com.onemap.apply.service.impl.fzss.hgxfxjg.HgxfxJgService;
+import com.onemap.apply.utils.FixedThreadUtil;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.system.api.AnalyseService;
@@ -96,7 +97,7 @@ public class HgxfxServiceImpl implements IHgxfxService {
         if (StringUtils.isEmpty(xzfw)) {
             return RequestResult.error("选址范围参数为空");
         }
-        Double area = Double.valueOf( xzfw.get("area").toString());
+        Double area = Double.valueOf(xzfw.get("area").toString());
         String ewkt = (String) xzfw.get("geom");
         if (StringUtils.isEmpty(ewkt)) {
             return RequestResult.error("选址范围参数为空");
@@ -118,8 +119,9 @@ public class HgxfxServiceImpl implements IHgxfxService {
             scxRw.setBsm(StringUtils.getUUID());
             hgxfxScxRwMapper.insert(scxRw);
         }
-
-        hxfxHandleService.hgxfxHandle(hgxfxDTO.getBsm(), ewkt);
+        FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
+            hxfxHandleService.hgxfxHandle(hgxfxDTO.getBsm(), ewkt);
+        });
         return RequestResult.success(hgxfxDTO.getBsm());
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/hgxfxjg/HgxfxHandleService.java

@@ -31,8 +31,10 @@ public class HgxfxHandleService {
     @Autowired
     private FxrwrzMapper fxrwrzMapper;
 
-    @Async
     public void hgxfxHandle(String bsm, String ewkt) {
+        System.out.println("进入hgxfxHandle.....................");
+        System.out.println("进入hgxfxHandle.....................");
+        System.out.println("进入hgxfxHandle.....................");
         QueryWrapper<HgxfxDTO> hgxfxWrapper = new QueryWrapper<HgxfxDTO>();
         hgxfxWrapper.eq("bsm", bsm);
         HgxfxDTO hgxfxDTO = hgxfxMapper.selectOne(hgxfxWrapper);

onemap-modules/onemap-apply/src/main/resources/bootstrap.yml

@@ -30,11 +30,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-file - 副本/src/main/resources/bootstrap.yml

@@ -34,11 +34,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-file/src/main/resources/bootstrap.yml

@@ -34,11 +34,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置