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-06-04 15:40:50 +09:00
commit 2bfeada0db
6 changed files with 71 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/interplug/qcast/biz/MainController.java
View File

@ -3,6 +3,7 @@ package com.interplug.qcast.biz;
import com.interplug.qcast.config.message.Messages;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -12,11 +13,33 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/main")
public class MainController {
@Autowired
Messages message;
@Autowired Messages message;
@Value("${front.url}")
private String frontUrl;
@GetMapping
public String Main() {
return message.getMessage("example.msg.001");
public MainTestResponse Main() {
MainTestResponse response =
new MainTestResponse(message.getMessage("example.msg.001"), frontUrl);
return response;
}
class MainTestResponse {
private String message;
private String frontUrl;
public MainTestResponse(String message, String frontUrl) {
this.message = message;
this.frontUrl = frontUrl;
}
public String getMessage() {
return message;
}
public String getFrontUrl() {
return frontUrl;
}
}
}

15
src/main/resources/config/application-dev.yml
View File

@ -15,21 +15,6 @@ spring:
username: pvDBuser
maximum-pool-size: 4
pool-name: Master-HikariPool
# datasource:
# master:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Master-HikariPool
# read:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Read-HikariPool
jackson:
time-zone: Asia/Seoul
batch:

26
src/main/resources/config/application-prd.yml
View File

@ -6,26 +6,14 @@ server:
spring:
datasource:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
username: pvDBuser
# jdbc-url: jdbc:log4jdbc:sqlserver://10.31.0.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=true
# username: pvDBuser
# password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
username: pvDBuser
maximum-pool-size: 4
pool-name: Master-HikariPool
# datasource:
# master:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Master-HikariPool
# read:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Read-HikariPool
jackson:
time-zone: Asia/Seoul
batch:
@ -40,10 +28,10 @@ batch:
job:
enabled: false
#QSP url 하나시스운영 #https://jp.qsalesplatform.com
#QSP url 하나시스개발 #https://121.168.9.37:8080
#QSP url 하나시스개발 #http://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120
qsp:
url: https://jp.qsalesplatform.com
url: http://121.168.9.37:8080
master-store-batch-url: /api/master/storeAdditionalInfo
master-material-batch-url: /api/master/materialList
master-bom-batch-url: /api/master/bomList

20
src/main/resources/config/application.yml
View File

@ -19,22 +19,6 @@ spring:
password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
maximum-pool-size: 4
pool-name: Master-HikariPool
# master:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Master-HikariPool
# # connection-test-query: SELECT 1
# read:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Read-HikariPool
# connection-test-query: SELECT 2
jackson:
time-zone: Asia/Seoul
batch:
@ -68,6 +52,10 @@ management:
health:
enabled: true
batch:
job:
enabled: true
file:
root.path: /home/development/public/files
ini.root.path: /home/development/public/files/NewEstimate

8
src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml
View File

@ -7,9 +7,13 @@
<select id="getCanvasStatusNewObjectNo" parameterType="string"
resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
/* sqlid : com.interplug.qcast.canvasStatus.getCanvasStatusNewObjectNo */
SELECT #{userId} + FORMAT(GETDATE(), 'yyMMdd') + RIGHT('000' + CAST(ISNULL(MAX(CAST(RIGHT(object_no, 3) AS INT)), 0) + 1 AS VARCHAR (3)), 3) AS objectNo
SELECT #{userId} + RIGHT('0' + CAST(YEAR(GETDATE()) % 100 AS VARCHAR), 2) +
RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2) +
RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2) + RIGHT('000' + CAST(ISNULL(MAX(CAST(RIGHT(object_no, 3) AS INT)), 0) + 1 AS VARCHAR (3)), 3) AS objectNo
FROM TB_CANVAS_STATUS
WHERE object_no LIKE #{userId} + FORMAT(GETDATE(), 'yyMMdd') + '%'
WHERE object_no LIKE #{userId} + RIGHT('0' + CAST(YEAR(GETDATE()) % 100 AS VARCHAR), 2) +
RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2) +
RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2) + '%'
</select>
<select id="getCanvasStatusImageAdd" parameterType="string"

44
src/main/resources/mappers/object/objectMapper.xml
View File

@ -327,11 +327,11 @@
<choose>
<when test='schDateType != null and schDateType == "U" and (schFromDt != null and schFromDt != "") and (schToDt != null and schToDt != "")'>
/* 갱신일 시작일,종료일 검색조건 */
AND O.LAST_EDIT_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schFromDt} AS DATE USING 'en-US')) + ' 00:00:00') AND CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schToDt} AS DATE USING 'en-US')) + ' 23:59:59')
AND O.LAST_EDIT_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schFromDt}, 120) + ' 00:00:00', 120) AND CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schToDt}, 120) + ' 23:59:59', 120)
</when>
<when test='schDateType != null and schDateType == "R" and (schFromDt != null and schFromDt != "") and (schToDt != null and schToDt != "")'>
/* 등록일 시작일,종료일 검색조건 */
AND OI.CREATE_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schFromDt} AS DATE USING 'en-US')) + ' 00:00:00') AND CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schToDt} AS DATE USING 'en-US')) + ' 23:59:59')
AND OI.CREATE_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schFromDt}, 120) + ' 00:00:00', 120) AND CONVERT(DATETIME, CONVERT(VARCHAR(10), #{schToDt}, 120) + ' 23:59:59', 120)
</when>
</choose>
<if test='schTempFlg != null and schTempFlg != ""'>
@ -471,23 +471,33 @@
</select>
<insert id="insertObjectNo" parameterType="com.interplug.qcast.biz.object.dto.ObjectRequest">
/* sqlid : com.interplug.qcast.biz.object.insertObjectNo */
INSERT INTO T_OBJECT_NO
(
SALE_STORE_ID
, YEAR
, MONTH
, DAY
, NO
)
SELECT
#{saleStoreId}
, RIGHT(CAST(YEAR(GETDATE()) AS VARCHAR), 2)
, RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2)
, RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2)
, ISNULL(MAX(NO), 0) + 1 FROM T_OBJECT_NO WHERE SALE_STORE_ID = #{saleStoreId} AND YEAR = RIGHT(CAST(YEAR(GETDATE()) AS VARCHAR), 2) AND MONTH = RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2) AND DAY = RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2)
MERGE INTO T_OBJECT_NO AS TARGET
USING (
SELECT
#{saleStoreId} AS SALE_STORE_ID
, RIGHT(CAST(YEAR(GETDATE()) AS VARCHAR), 2) AS YEAR
, RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2) AS MONTH
, RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2) AS DAY
, ISNULL(MAX(NO), 0) + 1 AS NO
FROM T_OBJECT_NO
WHERE SALE_STORE_ID = #{saleStoreId}
AND YEAR = RIGHT(CAST(YEAR(GETDATE()) AS VARCHAR), 2)
AND MONTH = RIGHT('0' + CAST(MONTH(GETDATE()) AS VARCHAR), 2)
AND DAY = RIGHT('0' + CAST(DAY(GETDATE()) AS VARCHAR), 2)
) AS SOURCE
ON TARGET.SALE_STORE_ID = SOURCE.SALE_STORE_ID
AND TARGET.YEAR = SOURCE.YEAR
AND TARGET.MONTH = SOURCE.MONTH
AND TARGET.DAY = SOURCE.DAY
WHEN MATCHED THEN
UPDATE SET
NO = SOURCE.NO
WHEN NOT MATCHED THEN
INSERT (SALE_STORE_ID, YEAR, MONTH, DAY, NO)
VALUES (SOURCE.SALE_STORE_ID, SOURCE.YEAR, SOURCE.MONTH, SOURCE.DAY, SOURCE.NO);
</insert>
<insert id="insertObject" parameterType="com.interplug.qcast.biz.object.dto.ObjectRequest">
/* sqlid : com.interplug.qcast.biz.object.insertObject */
INSERT INTO T_OBJECT