shjung 3 rokov pred
rodič
commit
cf780e2e02

+ 2 - 2
src/main/java/com/its/op/dto/its/vms/TbVmsFormDto.java

@@ -134,7 +134,7 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("심벌라이브러리 번호, Nullable = Y, NUMBER(4)")  // Y NUMBER(4)
         @JsonProperty("symb_lib_nmbr")
-        @PositiveOrZero
+//        @PositiveOrZero
         private Integer symbLibNmbr;
 
         @ApiModelProperty("VMS FORM 이미지, Nullable = Y, Image Data")  // Y BLOB
@@ -148,7 +148,7 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("CCTV 관리 번호, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("cctv_mngm_nmbr")
-        @PositiveOrZero
+//        @PositiveOrZero
         private Long cctvMngmNmbr;
 
         @ApiModelProperty("FORM 객체 목록")

+ 1 - 1
src/main/java/com/its/op/dto/its/vms/TbVmsFormObjectDto.java

@@ -243,7 +243,7 @@ public class TbVmsFormObjectDto implements Serializable {
 
         @ApiModelProperty("VMS 정보제공구간 ID, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("vms_ifsc_id")
-        @PositiveOrZero
+        //@PositiveOrZero
         private Long vmsIfscId;
 
         @Builder

+ 51 - 33
src/main/resources/mybatis/mapper/its/dashboard/DashboardMapper.xml

@@ -5,54 +5,72 @@
 
     <select id="findAllCmtrGradCountSttsLink" resultType="com.its.op.dto.its.dashboard.CmtrGradCountSttsDto">
         <![CDATA[
-        select prcn_dt, sum(ltc1) as ltc1, sum(ltc2) as ltc2, sum(ltc3) as ltc3, sum(ltc0) as ltc0,
+--         select prcn_dt, sum(ltc1) as ltc1, sum(ltc2) as ltc2, sum(ltc3) as ltc3, sum(ltc0) as ltc0,
+--                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
+--         from (select prcn_dt,
+--                      sum(decode(cmtr_grad_cd,'LTC1', 1, 0)) as ltc1,
+--                      sum(decode(cmtr_grad_cd,'LTC2', 1, 0)) as ltc2,
+--                      sum(decode(cmtr_grad_cd,'LTC3', 1, 0)) as ltc3,
+--                      sum(decode(cmtr_grad_cd,'LTC0', 1, 0)) as ltc0
+--               from tb_link_traf_hs
+--               where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
+--               group by prcn_dt, cmtr_grad_cd
+--              )
+--         group by prcn_dt
+--         order by prcn_dt
+        select prcn_dt, LINK_LIGT_NUM as ltc1, LINK_DELY_NUM as ltc2, LINK_CNGS_NUM as ltc3,
+               (select count(1) from tb_link where del_yn = 'N') - (LINK_LIGT_NUM + LINK_DELY_NUM + LINK_CNGS_NUM) as ltc0,
                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
-        from (select prcn_dt,
-                     sum(decode(cmtr_grad_cd,'LTC1', 1, 0)) as ltc1,
-                     sum(decode(cmtr_grad_cd,'LTC2', 1, 0)) as ltc2,
-                     sum(decode(cmtr_grad_cd,'LTC3', 1, 0)) as ltc3,
-                     sum(decode(cmtr_grad_cd,'LTC0', 1, 0)) as ltc0
-              from tb_link_traf_hs
-              where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
-              group by prcn_dt, cmtr_grad_cd
-             )
-        group by prcn_dt
+        from tb_trfc_prcn_stat
+        where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
         order by prcn_dt
         ]]>
     </select>
 
     <select id="findAllCmtrGradCountSttsIfsc" resultType="com.its.op.dto.its.dashboard.CmtrGradCountSttsDto">
         <![CDATA[
-        select prcn_dt, sum(ltc1) as ltc1, sum(ltc2) as ltc2, sum(ltc3) as ltc3, sum(ltc0) as ltc0,
+--         select prcn_dt, sum(ltc1) as ltc1, sum(ltc2) as ltc2, sum(ltc3) as ltc3, sum(ltc0) as ltc0,
+--                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
+--         from (select prcn_dt,
+--                      sum(decode(cmtr_grad_cd,'LTC1', 1, 0)) as ltc1,
+--                      sum(decode(cmtr_grad_cd,'LTC2', 1, 0)) as ltc2,
+--                      sum(decode(cmtr_grad_cd,'LTC3', 1, 0)) as ltc3,
+--                      sum(decode(cmtr_grad_cd,'LTC0', 1, 0)) as ltc0
+--               from tb_ifsc_traf_hs
+--               where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
+--               group by prcn_dt, cmtr_grad_cd
+--              )
+--         group by prcn_dt
+--         order by prcn_dt
+        select prcn_dt, IFSC_LIGT_NUM as ltc1, IFSC_DELY_NUM as ltc2, IFSC_CNGS_NUM as ltc3,
+               (select count(1) from tb_ifsc where del_yn = 'N') - (IFSC_LIGT_NUM + IFSC_DELY_NUM + IFSC_CNGS_NUM) as ltc0,
                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
-        from (select prcn_dt,
-                     sum(decode(cmtr_grad_cd,'LTC1', 1, 0)) as ltc1,
-                     sum(decode(cmtr_grad_cd,'LTC2', 1, 0)) as ltc2,
-                     sum(decode(cmtr_grad_cd,'LTC3', 1, 0)) as ltc3,
-                     sum(decode(cmtr_grad_cd,'LTC0', 1, 0)) as ltc0
-              from tb_ifsc_traf_hs
-              where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
-              group by prcn_dt, cmtr_grad_cd
-             )
-        group by prcn_dt
+        from tb_trfc_prcn_stat
+        where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
         order by prcn_dt
         ]]>
     </select>
 
     <select id="findAllCmtrGradCountSttsRoad" resultType="com.its.op.dto.its.dashboard.CmtrGradCountSttsDto">
         <![CDATA[
-        select prcn_dt, sum(ltc1) as ltc1, sum(ltc2) as ltc2, sum(ltc3) as ltc3, sum(ltc0) as ltc0,
+--         select prcn_dt, sum(ltc1) as ltc1, sum(ltc2) as ltc2, sum(ltc3) as ltc3, sum(ltc0) as ltc0,
+--                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
+--         from (select prcn_dt,
+--                      sum(decode(cmtr_grad_cd,'LTC1', 1, 0)) as ltc1,
+--                      sum(decode(cmtr_grad_cd,'LTC2', 1, 0)) as ltc2,
+--                      sum(decode(cmtr_grad_cd,'LTC3', 1, 0)) as ltc3,
+--                      sum(decode(cmtr_grad_cd,'LTC0', 1, 0)) as ltc0
+--               from tb_road_traf_hs
+--               where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
+--               group by prcn_dt, cmtr_grad_cd
+--              )
+--         group by prcn_dt
+--         order by prcn_dt
+        select prcn_dt, ROAD_LIGT_NUM as ltc1, ROAD_DELY_NUM as ltc2, ROAD_CNGS_NUM as ltc3,
+               (select count(1) from tb_road where del_yn = 'N') - (ROAD_LIGT_NUM + ROAD_DELY_NUM + ROAD_CNGS_NUM) as ltc0,
                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
-        from (select prcn_dt,
-                     sum(decode(cmtr_grad_cd,'LTC1', 1, 0)) as ltc1,
-                     sum(decode(cmtr_grad_cd,'LTC2', 1, 0)) as ltc2,
-                     sum(decode(cmtr_grad_cd,'LTC3', 1, 0)) as ltc3,
-                     sum(decode(cmtr_grad_cd,'LTC0', 1, 0)) as ltc0
-              from tb_road_traf_hs
-              where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
-              group by prcn_dt, cmtr_grad_cd
-             )
-        group by prcn_dt
+        from tb_trfc_prcn_stat
+        where prcn_dt >= to_char(sysdate-1/24, 'YYYYMMDDHH24MISS')
         order by prcn_dt
         ]]>
     </select>

+ 1 - 1
src/main/resources/static/application/facility/main/main.js

@@ -519,7 +519,7 @@ function hiCht_Bline(xAxisVal , yAxisVal) {
             animation: Highcharts.svg,
         },        
         title: {
-            text: 'LINK 구간 지정체 상황 (건수)',
+            text: '정보제공구간 지정체 상황 (건수)',
             style: {
                 color: 'rgb(139 138 139)',
                 fontSize: 15,