From dd50418315218979f8d596f34f185ae4a28adc4a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 10 四月 2023 12:39:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/terra/coal/mapper/MainMapper.java | 6 +++---
src/main/java/com/terra/coal/entity/CountEntity.java | 30 ++++++++++++++++++++----------
src/main/java/com/terra/coal/controller/MainController.java | 6 ++++--
src/main/java/com/terra/coal/service/MainService.java | 4 ++--
src/main/resources/mapper/MainMapper.xml | 8 ++++----
5 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/terra/coal/controller/MainController.java b/src/main/java/com/terra/coal/controller/MainController.java
index 921c294..016be14 100644
--- a/src/main/java/com/terra/coal/controller/MainController.java
+++ b/src/main/java/com/terra/coal/controller/MainController.java
@@ -75,7 +75,9 @@
@ApiOperation(value = "鏍规嵁鑼冨洿缁熻")
@ApiImplicitParams({
- @ApiImplicitParam(name = "txtPath", value = "鍧椾綋鏁版嵁鏂囦欢璺緞", dataType = "String", paramType = "query", example = "D:\\鍧椾綋鏁版嵁.txt")
+ @ApiImplicitParam(name = "wkt", value = "WKT鏂囨湰", dataType = "String", paramType = "query", example = "POLYGON ((113.5807 45.4897,113.5898 45.4893,113.5857 45.4837,113.5807 45.4897))"),
+ @ApiImplicitParam(name = "z", value = "楂樺害", dataType = "double", paramType = "query", example = "640"),
+ @ApiImplicitParam(name = "deep", value = "娣卞害", dataType = "double", paramType = "query", example = "50")
})
@GetMapping(value = "/countByRange")
public ResponseMsg<Object> countByRange(String wkt, double z, double deep) {
@@ -90,7 +92,7 @@
return fail("寮�鎸栨繁搴﹁繃灏�", null);
}
- List<CountEntity> rs = mainService.countByRange(wkt, z, deep);
+ List<CountEntity> rs = mainService.countByRange("'" + wkt + "'", z, z + deep);
return success("鎴愬姛", rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/terra/coal/entity/CountEntity.java b/src/main/java/com/terra/coal/entity/CountEntity.java
index 20d17ee..ffb4bad 100644
--- a/src/main/java/com/terra/coal/entity/CountEntity.java
+++ b/src/main/java/com/terra/coal/entity/CountEntity.java
@@ -9,9 +9,11 @@
private Double volume;
- private Double v1;
+ private Double coalProd;
- private Double v2;
+ private Double gangueProd;
+
+ private Double soilProd;
public CountEntity() {
}
@@ -32,19 +34,27 @@
this.volume = volume;
}
- public Double getV1() {
- return v1;
+ public Double getCoalProd() {
+ return coalProd;
}
- public void setV1(Double v1) {
- this.v1 = v1;
+ public void setCoalProd(Double coalProd) {
+ this.coalProd = coalProd;
}
- public Double getV2() {
- return v2;
+ public Double getGangueProd() {
+ return gangueProd;
}
- public void setV2(Double v2) {
- this.v2 = v2;
+ public void setGangueProd(Double gangueProd) {
+ this.gangueProd = gangueProd;
+ }
+
+ public Double getSoilProd() {
+ return soilProd;
+ }
+
+ public void setSoilProd(Double soilProd) {
+ this.soilProd = soilProd;
}
}
diff --git a/src/main/java/com/terra/coal/mapper/MainMapper.java b/src/main/java/com/terra/coal/mapper/MainMapper.java
index 80505a4..cb6697f 100644
--- a/src/main/java/com/terra/coal/mapper/MainMapper.java
+++ b/src/main/java/com/terra/coal/mapper/MainMapper.java
@@ -17,9 +17,9 @@
* 鏍规嵁鑼冨洿缁熻
*
* @param wkt
- * @param z
- * @param deep
+ * @param top
+ * @param bottom
* @return
*/
- public List<CountEntity> countByRange(String wkt, double z, double deep);
+ public List<CountEntity> countByRange(String wkt, double top, double bottom);
}
diff --git a/src/main/java/com/terra/coal/service/MainService.java b/src/main/java/com/terra/coal/service/MainService.java
index a644979..fc73132 100644
--- a/src/main/java/com/terra/coal/service/MainService.java
+++ b/src/main/java/com/terra/coal/service/MainService.java
@@ -30,8 +30,8 @@
Coal54Mapper coal54Mapper;
@Override
- public List<CountEntity> countByRange(String wkt, double z, double deep) {
- return mainMapper.countByRange(wkt, z, deep);
+ public List<CountEntity> countByRange(String wkt, double top, double bottom) {
+ return mainMapper.countByRange(wkt, top, bottom);
}
/**
diff --git a/src/main/resources/mapper/MainMapper.xml b/src/main/resources/mapper/MainMapper.xml
index 822d4ca..d57b870 100644
--- a/src/main/resources/mapper/MainMapper.xml
+++ b/src/main/resources/mapper/MainMapper.xml
@@ -2,10 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.terra.coal.mapper.MainMapper">
<select id="selectDictTab" resultType="com.terra.coal.entity.CountEntity">
- select ctype, sum(volume) "volume", sum(volume * density) "v1", sum(volume * density * gangue) "v2"
- from public.coal54
- where 1 = 1
+ select ctype, sum(volume) "volume", sum(coal_prod) "coal_prod", sum(gangue_prod) "gangue_prod", 0 "soil_prod"
+ from public.coal2000
+ where (top between #{top} and #{bottom} or bottom between #{top} and #{bottom}) and ST_Intersects(geom, ST_PolygonFromText(#{wkt}, 4490))
group by ctype
- order by ctype
+ order by ctype;
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3