gis/xian_api_new
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改实体功能，更加细化逻辑

Browse Source
This commit is contained in:
wzy-warehouse
2026-04-16 11:13:21 +08:00
parent 55739edea1
commit 7f91b376d4
15 changed files with 770 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gis/xian/controller/XianHiddenDangerSpotsController.java
+4 -4
View File
@@ -1,8 +1,8 @@
package com.gis.xian.controller;
import com.gis.xian.domain.ApiResponse;
import com.gis.xian.entity.XianHiddenDangerSpotsBasePoint;
import com.gis.xian.entity.XianHiddenDangerSpotsPointDetail;
import com.gis.xian.vo.XianHiddenDangerSpotsBasePointVo;
import com.gis.xian.vo.XianHiddenDangerSpotsPointDetailVo;
import com.gis.xian.service.XianHiddenDangerSpotsService;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
@@ -17,12 +17,12 @@ public class XianHiddenDangerSpotsController extends BaseController{
private XianHiddenDangerSpotsService xianHiddenDangerSpotsService;
@GetMapping("/base-points")
public ApiResponse<List<XianHiddenDangerSpotsBasePoint>> getBasePoints(@RequestParam String disasterType) {
public ApiResponse<List<XianHiddenDangerSpotsBasePointVo>> getBasePoints(@RequestParam String disasterType) {
return ApiResponse.ok(xianHiddenDangerSpotsService.getBasePoints(disasterType));
}
@GetMapping("point-detail/{id}")
public ApiResponse<XianHiddenDangerSpotsPointDetail> getPointDetailById(@PathVariable String id) {
public ApiResponse<XianHiddenDangerSpotsPointDetailVo> getPointDetailById(@PathVariable String id) {
return ApiResponse.ok(xianHiddenDangerSpotsService.getPointDetailById(Long.parseLong(id)));
}
}
src/main/java/com/gis/xian/controller/XianRiskSpotsController.java
+4 -4
View File
@@ -1,8 +1,8 @@
package com.gis.xian.controller;
import com.gis.xian.domain.ApiResponse;
import com.gis.xian.entity.XianRiskSpotsBasePoint;
import com.gis.xian.entity.XianRiskSpotsPointDetail;
import com.gis.xian.vo.XianRiskSpotsBasePointVo;
import com.gis.xian.vo.XianRiskSpotsPointDetailVo;
import com.gis.xian.service.XianRiskSpotsService;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,12 +20,12 @@ public class XianRiskSpotsController {
private XianRiskSpotsService xianRiskSpotsService;
@GetMapping("/base-points")
public ApiResponse<List<XianRiskSpotsBasePoint>> getBasePoints() {
public ApiResponse<List<XianRiskSpotsBasePointVo>> getBasePoints() {
return ApiResponse.ok(xianRiskSpotsService.getBasePoints());
}
@GetMapping("point-detail/{id}")
public ApiResponse<XianRiskSpotsPointDetail> getPointDetailById(@PathVariable String id) {
public ApiResponse<XianRiskSpotsPointDetailVo> getPointDetailById(@PathVariable String id) {
return ApiResponse.ok(xianRiskSpotsService.getPointDetailById(Long.parseLong(id)));
}
}
src/main/java/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.java
+4 -4
View File
@@ -1,7 +1,7 @@
package com.gis.xian.mapper;
import com.gis.xian.entity.XianHiddenDangerSpotsBasePoint;
import com.gis.xian.entity.XianHiddenDangerSpotsPointDetail;
import com.gis.xian.vo.XianHiddenDangerSpotsBasePointVo;
import com.gis.xian.vo.XianHiddenDangerSpotsPointDetailVo;
import java.util.List;
@@ -16,14 +16,14 @@ public interface XianHiddenDangerSpotsMapper {
* 获取所有基础点：滑坡、泥石流、山洪、内涝
* @return 基础点列表
*/
List<XianHiddenDangerSpotsBasePoint> getBasePoints(String disasterType);
List<XianHiddenDangerSpotsBasePointVo> getBasePoints(String disasterType);
/**
* 根据id获取隐患点详情
* @param id 隐患点id
* @return 隐患点详情
*/
XianHiddenDangerSpotsPointDetail getPointDetailById(Long id);
XianHiddenDangerSpotsPointDetailVo getPointDetailById(Long id);
}
src/main/java/com/gis/xian/mapper/XianRiskSpotsMapper.java
+4 -5
View File
@@ -1,8 +1,7 @@
package com.gis.xian.mapper;
import com.gis.xian.entity.XianRiskSpots;
import com.gis.xian.entity.XianRiskSpotsBasePoint;
import com.gis.xian.entity.XianRiskSpotsPointDetail;
import com.gis.xian.vo.XianRiskSpotsBasePointVo;
import com.gis.xian.vo.XianRiskSpotsPointDetailVo;
import java.util.List;
@@ -17,7 +16,7 @@ public interface XianRiskSpotsMapper {
* 获取所有风险点基础信息
* @return 风险点基础列表
*/
List<XianRiskSpotsBasePoint> getBasePoints();
List<XianRiskSpotsBasePointVo> getBasePoints();
/**
@@ -25,7 +24,7 @@ public interface XianRiskSpotsMapper {
* @param id 风险点id
* @return 风险点详情
*/
XianRiskSpotsPointDetail getPointDetailById(Long id);
XianRiskSpotsPointDetailVo getPointDetailById(Long id);
}
src/main/java/com/gis/xian/service/XianHiddenDangerSpotsService.java
+4 -4
View File
@@ -1,7 +1,7 @@
package com.gis.xian.service;
import com.gis.xian.entity.XianHiddenDangerSpotsBasePoint;
import com.gis.xian.entity.XianHiddenDangerSpotsPointDetail;
import com.gis.xian.vo.XianHiddenDangerSpotsBasePointVo;
import com.gis.xian.vo.XianHiddenDangerSpotsPointDetailVo;
import java.util.List;
@@ -11,12 +11,12 @@ public interface XianHiddenDangerSpotsService {
* 获取所有基础点：滑坡、泥石流、山洪、内涝
* @return 基础点列表
*/
List<XianHiddenDangerSpotsBasePoint> getBasePoints(String disasterType);
List<XianHiddenDangerSpotsBasePointVo> getBasePoints(String disasterType);
/**
* 根据id获取隐患点详情
* @param id 隐患点id
* @return 隐患点详情
*/
XianHiddenDangerSpotsPointDetail getPointDetailById(Long id);
XianHiddenDangerSpotsPointDetailVo getPointDetailById(Long id);
}
src/main/java/com/gis/xian/service/XianRiskSpotsService.java
+4 -4
View File
@@ -1,7 +1,7 @@
package com.gis.xian.service;
import com.gis.xian.entity.XianRiskSpotsBasePoint;
import com.gis.xian.entity.XianRiskSpotsPointDetail;
import com.gis.xian.vo.XianRiskSpotsBasePointVo;
import com.gis.xian.vo.XianRiskSpotsPointDetailVo;
import java.util.List;
@@ -10,12 +10,12 @@ public interface XianRiskSpotsService {
* 获取所有风险点基础信息
* @return 风险点基础列表
*/
List<XianRiskSpotsBasePoint> getBasePoints();
List<XianRiskSpotsBasePointVo> getBasePoints();
/**
* 根据id获取风险点详情
* @param id 风险点id
* @return 风险点详情
*/
XianRiskSpotsPointDetail getPointDetailById(Long id);
XianRiskSpotsPointDetailVo getPointDetailById(Long id);
}
src/main/java/com/gis/xian/service/impl/IXianHiddenDangerSpotsServiceImpl.java
+6 -6
View File
@@ -1,8 +1,8 @@
package com.gis.xian.service.impl;
import com.alibaba.fastjson2.JSON;
import com.gis.xian.entity.XianHiddenDangerSpotsBasePoint;
import com.gis.xian.entity.XianHiddenDangerSpotsPointDetail;
import com.gis.xian.vo.XianHiddenDangerSpotsBasePointVo;
import com.gis.xian.vo.XianHiddenDangerSpotsPointDetailVo;
import com.gis.xian.enums.DisasterTypeEnum;
import com.gis.xian.mapper.XianHiddenDangerSpotsMapper;
import com.gis.xian.service.XianHiddenDangerSpotsService;
@@ -29,7 +29,7 @@ public class IXianHiddenDangerSpotsServiceImpl implements XianHiddenDangerSpotsS
private String earthquakeBasePointsKey;
@Override
public List<XianHiddenDangerSpotsBasePoint> getBasePoints(String disasterType) {
public List<XianHiddenDangerSpotsBasePointVo> getBasePoints(String disasterType) {
// 从redis中读取基础点信息
Object data = null;
@@ -40,7 +40,7 @@ public class IXianHiddenDangerSpotsServiceImpl implements XianHiddenDangerSpotsS
}
if (data == null) {
List<XianHiddenDangerSpotsBasePoint> basePoints = xianHiddenDangerSpotsMapper.getBasePoints(disasterType);
List<XianHiddenDangerSpotsBasePointVo> basePoints = xianHiddenDangerSpotsMapper.getBasePoints(disasterType);
if(DisasterTypeEnum.RAINSTORM.getType().equals(disasterType)) {
redisTemplate.opsForValue().set(rainstormBasePointsKey, JSON.toJSONString(basePoints));
@@ -50,11 +50,11 @@ public class IXianHiddenDangerSpotsServiceImpl implements XianHiddenDangerSpotsS
return basePoints;
}
return JSON.parseArray(data.toString(), XianHiddenDangerSpotsBasePoint.class);
return JSON.parseArray(data.toString(), XianHiddenDangerSpotsBasePointVo.class);
}
@Override
public XianHiddenDangerSpotsPointDetail getPointDetailById(Long id) {
public XianHiddenDangerSpotsPointDetailVo getPointDetailById(Long id) {
return xianHiddenDangerSpotsMapper.getPointDetailById(id);
}
}
src/main/java/com/gis/xian/service/impl/IXianRiskSpotsServiceImpl.java
+6 -8
View File
@@ -1,10 +1,8 @@
package com.gis.xian.service.impl;
import com.alibaba.fastjson2.JSON;
import com.gis.xian.entity.XianHiddenDangerSpotsBasePoint;
import com.gis.xian.entity.XianRiskSpotsBasePoint;
import com.gis.xian.entity.XianRiskSpotsPointDetail;
import com.gis.xian.enums.DisasterTypeEnum;
import com.gis.xian.vo.XianRiskSpotsBasePointVo;
import com.gis.xian.vo.XianRiskSpotsPointDetailVo;
import com.gis.xian.mapper.XianRiskSpotsMapper;
import com.gis.xian.service.XianRiskSpotsService;
import jakarta.annotation.Resource;
@@ -27,21 +25,21 @@ public class IXianRiskSpotsServiceImpl implements XianRiskSpotsService {
private String riskPointKey;
@Override
public List<XianRiskSpotsBasePoint> getBasePoints() {
public List<XianRiskSpotsBasePointVo> getBasePoints() {
// 从redis中读取基础点信息
Object data = redisTemplate.opsForValue().get(riskPointKey);
if (data == null) {
List<XianRiskSpotsBasePoint> basePoints = xianRiskSpotsMapper.getBasePoints();
List<XianRiskSpotsBasePointVo> basePoints = xianRiskSpotsMapper.getBasePoints();
redisTemplate.opsForValue().set(riskPointKey, JSON.toJSONString(basePoints));
return basePoints;
}
return JSON.parseArray(data.toString(), XianRiskSpotsBasePoint.class);
return JSON.parseArray(data.toString(), XianRiskSpotsBasePointVo.class);
}
@Override
public XianRiskSpotsPointDetail getPointDetailById(Long id) {
public XianRiskSpotsPointDetailVo getPointDetailById(Long id) {
return xianRiskSpotsMapper.getPointDetailById(id);
}
}
src/main/java/com/gis/xian/entity/XianHiddenDangerSpotsBasePoint.java → src/main/java/com/gis/xian/vo/XianHiddenDangerSpotsBasePointVo.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.gis.xian.entity;
package com.gis.xian.vo;
import lombok.Data;
@@ -9,7 +9,7 @@ import java.util.Objects;
* @TableName xian_hidden_danger_spots
*/
@Data
public class XianHiddenDangerSpotsBasePoint {
public class XianHiddenDangerSpotsBasePointVo {
/**
* 序号
*/
@@ -34,7 +34,7 @@ public class XianHiddenDangerSpotsBasePoint {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
XianHiddenDangerSpotsBasePoint that = (XianHiddenDangerSpotsBasePoint) o;
XianHiddenDangerSpotsBasePointVo that = (XianHiddenDangerSpotsBasePointVo) o;
return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat) && Objects.equals(disasterType, that.disasterType);
}
src/main/java/com/gis/xian/entity/XianHiddenDangerSpotsPointDetail.java → src/main/java/com/gis/xian/vo/XianHiddenDangerSpotsPointDetailVo.java
+3 -3
View File
@@ -1,11 +1,11 @@
package com.gis.xian.entity;
package com.gis.xian.vo;
import lombok.Data;
import java.util.Objects;
@Data
public class XianHiddenDangerSpotsPointDetail {
public class XianHiddenDangerSpotsPointDetailVo {
/**
* 序号
*/
@@ -45,7 +45,7 @@ public class XianHiddenDangerSpotsPointDetail {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
XianHiddenDangerSpotsPointDetail that = (XianHiddenDangerSpotsPointDetail) o;
XianHiddenDangerSpotsPointDetailVo that = (XianHiddenDangerSpotsPointDetailVo) o;
return Objects.equals(id, that.id) && Objects.equals(fieldCode, that.fieldCode) && Objects.equals(disasterName, that.disasterName) && Objects.equals(position, that.position) && Objects.equals(disasterType, that.disasterType) && Objects.equals(scaleGrade, that.scaleGrade) && Objects.equals(riskGrade, that.riskGrade);
}
src/main/java/com/gis/xian/entity/XianRiskSpotsBasePoint.java → src/main/java/com/gis/xian/vo/XianRiskSpotsBasePointVo.java
+3 -3
View File
@@ -1,11 +1,11 @@
package com.gis.xian.entity;
package com.gis.xian.vo;
import lombok.Data;
import java.util.Objects;
@Data
public class XianRiskSpotsBasePoint {
public class XianRiskSpotsBasePointVo {
/**
* 序号
*/
@@ -25,7 +25,7 @@ public class XianRiskSpotsBasePoint {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
XianRiskSpotsBasePoint that = (XianRiskSpotsBasePoint) o;
XianRiskSpotsBasePointVo that = (XianRiskSpotsBasePointVo) o;
return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
}
src/main/java/com/gis/xian/entity/XianRiskSpotsPointDetail.java → src/main/java/com/gis/xian/vo/XianRiskSpotsPointDetailVo.java
+3 -3
View File
@@ -1,11 +1,11 @@
package com.gis.xian.entity;
package com.gis.xian.vo;
import lombok.Data;
import java.util.Objects;
@Data
public class XianRiskSpotsPointDetail {
public class XianRiskSpotsPointDetailVo {
/**
* 序号
*/
@@ -70,7 +70,7 @@ public class XianRiskSpotsPointDetail {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
XianRiskSpotsPointDetail that = (XianRiskSpotsPointDetail) o;
XianRiskSpotsPointDetailVo that = (XianRiskSpotsPointDetailVo) o;
return Objects.equals(id, that.id) && Objects.equals(riskName, that.riskName) && Objects.equals(unitCode, that.unitCode) && Objects.equals(position, that.position) && Objects.equals(residentCounts, that.residentCounts) && Objects.equals(riskProperty, that.riskProperty) && Objects.equals(permanentPopulation, that.permanentPopulation) && Objects.equals(housing, that.housing) && Objects.equals(inspectorName, that.inspectorName) && Objects.equals(inspectorTele, that.inspectorTele) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
}
src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml
+2 -2
View File
@@ -25,14 +25,14 @@
<result property="isDelete" column="is_delete" />
</resultMap>
<resultMap id="XianHiddenDangerSpotsBasePointResultMap" type="com.gis.xian.entity.XianHiddenDangerSpotsBasePoint">
<resultMap id="XianHiddenDangerSpotsBasePointResultMap" type="com.gis.xian.vo.XianHiddenDangerSpotsBasePointVo">
<id property="id" column="id" />
<result property="lon" column="lon" />
<result property="lat" column="lat" />
<result property="disasterType" column="disaster_type" />
</resultMap>
<resultMap id="XianHiddenDangerSpotsPointDetailResultMap" type="com.gis.xian.entity.XianHiddenDangerSpotsPointDetail">
<resultMap id="XianHiddenDangerSpotsPointDetailResultMap" type="com.gis.xian.vo.XianHiddenDangerSpotsPointDetailVo">
<id property="id" column="id" />
<result property="fieldCode" column="field_code" />
<result property="disasterName" column="disaster_name" />
src/main/resources/com/gis/xian/mapper/XianRiskSpotsMapper.xml
+3 -3
View File
@@ -29,13 +29,13 @@
<result property="isDelete" column="is_delete" />
</resultMap>
<resultMap id="XianRiskSpotsBasePointResultMap" type="com.gis.xian.entity.XianRiskSpotsBasePoint">
<resultMap id="XianRiskSpotsBasePointResultMap" type="com.gis.xian.vo.XianRiskSpotsBasePointVo">
<id property="id" column="id" />
<result property="lon" column="lon" />
<result property="lat" column="lat" />
</resultMap>
<resultMap id="XianRiskSpotsPointDetailResultMap" type="com.gis.xian.entity.XianRiskSpotsPointDetail">
<resultMap id="XianRiskSpotsPointDetailResultMap" type="com.gis.xian.vo.XianRiskSpotsPointDetailVo">
<id property="id" column="id" />
<result property="riskName" column="risk_name" />
<result property="unitCode" column="unit_code" />
@@ -56,7 +56,7 @@
</select>
<!-- 根据id获取风险点信息 -->
<select id="getPointDetailById" resultType="com.gis.xian.entity.XianRiskSpotsPointDetail">
<select id="getPointDetailById" resultType="com.gis.xian.vo.XianRiskSpotsPointDetailVo">
SELECT id, risk_name, unit_code, position, resident_counts, risk_property, permanent_population, housing, inspector_name, inspector_tele, lon, lat FROM xian_risk_spots
<where>
id = #{id}