vms dspl hs

src/main/java/com/its/op/controller/its/vms/TbVmsDsplHsController.java

@@ -40,9 +40,9 @@ public class TbVmsDsplHsController {
     @ApiOperation(value = "VMS 표출 이력 조회-이미지(TB_VMS_DSPL_HS)", response = TbVmsDsplHsImageDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/images", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplHsImageDto> findAllImageByDateRange(
-            @ApiParam(name = "id", value = "VMS 관리번호", example = "10016", required = true)
+            @ApiParam(name = "id", value = "VMS 관리번호", example = "1001", required = true)
             @RequestParam Long id,
-            @ApiParam(name = "DSPL_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220302151210", required = true)
+            @ApiParam(name = "DSPL_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20221115131510", required = true)
             @RequestParam String DSPL_DT
     ) {
         return this.service.findAllImageByDateRange(id, DSPL_DT);

src/main/java/com/its/op/service/its/vms/TbVmsDsplHsService.java

@@ -71,6 +71,7 @@ public class TbVmsDsplHsService {
     public List<TbVmsDsplHsImageDto> findAllImageByDateRange(Long id, String dsplDt) {
         List<TbVmsDsplHsImageDto> result = new ArrayList<>();
         List<TbVmsDsplHs> data = this.repo.findAllImageByDateRange(id, dsplDt);
+        log.info("{}", data);
         if (data != null) {
             data.forEach(obj -> {
                 TbVmsDsplHsImageDto dto = obj.toImageDto();
@@ -125,6 +126,7 @@ public class TbVmsDsplHsService {
         if (msgList.size() > 1) {
             for (int ii = 1; ii < msgList.size(); ii++) {
                 String tmp = msgList.get(ii);
+                log.error("{}", tmp);
                 int objType = Integer.parseInt(tmp.substring(0, 2), 16);
                 //int objLen  = Integer.parseInt(tmp.substring(2, 4), 16);
 
@@ -158,7 +160,9 @@ public class TbVmsDsplHsService {
                     //g2d.drawString(text, left, top + fontSize);
                 }
                 else if (objType == 2) {    // symbol id
-                    String symbLibId = tmp.substring(16, tmp.length());
+                    int imgW  = Integer.parseInt(tmp.substring(16, 20), 16);
+                    int imgH = Integer.parseInt(tmp.substring(20, 24), 16);
+                    String symbLibId = tmp.substring(24, tmp.length());
                     /**
                      * 심볼을 이미지 위에 그린다.
                      */
@@ -183,7 +187,9 @@ public class TbVmsDsplHsService {
                     List<String> trafList = ItsUtils.split(tmp, "+");
                     if (trafList.size() == 2) {
                         tmp = trafList.get(0);
-                        String symbLibId = tmp.substring(16, tmp.length());
+                        int imgW  = Integer.parseInt(tmp.substring(16, 20), 16);
+                        int imgH = Integer.parseInt(tmp.substring(20, 24), 16);
+                        String symbLibId = tmp.substring(24, tmp.length());
                         TbVmsSymbLib symbLib = VmsSymbLibManager.get(Integer.parseInt(symbLibId));
                         if (symbLib != null) {
                             Image imgBmp = symbLib.getImage();

src/main/resources/mybatis/mapper/its/dashboard/DashboardMapper.xml

@@ -124,7 +124,7 @@
                      nvl(sum(case when CLCT_SYST_CD = 'GITS01' then CLCT_NUM end), 0) AS gits01,
                      nvl(sum(case when CLCT_SYST_CD = 'MOCT01' then CLCT_NUM end), 0) AS moct01
               FROM TB_CLCT_SYST_STTS_HS
-              WHERE PRCN_DT BETWEEN TO_CHAR(SYSDATE-1, 'YYYYMMDD') || '000000' AND TO_CHAR(SYSDATE-1, 'YYYYMMDD') || '235959'
+              WHERE PRCN_DT BETWEEN TO_CHAR(SYSDATE, 'YYYYMMDD') || '000000' AND TO_CHAR(SYSDATE, 'YYYYMMDD') || '235959'
               GROUP BY PRCN_DT) B
              ON A.PRCN_TM = B.PRCN_TM
         ]]>

src/main/resources/mybatis/mapper/its/dbms/DbmsSttsMapper.xml

@@ -37,8 +37,7 @@
     <update id="updateDbmsStts" parameterType="com.its.op.dto.its.dbms.TbDbmsSttsDto">
         <![CDATA[
         UPDATE TB_DBMS_STTS
-           SET TBLS_NM        = #{stts.tblsNm},
-               TBLS_RMND_CPCT = #{stts.tblsRmndCpct},
+           SET TBLS_RMND_CPCT = #{stts.tblsRmndCpct},
                USE_SESN       = #{stts.useSesn},
                UPDT_DT        = #{stts.updtDt}
         WHERE DBMS_ID         = #{stts.dbSvrId}

src/main/resources/mybatis/mapper/its/statistics/IncidentStatisticsMapper.xml

@@ -81,8 +81,8 @@
                NVL(A.DATA_CNT,       0) AS DATA_CNT,
                NVL(A.STAT_DTNM,    '전체') AS STAT_DT_FMT,
                NVL(A.LINK_ID,        0) AS LINK_ID,
-               '[' || B.F_NODE || '] ' || C.NODE_NAME AS F_NAME,
-               '[' || B.T_NODE || '] ' || D.NODE_NAME AS T_NAME,
+               '[' || B.F_NODE_ID || '] ' || C.NODE_NAME AS F_NAME,
+               '[' || B.T_NODE_ID || '] ' || D.NODE_NAME AS T_NAME,
                NVL(A.INCD_OCRR_NUM,  0) AS INCD_OCRR_NUM,
                NVL(A.FTLT_PNUM,      0) AS FTLT_PNUM,
                NVL(A.INJR_PNUM,      0) AS INJR_PNUM,
@@ -100,8 +100,8 @@
                  GROUP BY ROLLUP(SUBSTR(STAT_DT, 1, 8), LINK_ID)
              ) A, TB_LINK B, TB_NODE C, TB_NODE D
         WHERE A.LINK_ID = B.LINK_ID
-          AND B.F_NODE = C.NODE_ID
-          AND B.T_NODE = D.NODE_ID
+          AND B.F_NODE_ID = C.NODE_ID
+          AND B.T_NODE_ID = D.NODE_ID
         ORDER BY A.STAT_DT
     </select>
 
@@ -109,8 +109,8 @@
         SELECT NVL(A.STAT_DT,      '전체') AS STAT_DT,
                NVL(A.DATA_CNT,       0) AS DATA_CNT,
                NVL(A.STAT_DTNM,    '전체') AS STAT_DT_FMT,
-               '[' || B.F_NODE || '] ' || C.NODE_NAME AS F_NAME,
-               '[' || B.T_NODE || '] ' || D.NODE_NAME AS T_NAME,
+               '[' || B.F_NODE_ID || '] ' || C.NODE_NAME AS F_NAME,
+               '[' || B.T_NODE_ID || '] ' || D.NODE_NAME AS T_NAME,
                NVL(A.LINK_ID,        0) AS LINK_ID,
                NVL(A.INCD_OCRR_NUM,  0) AS INCD_OCRR_NUM,
                NVL(A.FTLT_PNUM,      0) AS FTLT_PNUM,
@@ -125,12 +125,12 @@
                         SUM(INJR_PNUM)     AS INJR_PNUM,
                         SUM(PRPR_DMGE_AMT) AS PRPR_DMGE_AMT
                  FROM TB_INCD_SECT_STAT_MN
-                 WHERE STAT_DT BETWEEN '20201201000000' AND '20211201000000'
+                 WHERE STAT_DT BETWEEN  #{FROM_DT} AND #{TO_DT}
                  GROUP BY ROLLUP(SUBSTR(STAT_DT, 1, 6), LINK_ID)
              ) A, TB_LINK B, TB_NODE C, TB_NODE D
         WHERE A.LINK_ID = B.LINK_ID
-          AND B.F_NODE = C.NODE_ID
-          AND B.T_NODE = D.NODE_ID
+          AND B.F_NODE_ID = C.NODE_ID
+          AND B.T_NODE_ID = D.NODE_ID
         ORDER BY A.STAT_DT
     </select>
 
@@ -139,8 +139,8 @@
                NVL(A.DATA_CNT,       0) AS DATA_CNT,
                NVL(A.STAT_DTNM,    '전체') AS STAT_DT_FMT,
                NVL(A.LINK_ID,        0) AS LINK_ID,
-               '[' || B.F_NODE || '] ' || C.NODE_NAME AS F_NAME,
-               '[' || B.T_NODE || '] ' || D.NODE_NAME AS T_NAME,
+               '[' || B.F_NODE_ID || '] ' || C.NODE_NAME AS F_NAME,
+               '[' || B.T_NODE_ID || '] ' || D.NODE_NAME AS T_NAME,
                NVL(A.INCD_OCRR_NUM,  0) AS INCD_OCRR_NUM,
                NVL(A.FTLT_PNUM,      0) AS FTLT_PNUM,
                NVL(A.INJR_PNUM,      0) AS INJR_PNUM,
@@ -158,8 +158,8 @@
                  GROUP BY ROLLUP(SUBSTR(STAT_DT, 1, 4), LINK_ID)
              ) A, TB_LINK B, TB_NODE C, TB_NODE D
         WHERE A.LINK_ID = B.LINK_ID
-          AND B.F_NODE = C.NODE_ID
-          AND B.T_NODE = D.NODE_ID
+          AND B.F_NODE_ID = C.NODE_ID
+          AND B.T_NODE_ID = D.NODE_ID
         ORDER BY A.STAT_DT
     </select>