From 4de201c9f8a83baec45c7ea7351f8637f85cc4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?= =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com> Date: Thu, 12 Dec 2024 14:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E6=8A=95=E8=AF=89=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/datav/DataGobalController.java | 1 - .../datav/DataMailViewController.java | 2 +- .../controller/datav/SubOneController.java | 20 ++++---- .../mapper/CountyStreetDeptMapper.java | 4 ++ .../service/CountyStreetDeptService.java | 6 +++ src/main/resources/application.yml | 2 + .../datav/SubOneControllerTest.java | 46 +++++++++++++++++++ 7 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 src/test/java/com/biutag/supervision/controller/datav/SubOneControllerTest.java diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java index f02940c..06f2987 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java @@ -38,7 +38,6 @@ public class DataGobalController { private final DataGobalService dataGobalService; - //region 左边 // 机构问题排名 @Operation(summary = "机构问题排名") diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java b/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java index 8820d2a..fc97a9e 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataMailViewController.java @@ -1,6 +1,5 @@ package com.biutag.supervision.controller.datav; - import com.alibaba.fastjson.JSONObject; import com.biutag.supervision.constants.enums.DepartGroupEnum; import com.biutag.supervision.constants.enums.RepeatEnum; @@ -70,6 +69,7 @@ public class DataMailViewController { } // endregion + // region 中间 // 信访数据中央总览统计 @Operation(summary = "信访数据大屏中央数据统计") diff --git a/src/main/java/com/biutag/supervision/controller/datav/SubOneController.java b/src/main/java/com/biutag/supervision/controller/datav/SubOneController.java index 3d46e8c..785ef9f 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/SubOneController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/SubOneController.java @@ -27,28 +27,28 @@ import java.util.*; public class SubOneController { private final CountyStreetDeptService countyStreetDeptService; - @GetMapping("/test") - public Result test(@RequestParam Integer departId) { - List depts = countyStreetDeptService.getTest(4062); + + @GetMapping("/getSubOneStreetMap") + public Result getSubOneStreetMap(@RequestParam Integer departPId) { + List depts = countyStreetDeptService.getSubOneStreetMap(departPId); Map geoJson = new HashMap<>(); geoJson.put("type", "FeatureCollection"); + geoJson.put("name", "4062"); + List> features = new ArrayList<>(); for (CountyStreetDept dept : depts) { Map feature = new HashMap<>(); - feature.put("type", "Feature"); + feature.put("type", "Feature"); // 第一个键值 Map properties = new HashMap<>(); properties.put("name", dept.getName()); - feature.put("properties", properties); + properties.put("id", dept.getId()); + feature.put("properties", properties); // 第二个键值 - Map geometry = new HashMap<>(); - geometry.put("type", "MultiPolygon"); - geometry.put("coordinates", new Gson().fromJson(dept.getGeometry(), Object.class)); - feature.put("geometry", geometry); + feature.put("geometry", new Gson().fromJson(dept.getGeometry(), Object.class)); // 第三个键值 features.add(feature); } geoJson.put("features", features); - JSONObject jsonObject = new JSONObject(); jsonObject.put("geoJson", geoJson); return Result.success(jsonObject); diff --git a/src/main/java/com/biutag/supervision/mapper/CountyStreetDeptMapper.java b/src/main/java/com/biutag/supervision/mapper/CountyStreetDeptMapper.java index 9269582..f6b617d 100644 --- a/src/main/java/com/biutag/supervision/mapper/CountyStreetDeptMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/CountyStreetDeptMapper.java @@ -23,6 +23,10 @@ public interface CountyStreetDeptMapper extends BaseMapper { "FROM county_street_dept where id = 3319;") List props(Integer id); + + @Select("select * from county_street_dept where dept_pid = #{departPId}") + List getSubOneStreetMap(Integer departPId); + } diff --git a/src/main/java/com/biutag/supervision/service/CountyStreetDeptService.java b/src/main/java/com/biutag/supervision/service/CountyStreetDeptService.java index f960f25..d1244dc 100644 --- a/src/main/java/com/biutag/supervision/service/CountyStreetDeptService.java +++ b/src/main/java/com/biutag/supervision/service/CountyStreetDeptService.java @@ -23,6 +23,12 @@ public class CountyStreetDeptService { List res = countyStreetDeptMapper.props(id); return res; } + + public List getSubOneStreetMap(Integer departPId) { + List res = countyStreetDeptMapper.getSubOneStreetMap(departPId); + return res; + + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 64d18db..f888d95 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,6 +3,8 @@ server: spring: profiles: active: @profiles.active@ +# active: dev + datasource: dynamic: primary: master diff --git a/src/test/java/com/biutag/supervision/controller/datav/SubOneControllerTest.java b/src/test/java/com/biutag/supervision/controller/datav/SubOneControllerTest.java new file mode 100644 index 0000000..37d8f44 --- /dev/null +++ b/src/test/java/com/biutag/supervision/controller/datav/SubOneControllerTest.java @@ -0,0 +1,46 @@ +package com.biutag.supervision.controller.datav; + +import com.alibaba.fastjson.JSONObject; +import com.biutag.supervision.pojo.entity.CountyStreetDept; +import com.biutag.supervision.service.CountyStreetDeptService; +import com.google.gson.Gson; +import jakarta.annotation.Resource; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@SpringBootTest +public class SubOneControllerTest { + + @Resource + private CountyStreetDeptService countyStreetDeptService; + @Test + public void testSubstr() { + List depts = countyStreetDeptService.getTest(4062); + Map geoJson = new HashMap<>(); + geoJson.put("type", "FeatureCollection"); + geoJson.put("name", "4062"); + + List> features = new ArrayList<>(); + for (CountyStreetDept dept : depts) { + Map feature = new HashMap<>(); + feature.put("type", "Feature"); // 第一个键值 + + Map properties = new HashMap<>(); + properties.put("name", dept.getName()); + properties.put("id", dept.getId()); + feature.put("properties", properties); // 第二个键值 + + feature.put("geometry", new Gson().fromJson(dept.getGeometry(), Object.class)); // 第三个键值 + features.add(feature); + } + geoJson.put("features", features); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("geoJson", geoJson); + } + +}