Compare commits

..

No commits in common. "858940b8e892d462566cd6f53fe3166b734d33cf" and "4799f03963fd302c3fb67b0869c66cb374461b36" have entirely different histories.

2 changed files with 4 additions and 12 deletions

View File

@ -10,7 +10,6 @@ import java.math.BigDecimal;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.security.cert.X509Certificate;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -73,7 +72,6 @@ import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@ -1497,18 +1495,12 @@ public class EstimateService {
estimateResponse.setPwrGnrSim(pwrGnrSimResponse); estimateResponse.setPwrGnrSim(pwrGnrSimResponse);
// 도면 이미지 셋팅 // 도면 이미지 셋팅
String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo(); String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png"); URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
URLConnection con = url.openConnection(); URLConnection con = url.openConnection();
HttpURLConnection exitCode = (HttpURLConnection) con; HttpURLConnection exitCode = (HttpURLConnection)con;
System.err.println("exitCode: " + exitCode);
System.err.println("Exit code: " + exitCode.getResponseCode());
if (exitCode.getResponseCode() == 200) { if (exitCode.getResponseCode() == 200) {
InputStream imageInputStream = InputStream imageInputStream =
new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png").openStream(); new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png").openStream();
@ -1525,7 +1517,7 @@ public class EstimateService {
String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo(); String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png"); URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png");
URLConnection con2 = url2.openConnection(); URLConnection con2 = url2.openConnection();
HttpURLConnection exitCode2 = (HttpURLConnection) con2; HttpURLConnection exitCode2 = (HttpURLConnection)con2;
if (exitCode2.getResponseCode() == 200) { if (exitCode2.getResponseCode() == 200) {
InputStream imageInputStream2 = InputStream imageInputStream2 =
new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png").openStream(); new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png").openStream();

View File

@ -37,9 +37,9 @@ spring:
profiles: profiles:
scheduler: Y scheduler: Y
#QSP url #http://jp.qsalesplatform.com #QSP
qsp: qsp:
url: http://172.16.56.60:8110 url: http://1.248.227.176:8120
master-store-batch-url: /api/master/storeAdditionalInfo master-store-batch-url: /api/master/storeAdditionalInfo
master-material-batch-url: /api/master/materialList master-material-batch-url: /api/master/materialList
master-bom-batch-url: /api/master/bomList master-bom-batch-url: /api/master/bomList