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

feature/cha #59

Merged
ysCha merged 2 commits from feature/cha into dev 2025-06-04 10:47:39 +09:00
Conversation 0 Commits 2 Files Changed 4 +10 -48
4 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,21 +15,6 @@ spring:
username: pvDBuser username: pvDBuser
maximum-pool-size: 4 maximum-pool-size: 4
pool-name: Master-HikariPool 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: jackson:
time-zone: Asia/Seoul time-zone: Asia/Seoul
batch: batch:

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

@ -11,21 +11,6 @@ spring:
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
maximum-pool-size: 4 maximum-pool-size: 4
pool-name: Master-HikariPool 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: jackson:
time-zone: Asia/Seoul time-zone: Asia/Seoul
batch: batch:

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

@ -19,22 +19,6 @@ spring:
password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
maximum-pool-size: 4 maximum-pool-size: 4
pool-name: Master-HikariPool 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: jackson:
time-zone: Asia/Seoul time-zone: Asia/Seoul
batch: batch:
@ -68,6 +52,10 @@ management:
health: health:
enabled: true enabled: true
batch:
job:
enabled: true
file: file:
root.path: /home/development/public/files root.path: /home/development/public/files
ini.root.path: /home/development/public/files/NewEstimate 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" <select id="getCanvasStatusNewObjectNo" parameterType="string"
resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus"> resultType="com.interplug.qcast.biz.canvasStatus.dto.CanvasStatus">
/* sqlid : com.interplug.qcast.canvasStatus.getCanvasStatusNewObjectNo */ /* 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 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>
<select id="getCanvasStatusImageAdd" parameterType="string" <select id="getCanvasStatusImageAdd" parameterType="string"