feat: 천안 swagger(/batch/ens/v1/statusBulks) 상태조회시 발송마스터ID 파라메터 추가

mens-batch/src/main/java/kr/xit/biz/ens/model/EnsDTO.java

@@ -1,29 +1,21 @@
 package kr.xit.biz.ens.model;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.io.*;
+import java.time.*;
 
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.*;
+import com.fasterxml.jackson.datatype.jsr310.deser.*;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import kr.xit.biz.common.ApiConstants;
-import kr.xit.biz.ens.model.cmm.CmmEnsRequestDTO;
-import kr.xit.biz.ens.model.nice.NiceCiDTO;
+import io.swagger.v3.oas.annotations.media.*;
+import kr.xit.biz.common.*;
+import kr.xit.biz.ens.model.cmm.*;
+import kr.xit.biz.ens.model.nice.*;
 import kr.xit.core.biz.model.AuditFields;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
+import lombok.*;
+import lombok.experimental.*;
 
 /**
  * <pre>
@@ -59,6 +51,12 @@ public class EnsDTO {
          */
         @Schema(hidden = true, requiredMode = Schema.RequiredMode.AUTO, title = "배치실행주기", example = "day|hour")
         private String batchPeriod;
+
+        /**
+         * 발송마스터 ID - 값이 있으면 해당 마스터 건만 처리
+         */
+        @Schema(requiredMode = Schema.RequiredMode.AUTO, title = "발송마스터아이디", example = " ")
+        private String sndngMastrId;
     }
 
     @Data

mens-batch/src/main/java/kr/xit/biz/ens/web/EnsBatchController.java

@@ -1,22 +1,15 @@
 package kr.xit.biz.ens.web;
 
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.*;
+import org.springframework.web.bind.annotation.*;
 
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.ExampleObject;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import kr.xit.biz.ens.model.EnsDTO;
-import kr.xit.biz.ens.service.IEnsBatchAcceptService;
-import kr.xit.biz.ens.service.IEnsBatchCloseService;
-import kr.xit.biz.ens.service.IEnsBatchStatusService;
-import kr.xit.core.model.ApiResponseDTO;
-import kr.xit.core.model.IApiResponse;
-import lombok.RequiredArgsConstructor;
+import io.swagger.v3.oas.annotations.*;
+import io.swagger.v3.oas.annotations.media.*;
+import io.swagger.v3.oas.annotations.tags.*;
+import kr.xit.biz.ens.model.*;
+import kr.xit.biz.ens.service.*;
+import kr.xit.core.model.*;
+import lombok.*;
 
 /**
  * <pre>
@@ -118,10 +111,24 @@ public class EnsBatchController {
                     value = CCN),
                 @ExampleObject(
                     name = "천안시 동남구청",
-                    value = CAN_1),
+                    value = """
+                        {
+                          "sndngMastrId": "",
+                          "signguCode": "44131",
+                          "ffnlgCode": "11",
+                          "profile": "local"
+                        }
+                    """),
                 @ExampleObject(
                     name = "천안시 서북구청",
-                    value = CAN_2)
+                    value = """
+                        {
+                          "sndngMastrId": "",
+                          "signguCode": "44133",
+                          "ffnlgCode": "11",
+                          "profile": "local"
+                        }
+                    """)
             })
     })
     @Operation(summary = "통합문서(bulk) 상태 조회", description = "통합문서 상태 조회")

mens-batch/src/main/resources/egovframework/mapper/biz/ens-oracle-mapper.xml

@@ -1012,6 +1012,9 @@
 		WHERE tesm.sndng_process_sttus IN ('send-ok', 'sending1', 'sending2')
 		  AND tesm.signgu_code = #{signguCode}
 		  AND tesm.ffnlg_code = #{ffnlgCode}
+		<if test="sndngMastrId != null and sndngMastrId != ''">
+		  AND tesm.sndng_mastr_id = #{sndngMastrId}	
+		</if>
 	</select>
 
 	<select id="selectKakaopayStatusTgts" resultType="string">