Compare commits

..

No commits in common. "1a4eb67f2d0f82be276080d125ddfa7a18f82bf7" and "0df9b289c0c71bb1359bef7624e9a357fe12d729" have entirely different histories.

View File

@ -210,12 +210,9 @@ public class PwrGnrSimService {
} }
k++; k++;
} }
// module 정보 - 중복 모듈 제거 // module 정보
k = 0; k = 0;
Set<String> usedModules = new HashSet<>();
for (PwrGnrSimRoofResponse m : moduleGroupList) { for (PwrGnrSimRoofResponse m : moduleGroupList) {
if (!usedModules.contains(m.getItemId())) {
usedModules.add(m.getItemId());
if (k == 0) { if (k == 0) {
pwrGnrSimReq.setModule1(m.getItemId()); pwrGnrSimReq.setModule1(m.getItemId());
pwrGnrSimReq.setModuleAmp1(m.getAmp()); pwrGnrSimReq.setModuleAmp1(m.getAmp());
@ -230,7 +227,7 @@ public class PwrGnrSimService {
pwrGnrSimReq.setModuleTempCoeff2(m.getTempCoeff()); pwrGnrSimReq.setModuleTempCoeff2(m.getTempCoeff());
pwrGnrSimReq.setModuleTempLoss2(m.getTempLoss()); pwrGnrSimReq.setModuleTempLoss2(m.getTempLoss());
pwrGnrSimReq.setNorthModuleYn2(m.getNorthModuleYn()); //모듈 북면지원여부 pwrGnrSimReq.setNorthModuleYn2(m.getNorthModuleYn()); //모듈 북면지원여부
} else if (k == 2) { } else {
pwrGnrSimReq.setModule3(m.getItemId()); pwrGnrSimReq.setModule3(m.getItemId());
pwrGnrSimReq.setModuleAmp3(m.getAmp()); pwrGnrSimReq.setModuleAmp3(m.getAmp());
pwrGnrSimReq.setModuleSpecification3(m.getSpecification()); pwrGnrSimReq.setModuleSpecification3(m.getSpecification());
@ -239,8 +236,6 @@ public class PwrGnrSimService {
pwrGnrSimReq.setNorthModuleYn3(m.getNorthModuleYn()); //모듈 북면지원여부 pwrGnrSimReq.setNorthModuleYn3(m.getNorthModuleYn()); //모듈 북면지원여부
} }
k++; k++;
if (k >= 3) break; // 최대 3개 모듈만 설정
}
} }
// 전체 시스템 용량 // 전체 시스템 용량