From fc21756767239c3a87b07a30fde732b1f9ecc0f4 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Wed, 4 Jun 2025 10:19:35 +0900 Subject: [PATCH 1/7] =?UTF-8?q?profile=20=ED=99=95=EC=9D=B8=EC=9A=A9=20?= =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interplug/qcast/biz/MainController.java | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/MainController.java b/src/main/java/com/interplug/qcast/biz/MainController.java index 70bdec4b..377214fe 100644 --- a/src/main/java/com/interplug/qcast/biz/MainController.java +++ b/src/main/java/com/interplug/qcast/biz/MainController.java @@ -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; + } } } From 821ad1a8c76002eb17b425ec7eef662e2068dbd0 Mon Sep 17 00:00:00 2001 From: cha Date: Wed, 4 Jun 2025 10:30:37 +0900 Subject: [PATCH 2/7] =?UTF-8?q?format=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mappers/canvasStatus/canvasStatusMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml index 78539bc9..5ea76411 100644 --- a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml +++ b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml @@ -7,9 +7,13 @@ - /* 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); + /* sqlid : com.interplug.qcast.biz.object.insertObject */ INSERT INTO T_OBJECT