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

혼함모듈 수정

Browse Source
This commit is contained in:
ysCha 2025-12-10 09:35:40 +09:00
parent e4fb11bb03
commit 73e22af72b
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,15 +254,22 @@ public class PwrGnrSimService {
dKoubai[i] = (2 * Math.PI) * (Double.parseDouble(data.getSlopeAngle()) / 360);
}
dHoui[i] = Math.abs((2 * Math.PI) * (Double.parseDouble(data.getAzimuth()) / 360));
// dHoui[i] = Math.abs((2 * Math.PI) * (Double.parseDouble(data.getAzimuth()) / 360));
dHoui[i] = (2 * Math.PI) * (Double.parseDouble(data.getAzimuth()) / 360);
// 지붕별 모듈정보 셋팅
int j = 0;
for (PwrGnrSimRoofResponse m : moduleGroupList) {
if (data.getRoofSurfaceId().equals(m.getRoofSurfaceId())) {
dSpecification += m.getTotSpecification();
if (j == 0) {
dModuleInput1[i] = Integer.parseInt(m.getAmount());
if(pwrGnrSimReq.getModule1().equals(m.getItemId())){
dModuleInput1[i] = Integer.parseInt(m.getAmount());
}else if(pwrGnrSimReq.getModule2().equals(m.getItemId())){
dModuleInput2[i] = Integer.parseInt(m.getAmount());
}else if(pwrGnrSimReq.getModule3().equals(m.getItemId())){
dModuleInput3[i] = Integer.parseInt(m.getAmount());
}
} else if (j == 1) {
dModuleInput2[i] = Integer.parseInt(m.getAmount());
} else {
@ -409,7 +416,7 @@ public class PwrGnrSimService {
// PCS1, pcs2, pcs3 선택 정보
double pcs1_henkankouritsu = pwrGnrSimReq.getPcsCnvEff1() / 100; // 변환 효율
double pcs1_youryou = pwrGnrSimReq.getPcsSpecification1(); // 용량 (예시 4.4)
double pcs2_henkankouritsu = pwrGnrSimReq.getPcsCnvEff2() / 100;
double pcs2_henkankouritsu = (pwrGnrSimReq.getPcsCnvEff2() / 100);
double pcs2_youryou = pwrGnrSimReq.getPcsSpecification2();
double pcs3_henkankouritsu = pwrGnrSimReq.getPcsCnvEff3() / 100;
double pcs3_youryou = pwrGnrSimReq.getPcsSpecification3();
@ -425,12 +432,12 @@ public class PwrGnrSimService {
// pcs1과 pcs2, pcs3의 실효 변환 효율 중 낮은 값을 사용
double[] values = {pcs1_henkankouritsu, pcs2_henkankouritsu, pcs3_henkankouritsu};
double pcs_henkankouritsu =
Arrays.stream(values)
.filter(value -> value > 0.0) // 0.0 제외
.min()
.orElse(0.0); // 모두 0.0인 경우 기본값 반환
// double pcs_henkankouritsu =
// Arrays.stream(values)
// .filter(value -> value > 0.0) // 0.0 제외
// .min()
// .orElse(0.0); // 모두 0.0인 경우 기본값 반환
double pcs_henkankouritsu = Math.min(pcs1_henkankouritsu,pcs2_henkankouritsu);
// pcs 총 용량 계산
double pcs_youryou_total = (pcs1_youryou * pcs1_number)
+ (pcs2_youryou * pcs2_number)