From 4bb5abbfd9484d91fc309c23b107f4cf6e4abdc5 Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Wed, 11 Jun 2025 10:59:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(kangzai):=20=E9=87=8D=E6=9E=84=E5=B0=BE?=
=?UTF-8?q?=E7=9F=BF=E5=BA=93=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 重构了尾矿库基本信息实体类、DAO、服务层和控制器的代码结构- 添加了新的字段和方法，以支持更详细的尾矿库信息管理
- 新增了批量查询功能和坐标转换工具类
- 优化了代码格式和命名规范
---
pom.xml | 6 -
.../com/zcloud/common/utils/BaiduMapUtil.java | 91 ++++++++++++-
.../BusEmergencyStorageController.java | 5 +
.../BusGeologicalDisasterController.java | 5 +
.../BusMountainFloodVillageController.java | 4 +
.../BusReservoirBasicController.java | 5 +
.../controller/BusRiverController.java | 4 +
.../controller/BusRiverPointController.java | 4 +
.../BusRiverRiskVillagesController.java | 4 +
.../BusRiverSectionsController.java | 4 +
.../BusRiverStructuresController.java | 5 +
.../BusRiverStructuresPointController.java | 4 +
.../BusTailingsReservoirController.java | 37 +++---
.../BusUrbanFloodPointController.java | 4 +
.../kangzai/dao/BusTailingsReservoirDao.java | 10 +-
.../entity/BusEmergencyStorageEntity.java | 6 +
.../entity/BusTailingsReservoirEntity.java | 120 +++++++++++-------
.../service/BusTailingsReservoirService.java | 9 +-
.../impl/BusTailingsReservoirServiceImpl.java | 71 +++++------
.../kangzai/BusTailingsReservoirDao.xml | 104 +++++++++------
20 files changed, 342 insertions(+), 160 deletions(-)
diff --git a/pom.xml b/pom.xml
index 031e8d9..f7554ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,12 +224,6 @@
${lombok.version}
-
- org.springframework
- spring-test
- 5.2.9.RELEASE
-
-
com.aliyun.oss
diff --git a/src/main/java/com/zcloud/common/utils/BaiduMapUtil.java b/src/main/java/com/zcloud/common/utils/BaiduMapUtil.java
index 65b8a0b..06715cf 100644
--- a/src/main/java/com/zcloud/common/utils/BaiduMapUtil.java
+++ b/src/main/java/com/zcloud/common/utils/BaiduMapUtil.java
@@ -2,6 +2,11 @@ package com.zcloud.common.utils;
import com.alibaba.fastjson.JSONObject;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
/**
* 百度地图工具类
*/
@@ -11,22 +16,23 @@ public class BaiduMapUtil {
/**
* 根据经纬度获取详细地址
- * @param lng 经度
- * @param lat 纬度
+ *
+ * @param lng 经度
+ * @param lat 纬度
* @param coordtype 坐标系类型（wgs84ll/gcj02等）
* @return 格式化地址
*/
public static String getAddressByLocation(double lng, double lat, String coordtype) throws Exception {
String url = String.format(
- "http://api.map.baidu.com/reverse_geocoding/v3/?ak=%s&output=json&coordtype=%s&location=%s,%s",
- BAIDU_AK, coordtype, lat, lng); // 注意百度坐标系是纬度在前
+ "http://api.map.baidu.com/reverse_geocoding/v3/?ak=%s&output=json&coordtype=%s&location=%s,%s",
+ BAIDU_AK, coordtype, lat, lng); // 注意百度坐标系是纬度在前
String response = HttpRequestUtil.doGet(url);
JSONObject result = JSONObject.parseObject(response);
if (result.getInteger("status") == 0) {
return result.getJSONObject("result")
- .getString("formatted_address");
+ .getString("formatted_address");
}
throw new RuntimeException("地址解析失败：" + result.getString("message"));
}
@@ -35,4 +41,79 @@ public class BaiduMapUtil {
public static String getAddressByLocation(double lng, double lat) throws Exception {
return getAddressByLocation(lng, lat, "wgs84ll");
}
+
+ /**
+ * 将WGS84坐标转换为BD09坐标
+ *
+ * @param lng 经度（WGS84）
+ * @param lat 纬度（WGS84）
+ * @return 转换后的BD09坐标数组 [经度, 纬度]
+ */
+ public static double[] convertWGS84ToBD09(double lng, double lat) throws Exception {
+ String url = String.format("%s?coords=%f,%f&from=1&to=5&ak=%s", "http://api.map.baidu.com/geoconv/v1/", lng, lat, BAIDU_AK);
+ String response = HttpRequestUtil.doGet(url);
+
+ if (response == null) {
+ throw new RuntimeException("调用百度坐标转换API失败");
+ }
+
+ JSONObject result = JSONObject.parseObject(response);
+ int status = result.getIntValue("status");
+
+ if (status != 0) {
+ throw new RuntimeException("坐标转换失败：" + result.getString("message"));
+ }
+
+ List> list = result.getObject("result", List.class);
+ Map point = list.get(0);
+
+ return new double[]{
+ ((Double) point.get("x")),
+ ((Double) point.get("y"))
+ };
+ }
+
+ /**
+ * 批量转换WGS84坐标为BD09坐标
+ *
+ * @param coordinates 多个坐标对，格式：List
+ * @return 转换后的坐标列表，顺序与输入一致
+ */
+ public static List batchConvertWGS84ToBD09(List coordinates) throws Exception {
+ if (coordinates == null || coordinates.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ StringBuilder coordsBuilder = new StringBuilder();
+ for (double[] coord : coordinates) {
+ coordsBuilder.append(coord[0]).append(",").append(coord[1]).append(";");
+ }
+ String coords = coordsBuilder.substring(0, coordsBuilder.length() - 1); // 去掉最后一个分号
+
+ String url = String.format("%s?coords=%s&from=1&to=5&ak=%s", "http://api.map.baidu.com/geoconv/v1/", coords, BAIDU_AK);
+ String response = HttpRequestUtil.doGet(url);
+
+ if (response == null) {
+ throw new RuntimeException("调用百度坐标转换API失败");
+ }
+
+ JSONObject result = JSONObject.parseObject(response);
+ int status = result.getIntValue("status");
+
+ if (status != 0) {
+ throw new RuntimeException("坐标转换失败：" + result.getString("message"));
+ }
+
+ List> points = result.getObject("result", List.class);
+ List converted = new ArrayList<>();
+
+ for (Map point : points) {
+ converted.add(new double[]{
+ ((Double) point.get("x")),
+ ((Double) point.get("y"))
+ });
+ }
+
+ return converted;
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusEmergencyStorageController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusEmergencyStorageController.java
index f027833..9be197d 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusEmergencyStorageController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusEmergencyStorageController.java
@@ -76,4 +76,9 @@ public class BusEmergencyStorageController extends AbstractController {
return R.ok().put("busEmergencyStorage", busEmergencyStorage);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busEmergencyStorageService.queryByFlexibleParams("is_delete", "0"));
+ }
+
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusGeologicalDisasterController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusGeologicalDisasterController.java
index af6124d..3cc97f9 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusGeologicalDisasterController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusGeologicalDisasterController.java
@@ -76,4 +76,9 @@ public class BusGeologicalDisasterController extends AbstractController {
return R.ok().put("busGeologicalDisaster", busGeologicalDisaster);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busGeologicalDisasterService.queryByFlexibleParams("is_delete", "0"));
+ }
+
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusMountainFloodVillageController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusMountainFloodVillageController.java
index 093d80f..2a0387f 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusMountainFloodVillageController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusMountainFloodVillageController.java
@@ -76,4 +76,8 @@ public class BusMountainFloodVillageController extends AbstractController {
return R.ok().put("busMountainFloodVillage", busMountainFloodVillage);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busMountainFloodVillageService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusReservoirBasicController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusReservoirBasicController.java
index d9ad7fe..9bfd4fa 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusReservoirBasicController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusReservoirBasicController.java
@@ -76,4 +76,9 @@ public class BusReservoirBasicController extends AbstractController {
return R.ok().put("busReservoirBasic", busReservoirBasic);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busReservoirBasicService.queryByFlexibleParams("is_delete", "0"));
+ }
+
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverController.java
index ae3d351..d92f27f 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverController.java
@@ -76,4 +76,8 @@ public class BusRiverController extends AbstractController {
return R.ok().put("busRiver", busRiver);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busRiverService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverPointController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverPointController.java
index f49ecca..4c9e4d8 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverPointController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverPointController.java
@@ -71,4 +71,8 @@ public class BusRiverPointController extends AbstractController {
return R.ok().put("busRiverPoint", busRiverPoint);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busRiverPointService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverRiskVillagesController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverRiskVillagesController.java
index 55af1ff..c47ebf0 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverRiskVillagesController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverRiskVillagesController.java
@@ -73,4 +73,8 @@ public class BusRiverRiskVillagesController extends AbstractController {
return R.ok().put("busRiverRiskVillages", busRiverRiskVillages);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busRiverRiskVillagesService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverSectionsController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverSectionsController.java
index 2bf7b43..fe98605 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverSectionsController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverSectionsController.java
@@ -73,4 +73,8 @@ public class BusRiverSectionsController extends AbstractController {
return R.ok().put("busRiverSections", busRiverSections);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busRiverSectionsService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresController.java
index 2420235..e7c143e 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresController.java
@@ -72,4 +72,9 @@ public class BusRiverStructuresController extends AbstractController {
return R.ok().put("busRiverStructures", busRiverStructures);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busRiverStructuresService.queryByFlexibleParams("is_delete", "0"));
+ }
+
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresPointController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresPointController.java
index c1870ec..4353d02 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresPointController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusRiverStructuresPointController.java
@@ -72,4 +72,8 @@ public class BusRiverStructuresPointController extends AbstractController {
return R.ok().put("busRiverStructuresPoint", busRiverStructuresPoint);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busRiverStructuresPointService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusTailingsReservoirController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusTailingsReservoirController.java
index 083a3db..97004c8 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusTailingsReservoirController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusTailingsReservoirController.java
@@ -11,15 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-
import java.util.Map;
/**
* @Author fangjiakai
- * @Desc 尾矿库基本信息表(BusTailingsReservoir)表控制层
- * @Date 2025-06-09 10:14:59
+ * @Desc (BusTailingsReservoir)表控制层
+ * @Date 2025-06-10 18:47:46
*/
-@Api(tags = "尾矿库基本信息表")
+@Api(tags = "")
@RestController
@RequestMapping("busTailingsReservoir")
public class BusTailingsReservoirController extends AbstractController {
@@ -27,19 +26,19 @@ public class BusTailingsReservoirController extends AbstractController {
@Autowired
private BusTailingsReservoirService busTailingsReservoirService;
- @ApiOperation("尾矿库基本信息表-新增数据")
- @SysLog("尾矿库基本信息表-新增数据")
+ @ApiOperation("-新增数据")
+ @SysLog("-新增数据")
@PostMapping("/save")
public R insert(@RequestBody BusTailingsReservoirEntity param) {
param.setCreator(getUserId());
- param.setOperator(getUserId());
+ param.setOperator(getUserId());
busTailingsReservoirService.save(param);
return R.ok();
}
- @ApiOperation("尾矿库基本信息表-编辑数据")
- @SysLog("尾矿库基本信息表-编辑数据")
+ @ApiOperation("-编辑数据")
+ @SysLog("-编辑数据")
@PostMapping("/update")
public R update(@RequestBody BusTailingsReservoirEntity param) {
param.setOperator(getUserId());
@@ -49,30 +48,34 @@ public class BusTailingsReservoirController extends AbstractController {
}
- @ApiOperation("尾矿库基本信息表-删除数据")
- @SysLog("尾矿库基本信息表-删除数据")
+ @ApiOperation("-删除数据")
+ @SysLog("-删除数据")
@PostMapping("/delete")
public R delete(@RequestBody BusTailingsReservoirEntity param) {
- busTailingsReservoirService.delete(param.getTailingsReservoirId(), getUserId());
+ busTailingsReservoirService.delete(param.getTailingsReservoirId(),getUserId());
return R.ok();
}
- @ApiOperation("尾矿库基本信息表-分页查询")
- @SysLog("尾矿库基本信息表-分页查询")
+ @ApiOperation("-分页查询")
+ @SysLog("-分页查询")
@PostMapping("/listPage")
public R listPage(@RequestBody Map params) {
PageUtils page = busTailingsReservoirService.listPage(params);
- return R.ok().put("page", page);
+ return R.ok().put("page", page);
}
- @ApiOperation("尾矿库基本信息表-根据ID查详情")
- @SysLog("尾矿库基本信息表-根据ID查详情")
+ @ApiOperation("-根据ID查详情")
+ @SysLog("-根据ID查详情")
@PostMapping("/info")
public R info(@RequestBody BusTailingsReservoirEntity param) {
BusTailingsReservoirEntity busTailingsReservoir = busTailingsReservoirService.getById(param.getTailingsReservoirId());
return R.ok().put("busTailingsReservoir", busTailingsReservoir);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busTailingsReservoirService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/controller/BusUrbanFloodPointController.java b/src/main/java/com/zcloud/modules/kangzai/controller/BusUrbanFloodPointController.java
index 337d0bf..d4978c6 100644
--- a/src/main/java/com/zcloud/modules/kangzai/controller/BusUrbanFloodPointController.java
+++ b/src/main/java/com/zcloud/modules/kangzai/controller/BusUrbanFloodPointController.java
@@ -76,4 +76,8 @@ public class BusUrbanFloodPointController extends AbstractController {
return R.ok().put("busUrbanFloodPoint", busUrbanFloodPoint);
}
+ @PostMapping("/list")
+ public R list() {
+ return R.ok().put("list", busUrbanFloodPointService.queryByFlexibleParams("is_delete", "0"));
+ }
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/dao/BusTailingsReservoirDao.java b/src/main/java/com/zcloud/modules/kangzai/dao/BusTailingsReservoirDao.java
index 2e893e9..e308c8f 100644
--- a/src/main/java/com/zcloud/modules/kangzai/dao/BusTailingsReservoirDao.java
+++ b/src/main/java/com/zcloud/modules/kangzai/dao/BusTailingsReservoirDao.java
@@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-
-import java.util.Map;
-
+ import java.util.Map;
/**
* @Author fangjiakai
- * @Desc 尾矿库基本信息表(BusTailingsReservoir)表数据库访问层
- * @Date 2025-06-09 10:15:00
+ * @Desc (BusTailingsReservoir)表数据库访问层
+ * @Date 2025-06-10 18:47:48
*/
@Mapper
public interface BusTailingsReservoirDao extends BaseMapper {
@@ -20,5 +18,5 @@ public interface BusTailingsReservoirDao extends BaseMapper listPage(@Param("page") Page> page, @Param("params") Map params);
+ IPage listPage(@Param("page") Page> page,@Param("params") Map params);
}
diff --git a/src/main/java/com/zcloud/modules/kangzai/entity/BusEmergencyStorageEntity.java b/src/main/java/com/zcloud/modules/kangzai/entity/BusEmergencyStorageEntity.java
index ab294e2..c21e9b7 100644
--- a/src/main/java/com/zcloud/modules/kangzai/entity/BusEmergencyStorageEntity.java
+++ b/src/main/java/com/zcloud/modules/kangzai/entity/BusEmergencyStorageEntity.java
@@ -46,6 +46,12 @@ public class BusEmergencyStorageEntity implements Serializable {
//地区
@ApiModelProperty(value = "地区")
private String areaName;
+ //级别
+ @ApiModelProperty(value = "级别")
+ private String emergencyLevel;
+ //地址
+ @ApiModelProperty(value = "地址")
+ private String address;
//管理单位
@ApiModelProperty(value = "管理单位")
private String managementUnit;
diff --git a/src/main/java/com/zcloud/modules/kangzai/entity/BusTailingsReservoirEntity.java b/src/main/java/com/zcloud/modules/kangzai/entity/BusTailingsReservoirEntity.java
index 50a4274..26af611 100644
--- a/src/main/java/com/zcloud/modules/kangzai/entity/BusTailingsReservoirEntity.java
+++ b/src/main/java/com/zcloud/modules/kangzai/entity/BusTailingsReservoirEntity.java
@@ -11,62 +11,92 @@ import java.io.Serializable;
/**
* @Author fangjiakai
- * @Desc 尾矿库基本信息表(BusTailingsReservoir)实体
- * @Date 2025-06-09 10:14:59
+ * @Desc (BusTailingsReservoir)实体
+ * @Date 2025-06-10 18:47:45
*/
@Data
@TableName("bus_tailings_reservoir")
public class BusTailingsReservoirEntity implements Serializable {
- private static final long serialVersionUID = -81902974361413735L;
+ private static final long serialVersionUID = 956061069869617279L;
//尾矿库唯一ID
@ApiModelProperty(value = "尾矿库唯一ID")
@TableId
private String tailingsReservoirId;
- //归属单位
- @ApiModelProperty(value = "归属单位")
- private String ownerUnit;
+ //名称
+ @ApiModelProperty(value = "名称")
+ private String name;
//地址
@ApiModelProperty(value = "地址")
private String address;
- //尾矿库名称
- @ApiModelProperty(value = "尾矿库名称")
- private String reservoirName;
- //类型（字典）
- @ApiModelProperty(value = "类型（字典）")
- private String reservoirType;
- //是否备案（字典：是/否）
- @ApiModelProperty(value = "是否备案（字典：是/否）")
- private String isRecorded;
- //备案日期
- @ApiModelProperty(value = "备案日期")
- private String recordDate;
- //坝高(m)
- @ApiModelProperty(value = "坝高(m)")
- private Double damHeight;
- //库容(万m³)
- @ApiModelProperty(value = "库容(万m³)")
- private Double capacity;
- //等级（字典）
- @ApiModelProperty(value = "等级（字典）")
- private String reservoirGrade;
- //最小安全超高(m)
- @ApiModelProperty(value = "最小安全超高(m)")
- private Double minSafetyHeight;
- //最小滩长(m)
- @ApiModelProperty(value = "最小滩长(m)")
- private Double minBeachLength;
- //坝的级别（字典）
- @ApiModelProperty(value = "坝的级别（字典）")
- private String damGrade;
- //联系人
- @ApiModelProperty(value = "联系人")
- private String contactPerson;
- //联系电话
- @ApiModelProperty(value = "联系电话")
- private String contactPhone;
- //备注
- @ApiModelProperty(value = "备注")
- private String remarks;
+ //省（字典）
+ @ApiModelProperty(value = "省（字典）")
+ private String province;
+ //市（字典）
+ @ApiModelProperty(value = "市（字典）")
+ private String city;
+ //县（字典）
+ @ApiModelProperty(value = "县（字典）")
+ private String county;
+ //乡（字典）
+ @ApiModelProperty(value = "乡（字典）")
+ private String village;
+ //街（字典）
+ @ApiModelProperty(value = "街（字典）")
+ private String street;
+ //地区
+ @ApiModelProperty(value = "地区")
+ private String areaName;
+ //运行状态
+ @ApiModelProperty(value = "运行状态")
+ private String runningStatus;
+ //是否有生产经营主体
+ @ApiModelProperty(value = "是否有生产经营主体")
+ private String hasProductionEntity;
+ //是否为头顶库
+ @ApiModelProperty(value = "是否为头顶库")
+ private String isOverheadVault;
+ //矿种
+ @ApiModelProperty(value = "矿种")
+ private String mineralSpecies;
+ //设计等别
+ @ApiModelProperty(value = "设计等别")
+ private String designGrade;
+ //现状等别
+ @ApiModelProperty(value = "现状等别")
+ private String currentGrade;
+ //设计坝高
+ @ApiModelProperty(value = "设计坝高")
+ private Double designDamHeight;
+ //现状坝高
+ @ApiModelProperty(value = "现状坝高")
+ private Double currentDamHeight;
+ //设计库容
+ @ApiModelProperty(value = "设计库容")
+ private Double designStorageCapacity;
+ //现状库容
+ @ApiModelProperty(value = "现状库容")
+ private Double currentStorageCapacity;
+ //是否在长江、黄河及其主要支流、其他重要河流岸线3公里范围内
+ @ApiModelProperty(value = "是否在长江、黄河及其主要支流、其他重要河流岸线3公里范围内")
+ private String isCloseToImportantRivers;
+ //安全生产许可证或安全设施设计批复编号
+ @ApiModelProperty(value = "安全生产许可证或安全设施设计批复编号")
+ private String safetyProductionLicense;
+ //生效日期
+ @ApiModelProperty(value = "生效日期")
+ private String effectiveDate;
+ //失效日期
+ @ApiModelProperty(value = "失效日期")
+ private String expiryDate;
+ //企业或管理单位主要负责人姓名
+ @ApiModelProperty(value = "企业或管理单位主要负责人姓名")
+ private String corpPrincipalName;
+ //企业或管理单位主要负责人职务
+ @ApiModelProperty(value = "企业或管理单位主要负责人职务")
+ private String corpPrincipalPost;
+ //企业或管理单位主要负责人手机
+ @ApiModelProperty(value = "企业或管理单位主要负责人手机")
+ private String corpPrincipalPhone;
//经度
@ApiModelProperty(value = "经度")
private Double longitude;
diff --git a/src/main/java/com/zcloud/modules/kangzai/service/BusTailingsReservoirService.java b/src/main/java/com/zcloud/modules/kangzai/service/BusTailingsReservoirService.java
index 7df7cf3..c4bcf5d 100644
--- a/src/main/java/com/zcloud/modules/kangzai/service/BusTailingsReservoirService.java
+++ b/src/main/java/com/zcloud/modules/kangzai/service/BusTailingsReservoirService.java
@@ -10,15 +10,14 @@ import java.util.Map;
/**
* @Author fangjiakai
- * @Desc 尾矿库基本信息表(BusTailingsReservoir)表服务接口
- * @Date 2025-06-09 10:15:00
+ * @Desc (BusTailingsReservoir)表服务接口
+ * @Date 2025-06-10 18:47:47
*/
public interface BusTailingsReservoirService extends IService {
BusTailingsReservoirEntity queryByFlexibleParams(String paramName, Object paramValue);
- List queryListByFlexibleParams(String paramName, Object paramValue);
-
+ List queryListByFlexibleParams(String paramName, Object paramValue);
/**
* 分页查询
*/
@@ -27,6 +26,6 @@ public interface BusTailingsReservoirService extends IService implements BusTailingsReservoirService {
@Override
- public BusTailingsReservoirEntity queryByFlexibleParams(String paramName, Object paramValue) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq(paramName, paramValue); // 根据传入的参数名和参数值动态构建查询条件
+ public BusTailingsReservoirEntity queryByFlexibleParams(String paramName, Object paramValue) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(paramName, paramValue); // 根据传入的参数名和参数值动态构建查询条件
- return baseMapper.selectOne(queryWrapper);
- }
+ return baseMapper.selectOne(queryWrapper);
+ }
- @Override
- public List queryListByFlexibleParams(String paramName, Object paramValue) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq(paramName, paramValue); // 根据传入的参数名和参数值动态构建查询条件
+ @Override
+ public List queryListByFlexibleParams(String paramName, Object paramValue) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(paramName, paramValue); // 根据传入的参数名和参数值动态构建查询条件
- return baseMapper.selectList(queryWrapper);
- }
+ return baseMapper.selectList(queryWrapper);
+ }
@Override
public PageUtils listPage(Map params) {
- Page> page = new Page<>(Integer.parseInt(params.get("curPage").toString()), Integer.parseInt(params.get("limit").toString()));
- params.put("isDelete", 0);
- IPage ipage = baseMapper.listPage(page, params);
+ Page> page = new Page<>(Integer.parseInt(params.get("curPage").toString()),Integer.parseInt(params.get("limit").toString()));
+ params.put("isDelete",0);
+ IPage ipage = baseMapper.listPage(page,params);
return new PageUtils(ipage);
}
- @Override
- public void delete(String tailingsReservoirId, String userId) {
- UpdateWrapper updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("tailings_reservoir_id", tailingsReservoirId);
+ @Override
+ public void delete(String tailingsReservoirId,String userId){
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("tailings_reservoir_id",tailingsReservoirId);
- BusTailingsReservoirEntity busTailingsReservoir = new BusTailingsReservoirEntity();
- busTailingsReservoir.setOperator(userId);
- busTailingsReservoir.setIsDelete(1);
+ BusTailingsReservoirEntity busTailingsReservoir = new BusTailingsReservoirEntity();
+ busTailingsReservoir.setOperator(userId);
+ busTailingsReservoir.setIsDelete(1);
- this.update(busTailingsReservoir, updateWrapper);
- }
+ this.update(busTailingsReservoir, updateWrapper);
+ }
}
diff --git a/src/main/resources/mapper/kangzai/BusTailingsReservoirDao.xml b/src/main/resources/mapper/kangzai/BusTailingsReservoirDao.xml
index 4261b45..c6f105c 100644
--- a/src/main/resources/mapper/kangzai/BusTailingsReservoirDao.xml
+++ b/src/main/resources/mapper/kangzai/BusTailingsReservoirDao.xml
@@ -5,77 +5,101 @@