add sect_grad_stup

conf/traf-prcs-server.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

src/main/java/com/its/traf/dao/mapper/its/TbSectGradMapper.java

@@ -11,6 +11,5 @@ public interface TbSectGradMapper {
 
     List<TbSectGradVo> findAllList();
     List<TbSectGradStupDto> findAllListStup();
-    List<TbSectGradStupDto> findAllListStupLocal();
 
 }

src/main/java/com/its/traf/service/its/TbIfscService.java

@@ -176,14 +176,6 @@ public class TbIfscService extends AbstractDataService<Long, TbIfscDto> implemen
                     traf.setCMTR_GRAD_CD(this.sectGradService.getCmtrGradCd(traf.getSPED()));
                 }
 
-                // 지역등급기준 소통등급 설정
-                sectGrad = this.sectGradService.getLocal(ifsc.getSectGradCd());
-                if (sectGrad != null) {
-                    traf.setLOCAL_GRAD_CD(sectGrad.getCmtrGradCd(traf.getSPED()));
-                } else {
-                    traf.setLOCAL_GRAD_CD(this.sectGradService.getCmtrGradCd(traf.getSPED()));
-                }
-
                 if (nOcpyCnt > 0) {
                     traf.setOCPY_RATE(fSumOcpy / nOcpyCnt);
                 } else {
@@ -222,7 +214,6 @@ public class TbIfscService extends AbstractDataService<Long, TbIfscDto> implemen
             param.put("CMTR_GRAD_CD",   traf.getCMTR_GRAD_CD());
             param.put("PTRN_SPED",      traf.getPTRN_SPED());
             param.put("DATA_NUM",       traf.getDATA_NUM());
-            param.put("LOCAL_GRAD_CD",  traf.getLOCAL_GRAD_CD());
             updLists.add(param);
             if (traf.getSPED() > 0) {
                 insLists.add(param);

src/main/java/com/its/traf/service/its/TbLinkService.java

@@ -373,14 +373,6 @@ public class TbLinkService extends AbstractDataService<Long, TbLinkDto> implemen
             } else {
                 traf.setCMTR_GRAD_CD(this.sectGradService.getCmtrGradCd(traf.getSPED()));
             }
-
-            // 지역등급기준 소통등급 설정
-            sectGrad = this.sectGradService.getLocal(link.getSectGradCd());
-            if (sectGrad != null) {
-                traf.setLOCAL_GRAD_CD(sectGrad.getCmtrGradCd(traf.getSPED()));
-            } else {
-                traf.setLOCAL_GRAD_CD(this.sectGradService.getCmtrGradCd(traf.getSPED()));
-            }
         }
     }
 
@@ -542,7 +534,6 @@ public class TbLinkService extends AbstractDataService<Long, TbLinkDto> implemen
             param.put("PRCN_SORC",      traf.getPRCN_SORC());
             param.put("ADJS_SORC",      traf.getADJS_SORC());
             param.put("DATA_NUM",       traf.getDATA_NUM());
-            param.put("LOCAL_GRAD_CD",  traf.getLOCAL_GRAD_CD());
             updLists.add(param);
             if (traf.getSPED() > 0) {
                 insLists.add(param);

src/main/java/com/its/traf/service/its/TbRoadService.java

@@ -176,14 +176,6 @@ public class TbRoadService extends AbstractDataService<Long, TbRoadDto> implemen
                     traf.setCMTR_GRAD_CD(this.sectGradService.getCmtrGradCd(traf.getSPED()));
                 }
 
-                // 지역등급기준 소통등급
-                sectGrad = this.sectGradService.getLocal(road.getSectGradCd());
-                if (sectGrad != null) {
-                    traf.setLOCAL_GRAD_CD(sectGrad.getCmtrGradCd(traf.getSPED()));
-                } else {
-                    traf.setLOCAL_GRAD_CD(this.sectGradService.getCmtrGradCd(traf.getSPED()));
-                }
-
                 if (nOcpyCnt > 0) {
                     traf.setOCPY_RATE(fSumOcpy / nOcpyCnt);
                 } else {
@@ -223,7 +215,6 @@ public class TbRoadService extends AbstractDataService<Long, TbRoadDto> implemen
             param.put("CMTR_GRAD_CD",   traf.getCMTR_GRAD_CD());
             param.put("PTRN_SPED",      traf.getPTRN_SPED());
             param.put("DATA_NUM",       traf.getDATA_NUM());
-            param.put("LOCAL_GRAD_CD",  traf.getLOCAL_GRAD_CD());
             updLists.add(param);
             if (traf.getSPED() > 0) {
                 insLists.add(param);

src/main/java/com/its/traf/service/its/TbSectGradService.java

@@ -10,7 +10,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Hashtable;
 import java.util.List;
 
 @Slf4j
@@ -18,7 +17,6 @@ import java.util.List;
 @Service
 public class TbSectGradService extends AbstractDataService<String, TbSectGradDto> {
 
-    private Hashtable<String, TbSectGradDto> localMapData = new Hashtable<>();
     private final TbSectGradMapper mapper;
 
     /**
@@ -37,11 +35,13 @@ public class TbSectGradService extends AbstractDataService<String, TbSectGradDto
         for (TbSectGradVo ett : data) {
             TbSectGradDto dto = ett.toDto();
             put(ett.getSectGradCd(), dto);
-            this.localMapData.put(ett.getSectGradCd(), dto);
         }
 
         // 국토교통부 기준 소통등급 정보조회
         List<TbSectGradStupDto> stupData = this.mapper.findAllListStup();
+        if (stupData.isEmpty()) {
+            log.error("TbSectGradService.load: Not Found Sect Grad Stup.");
+        }
         for (TbSectGradStupDto dto : stupData) {
             TbSectGradDto obj = get(dto.getSectGradCd());
             if (obj != null) {
@@ -54,26 +54,9 @@ public class TbSectGradService extends AbstractDataService<String, TbSectGradDto
             obj.makeGradCdMap();
         }
 
-        // 지역등급기준 소통등급 정보조회
-        stupData = this.mapper.findAllListStupLocal();
-        for (TbSectGradStupDto dto : stupData) {
-            TbSectGradDto obj = this.localMapData.get(dto.getSectGradCd());
-            if (obj != null) {
-                obj.getGradSubs().add(dto);
-            }
-        }
-        // 소통등급 정보 소팅
-        for (String key: this.localMapData.keySet()) {
-            TbSectGradDto localObj = this.localMapData.get(key);
-            localObj.makeGradCdMap();
-        }
         return count();
     }
 
-    public TbSectGradDto getLocal(String grade) {
-        return this.localMapData.get(grade);
-    }
-
 //    /**
 //     * 구간 등급과 속도를 이용하여 소통등급 코드를 조회
 //     * @param SECT_GRAD_CD

src/main/java/com/its/traf/vo/traffic/voIfscTraf.java

@@ -19,7 +19,6 @@ public class voIfscTraf {
     private int    TRVL_HH;         //	N	NUMBER(6)	    Y	0		통행 시간
     private String CMTR_GRAD_CD;    //	N	VARCHAR2(7)	    Y			소통 등급 코드
     private int    DATA_NUM;        //	N	NUMBER(3)	    Y	0		데이터 개수
-    private String LOCAL_GRAD_CD;    //	N	VARCHAR2(7)	    Y			지역등급기준 소통 등급 코드
 
     public boolean isValid() {
         return this.CMTR_GRAD_CD.equals(ITS.TRAFFIC_NONE) ? false : true;
@@ -36,6 +35,5 @@ public class voIfscTraf {
         this.CMTR_GRAD_CD = ITS.TRAFFIC_NONE;
         this.PTRN_SPED    = 0;
         this.DATA_NUM     = 0;
-        this.LOCAL_GRAD_CD = ITS.TRAFFIC_NONE;
     }
 }

src/main/java/com/its/traf/vo/traffic/voLinkTraf.java

@@ -25,7 +25,6 @@ public class voLinkTraf {
     private String PRCN_SORC;       //	N	VARCHAR2(7)	    Y			가공 소스
     private String ADJS_SORC;       //	N	VARCHAR2(7)	    Y			보정 소스
     private int    DATA_NUM;        //	N	NUMBER(3)	    Y	0		데이터 개수
-    private String LOCAL_GRAD_CD;    //	N	VARCHAR2(7)	    Y			지역등급기준 소통 등급 코드
 
     public boolean isValid() {
         return this.CMTR_GRAD_CD.equals(ITS.TRAFFIC_NONE) ? false : true;
@@ -51,7 +50,6 @@ public class voLinkTraf {
         this.PRCN_SORC    = ITS.CORRECT_SOURCE_NONE;
         this.ADJS_SORC    = ITS.CORRECT_SOURCE_NONE;
         this.DATA_NUM     = 0;
-        this.LOCAL_GRAD_CD = ITS.TRAFFIC_NONE;
     }
 
     public voLinkTraf copy(Long LINK_ID) {
@@ -72,7 +70,6 @@ public class voLinkTraf {
         traf.setPRCN_SORC(this.PRCN_SORC);
         traf.setADJS_SORC(this.ADJS_SORC);
         traf.setDATA_NUM(this.DATA_NUM);
-        traf.setLOCAL_GRAD_CD(this.LOCAL_GRAD_CD);
         return traf;
     }
 }

src/main/java/com/its/traf/vo/traffic/voRoadTraf.java

@@ -19,7 +19,6 @@ public class voRoadTraf {
     private int    TRVL_HH;         //	N	NUMBER(6)	    Y	0		통행 시간
     private String CMTR_GRAD_CD;    //	N	VARCHAR2(7)	    Y			소통 등급 코드
     private int    DATA_NUM;        //	N	NUMBER(3)	    Y	0		데이터 개수
-    private String LOCAL_GRAD_CD;    //	N	VARCHAR2(7)	    Y			지역등급기준 소통 등급 코드
 
     public boolean isValid() {
         return this.CMTR_GRAD_CD.equals(ITS.TRAFFIC_NONE) ? false : true;
@@ -36,6 +35,5 @@ public class voRoadTraf {
         this.CMTR_GRAD_CD = ITS.TRAFFIC_NONE;
         this.PTRN_SPED    = 0;
         this.DATA_NUM     = 0;
-        this.LOCAL_GRAD_CD = ITS.TRAFFIC_NONE;
     }
 }

src/main/resources/mybatis/mapper/its/IfscMapper.xml

@@ -45,8 +45,7 @@
                       #{TRVL_HH}      AS TRVL_HH,
                       #{CMTR_GRAD_CD} AS CMTR_GRAD_CD,
                       #{PTRN_SPED}    AS PTRN_SPED,
-                      #{DATA_NUM}     AS DATA_NUM,
-                      #{LOCAL_GRAD_CD} AS LOCAL_GRAD_CD
+                      #{DATA_NUM}     AS DATA_NUM
                  FROM DUAL
               ) M
         ON (L.IFSC_ID = M.IFSC_ID)
@@ -59,8 +58,7 @@
                    L.TRVL_HH      = M.TRVL_HH,
                    L.CMTR_GRAD_CD = M.CMTR_GRAD_CD,
                    L.PTRN_SPED    = M.PTRN_SPED,
-                   L.DATA_NUM     = M.DATA_NUM,
-                   L.LOCAL_GRAD_CD = M.LOCAL_GRAD_CD
+                   L.DATA_NUM     = M.DATA_NUM
         WHEN NOT MATCHED THEN
         INSERT (
                    IFSC_ID,
@@ -71,8 +69,7 @@
                    TRVL_HH,
                    CMTR_GRAD_CD,
                    PTRN_SPED,
-                   DATA_NUM,
-                   LOCAL_GRAD_CD )
+                   DATA_NUM )
         VALUES (
                    M.IFSC_ID,
                    M.PRCN_DT,
@@ -82,8 +79,7 @@
                    M.TRVL_HH,
                    M.CMTR_GRAD_CD,
                    M.PTRN_SPED,
-                   M.DATA_NUM,
-                   M.LOCAL_GRAD_CD )
+                   M.DATA_NUM )
     ]]>
     </update>
 

src/main/resources/mybatis/mapper/its/LinkMapper.xml

@@ -52,8 +52,7 @@
                       #{PTRN_SPED}    AS PTRN_SPED,
                       #{PRCN_SORC}    AS PRCN_SORC,
                       #{ADJS_SORC}    AS ADJS_SORC,
-                      #{DATA_NUM}     AS DATA_NUM,
-                      #{LOCAL_GRAD_CD} AS LOCAL_GRAD_CD
+                      #{DATA_NUM}     AS DATA_NUM
                  FROM DUAL
               ) M
         ON (L.LINK_ID = M.LINK_ID)
@@ -72,8 +71,7 @@
                    L.PTRN_SPED    = M.PTRN_SPED,
                    L.PRCN_SORC    = M.PRCN_SORC,
                    L.ADJS_SORC    = M.ADJS_SORC,
-                   L.DATA_NUM     = M.DATA_NUM,
-                   L.LOCAL_GRAD_CD = M.LOCAL_GRAD_CD
+                   L.DATA_NUM     = M.DATA_NUM
         WHEN NOT MATCHED THEN
         INSERT (
                    LINK_ID,
@@ -90,8 +88,7 @@
                    PTRN_SPED,
                    PRCN_SORC,
                    ADJS_SORC,
-                   DATA_NUM,
-                   LOCAL_GRAD_CD )
+                   DATA_NUM )
         VALUES (
                    M.LINK_ID,
                    M.PRCN_DT,
@@ -107,8 +104,7 @@
                    M.PTRN_SPED,
                    M.PRCN_SORC,
                    M.ADJS_SORC,
-                   M.DATA_NUM,
-                   M.LOCAL_GRAD_CD )
+                   M.DATA_NUM )
     ]]>
     </update>
 

src/main/resources/mybatis/mapper/its/RoadMapper.xml

@@ -43,8 +43,7 @@
                       #{TRVL_HH}      AS TRVL_HH,
                       #{CMTR_GRAD_CD} AS CMTR_GRAD_CD,
                       #{PTRN_SPED}    AS PTRN_SPED,
-                      #{DATA_NUM}     AS DATA_NUM,
-                      #{LOCAL_GRAD_CD} AS LOCAL_GRAD_CD
+                      #{DATA_NUM}     AS DATA_NUM
                  FROM DUAL
               ) M
         ON (L.ROAD_ID = M.ROAD_ID)
@@ -57,8 +56,7 @@
                    L.TRVL_HH      = M.TRVL_HH,
                    L.CMTR_GRAD_CD = M.CMTR_GRAD_CD,
                    L.PTRN_SPED    = M.PTRN_SPED,
-                   L.DATA_NUM     = M.DATA_NUM,
-                   L.LOCAL_GRAD_CD = M.LOCAL_GRAD_CD
+                   L.DATA_NUM     = M.DATA_NUM
         WHEN NOT MATCHED THEN
         INSERT (
                    ROAD_ID,
@@ -69,8 +67,7 @@
                    TRVL_HH,
                    CMTR_GRAD_CD,
                    PTRN_SPED,
-                   DATA_NUM,
-                   LOCAL_GRAD_CD )
+                   DATA_NUM )
         VALUES (
                    M.ROAD_ID,
                    M.PRCN_DT,
@@ -80,8 +77,7 @@
                    M.TRVL_HH,
                    M.CMTR_GRAD_CD,
                    M.PTRN_SPED,
-                   M.DATA_NUM,
-                   M.LOCAL_GRAD_CD )
+                   M.DATA_NUM )
     ]]>
     </update>
 

src/main/resources/mybatis/mapper/its/TbSectGradMapper.xml

@@ -19,19 +19,10 @@
                A.HGHS_TRVL_SPED AS HGHS_TRVL_SPED,
                A.CNGS_GRAD_YN   AS CNGS_GRAD_YN
         FROM TB_SECT_GRAD_STUP A
-        WHERE A.SECT_GRAD_TP = 'M'
-        ]]>
-    </select>
-
-    <select id="findAllListStupLocal" resultType="com.its.traf.dto.its.TbSectGradStupDto" fetchSize="100">
-    <![CDATA[
-        SELECT A.SECT_GRAD_CD   AS SECT_GRAD_CD,
-               A.CMTR_GRAD_CD   AS CMTR_GRAD_CD,
-               A.LWST_TRVL_SPED AS LWST_TRVL_SPED,
-               A.HGHS_TRVL_SPED AS HGHS_TRVL_SPED,
-               A.CNGS_GRAD_YN   AS CNGS_GRAD_YN
-        FROM TB_SECT_GRAD_STUP A
-        WHERE A.SECT_GRAD_TP = 'L'
+        WHERE A.SECT_GRAD_TP = (SELECT TRIM(CMMN_CD_ABBR)
+                                  FROM TB_CMMN_CD
+                                 WHERE CMMN_CLSF_CD = 'PRCS'
+                                   AND CMMN_CD = 'TYPE')
         ]]>
     </select>