dev 4th

src/main/java/com/its/dsrc/entity/TbRseObuClct.java

@@ -15,4 +15,6 @@ public class TbRseObuClct {
     private String OBU_IDNT_NMBR;   //	N	VARCHAR2(200)	N			OBU 인식 번호
     private String CTYP;            //	N	VARCHAR2(7)	    Y			차종
     private String OBU_KIND;        //	N	VARCHAR2(7)	    Y			OBU 종류
+    //TODO
+    private String PREV_RSE_CTLR_NMBR;  // 이전 통과 RSE
 }

src/main/java/com/its/dsrc/ui/SubUIController.java

@@ -1,9 +1,11 @@
 package com.its.dsrc.ui;
 
 import com.its.dsrc.entity.TbRseCtlr;
+import org.springframework.core.io.ClassPathResource;
 
 import javax.swing.*;
-import java.awt.*;
+import java.io.IOException;
+import java.net.URL;
 
 public class SubUIController extends JFrame {
     private SubUI view;
@@ -11,8 +13,12 @@ public class SubUIController extends JFrame {
 
     public SubUIController(JFrame jFrame) {
         super("제어기 정보");
-        String pathOfImage = "C:\\DEV\\ITS\\01.WINDOWS\\22.01.YONGIN\\JAVA\\vds-comm-server\\src\\main\\resources\\static\\image\\application.png";
-        setIconImage(Toolkit.getDefaultToolkit().getImage(pathOfImage));
+        try {
+            ClassPathResource file = new ClassPathResource("static/image/application.png");
+            URL imgURL = file.getURL();
+            setIconImage(new ImageIcon(imgURL).getImage());
+        } catch (IOException e) {
+        }
         this.caller = jFrame;
         this.view = new SubUI() {
             @Override

src/main/java/com/its/dsrc/xnettcp/dsrc/process/service/OBUGatherInfoService.java

@@ -72,6 +72,7 @@ public class OBUGatherInfoService {
                 String obuIdNumber = "0";
                 String generationDate = "0";
                 String generationTime = "0";
+                String prevRseCtlrNmbr = "";
                 if (obuGatherInfo.getObuType() != null) {
                     obuType = obuGatherInfo.getObuType().toString();
                 }
@@ -88,8 +89,11 @@ public class OBUGatherInfoService {
                     generationTime = obuGatherInfo.getGenerationTime().toString();
                 }
 
+                // 이전 통과 RSE 를 찾는다
+                //
+
                 String generationTm = generationDate+generationTime;
-                TbRseObuClct voObu = new TbRseObuClct(obj.getID(), generationTm, obuIdNumber, vehicleType, obuType);
+                TbRseObuClct voObu = new TbRseObuClct(obj.getID(), generationTm, obuIdNumber, vehicleType, obuType, prevRseCtlrNmbr);
                 obuGatherInfos.add(voObu);
 
                 log.debug("OBUGatherInfoService.decoding_OBUGatherInfo: {}, {}, {}, {}, voObu: {}",
@@ -129,6 +133,7 @@ public class OBUGatherInfoService {
                             this.rseSectService.getDsrcObuPassMap().get(endDsrcSectId).put(obuIdNumber, obuEndPassInfo);
                             continue;
                         }
+
                         // 존재하면 종료 DSRC 통과시각을 업데이트 한다.
                         passInfo.get(obuIdNumber).setEndDsrcPassTm(generationTm);
                     }

src/main/resources/mybatis/mapper/RseStatMapper.xml

@@ -41,7 +41,7 @@
 
     <update id="CRT_TB_RSE_OBU_CLCT_HH_PNST" parameterType="com.its.dsrc.vo.voStatisticsTime">
     <![CDATA[
-        MERGE INTO TB_RSE_OBU_CLCT_HH_PNST L
+        MERGE INTO TB_RSE_OBU_CLCT_PNST_HH L
             USING (
                 SELECT  #{prcs.STAT_DT}  AS STAT_DT,
                         RSE_CTLR_NMBR    AS RSE_CTLR_NMBR,
@@ -50,8 +50,9 @@
                 FROM TB_RSE_OBU_CLCT_STAT_HH
                 WHERE STAT_DT = #{prcs.STAT_DT}
                 GROUP BY RSE_CTLR_NMBR ) M
-            ON (L.STAT_DT = M.STAT_DT AND L.RSE_CTLR_NMBR = M.RSE_CTLR_NMBR)
+            ON (L.RSE_CTLR_NMBR = M.RSE_CTLR_NMBR)
             WHEN MATCHED THEN UPDATE SET
+                L.STAT_DT     = M.STAT_DT,
                 L.DAY_TYPE_CD = M.DAY_TYPE_CD,
                 L.CLCT_NUM    = M.CLCT_NUM
             WHEN NOT MATCHED THEN