From 0d67c195ec3b42e3158bea4174b35a4a86e54c93 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Fri, 16 Jan 2026 10:40:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=AE=89=E5=85=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservoirDemarcationInfoController.java | 78 +++++++++++++++++++ .../ReservoirDemarcationInfoMapper.java | 9 +++ .../gunshi/project/ss/model/AttResBase.java | 8 ++ .../ss/model/ReservoirDemarcationInfo.java | 49 ++++++++++++ .../ReservoirDemarcationInfoService.java | 15 ++++ 5 files changed, 159 insertions(+) create mode 100644 src/main/java/com/gunshi/project/ss/controller/ReservoirDemarcationInfoController.java create mode 100644 src/main/java/com/gunshi/project/ss/mapper/ReservoirDemarcationInfoMapper.java create mode 100644 src/main/java/com/gunshi/project/ss/model/ReservoirDemarcationInfo.java create mode 100644 src/main/java/com/gunshi/project/ss/service/ReservoirDemarcationInfoService.java diff --git a/src/main/java/com/gunshi/project/ss/controller/ReservoirDemarcationInfoController.java b/src/main/java/com/gunshi/project/ss/controller/ReservoirDemarcationInfoController.java new file mode 100644 index 0000000..55e4f28 --- /dev/null +++ b/src/main/java/com/gunshi/project/ss/controller/ReservoirDemarcationInfoController.java @@ -0,0 +1,78 @@ +package com.gunshi.project.ss.controller; + + +import com.gunshi.core.result.R; +import com.gunshi.project.ss.model.FileAssociations; +import com.gunshi.project.ss.model.ReservoirDemarcationInfo; +import com.gunshi.project.ss.service.FileAssociationsService; +import com.gunshi.project.ss.service.ReservoirDemarcationInfoService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Tag(name = "水库划界信息") +@RestController +@RequestMapping("/reservoirDemarcationInfo") +public class ReservoirDemarcationInfoController extends AbstractCommonFileController { + + + private static final String managementScopeArea = "managementScopeArea"; + + private static final String protectionScopeArea = "protectionScopeArea"; + + private static final String propertyCertificateArea = "propertyCertificateArea"; + + private static final String totalUseArea = "totalUseArea"; + + @Autowired + private ReservoirDemarcationInfoService service; + + @Autowired + private FileAssociationsService fileService; + + @Operation(description = "获取信息") + @GetMapping("/get") + public R get(){ + ReservoirDemarcationInfo query = service.list().get(0); + //获取资料 + List managementScopeAreaFile = fileService.getFiles(managementScopeArea, query.getId().toString()); + + List protectionScopeAreaFile = fileService.getFiles(protectionScopeArea, query.getId().toString()); + + List propertyCertificateAreaFile = fileService.getFiles(propertyCertificateArea, query.getId().toString()); + + List totalUseAreaFile = fileService.getFiles(totalUseArea, query.getId().toString()); + + query.setManagementScopeAreaFiles(managementScopeAreaFile); + query.setProtectionScopeFiles(protectionScopeAreaFile); + query.setPropertyCertificateAreaFiles(propertyCertificateAreaFile); + query.setTotalUseAreaFiles(totalUseAreaFile); + return R.ok(query); + } + + @Operation(description = "修改") + @PostMapping("/update") + public R update(@RequestBody ReservoirDemarcationInfo dto){ + boolean flag = service.updateById(dto); + if(flag){ + fileService.saveFile(dto.getManagementScopeAreaFiles(),managementScopeArea,dto.getId().toString()); + fileService.saveFile(dto.getProtectionScopeFiles(),protectionScopeArea,dto.getId().toString()); + fileService.saveFile(dto.getPropertyCertificateAreaFiles(), propertyCertificateArea,dto.getId().toString()); + fileService.saveFile(dto.getTotalUseAreaFiles(),totalUseArea,dto.getId().toString()); + } + return R.ok(dto); + } + + + + @Override + public String getGroupId() { + return ""; + } + + + +} diff --git a/src/main/java/com/gunshi/project/ss/mapper/ReservoirDemarcationInfoMapper.java b/src/main/java/com/gunshi/project/ss/mapper/ReservoirDemarcationInfoMapper.java new file mode 100644 index 0000000..5aa8763 --- /dev/null +++ b/src/main/java/com/gunshi/project/ss/mapper/ReservoirDemarcationInfoMapper.java @@ -0,0 +1,9 @@ +package com.gunshi.project.ss.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gunshi.project.ss.model.ReservoirDemarcationInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ReservoirDemarcationInfoMapper extends BaseMapper { +} diff --git a/src/main/java/com/gunshi/project/ss/model/AttResBase.java b/src/main/java/com/gunshi/project/ss/model/AttResBase.java index ed3802f..4c3c0dd 100644 --- a/src/main/java/com/gunshi/project/ss/model/AttResBase.java +++ b/src/main/java/com/gunshi/project/ss/model/AttResBase.java @@ -631,4 +631,12 @@ public class AttResBase implements Serializable { @Schema(description = "发证时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate issuingTime; + + @TableField("charge_person") + @Schema(description = "负责人") + private String chargePerson; + + @TableField("management_housing") + @Schema(description = "管理用房") + private String managementHousing; } diff --git a/src/main/java/com/gunshi/project/ss/model/ReservoirDemarcationInfo.java b/src/main/java/com/gunshi/project/ss/model/ReservoirDemarcationInfo.java new file mode 100644 index 0000000..d2af35f --- /dev/null +++ b/src/main/java/com/gunshi/project/ss/model/ReservoirDemarcationInfo.java @@ -0,0 +1,49 @@ +package com.gunshi.project.ss.model; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +@TableName("reservoir_demarcation_info") +public class ReservoirDemarcationInfo { + + /** 主键ID */ + @TableId(value = "id") + private Long id; + + + @TableField("management_scope_area") + @Schema(description = "管理范围（km²）") + private BigDecimal managementScopeArea; + + @TableField(exist = false) + private List managementScopeAreaFiles; + + @TableField("protection_scope_area") + @Schema(description = "保护范围（km²）") + private BigDecimal protectionScopeArea; + + @TableField(exist = false) + private List protectionScopeFiles; + + @TableField("property_certificate_area") + @Schema(description = "已取得不动产权证书面积（万亩）") + private BigDecimal propertyCertificateArea; + + @TableField(exist = false) + private List propertyCertificateAreaFiles; + + @TableField("total_use_area") + @Schema(description = "用地总面积（万亩）") + private BigDecimal totalUseArea; + + @TableField(exist = false) + private List totalUseAreaFiles; +} diff --git a/src/main/java/com/gunshi/project/ss/service/ReservoirDemarcationInfoService.java b/src/main/java/com/gunshi/project/ss/service/ReservoirDemarcationInfoService.java new file mode 100644 index 0000000..61bf1e3 --- /dev/null +++ b/src/main/java/com/gunshi/project/ss/service/ReservoirDemarcationInfoService.java @@ -0,0 +1,15 @@ +package com.gunshi.project.ss.service; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.project.ss.mapper.ReservoirDemarcationInfoMapper; +import com.gunshi.project.ss.model.ReservoirDemarcationInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional(rollbackFor = Exception.class) +public class ReservoirDemarcationInfoService extends ServiceImpl { +}