From a0fbc610312740e2b86e2afc8896bb16ac90dcdf Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 30 May 2023 13:32:50 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java  |  8 ++++++--
 .../service/bean/EcCctvCrackdownServiceBean.java   |  8 ++++----
 .../biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml    | 14 +++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java
index 67dfce92..968b350f 100644
--- a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java
+++ b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java
@@ -138,6 +138,10 @@ public class CctvCrackdownDTO {
         private String crdnBgngTm;
         /**
          * 단속 종료 시간
+         */
+        private String crdnEndTm;
+        /**
+         * 단속 종료 시각
           */
         private String crdnEndHr;
         /**
@@ -147,7 +151,7 @@ public class CctvCrackdownDTO {
         /**
          * 단속동명 - 법정동과 매핑(시군구도 함께)
          */
-        private String regltDongNm;
+        private String crdnStdgNm;
         /**
          * 단속 장소
          */
@@ -260,7 +264,7 @@ public class CctvCrackdownDTO {
         // 단속 데이타 생성시 필요
         private String violtLrgNm;
         private String vltnCn;
-        private String regltDongNm;
+        private String crdnStdgNm;
         private String crdnSpareaNm;
         private String crdnPlc;
 
diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java
index 32522ebf..ff9b4c78 100644
--- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java
+++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java
@@ -185,7 +185,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E
                 .sysSeCd(getUserInfo().getOrgnztId())
                 .sggCd(getUserInfo().getPstinstCode())
                 .vhrno(busOnlyDTO.getVhrno())
-                //.regltDongNm(mdInfos[1])
+                //.crndDongNm(mdInfos[1])
                 //.crdnPlc(mdInfos[2])
                 //.법규
                 //.어린이보호구역
@@ -309,12 +309,12 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E
 
         return CctvCrackdownDTO.ExtrlRegltCntc.builder()
             .vhrno(mdInfos[0])
-            .regltDongNm(mdInfos[1])
+            .crdnStdgNm(mdInfos[1])
             .crdnPlc(mdInfos[2])
             .violtLrgNm(mdInfos[3])
             .crdnSpareaNm(mdInfos[4])
             .crdnBgngTm(mdInfos[5])
-            .crdnEndHr(mdInfos[6])
+            .crdnEndTm(mdInfos[6])
             .gpsX(metaFileInfos.size() >= 3? metaFileInfos.get(1).trim() : null)
             .gpsY(metaFileInfos.size() >= 3? metaFileInfos.get(2).trim() : null)
 
@@ -341,7 +341,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E
             .crdnRegSeCd(FimsConst.CrdnRegSeCd.AUTO_REGIST.getCode())
             .crdnSttsCd(FimsConst.CrdnSttsCd.CRACKDOWN_INIT.getCode())
             .crdnPlc(extrDTO.getCrdnPlc())
-            .regltDongNm(extrDTO.getRegltDongNm())
+            .crdnStdgNm(extrDTO.getCrdnStdgNm())
             .vltnCn(extrDTO.getVltnCn())
             .crdnSpareaNm(extrDTO.getCrdnSpareaNm())
             .violtLrgNm(extrDTO.getVioltLrgNm())
diff --git a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml
index f18ff052..b5791b46 100644
--- a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml
+++ b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml
@@ -16,7 +16,7 @@
 		     , crdn_ymd
 		     , crdn_bgng_tm
 		     , crdn_end_hr
-		     , reglt_dong_nm
+		     , crdn_stdg_nm
 		     , crdn_plc
 		     , crdn_sparea_nm
 		     , crdn_bzenty_cd
@@ -73,8 +73,8 @@
 			, vhrno
 			, crdn_ymd
 			, crdn_bgng_tm
-			, crdn_end_hr
-			, reglt_dong_nm
+			, crdn_end_tm
+			, crdn_stdg_nm
 			, crdn_plc
 			, crdn_sparea_nm
 			, crdn_bzenty_cd
@@ -94,8 +94,8 @@
 			, #{vhrno}
 			, #{crdnYmd}
 			, #{crdnBgngTm}
-			, #{crdnEndHr}
-			, #{regltDongNm}
+			, #{crdnEndTm}
+			, #{crdnStdgNm}
 			, #{crdnPlc}
 			, #{crdnSpareaNm}
 			, #{crdnBzentyCd}
@@ -154,12 +154,12 @@
 				, #{inptSeCd} -- 입력 구분 코드
 				, crdn_ymd
 				, crdn_bgng_tm  -- 단속 시작 시간
-				, crdn_end_hr  -- 단속 종료 시간
+				, crdn_end_hm  -- 단속 종료 시간
 				, #{crdnPlc} -- crdn_plc
 				, '1'  -- 위반 횟수
 				, (SELECT tgt.stdg_nm
 				     FROM tb_stdg_info tgt
-                    WHERE tgt.stdg_nm = #{regltDongNm}
+                    WHERE tgt.stdg_nm = #{crdnStdgNm}
                     limit 1
 				)  -- 위반 법정동 명
 				, (SELECT tgt.mapng_code