dd

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

@@ -29,7 +29,7 @@ public class TbVmsDsplSchAutoController {
      * @param id
      * @return
      */
-    @ApiOperation(value = "VMS 폼 스케줄 목록 조회(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 스케줄 목록 조회(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllVmsDsplSchedule(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -44,7 +44,7 @@ public class TbVmsDsplSchAutoController {
      * @param schType
      * @return
      */
-    @ApiOperation(value = "VMS 제어기 유형별 폼 스케줄 목록 조회(TB_VMS_TRFC_INFR_DSPL_SCH)", response = VmsFormIfscDto.class)
+    @ApiOperation(value = "VMS 제어기 유형별 폼 스케줄 목록 조회(TB_VMS_DSPL_SCH)", response = VmsFormIfscDto.class)
     @GetMapping(value = "/form/ifsc/{ctlrId}/{schType}/{phase}", produces = {"application/json; charset=utf8"})
     public VmsFormIfscDto findAllVmsFormIfsc(
             @ApiParam(name = "ctlrId", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -58,13 +58,13 @@ public class TbVmsDsplSchAutoController {
     }
 
 
-    @ApiOperation(value = "VMS 제어기 유형별 폼 스케줄 목록 조회(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
-    @GetMapping(value = "/list-form/{id}/{type}", produces = {"application/json; charset=utf8"})
+    @ApiOperation(value = "VMS 제어기 유형별 폼 스케줄 목록 조회(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/list-form/{ctlrNmbr}/{schType}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllVmsDsplSchedule(
-            @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
-            @PathVariable final Long id,
-            @ApiParam(name = "type", value = "VMS 스케쥴 코드(0:교통정보,1:돌발,2:공사/행사,3:홍보,4:우회도로,7:정체,8:재난안전)", example = "0", required = true)
-            @PathVariable final Integer type
+            @ApiParam(name = "ctlrNmbr", value = "VMS 제어기 관리번호", example = "10005", required = true)
+            @PathVariable final Long ctlrNmbr,
+            @ApiParam(name = "schType", value = "VMS 스케쥴 코드(0:교통정보,1:돌발,2:공사/행사,3:홍보,4:우회도로,7:정체,8:재난안전)", example = "0", required = true)
+            @PathVariable final Integer schType
     ) {
         // 교통정보 ("0");
         // 돌발 ("1");
@@ -73,8 +73,8 @@ public class TbVmsDsplSchAutoController {
         // 우회도로 ("4");
         // 정체 ("7");
         // 재난안전 ("8");
-        List<Integer> trfcSituTypeCd = Arrays.asList(type);
-        return this.service.findAllVmsDsplSchedule(id, "A", trfcSituTypeCd);
+        List<Integer> trfcSituTypeCd = Arrays.asList(schType);
+        return this.service.findAllVmsDsplSchedule(ctlrNmbr, "A", trfcSituTypeCd);
     }
     // 교통정보 폼 그리기
     @ApiOperation(value = "VMS 교통정보 폼 그리기", response = VmsFormDrawTrafDto.class, responseContainer = "ArrayList")
@@ -90,7 +90,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 교통정보
-    @ApiOperation(value = "VMS 폼 정보 조회-교통정보(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-교통정보(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/traffic/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllTrafficByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -100,7 +100,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 정체
-    @ApiOperation(value = "VMS 폼 정보 조회-정체(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-정체(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/congest/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllCongestByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -110,7 +110,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 돌발
-    @ApiOperation(value = "VMS 폼 정보 조회-돌발(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-돌발(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/incident/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllIncidentByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -120,7 +120,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 공사/행사
-    @ApiOperation(value = "VMS 폼 정보 조회-공사/행사(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-공사/행사(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/event/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllEventByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -130,7 +130,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 홍보
-    @ApiOperation(value = "VMS 폼 정보 조회-홍보(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-홍보(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/notice/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllHongboByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -140,7 +140,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 우회도로
-    @ApiOperation(value = "VMS 폼 정보 조회-우회도로(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-우회도로(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/detour/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllDetourByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)
@@ -150,7 +150,7 @@ public class TbVmsDsplSchAutoController {
     }
 
     // 재난안전
-    @ApiOperation(value = "VMS 폼 정보 조회-재난안전(TB_VMS_TRFC_INFR_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "VMS 폼 정보 조회-재난안전(TB_VMS_DSPL_SCH)", response = TbVmsDsplSchDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/list/safety/{id}", produces = {"application/json; charset=utf8"})
     public List<TbVmsDsplSchDto> findAllSafetyByVmsType(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호", example = "10005", required = true)

src/main/java/com/its/op/dao/repository/its/vms/TbVmsCtlrRepository.java

@@ -59,7 +59,7 @@ public interface TbVmsCtlrRepository extends JpaRepository<TbVmsCtlr, Long>, Jpa
                     "   SET VMS_PHSE_CHNG_CYCL    = :schMsgTime, " +
                     "       VMS_CMNC_ERR_BASS_VAL = :moduleTemp, " +
                     "       FAN_MTNS_TMPR         = :fanTemp,    " +
-                    "       HETR_MTNS_TMPR        = :heaterTemp, " +
+                    "       HETR_RUN_TMPR         = :heaterTemp, " +
                     "       VMS_MODL_ERR_RATE     = :moduleFail  " +
                     " WHERE VMS_CTLR_NMBR = :id                  ",
             nativeQuery = true)

src/main/java/com/its/op/dto/its/vms/TbVmsCtlrSttsDto.java

@@ -188,12 +188,12 @@ public class TbVmsCtlrSttsDto implements Serializable {
     private Integer vmsMaxPhseNum;
 
     @ApiModelProperty("팬 동작 온도")
-    @JsonProperty("fan_mtns_tmpr")
-    private Integer fanMtnsTmpr;
+    @JsonProperty("fan_run_tmpr")
+    private Integer fanRunTmpr;
 
     @ApiModelProperty("히터 동작 온도")
-    @JsonProperty("hetr_mtns_tmpr")
-    private Integer hetrMtnsTmpr;
+    @JsonProperty("hetr_run_tmpr")
+    private Integer hetrRunTmpr;
 
     @ApiModelProperty("스트리밍 세션 명")
     @JsonProperty("strm_sesn_nm")

src/main/java/com/its/op/dto/its/vms/TbVmsDsplPrstDto.java

@@ -165,12 +165,6 @@ public class TbVmsDsplPrstDto implements Serializable {
             this.fanSttsDesc = stts.getFanSttsDesc();
             this.hetrSttsDesc = stts.getHetrSttsDesc();
             this.missSttsYn = stts.getMissSttsYn();
-//            this.cmncSttsCd = stts.getCmncSttsCd();
-//            this.pwerSttsCd = stts.getPwerSttsCd();
-//            this.modlSttsCd = stts.getModlSttsCd();
-//            this.cboxDoorSttsCd = stts.getCboxDoorSttsCd();
-//            this.fanSttsCd = stts.getFanSttsCd();
-//            this.hetrSttsCd = stts.getHetrSttsCd();
             this.cboxTmpr = stts.getCboxTmpr();
             this.brghVal = stts.getBrghVal();
         }

src/main/java/com/its/op/entity/its/vms/TbVmsCtlr.java

@@ -334,6 +334,7 @@ public class TbVmsCtlr implements Serializable {
             dto.setCboxTmpr(255);
             dto.setBrghVal(255);
         }
+        dto.setCommSttsDesc(CodeManager.STTS_UNKNOWN);  // 사용안함
 
         dto.setMissSttsYn(ItsUtils.getMissSttsYn(dto.getUpdtDt()));
         if (("Y").equals(dto.getMissSttsYn())) {
@@ -356,6 +357,7 @@ public class TbVmsCtlr implements Serializable {
             dto.setFanSttsDesc(CodeManager.STTS_UNKNOWN);        // 팬상태
             dto.setHetrSttsDesc(CodeManager.STTS_UNKNOWN);       // 히터상태
             dto.setCboxTmpr(255);
+            dto.setBrghVal(255);
         }
 
         return dto;

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

@@ -280,8 +280,13 @@ public class TbVmsDsplSchService {
      * @return
      */
     public List<TbVmsDsplSchDto> findAllVmsDsplSchedule(Long id) {
-        List<Integer> trfcSituTypeCd = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        return findAllVmsDsplSchedule(id, "A", trfcSituTypeCd);
+        //List<Integer> trfcSituTypeCd = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+        List<Integer> trfcSituTypeCd = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        List<TbVmsDsplSchDto> trfSchList = findAllTraffic(id);
+        List<TbVmsDsplSchDto> etcSchList = findAllVmsDsplSchedule(id, "A", trfcSituTypeCd);
+        trfSchList.addAll(etcSchList);
+        return trfSchList;
     }
     // 교통정보
     public List<TbVmsDsplSchDto> findAllTraffic(Long id) {