Selaa lähdekoodia

add esb vms simple message send protocol

shjung 1 vuosi sitten
vanhempi
commit
fed278df92

+ 1 - 1
conf/debug.properties

@@ -1,5 +1,5 @@
 #system debug setting configuration...
-#Tue Aug 22 14:44:54 KST 2023
+#Tue Aug 22 17:18:21 KST 2023
 packet-info=1001
 packet-dump=1001
 system-debug=true

+ 3 - 4
src/main/java/com/its/vms/config/SwaggerConfig.java

@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
@@ -16,8 +17,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import java.util.ArrayList;
 import java.util.List;
 
-import static springfox.documentation.builders.PathSelectors.regex;
-
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {
@@ -41,8 +40,8 @@ public class SwaggerConfig {
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.its.vms.api.controller"))
                 //.paths(PathSelectors.any())
-                //.paths(PathSelectors.ant("/api/vms/control/**"))
-                .paths(regex("/api/vms/(control|esb)/.*"))
+                .paths(PathSelectors.ant("/api/vms/control/**"))
+                //.paths(regex("/api/vms/(control|esb)/.*"))
                 .build();
     }
 

+ 3 - 1
src/main/resources/mybatis/mapper/VmsCtlrMapper.xml

@@ -40,7 +40,7 @@
                t1.hetr_mode           AS hetrMode,
                t1.brgh_curr_step      AS brghCurrStep,
                t1.istl_lctn_addr      AS istlLctnAddr,
-               2                      AS protocolVer,
+               t1.protocol_ver        AS protocolVer,
                t1.del_yn              AS delYn,
                t2.vms_wdth            AS vmsWidth,
                t2.vms_hght            AS vmsHeight,
@@ -52,6 +52,7 @@
         inner join tb_vms_type t2
                 on t1.del_yn = 'N'
                and t1.vms_type_cd = t2.vms_type_cd
+               and t1.protocol_ver = 2
         order by t1.vms_ctlr_nmbr
     ]]>
     </select>
@@ -74,6 +75,7 @@
         from tb_vms_ctlr_stts t1
         inner join tb_vms_ctlr t2
         on t1.vms_ctlr_nmbr = t2.vms_ctlr_nmbr
+        and t2.protocol_ver = 2
         ]]>
     </select>
 

+ 2 - 0
src/main/resources/mybatis/mapper/VmsDisplayOnOffMapper.xml

@@ -9,6 +9,8 @@
                t1.panl_on_time  AS panlOnTime,
                t1.panl_off_time AS panlOffTime
         from tb_vms_ctlr t1
+       where t1.del_yn = 'N'
+         and t1.protocol_ver = 2
         ]]>
     </select>
 

+ 1 - 0
src/main/resources/mybatis/mapper/VmsIfscMapper.xml

@@ -19,6 +19,7 @@
           and b.vms_ifsc_id   = c.vms_ifsc_id
           and c.use_yn = 'Y'
           and a.del_yn = 'N'
+          and a.protocol_ver = 2
         order by a.vms_ctlr_nmbr, b.dspl_prrt
         ]]>
     </select>

+ 4 - 2
src/main/resources/mybatis/mapper/VmsManageMapper.xml

@@ -10,7 +10,7 @@
         FROM (SELECT A.VMS_CTLR_NMBR, B.ORD AS PHASE, '19700101000000' AS DSPL_DT, 'A' AS VMS_SCH_TYPE, 'N' AS DNLD_YN
               FROM TB_VMS_CTLR A,
                    (SELECT LEVEL AS ORD FROM DUAL CONNECT BY LEVEL < #{maxPhase}) B
-             ) X
+              WHERE PROTOCOL_VER = 2) X
         WHERE (VMS_CTLR_NMBR, PHASE) NOT IN (SELECT VMS_CTLR_NMBR, PHASE FROM TB_VMS_DSPL_PRST)
         ORDER BY VMS_CTLR_NMBR, PHASE
         ]]>
@@ -20,8 +20,9 @@
     <![CDATA[
         select vms_ctlr_nmbr             AS vmsCtlrNmbr,
                oper_mode                 AS operMode,
-               nvl(vms_max_phse_num, 16) AS vmsMaxPhaseNum
+               nvl(vms_max_phse_num, 10) AS vmsMaxPhaseNum
         from tb_vms_ctlr
+       where protocol_ver = 2
         ]]>
     </select>
 
@@ -136,6 +137,7 @@
                       tb_vms_dspl_sch  b,
                       tb_vms_form      c
                  where a.del_yn        = 'N'
+                   and protocol_ver    = 2
                    and b.use_yn        = 'Y'
                    and c.valid_yn      = 'Y'
                    and a.vms_ctlr_nmbr = b.vms_ctlr_nmbr