diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
index 3f10405a..390d559d 100644
--- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
+++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
@@ -18,13 +18,13 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
@Slf4j
@Service
@@ -42,57 +42,64 @@ public class PwrGnrSimService {
private final PwrGnrSimMapper pwrGnrSimMapper;
- static String[][] module_data = readValuesFromFileString2("module_data.txt");
+ static String[][] module_data =
+ readValuesFromFileString2("template/pwrGnrSimulation/module_data.txt");
- static String[][] pcs_data = readValuesFromFileString2("pcs_data.txt");
+ static String[][] pcs_data = readValuesFromFileString2("template/pwrGnrSimulation/pcs_data.txt");
- double[] snow = readValuesFromFile("snow.txt");
+ double[] snow = readValuesFromFile("template/pwrGnrSimulation/snow.txt");
// cosθz
- double[][] cosThetaZ = readValuesFromFile2("cosThetaZ.txt");
+ double[][] cosThetaZ = readValuesFromFile2("template/pwrGnrSimulation/cosThetaZ.txt");
// hinode_nichibotsu
- double[][] hinode_nichibotsu = readValuesFromFile2("hinode_nichibotsu.txt");
+ double[][] hinode_nichibotsu =
+ readValuesFromFile2("template/pwrGnrSimulation/hinode_nichibotsu.txt");
- double[] ion = readValuesFromFile("ion.txt");
+ double[] ion = readValuesFromFile("template/pwrGnrSimulation/ion.txt");
// 시간 각도
- double[][] jikakudo = readValuesFromFile2("jikakudo.txt");
+ double[][] jikakudo = readValuesFromFile2("template/pwrGnrSimulation/jikakudo.txt");
- double[] jimenhansharitsu = readValuesFromFile("jimenhansharitsu.txt");
+ double[] jimenhansharitsu = readValuesFromFile("template/pwrGnrSimulation/jimenhansharitsu.txt");
// 균시차
- // double[] kinjisa = readValuesFromFile("kinjisa.txt");
+ // double[] kinjisa = readValuesFromFile("template/pwrGnrSimulation/kinjisa.txt");
// 위도 경도[rad]
- double[][] latlng = readValuesFromFile2("latlng.txt");
+ double[][] latlng = readValuesFromFile2("template/pwrGnrSimulation/latlng.txt");
- double[][] rd = readValuesFromFile2("rd.txt");
+ double[][] rd = readValuesFromFile2("template/pwrGnrSimulation/rd.txt");
- double[][] rdx = readValuesFromFile2("rdx.txt");
+ double[][] rdx = readValuesFromFile2("template/pwrGnrSimulation/rdx.txt");
- // double[][] rt = readValuesFromFile2("rt.txt");
+ // double[][] rt = readValuesFromFile2("template/pwrGnrSimulation/rt.txt");
- double[][] rtx = readValuesFromFile2("rtx.txt");
+ double[][] rtx = readValuesFromFile2("template/pwrGnrSimulation/rtx.txt");
// 산란 일사
- double[] sanrannissha = readValuesFromFile("sanrannissha.txt");
+ double[] sanrannissha = readValuesFromFile("template/pwrGnrSimulation/sanrannissha.txt");
// 수평면 일사
- double[] suiheimennissha = readValuesFromFile("suiheimennissha.txt");
+ double[] suiheimennissha = readValuesFromFile("template/pwrGnrSimulation/suiheimennissha.txt");
// 태양 적위
- double[] taiyousekii = readValuesFromFile("taiyousekii.txt");
+ double[] taiyousekii = readValuesFromFile("template/pwrGnrSimulation/taiyousekii.txt");
- static double[][] peakcut_by_pcs_data = readValuesFromFile2("peakcut_by_pcs_data.txt");
+ static double[][] peakcut_by_pcs_data =
+ readValuesFromFile2("template/pwrGnrSimulation/peakcut_by_pcs_data.txt");
- static double[][] tashounen_data_deg0 = readValuesFromFile2("tashounen_data_deg0.txt");
+ static double[][] tashounen_data_deg0 =
+ readValuesFromFile2("template/pwrGnrSimulation/tashounen_data_deg0.txt");
- static double[][] tashounen_data_deg90 = readValuesFromFile2("tashounen_data_deg90.txt");
+ static double[][] tashounen_data_deg90 =
+ readValuesFromFile2("template/pwrGnrSimulation/tashounen_data_deg90.txt");
- static double[][] amp_peakcut_data_deg0 = readValuesFromFile2("amp_peakcut_data_deg0.txt");
+ static double[][] amp_peakcut_data_deg0 =
+ readValuesFromFile2("template/pwrGnrSimulation/amp_peakcut_data_deg0.txt");
- static double[][] amp_peakcut_data_deg90 = readValuesFromFile2("amp_peakcut_data_deg90.txt");
+ static double[][] amp_peakcut_data_deg90 =
+ readValuesFromFile2("template/pwrGnrSimulation/amp_peakcut_data_deg90.txt");
/**
* 발전시뮬레이션 계산로직
@@ -224,12 +231,13 @@ public class PwrGnrSimService {
int i = 0;
for (PwrGnrSimRoofResponse data : roofList) {
- if (data.getSlope() != null) { // 경사
+ if (data.getClassType() == 0) { // 경사
dKoubai[i] =
(2 * Math.PI)
- * ((Math.atan(Double.parseDouble(data.getSlope()) / 10) * 180 / Math.PI) / 360);
+ * ((Math.atan(Double.parseDouble(data.getSlopeAngle()) / 10) * 180 / Math.PI)
+ / 360);
} else { // 각도
- dKoubai[i] = (2 * Math.PI) * (Double.parseDouble(data.getAngle()) / 360);
+ dKoubai[i] = (2 * Math.PI) * (Double.parseDouble(data.getSlopeAngle()) / 360);
}
dHoui[i] = Math.abs((2 * Math.PI) * (Double.parseDouble(data.getAzimuth()) / 360));
@@ -1369,28 +1377,29 @@ public class PwrGnrSimService {
// 상단 요약정보
elm = doc.getElementById("objectNo");
elm.text(
- ObjectUtils.nullSafeToString(data.getObjectNo() + " (Plan No : " + data.getPlanNo() + ")"));
+ StringUtils.defaultString(data.getObjectNo() + " (Plan No : " + data.getPlanNo() + ")"));
elm = doc.getElementById("drawingEstimateCreateDate");
- elm.text(ObjectUtils.nullSafeToString(data.getDrawingEstimateCreateDate()));
+ elm.text(StringUtils.defaultString(data.getDrawingEstimateCreateDate()));
elm = doc.getElementById("prefName");
- elm.text(ObjectUtils.nullSafeToString(data.getPrefName()));
+
+ elm.text(StringUtils.defaultString(data.getPrefName()));
elm = doc.getElementById("areaName");
- elm.text(ObjectUtils.nullSafeToString(data.getAreaName()));
+ elm.text(StringUtils.defaultString(data.getAreaName()));
elm = doc.getElementById("capacity");
- elm.text(ObjectUtils.nullSafeToString(data.getCapacity()));
+ elm.text(StringUtils.defaultString(data.getCapacity()));
elm = doc.getElementById("anlFrcsGnrt");
- elm.text(ObjectUtils.nullSafeToString(data.getAnlFrcsGnrt()));
+ elm.text(StringUtils.defaultString(String.valueOf(data.getAnlFrcsGnrt())));
elm = doc.getElementById("snowfall");
- elm.text(ObjectUtils.nullSafeToString(data.getSnowfall()));
+ elm.text(StringUtils.defaultString(data.getSnowfall()));
elm = doc.getElementById("standardWindSpeedId");
- elm.text(ObjectUtils.nullSafeToString(data.getStandardWindSpeedId()));
+ elm.text(StringUtils.defaultString(data.getStandardWindSpeedId()));
if (data.getFrcPwrGnrList() != null && data.getFrcPwrGnrList().length > 0) {
@@ -1479,7 +1488,10 @@ public class PwrGnrSimService {
if (data.getFrcPwrGnrList() != null && data.getFrcPwrGnrList().length > 0) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < 13; i++) {
- sb.append("| " + ObjectUtils.nullSafeToString(data.getFrcPwrGnrList()[i]) + " | ");
+ sb.append(
+ ""
+ + StringUtils.defaultString(String.valueOf(data.getFrcPwrGnrList()[i]))
+ + " | ");
}
elm = doc.getElementById("frcPwrGnrList_detail");
@@ -1492,18 +1504,12 @@ public class PwrGnrSimService {
for (int i = 0; i < data.getRoofModuleList().size(); i++) {
PwrGnrSimRoofResponse listItem = data.getRoofModuleList().get(i);
-
sb.append("");
- sb.append("| " + ObjectUtils.nullSafeToString(listItem.getRoofSurface()) + " | ");
- sb.append(
- ""
- + Optional.ofNullable(listItem.getSlope()).orElse("")
- + ""
- + Optional.ofNullable(listItem.getAngle()).orElse("")
- + " | ");
- sb.append("" + ObjectUtils.nullSafeToString(listItem.getAzimuth()) + " | ");
- sb.append("" + ObjectUtils.nullSafeToString(listItem.getItemNo()) + " | ");
- sb.append("" + ObjectUtils.nullSafeToString(listItem.getAmount()) + " | ");
+ sb.append("" + StringUtils.defaultString(listItem.getRoofSurface()) + " | ");
+ sb.append("" + Optional.ofNullable(listItem.getSlopeAngle()).orElse("") + " | ");
+ sb.append("" + StringUtils.defaultString(listItem.getAzimuth()) + " | ");
+ sb.append("" + StringUtils.defaultString(listItem.getItemNo()) + " | ");
+ sb.append("" + StringUtils.defaultString(listItem.getAmount()) + " | ");
sb.append("
");
}
@@ -1519,8 +1525,8 @@ public class PwrGnrSimService {
PwrGnrSimRoofResponse listItem = data.getPcsList().get(i);
sb.append("");
- sb.append("| " + ObjectUtils.nullSafeToString(listItem.getItemNo()) + " | ");
- sb.append("" + ObjectUtils.nullSafeToString(listItem.getAmount()) + " | ");
+ sb.append("" + StringUtils.defaultString(listItem.getItemNo()) + " | ");
+ sb.append("" + StringUtils.defaultString(listItem.getAmount()) + " | ");
sb.append("