qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/dev-yj

Browse Source
This commit is contained in:
yjnoh 2025-05-26 15:48:19 +09:00
commit 3a1a85caae
2 changed files with 192 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
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();

7
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -362,7 +362,12 @@
<select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String"> <select id="selectEstimateRoofCertVolKw" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="String">
/* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */ /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofCertVolKw */
SELECT SELECT
FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW -- FORMAT(ISNULL(SUM(CASE WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW ELSE T.PC_VOL_KW END), 0), '#,##0.000') AS CERT_VOL_KW
REPLACE(CONVERT(VARCHAR, CAST(ISNULL(SUM(
CASE
WHEN T.MODULE_VOL_KW <![CDATA[ <= ]]> T.PC_VOL_KW THEN T.MODULE_VOL_KW
ELSE T.PC_VOL_KW
END), 0) AS NUMERIC(18, 3)), 1), ',', '') AS CERT_VOL_KW
FROM FROM
( (
SELECT SELECT