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

Merge pull request 'dev' (#35) from dev into dev-deploy

Browse Source 
Reviewed-on: #35
This commit is contained in:
ysCha 2025-05-30 09:49:36 +09:00
commit 4fe50e1ad5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1490,6 +1490,7 @@ public class EstimateService {
pwrGnrSimResponse.setGuideInfo(pwrGnrSimGuideInfo.getData());
}
} catch (Exception e) {
log.error(e.toString());
}
}
@ -1507,6 +1508,7 @@ public class EstimateService {
byte[] drawingImg1 = Util.toByteArray(imageInputStream);
estimateResponse.setDrawingImg1(drawingImg1);
}
log.debug("url1 ::: {}", url);
// File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
// if (file.exists()) {
// InputStream imageInputStream =
@ -1524,6 +1526,7 @@ public class EstimateService {
byte[] drawingImg2 = Util.toByteArray(imageInputStream2);
estimateResponse.setDrawingImg2(drawingImg2);
}
log.debug("url2 ::: {}", url2);
// file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
// if (file.exists()) {
// InputStream imageInputStream2 =

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

@ -280,7 +280,8 @@ public class PwrGnrSimService {
try {
pwrGnrSimRes = this.calcResults(pwrGnrSimReq, roofLength);
} catch (Exception e) {
e.printStackTrace();
log.error(e.toString());
//e.printStackTrace();
}
// DecimalFormat 객체 생성
@ -497,7 +498,9 @@ public class PwrGnrSimService {
}
// 결과 확인용
System.err.println("hatsudenryou_all 결과 ::: " + Arrays.toString(hatsudenryou_all));
//System.err.println("hatsudenryou_all 결과 ::: " + Arrays.toString(hatsudenryou_all));
log.debug("hatsudenryou_all ::: " + Arrays.toString(hatsudenryou_all));
// System.err.println("hatsudenryou_all_snow 결과 ::: " +
// Arrays.toString(hatsudenryou_all_snow));
// System.err.println(
@ -615,7 +618,7 @@ public class PwrGnrSimService {
double[] peakcutResult = new double[2];
peakcutResult[0] = amp_peakcut_result;
peakcutResult[1] = Math.min(watt_peakcut_result, amp_peakcut_result);
log.debug("peakcutResult ::: {}", peakcutResult);
return peakcutResult;
}
@ -1183,13 +1186,13 @@ public class PwrGnrSimService {
i++;
}
log.error(Arrays.toString(IsbyTotal));
log.debug(Arrays.toString(IsbyTotal));
// 직달, 산란, 지면 반사를 매월 합계
for (int m = 0; m < 12; m++) {
shamenNissha[m] = IsbyTotal[m] + IbbyTotal[m] + IrbyTotal[m];
}
}
log.debug("shamenNissha ::: {}", shamenNissha);
return shamenNissha;
}