Compare commits
No commits in common. "4fe50e1ad5665d975b210e85b2c5df309e62b252" and "a5f174e5da0ff9e32dae191e2433c0f361b98ba3" have entirely different histories.
4fe50e1ad5
...
a5f174e5da
@ -1490,7 +1490,6 @@ public class EstimateService {
|
|||||||
pwrGnrSimResponse.setGuideInfo(pwrGnrSimGuideInfo.getData());
|
pwrGnrSimResponse.setGuideInfo(pwrGnrSimGuideInfo.getData());
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error(e.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1508,7 +1507,6 @@ public class EstimateService {
|
|||||||
byte[] drawingImg1 = Util.toByteArray(imageInputStream);
|
byte[] drawingImg1 = Util.toByteArray(imageInputStream);
|
||||||
estimateResponse.setDrawingImg1(drawingImg1);
|
estimateResponse.setDrawingImg1(drawingImg1);
|
||||||
}
|
}
|
||||||
log.debug("url1 ::: {}", url);
|
|
||||||
// File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
|
// File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
|
||||||
// if (file.exists()) {
|
// if (file.exists()) {
|
||||||
// InputStream imageInputStream =
|
// InputStream imageInputStream =
|
||||||
@ -1526,7 +1524,6 @@ public class EstimateService {
|
|||||||
byte[] drawingImg2 = Util.toByteArray(imageInputStream2);
|
byte[] drawingImg2 = Util.toByteArray(imageInputStream2);
|
||||||
estimateResponse.setDrawingImg2(drawingImg2);
|
estimateResponse.setDrawingImg2(drawingImg2);
|
||||||
}
|
}
|
||||||
log.debug("url2 ::: {}", url2);
|
|
||||||
// file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
|
// file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
|
||||||
// if (file.exists()) {
|
// if (file.exists()) {
|
||||||
// InputStream imageInputStream2 =
|
// InputStream imageInputStream2 =
|
||||||
|
|||||||
@ -280,8 +280,7 @@ public class PwrGnrSimService {
|
|||||||
try {
|
try {
|
||||||
pwrGnrSimRes = this.calcResults(pwrGnrSimReq, roofLength);
|
pwrGnrSimRes = this.calcResults(pwrGnrSimReq, roofLength);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error(e.toString());
|
e.printStackTrace();
|
||||||
//e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DecimalFormat 객체 생성
|
// DecimalFormat 객체 생성
|
||||||
@ -498,9 +497,7 @@ 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 결과 ::: " +
|
// System.err.println("hatsudenryou_all_snow 결과 ::: " +
|
||||||
// Arrays.toString(hatsudenryou_all_snow));
|
// Arrays.toString(hatsudenryou_all_snow));
|
||||||
// System.err.println(
|
// System.err.println(
|
||||||
@ -618,7 +615,7 @@ public class PwrGnrSimService {
|
|||||||
double[] peakcutResult = new double[2];
|
double[] peakcutResult = new double[2];
|
||||||
peakcutResult[0] = amp_peakcut_result;
|
peakcutResult[0] = amp_peakcut_result;
|
||||||
peakcutResult[1] = Math.min(watt_peakcut_result, amp_peakcut_result);
|
peakcutResult[1] = Math.min(watt_peakcut_result, amp_peakcut_result);
|
||||||
log.debug("peakcutResult ::: {}", peakcutResult);
|
|
||||||
return peakcutResult;
|
return peakcutResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1186,13 +1183,13 @@ public class PwrGnrSimService {
|
|||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
log.debug(Arrays.toString(IsbyTotal));
|
log.error(Arrays.toString(IsbyTotal));
|
||||||
// 직달, 산란, 지면 반사를 매월 합계
|
// 직달, 산란, 지면 반사를 매월 합계
|
||||||
for (int m = 0; m < 12; m++) {
|
for (int m = 0; m < 12; m++) {
|
||||||
shamenNissha[m] = IsbyTotal[m] + IbbyTotal[m] + IrbyTotal[m];
|
shamenNissha[m] = IsbyTotal[m] + IbbyTotal[m] + IrbyTotal[m];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.debug("shamenNissha ::: {}", shamenNissha);
|
|
||||||
return shamenNissha;
|
return shamenNissha;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user