qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '[1516] 발전량 수정 중복모듈처리' (#408) from dev into prd-deploy

Browse Source 
Reviewed-on: #408
This commit is contained in:
ysCha 2026-03-09 13:39:06 +09:00
commit 1a4eb67f2d
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
View File

@ -210,33 +210,38 @@ public class PwrGnrSimService {
}
k++;
}
// module 정보
k = 0;
for (PwrGnrSimRoofResponse m : moduleGroupList) {
if (k == 0) {
pwrGnrSimReq.setModule1(m.getItemId());
pwrGnrSimReq.setModuleAmp1(m.getAmp());
pwrGnrSimReq.setModuleSpecification1(m.getSpecification());
pwrGnrSimReq.setModuleTempCoeff1(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss1(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn1(m.getNorthModuleYn()); //모듈 북면지원여부
} else if (k == 1) {
pwrGnrSimReq.setModule2(m.getItemId());
pwrGnrSimReq.setModuleAmp2(m.getAmp());
pwrGnrSimReq.setModuleSpecification2(m.getSpecification());
pwrGnrSimReq.setModuleTempCoeff2(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss2(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn2(m.getNorthModuleYn()); //모듈 북면지원여부
} else {
pwrGnrSimReq.setModule3(m.getItemId());
pwrGnrSimReq.setModuleAmp3(m.getAmp());
pwrGnrSimReq.setModuleSpecification3(m.getSpecification());
pwrGnrSimReq.setModuleTempCoeff3(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss3(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn3(m.getNorthModuleYn()); //모듈 북면지원여부
// module 정보 - 중복 모듈 제거
k = 0;
Set<String> usedModules = new HashSet<>();
for (PwrGnrSimRoofResponse m : moduleGroupList) {
if (!usedModules.contains(m.getItemId())) {
usedModules.add(m.getItemId());
if (k == 0) {
pwrGnrSimReq.setModule1(m.getItemId());
pwrGnrSimReq.setModuleAmp1(m.getAmp());
pwrGnrSimReq.setModuleSpecification1(m.getSpecification());
pwrGnrSimReq.setModuleTempCoeff1(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss1(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn1(m.getNorthModuleYn()); //모듈 북면지원여부
} else if (k == 1) {
pwrGnrSimReq.setModule2(m.getItemId());
pwrGnrSimReq.setModuleAmp2(m.getAmp());
pwrGnrSimReq.setModuleSpecification2(m.getSpecification());
pwrGnrSimReq.setModuleTempCoeff2(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss2(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn2(m.getNorthModuleYn()); //모듈 북면지원여부
} else if (k == 2) {
pwrGnrSimReq.setModule3(m.getItemId());
pwrGnrSimReq.setModuleAmp3(m.getAmp());
pwrGnrSimReq.setModuleSpecification3(m.getSpecification());
pwrGnrSimReq.setModuleTempCoeff3(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss3(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn3(m.getNorthModuleYn()); //모듈 북면지원여부
}
k++;
if (k >= 3) break; // 최대 3개 모듈만 설정
}
}
k++;
}
// 전체 시스템 용량
double dSpecification = 0.0;