Merge pull request '이미지 불러오기 방법 변경 (File => Url)' (#22) from feature/cha into dev

Reviewed-on: #22

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

@@ -7,6 +7,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1494,21 +1497,40 @@ public class EstimateService {
 
       // 도면 이미지 셋팅
       String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
-      File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
-      if (file.exists()) {
+
+      URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
+      URLConnection con = url.openConnection();
+      HttpURLConnection exitCode = (HttpURLConnection)con;
+      if (exitCode.getResponseCode() == 200) {
         InputStream imageInputStream =
-            new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
+                new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png").openStream();
         byte[] drawingImg1 = Util.toByteArray(imageInputStream);
         estimateResponse.setDrawingImg1(drawingImg1);
       }
-
-      file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
-      if (file.exists()) {
+//      File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
+//      if (file.exists()) {
+//        InputStream imageInputStream =
+//            new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
+//        byte[] drawingImg1 = Util.toByteArray(imageInputStream);
+//        estimateResponse.setDrawingImg1(drawingImg1);
+//      }
+      String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
+      URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png");
+      URLConnection con2 = url2.openConnection();
+      HttpURLConnection exitCode2 = (HttpURLConnection)con2;
+      if (exitCode2.getResponseCode() == 200) {
         InputStream imageInputStream2 =
-            new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
+                new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2.png").openStream();
         byte[] drawingImg2 = Util.toByteArray(imageInputStream2);
-        estimateResponse.setDrawingImg2(drawingImg2);
+        estimateResponse.setDrawingImg1(drawingImg2);
       }
+//      file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
+//      if (file.exists()) {
+//        InputStream imageInputStream2 =
+//            new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
+//        byte[] drawingImg2 = Util.toByteArray(imageInputStream2);
+//        estimateResponse.setDrawingImg2(drawingImg2);
+//      }
 
       if ("PDF".equals(estimateRequest.getSchDownload())) { // PDF 다운로드
         String[] arrSection = new String[6];

src/main/resources/config/application-dev.yml

@@ -58,7 +58,7 @@ file:
   root.path: /home/development/public/files
   ini.root.path: /home/development/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing
+  ini.drawing.img.path: https://files.hanasys.jp/Drawing
 
 front:
   url: http://1.248.227.176:3000

src/main/resources/config/application-local.yml

@@ -39,7 +39,7 @@ spring:
 
 #QSP
 qsp:
-  url: http://localhost:8120
+  url: http://1.248.227.176:8120
   master-store-batch-url: /api/master/storeAdditionalInfo
   master-material-batch-url: /api/master/materialList
   master-bom-batch-url: /api/master/bomList

src/main/resources/config/application-prd.yml

@@ -58,7 +58,7 @@ file:
   root.path: /home/production/public/files
   ini.root.path: /home/production/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: /home/production/public/files/NewEstimate/Drawing
+  ini.drawing.img.path: https://files.hanasys.jp/Drawing
 
 front:
   url: https://hanasys.jp

src/main/resources/config/application.yml

@@ -65,7 +65,7 @@ file:
   root.path: /home/development/public/files
   ini.root.path: /home/development/public/files/NewEstimate
   ini.base.filename: 料金シミュレーション.ini
-  ini.drawing.img.path: /home/development/public/files/NewEstimate/Drawing
+  ini.drawing.img.path: https://files.hanasys.jp/Drawing
 
 # log
 logging:

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -322,7 +322,6 @@
             , II.ITEM_CTG_GR
             , ISNULL(PPM.SALE_PRICE, '0') AS SALE_PRICE
             , CASE WHEN PPM.SALE_PRICE = 0 THEN '1' ELSE '0' END AS OPEN_FLG
-            , CASE WHEN PPM.UNIT_PRICE = 0 AND PPM.SALE_PRICE <![CDATA[ <> ]]> 0 THEN '1' ELSE '0' END AS UNIT_OPEN_FLG
         FROM M_ITEM I WITH (NOLOCK)
         INNER JOIN M_ITEM_INFO II WITH (NOLOCK)
             ON I.ITEM_ID = II.ITEM_ID