발전시뮬레이션 수정

src/main/java/com/interplug/qcast/batch/master/StoreJobConfiguration.java

@@ -93,12 +93,9 @@ public class StoreJobConfiguration implements JobExecutionListener {
         createWriter(
             (items) -> {
               try {
-                log.debug("Store batch processing {} items", items.size());
                 userService.setStoreBatch(items);
-                log.debug("Successfully processed store batch");
               } catch (Exception e) {
                 log.error("Error processing store batch: {}", e.getMessage(), e);
-                throw new RuntimeException("Failed to process store batch", e);
               }
             },
             "store"));
@@ -114,12 +111,9 @@ public class StoreJobConfiguration implements JobExecutionListener {
         createWriter(
             (items) -> {
               try {
-                log.debug("User batch processing {} items", items.size());
                 userService.setUserBatch(items);
-                log.debug("Successfully processed user batch");
               } catch (Exception e) {
                 log.error("Error processing user batch: {}", e.getMessage(), e);
-                throw new RuntimeException("Failed to process user batch", e);
               }
             },
             "user"));
@@ -136,12 +130,9 @@ public class StoreJobConfiguration implements JobExecutionListener {
         createWriter(
             (items) -> {
               try {
-                log.debug("Favorite batch processing {} items", items.size());
                 storeFavService.setStoreFavoriteBatch(items);
-                log.debug("Successfully processed favorite batch");
               } catch (Exception e) {
                 log.error("Error processing favorite batch: {}", e.getMessage(), e);
-                throw new RuntimeException("Failed to process favorite batch", e);
               }
             },
             "favorite"));

src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -999,6 +999,17 @@ public class EstimateService {
           pwrGnrSimService.selectPwrGnrSimulation(pwrGnrSimRequest);
       pwrGnrSimResponse.setPwrGnrSimType(estimateRequest.getPwrGnrSimType());
 
+      // 발전시뮬레이션 타입에 따른 list 셋팅
+      if ("A".equals(estimateRequest.getPwrGnrSimType())) {
+        pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouAll());
+      } else if ("B".equals(estimateRequest.getPwrGnrSimType())) {
+        pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouAllSnow());
+      } else if ("C".equals(estimateRequest.getPwrGnrSimType())) {
+        pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouPeakcutAll());
+      } else if ("D".equals(estimateRequest.getPwrGnrSimType())) {
+        pwrGnrSimResponse.setFrcPwrGnrList(pwrGnrSimResponse.getHatsudenryouPeakcutAllSnow());
+      }
+
       if (pwrGnrSimResponse != null) {
         try {
           // 발전시뮬레이션 안내사항 조회

src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java

@@ -1319,16 +1319,7 @@ public class PwrGnrSimService {
   public static Document pwrGnrSimPdfHtml(Document doc, PwrGnrSimResponse data)
       throws IOException, QcastException {
 
-    String[] pwrGnrSimList = new String[13];
+    String[] pwrGnrSimList = data.getFrcPwrGnrList();
-    if ("A".equals(data.getPwrGnrSimType())) {
-      pwrGnrSimList = data.getHatsudenryouAll();
-    } else if ("B".equals(data.getPwrGnrSimType())) {
-      pwrGnrSimList = data.getHatsudenryouAllSnow();
-    } else if ("C".equals(data.getPwrGnrSimType())) {
-      pwrGnrSimList = data.getHatsudenryouPeakcutAll();
-    } else if ("D".equals(data.getPwrGnrSimType())) {
-      pwrGnrSimList = data.getHatsudenryouPeakcutAllSnow();
-    }
 
     Element elm;
 
@@ -1494,6 +1485,9 @@ public class PwrGnrSimService {
       elm.append(sb.toString());
     }
 
+    elm = doc.getElementById("guideInfo");
+    elm.append(data.getGuideInfo());
+
     return doc;
   }
 

src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/dto/PwrGnrSimResponse.java

@@ -9,6 +9,9 @@ public class PwrGnrSimResponse {
   @Schema(description = "적재율")
   private double sekisairitsu;
 
+  @Schema(description = "엑셀/PDF 다운로드시 LIST")
+  private String[] frcPwrGnrList;
+
   @Schema(description = "적설 고려 없음 (피크 컷 없음 발전량) Type : A")
   private String[] hatsudenryouAll;
 

src/main/resources/mappers/pwrGnrSimulation/pwrGnrSimMapper.xml

@@ -61,6 +61,7 @@
           AND C.ITEM_GROUP ='PC_'
         group by B.ITEM_ID, B.ITEM_NO, C.CNV_EFF , C.AMP ,B.SPECIFICATION
         ORDER BY B.SPECIFICATION
+        /* TODO :: 직렬,병렬 조건 추가필요 */
     </select>
 
 
@@ -80,6 +81,10 @@
              , C.CNV_EFF
              , C.AMP
              , B.SPECIFICATION
+             , A.ROOF_SURFACE
+             , A.CLASS_TYPE
+             , A.AZIMUTH
+             , (CASE WHEN A.CLASS_TYPE = 0 THEN A.SLOPE ELSE A.ANGLE END) AS SLOPE_ANGLE
         FROM  T_ROOF_ESTIMATE A WITH (NOLOCK)
         INNER JOIN T_ROOF_ITEM_ESTIMATE B WITH (NOLOCK)
             ON A.OBJECT_NO = B.OBJECT_NO

src/main/resources/mappers/user/userMapper.xml

@@ -215,7 +215,7 @@
             ) VALUES (
                   #{userId}
                 , #{saleStoreId}
-                , #{userId}
+                , SUBSTRING(#{userId},0,31)
                 , #{category}
                 , #{name}
                 , #{nameKana}

src/main/resources/template/pdf/pdf_download_quotation_detail_template.html

@@ -612,7 +612,8 @@
         ● Hanwha Japan 年間発電量シミュレーション案内事項
     </div>
     <div class="guide-box">
-        <div class="guide-content" id="guideInfo"></div>
+        <pre class="guide-content" id="guideInfo">
+        </pre>
     </div>
 </div>
 <div class="section4">