From 74ca8776642bfbde2f16544baf235f03ee4f781e Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 5 Feb 2026 17:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E6=B0=B4=E5=BA=93=E5=88=92?=
 =?UTF-8?q?=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  2 +-
 src/main/java/com/gunshi/project/ss/Main.java          |  4 ++--
 .../ss/entity/vo/ScreenReservoirDemarcationVo.java     |  5 +----
 .../com/gunshi/project/ss/service/RealRainService.java | 10 ++++------
 .../ss/service/ScreenReservoirDemarcationService.java  | 10 ++++++----
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index e9c5bde..f7f94df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>gunshi-project-ss</artifactId>
     <version>1.0-SNAPSHOT</version>
     <description>
-        黑石咀水库系统
+        双石水库系统
     </description>
     <!-- 属性继承自parent项目 -->
     <!-- 依赖版本管理继承自parent项目 -->
diff --git a/src/main/java/com/gunshi/project/ss/Main.java b/src/main/java/com/gunshi/project/ss/Main.java
index a7f5b8d..1c969ce 100644
--- a/src/main/java/com/gunshi/project/ss/Main.java
+++ b/src/main/java/com/gunshi/project/ss/Main.java
@@ -12,11 +12,11 @@ import org.springframework.cache.annotation.EnableCaching;
 @OpenAPIDefinition(
         servers = {
                 @Server(
-                        url = "http://localhost:24305/gunshiApp/hsz",
+                        url = "http://localhost:24305/gunshiApp/ss",
                         description = "本地测试环境"
                 ),
                 @Server(
-                        url = "http://local.gunshiiot.com:18083/gunshiApp/hsz",
+                        url = "http://local.gunshiiot.com:18083/gunshiApp/ss",
                         description = "线上测试环境"
                 )
         }
diff --git a/src/main/java/com/gunshi/project/ss/entity/vo/ScreenReservoirDemarcationVo.java b/src/main/java/com/gunshi/project/ss/entity/vo/ScreenReservoirDemarcationVo.java
index 7082260..ed7a013 100644
--- a/src/main/java/com/gunshi/project/ss/entity/vo/ScreenReservoirDemarcationVo.java
+++ b/src/main/java/com/gunshi/project/ss/entity/vo/ScreenReservoirDemarcationVo.java
@@ -33,11 +33,8 @@ public class ScreenReservoirDemarcationVo {
     @Schema(description = "用地总面积（万亩）文件")
     private List<FileAssociations> totalUseAreaFiles;
 
-    //不动产权名称
-    private String PropertyCertificateName;
-
     //不动产权面积
-    private BigDecimal PropertyCertificateArea;
+    private BigDecimal propertyCertificateArea;
 
     private List<FileAssociations> propertyCertificateFiles;
 
diff --git a/src/main/java/com/gunshi/project/ss/service/RealRainService.java b/src/main/java/com/gunshi/project/ss/service/RealRainService.java
index 9920f62..d828e89 100644
--- a/src/main/java/com/gunshi/project/ss/service/RealRainService.java
+++ b/src/main/java/com/gunshi/project/ss/service/RealRainService.java
@@ -7,8 +7,6 @@ import com.gunshi.project.ss.entity.so.RealRainBaseSo;
 import com.gunshi.project.ss.entity.vo.RealRainListVo;
 import com.gunshi.project.ss.entity.vo.RealRainStatListVo;
 import com.gunshi.project.ss.mapper.RealRainMapper;
-import com.gunshi.project.ss.model.AttBasBase;
-import com.gunshi.project.ss.model.AttBasBaseAutoDao;
 import com.gunshi.project.ss.util.DateUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +36,7 @@ public class RealRainService {
     @Autowired
     private RealRainMapper realRainMapper;
 
-    private final AttBasBaseAutoDao attBasBaseAutoDao;
+//    private final AttBasBaseAutoDao attBasBaseAutoDao;
 
     @Autowired
     private StPptnRMapper stPptnRMapper;
@@ -187,9 +185,9 @@ public class RealRainService {
      *
      * @param
      */
-    public List<AttBasBase> queryBasNameList() {
-        return attBasBaseAutoDao.list();
-    }
+//    public List<AttBasBase> queryBasNameList() {
+//        return attBasBaseAutoDao.list();
+//    }
 
 
     private void checkParam(RealRainBaseSo realRainBaseSo) {
diff --git a/src/main/java/com/gunshi/project/ss/service/ScreenReservoirDemarcationService.java b/src/main/java/com/gunshi/project/ss/service/ScreenReservoirDemarcationService.java
index 78559ae..18a5a79 100644
--- a/src/main/java/com/gunshi/project/ss/service/ScreenReservoirDemarcationService.java
+++ b/src/main/java/com/gunshi/project/ss/service/ScreenReservoirDemarcationService.java
@@ -10,6 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @Slf4j
 @Service
 public class ScreenReservoirDemarcationService {
@@ -42,13 +45,12 @@ public class ScreenReservoirDemarcationService {
         res.setProtectionScopeFiles(fileService.getFiles2(protectionScopeArea,one.getId().toString()));
         res.setTotalUseAreaFiles(fileService.getFiles2(totalUseArea,one.getId().toString()));
 
-        PropertyCertificate two = propertyCertificateService.lambdaQuery().orderByDesc(PropertyCertificate::getCreateTime).last("limit 1").one();
+        List<PropertyCertificate> two = propertyCertificateService.list();
         if(two == null){
             return res;
         }
-        res.setPropertyCertificateName(two.getName());
-        res.setPropertyCertificateArea(two.getArea());
-        res.setPropertyCertificateFiles(fileService.getFiles2(propertyCertificate,two.getId().toString()));
+        res.setPropertyCertificateArea(two.stream().map(PropertyCertificate::getArea).reduce(BigDecimal.ZERO, BigDecimal::add));
+        //res.setPropertyCertificateFiles(fileService.getFiles2(propertyCertificate,two.getId().toString()));
         return res;
     }
 }