yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏-水库划界

master
wany 2026-02-05 17:17:46 +08:00
parent 8349485d62
commit 74ca877664
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -14,7 +14,7 @@
<artifactId>gunshi-project-ss</artifactId>
<version>1.0-SNAPSHOT</version>
<description>
黑石咀水库系统
双石水库系统
</description>
<!-- 属性继承自parent项目 -->
<!-- 依赖版本管理继承自parent项目 -->

4
src/main/java/com/gunshi/project/ss/Main.java
View File

@ -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 = "线上测试环境"
)
}

5
src/main/java/com/gunshi/project/ss/entity/vo/ScreenReservoirDemarcationVo.java
View File

@ -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;

10
src/main/java/com/gunshi/project/ss/service/RealRainService.java
View File

@ -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) {

10
src/main/java/com/gunshi/project/ss/service/ScreenReservoirDemarcationService.java
View File

@ -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;
}
}