shjung 3 ani în urmă
părinte
comite
d8bac95d46
55 a modificat fișierele cu 604 adăugiri și 337 ștergeri
  1. 6 6
      src/main/java/com/its/api/its/controller/analysis/TbTraf15mStatAnalController.java
  2. 6 6
      src/main/java/com/its/api/its/controller/incident/TbIncdOcrrCodeController.java
  3. 44 8
      src/main/java/com/its/api/its/controller/vms/VmsCommonController.java
  4. 33 0
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFontShpeDto.java
  5. 8 64
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFormObjectTypeDto.java
  6. 2 58
      src/main/java/com/its/api/its/model/dto/vms/TbVmsFormTypeDto.java
  7. 37 0
      src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplDrctDto.java
  8. 37 0
      src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplMthdDto.java
  9. 50 0
      src/main/java/com/its/api/its/model/entity/vms/TbVmsFontShpe.java
  10. 1 11
      src/main/java/com/its/api/its/model/entity/vms/TbVmsFormObjectType.java
  11. 0 10
      src/main/java/com/its/api/its/model/entity/vms/TbVmsFormType.java
  12. 56 0
      src/main/java/com/its/api/its/model/entity/vms/TbVmsMsgDsplDrct.java
  13. 55 0
      src/main/java/com/its/api/its/model/entity/vms/TbVmsMsgDsplMthd.java
  14. 11 0
      src/main/java/com/its/api/its/repository/vms/TbVmsFontShpeRepository.java
  15. 5 0
      src/main/java/com/its/api/its/repository/vms/TbVmsFormObjectTypeRepository.java
  16. 11 0
      src/main/java/com/its/api/its/repository/vms/TbVmsMsgDsplDrctRepository.java
  17. 11 0
      src/main/java/com/its/api/its/repository/vms/TbVmsMsgDsplMthdRepository.java
  18. 7 7
      src/main/java/com/its/api/its/service/analysis/PtrnDataService.java
  19. 1 1
      src/main/java/com/its/api/its/service/atrd/AtrdTrafficStatisticsService.java
  20. 1 1
      src/main/java/com/its/api/its/service/code/TbClctSystStupService.java
  21. 1 1
      src/main/java/com/its/api/its/service/code/TbCmmnCdService.java
  22. 3 3
      src/main/java/com/its/api/its/service/dashboard/facility/BisService.java
  23. 8 8
      src/main/java/com/its/api/its/service/dashboard/facility/ItsService.java
  24. 1 1
      src/main/java/com/its/api/its/service/database/TbCnctIntnService.java
  25. 1 1
      src/main/java/com/its/api/its/service/database/TbLeglHldyInfrService.java
  26. 2 2
      src/main/java/com/its/api/its/service/ifsc/TbIfscService.java
  27. 1 1
      src/main/java/com/its/api/its/service/incident/TbIncdOcrrService.java
  28. 1 1
      src/main/java/com/its/api/its/service/link/LinkParaDetlService.java
  29. 1 1
      src/main/java/com/its/api/its/service/link/LinkParaStupService.java
  30. 2 2
      src/main/java/com/its/api/its/service/link/TbLinkService.java
  31. 4 4
      src/main/java/com/its/api/its/service/link/TbTrfcPrcnStatService.java
  32. 3 3
      src/main/java/com/its/api/its/service/oper/TbGropMenuAthrService.java
  33. 1 1
      src/main/java/com/its/api/its/service/oper/TbOperSystService.java
  34. 1 1
      src/main/java/com/its/api/its/service/oper/TbUserGropInfrService.java
  35. 2 2
      src/main/java/com/its/api/its/service/road/TbRoadService.java
  36. 3 3
      src/main/java/com/its/api/its/service/statistics/FcltSttsStatisticsService.java
  37. 5 5
      src/main/java/com/its/api/its/service/unit/TbUnitSystSttsHsService.java
  38. 2 2
      src/main/java/com/its/api/its/service/unit/TbUnitSystSttsService.java
  39. 1 1
      src/main/java/com/its/api/its/service/vds/TbVdsCtlrSttsHsService.java
  40. 1 1
      src/main/java/com/its/api/its/service/vds/TbVdsCtlrSttsService.java
  41. 3 3
      src/main/java/com/its/api/its/service/vms/TbVmsCtlrService.java
  42. 2 2
      src/main/java/com/its/api/its/service/vms/TbVmsDsplHsService.java
  43. 48 0
      src/main/java/com/its/api/its/service/vms/TbVmsFontShpeService.java
  44. 16 51
      src/main/java/com/its/api/its/service/vms/TbVmsFormObjectTypeService.java
  45. 1 53
      src/main/java/com/its/api/its/service/vms/TbVmsFormTypeService.java
  46. 3 3
      src/main/java/com/its/api/its/service/vms/TbVmsIfscRltnService.java
  47. 3 3
      src/main/java/com/its/api/its/service/vms/TbVmsIfscService.java
  48. 1 1
      src/main/java/com/its/api/its/service/vms/TbVmsLinkIfscService.java
  49. 48 0
      src/main/java/com/its/api/its/service/vms/TbVmsMsgDsplDrctService.java
  50. 48 0
      src/main/java/com/its/api/its/service/vms/TbVmsMsgDsplMthdService.java
  51. 1 1
      src/main/java/com/its/api/its/service/vms/TbVmsSttsHsService.java
  52. 1 1
      src/main/java/com/its/api/its/service/vms/TbVmsSttsService.java
  53. 1 1
      src/main/java/com/its/api/its/service/vms/TbVmsSymbLibService.java
  54. 1 1
      src/main/java/com/its/api/its/service/vms/TbVmsTypeService.java
  55. 1 1
      src/main/java/com/its/api/its/service/vms/TbVmsUsagTypeService.java

+ 6 - 6
src/main/java/com/its/api/its/controller/analysis/TbTraf15mStatAnalController.java

@@ -40,13 +40,13 @@ public class TbTraf15mStatAnalController {
             @RequestParam String TO_DT
     ) {
 
-        if (HIST_TYPE.equalsIgnoreCase("LINK")) {
+        if (("LINK").equalsIgnoreCase(HIST_TYPE)) {
             return this.linkService.findAllCountByDateRange(FROM_DT, TO_DT);
         }
-        else if (HIST_TYPE.equalsIgnoreCase("IFSC")) {
+        else if (("IFSC").equalsIgnoreCase(HIST_TYPE)) {
             return this.ifscService.findAllCountByDateRange(FROM_DT, TO_DT);
         }
-        else if (HIST_TYPE.equalsIgnoreCase("ROAD")) {
+        else if (("ROAD").equalsIgnoreCase(HIST_TYPE)) {
             return this.roadService.findAllCountByDateRange(FROM_DT, TO_DT);
         }
         else {
@@ -63,13 +63,13 @@ public class TbTraf15mStatAnalController {
             @RequestParam String STAT_DT
     ) {
 
-        if (HIST_TYPE.equalsIgnoreCase("LINK")) {
+        if (("LINK").equalsIgnoreCase(HIST_TYPE)) {
             return this.linkService.findAllDataByDateRange(STAT_DT);
         }
-        else if (HIST_TYPE.equalsIgnoreCase("IFSC")) {
+        else if (("IFSC").equalsIgnoreCase(HIST_TYPE)) {
             return this.ifscService.findAllDataByDateRange(STAT_DT);
         }
-        else if (HIST_TYPE.equalsIgnoreCase("ROAD")) {
+        else if (("ROAD").equalsIgnoreCase(HIST_TYPE)) {
             return this.roadService.findAllDataByDateRange(STAT_DT);
         }
         else {

+ 6 - 6
src/main/java/com/its/api/its/controller/incident/TbIncdOcrrCodeController.java

@@ -78,16 +78,16 @@ public class TbIncdOcrrCodeController {
             @ApiParam(name = "id", value = "돌발상황 유형 분류 코드(1,2,3,4)", example = "1", required = true)
             @PathVariable String id
     ) {
-        if ("1".equals(id)) {
+        if (("1").equals(id)) {
             return findAllACTU();
         }
-        else if ("2".equals(id)) {
+        else if (("2").equals(id)) {
             return findAllCRTU();
         }
-        else if ("3".equals(id)) {
+        else if (("3").equals(id)) {
             return findAllEVTU();
         }
-        //else //if ("4".equals(id)) {
+        //else //if (("4").equals(id)) {
             return findAllWETU();
         //}
     }
@@ -146,10 +146,10 @@ public class TbIncdOcrrCodeController {
             @ApiParam(name = "id", value = "VMS 돌발 유형 코드(VIT1,VIT2)", example = "VIT1", required = true)
             @PathVariable String id
     ) {
-        if ("VIT1".equals(id)) {
+        if (("VIT1").equals(id)) {
             return findAllIDT();
         }
-        //else //if ("VIT2".equals(id)) {
+        //else //if (("VIT2").equals(id)) {
         return findAllEDT();
         //}
     }

+ 44 - 8
src/main/java/com/its/api/its/controller/vms/VmsCommonController.java

@@ -1,15 +1,14 @@
 package com.its.api.its.controller.vms;
 
 import com.its.api.its.model.dto.vms.*;
-import com.its.api.its.service.vms.TbVmsCtlrService;
-import com.its.api.its.service.vms.TbVmsFormTypeService;
-import com.its.api.its.service.vms.TbVmsTypeService;
-import com.its.api.its.service.vms.TbVmsUsagTypeService;
+import com.its.api.its.service.vms.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,29 +25,66 @@ public class VmsCommonController {
     private final TbVmsTypeService vmsTypeService;
     private final TbVmsCtlrService vmsCtlrService;
     private final TbVmsFormTypeService formTypeService;
+    private final TbVmsMsgDsplMthdService msgDsplMthdService;
+    private final TbVmsMsgDsplDrctService msgDsplDrctService;
+    private final TbVmsFontShpeService fontShpeService;
+    private final TbVmsFormObjectTypeService objectTypeService;
 
     @ApiOperation(value = "VMS 제어기 용도 유형 조회(TB_VMS_USAG_TYPE)", response = TbVmsUsagTypeDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/vms-usage", produces = {"application/json; charset=utf8"})
     public List<TbVmsUsagTypeDto> findAllVmsUsageType() {
-        return usagTypeService.findAll();
+        return this.usagTypeService.findAll();
     }
 
     @ApiOperation(value = "VMS 제어기 유형(크기) 조회(TB_VMS_TYPE)", response = TbVmsTypeDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/vms-type", produces = {"application/json; charset=utf8"})
     public List<TbVmsTypeDto> findAllVmsType() {
-        return vmsTypeService.findAll();
+        return this.vmsTypeService.findAll();
     }
 
     @ApiOperation(value = "VMS 목록 조회(TB_VMS_CTLR)", response = TbVmsIfscRltnDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/vms-list", produces = {"application/json; charset=utf8"})
     public List<TbVmsCtlrDto> findVmsCtlrAll() {
-        return vmsCtlrService.findNotDeletedAll();
+        return this.vmsCtlrService.findNotDeletedAll();
     }
 
     @ApiOperation(value = "VMS 폼 유형 조회(TB_VMS_FORM_TYPE)", response = TbVmsFormTypeDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/vms-form-type", produces = {"application/json; charset=utf8"})
     public List<TbVmsFormTypeDto> findVmsFormTypeAll() {
-        return formTypeService.findAll();
+        return this.formTypeService.findAll();
+    }
+
+    @ApiOperation(value = "VMS 폼 표출방법 조회(TB_VMS_MSG_DSPL_MTHD)", response = TbVmsMsgDsplMthdDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/vms-form-dspl-mthd", produces = {"application/json; charset=utf8"})
+    public List<TbVmsMsgDsplMthdDto> findVmsFormDsplMthdAll() {
+        return this.msgDsplMthdService.findAll();
+    }
+
+    @ApiOperation(value = "VMS 폼 표출방향 조회(TB_VMS_MSG_DSPL_DRCT)", response = TbVmsMsgDsplDrctDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/vms-form-dspl-drct", produces = {"application/json; charset=utf8"})
+    public List<TbVmsMsgDsplDrctDto> findVmsFormDsplDrctAll() {
+        return this.msgDsplDrctService.findAll();
+    }
+
+    @ApiOperation(value = "VMS 폼 폰트유형 조회(TB_VMS_FONT_SHPE)", response = TbVmsFontShpeDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/vms-form-font", produces = {"application/json; charset=utf8"})
+    public List<TbVmsFontShpeDto> findVmsFormFontAll() {
+        return this.fontShpeService.findAll();
+    }
+
+    @ApiOperation(value = "VMS 폼 객체유형 조회-전체(TB_VMS_FORM_OBJECT_TYPE)", response = TbVmsFormObjectTypeDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/vms-form-object", produces = {"application/json; charset=utf8"})
+    public List<TbVmsFormObjectTypeDto> findVmsFormObjectTypeAll() {
+        return this.objectTypeService.findAll();
+    }
+
+    @ApiOperation(value = "VMS 폼 객체유형 조회(TB_VMS_FORM_OBJECT_TYPE)", response = TbVmsFormObjectTypeDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/vms-form-object/{type}", produces = {"application/json; charset=utf8"})
+    public List<TbVmsFormObjectTypeDto> findVmsFormObjectTypeAllByFormType(
+            @ApiParam(name = "type", value = "VMS 폼 유형 코드", example = "11", required = true)
+            @PathVariable final Integer type
+    ) {
+        return this.objectTypeService.findAllByFormType(type);
     }
 
 }

+ 33 - 0
src/main/java/com/its/api/its/model/dto/vms/TbVmsFontShpeDto.java

@@ -0,0 +1,33 @@
+package com.its.api.its.model.dto.vms;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * VMS 글꼴 형태 DTO Class
+ */
+@Data
+@Builder
+@ApiModel("TbVmsFontShpeDto(VMS 글꼴 형태)")
+public class TbVmsFontShpeDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("VMS 글꼴 형태 코드")  // N NUMBER(3)
+    @JsonProperty("vms_font_shpe_cd")
+    private Integer vmsFontShpeCd;
+
+    @ApiModelProperty("VMS 글꼴 형태 명")  // Y VARCHAR(60)
+    @JsonProperty("vms_font_shpe_nm")
+    private String vmsFontShpeNm;
+
+    // Code Description Field
+    @ApiModelProperty("VMS 글꼴 형태 코드 설명")
+    @JsonProperty("vms_font_shpe_desc")    // VMS_FONT_SHPE_CD
+    private String vmsFontShpeDesc;
+
+}

+ 8 - 64
src/main/java/com/its/api/its/model/dto/vms/TbVmsFormObjectTypeDto.java

@@ -1,13 +1,12 @@
 package com.its.api.its.model.dto.vms;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.its.api.its.model.entity.vms.TbVmsFormObjectType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
 
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -31,69 +30,14 @@ public class TbVmsFormObjectTypeDto implements Serializable {
     @JsonProperty("vms_form_object_type_nm")
     private String vmsFormObjectTypeNm;
 
-    @ApiModelProperty("편집 코드")  // Y VARCHAR(7)
-    @JsonProperty("edtn_cd")
-    private String edtnCd;
-
     // Code Description Field
-    @ApiModelProperty("VMS FORM 유형 설명")
-    @JsonProperty("vms_form_type_desc")    // VMS_FORM_TYPE_CD
-    private Integer vmsFormTypeDesc;
+    //@ApiModelProperty("VMS FORM 유형 설명")
+    //@JsonProperty("vms_form_type_desc")    // VMS_FORM_TYPE_CD
+    @JsonIgnore
+    private String vmsFormTypeDesc;
 
     @ApiModelProperty("VMS FORM OBJECT 유형 코드 설명")
     @JsonProperty("vms_form_object_type_desc")    // VMS_FORM_OBJECT_TYPE_CD
-    private Integer vmsFormObjectTypeDesc;
-
-    @ApiModelProperty("편집 코드 설명")
-    @JsonProperty("edtn_desc")    // EDTN_CD
-    private String edtnDesc;
-
-    @ApiModel("TbVmsFormObjectTypeUpdReq(VMS OBJECT 유형 정보변경)")
-    @Getter
-    @Setter
-    @ToString
-    @NoArgsConstructor(access = AccessLevel.PROTECTED)
-    public static class TbVmsFormObjectTypeUpdReq {
-
-        @ApiModelProperty("VMS FORM 유형, Nullable = N, NUMBER(3)")  // N NUMBER(3)
-        @JsonProperty("vms_form_type_cd")
-        @Positive
-        private Integer vmsFormTypeCd;
-
-        @ApiModelProperty("VMS FORM OBJECT 유형 코드, Nullable = N, NUMBER(3)")  // N NUMBER(3)
-        @JsonProperty("vms_form_object_type_cd")
-        @Positive
-        private Integer vmsFormObjectTypeCd;
-
-        @ApiModelProperty("VMS FORM OBJECT 유형 명, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
-        @JsonProperty("vms_form_object_type_nm")
-        @Size(min=1, max=60)
-        private String vmsFormObjectTypeNm;
-
-        @ApiModelProperty("편집 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("edtn_cd")
-        @Size(min=1, max=7)
-        private String edtnCd;
-
-        @Builder
-        public TbVmsFormObjectTypeUpdReq(Integer vms_form_type_cd, Integer vms_form_object_type_cd, String vms_form_object_type_nm, String edtn_cd) {
-            this.vmsFormTypeCd = vms_form_type_cd;
-            this.vmsFormObjectTypeCd = vms_form_object_type_cd;
-            this.vmsFormObjectTypeNm = vms_form_object_type_nm;
-            this.edtnCd = edtn_cd;
-        }
-
-        public TbVmsFormObjectType toEntity() {
-            TbVmsFormObjectType entity = TbVmsFormObjectType.builder()
-                    .vmsFormTypeCd(this.vmsFormTypeCd)
-                    .vmsFormObjectTypeCd(this.vmsFormObjectTypeCd)
-                    .vmsFormObjectTypeNm(this.vmsFormObjectTypeNm)
-                    .edtnCd(this.edtnCd)
-                    .build();
-
-            return entity;
-        }
-
-    }
+    private String vmsFormObjectTypeDesc;
 
 }

+ 2 - 58
src/main/java/com/its/api/its/model/dto/vms/TbVmsFormTypeDto.java

@@ -1,13 +1,11 @@
 package com.its.api.its.model.dto.vms;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.its.api.its.model.entity.vms.TbVmsFormType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
 
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -27,58 +25,4 @@ public class TbVmsFormTypeDto implements Serializable {
     @JsonProperty("vms_form_type_nm")
     private String vmsFormTypeNm;
 
-    @ApiModelProperty("편집 코드")  // Y VARCHAR(7)
-    @JsonProperty("edtn_cd")
-    private String edtnCd;
-
-    // Code Description Field
-    @ApiModelProperty("VMS FORM 유형 코드 설명")
-    @JsonProperty("vms_form_type_desc")    // VMS_FORM_TYPE_CD
-    private Integer vmsFormTypeDesc;
-
-    @ApiModelProperty("편집 코드 설명")
-    @JsonProperty("edtn_desc")    // EDTN_CD
-    private String edtnDesc;
-
-    @ApiModel("TbVmsFormTypeUpdReq(VMS FORM 유형 정보변경)")
-    @Getter
-    @Setter
-    @ToString
-    @NoArgsConstructor(access = AccessLevel.PROTECTED)
-    public static class TbVmsFormTypeUpdReq {
-
-        @ApiModelProperty("VMS FORM 유형 코드, Nullable = N, NUMBER(3)")  // N NUMBER(3)
-        @JsonProperty("vms_form_type_cd")
-        @Positive
-        private Integer vmsFormTypeCd;
-
-        @ApiModelProperty("VMS FORM 유형 명, Nullable = Y, VARCHAR(60)")  // Y VARCHAR(60)
-        @JsonProperty("vms_form_type_nm")
-        @Size(min=1, max=60)
-        private String vmsFormTypeNm;
-
-        @ApiModelProperty("편집 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("edtn_cd")
-        @Size(min=1, max=7)
-        private String edtnCd;
-
-        @Builder
-        public TbVmsFormTypeUpdReq(Integer vms_form_type_cd, String vms_form_type_nm, String edtn_cd) {
-            this.vmsFormTypeCd = vms_form_type_cd;
-            this.vmsFormTypeNm = vms_form_type_nm;
-            this.edtnCd = edtn_cd;
-        }
-
-        public TbVmsFormType toEntity() {
-            TbVmsFormType entity = TbVmsFormType.builder()
-                    .vmsFormTypeCd(this.vmsFormTypeCd)
-                    .vmsFormTypeNm(this.vmsFormTypeNm)
-                    .edtnCd(this.edtnCd)
-                    .build();
-
-            return entity;
-        }
-
-    }
-
 }

+ 37 - 0
src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplDrctDto.java

@@ -0,0 +1,37 @@
+package com.its.api.its.model.dto.vms;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * VMS 메시지 표출 방향 DTO Class
+ */
+@Data
+@Builder
+@ApiModel("TbVmsMsgDsplDrctDto(VMS 메시지 표출 방향)")
+public class TbVmsMsgDsplDrctDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("VMS 메시지 표출 방향 코드")  // N NUMBER(3)
+    @JsonProperty("vms_msg_dspl_drct_cd")
+    private Integer vmsMsgDsplDrctCd;
+
+    @ApiModelProperty("VMS 메시지 표출 방향 명")  // Y VARCHAR(60)
+    @JsonProperty("vms_msg_dspl_drct_nm")
+    private String vmsMsgDsplDrctNm;
+
+    @ApiModelProperty("표출 방법 설명")  // Y VARCHAR(200)
+    @JsonProperty("dspl_mthd_expl")
+    private String dsplMthdExpl;
+
+    // Code Description Field
+    @ApiModelProperty("VMS 메시지 표출 방향 코드 설명")
+    @JsonProperty("vms_msg_dspl_drct_desc")    // VMS_MSG_DSPL_DRCT_CD
+    private String vmsMsgDsplDrctDesc;
+
+}

+ 37 - 0
src/main/java/com/its/api/its/model/dto/vms/TbVmsMsgDsplMthdDto.java

@@ -0,0 +1,37 @@
+package com.its.api.its.model.dto.vms;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * VMS 메시지 표출 방법 DTO Class
+ */
+@Data
+@Builder
+@ApiModel("TbVmsMsgDsplMthdDto(VMS 메시지 표출 방법)")
+public class TbVmsMsgDsplMthdDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("VMS 메시지 표출 방법 코드")  // N NUMBER(3)
+    @JsonProperty("vms_msg_dspl_mthd_cd")
+    private Integer vmsMsgDsplMthdCd;
+
+    @ApiModelProperty("VMS 메시지 표출 방법 명")  // Y VARCHAR(60)
+    @JsonProperty("vms_msg_dspl_mthd_nm")
+    private String vmsMsgDsplMthdNm;
+
+    @ApiModelProperty("표출 방법 설명")  // Y VARCHAR(200)
+    @JsonProperty("dspl_mthd_expl")
+    private String dsplMthdExpl;
+
+    // Code Description Field
+    @ApiModelProperty("VMS 메시지 표출 방법 코드 설명")
+    @JsonProperty("vms_msg_dspl_mthd_desc")    // VMS_MSG_DSPL_MTHD_CD
+    private String vmsMsgDsplMthdDesc;
+
+}

+ 50 - 0
src/main/java/com/its/api/its/model/entity/vms/TbVmsFontShpe.java

@@ -0,0 +1,50 @@
+package com.its.api.its.model.entity.vms;
+
+import com.its.api.its.model.dto.vms.TbVmsFontShpeDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * VMS 글꼴 형태 Entity Class
+ */
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+@AllArgsConstructor
+@ApiModel("VMS 글꼴 형태")
+@Entity
+@Table(name = "TB_VMS_FONT_SHPE")
+public class TbVmsFontShpe implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("VMS 글꼴 형태 코드")  // N NUMBER(3)
+    @Id
+    @Column(name = "VMS_FONT_SHPE_CD", nullable = false, columnDefinition = "NUMBER", length = 3)
+    private Integer vmsFontShpeCd;
+
+    @ApiModelProperty("VMS 글꼴 형태 명")  // Y VARCHAR(60)
+    @Column(name = "VMS_FONT_SHPE_NM", length = 60)
+    private String vmsFontShpeNm;
+
+    @ApiModelProperty("편집 코드")  // Y VARCHAR(7)
+    @Column(name = "EDTN_CD", length = 7)
+    private String edtnCd;
+
+    public TbVmsFontShpeDto toDto() {
+        TbVmsFontShpeDto dto = TbVmsFontShpeDto.builder()
+                .vmsFontShpeCd(this.vmsFontShpeCd)
+                .vmsFontShpeNm(this.vmsFontShpeNm)
+                .build();
+
+        dto.setVmsFontShpeDesc("[" + dto.getVmsFontShpeCd() + "] " + dto.getVmsFontShpeNm());
+        return dto;
+    }
+
+}

+ 1 - 11
src/main/java/com/its/api/its/model/entity/vms/TbVmsFormObjectType.java

@@ -45,20 +45,10 @@ public class TbVmsFormObjectType implements Serializable {
                 .vmsFormTypeCd(this.vmsFormTypeCd)
                 .vmsFormObjectTypeCd(this.vmsFormObjectTypeCd)
                 .vmsFormObjectTypeNm(this.vmsFormObjectTypeNm)
-                .edtnCd(this.edtnCd)
                 .build();
 
+        dto.setVmsFormObjectTypeDesc("[" + dto.getVmsFormObjectTypeCd() + "] " + dto.getVmsFormObjectTypeNm());
         return dto;
     }
 
-    public TbVmsFormObjectType(Integer vmsFormTypeCd, Integer vmsFormObjectTypeCd) {
-        this.vmsFormTypeCd = vmsFormTypeCd;
-        this.vmsFormObjectTypeCd = vmsFormObjectTypeCd;
-    }
-
-    public void updateInfo(TbVmsFormObjectTypeDto.TbVmsFormObjectTypeUpdReq req) {
-        this.vmsFormObjectTypeNm = req.getVmsFormObjectTypeNm();
-        this.edtnCd = req.getEdtnCd();
-    }
-
 }

+ 0 - 10
src/main/java/com/its/api/its/model/entity/vms/TbVmsFormType.java

@@ -41,19 +41,9 @@ public class TbVmsFormType implements Serializable {
         TbVmsFormTypeDto dto = TbVmsFormTypeDto.builder()
                 .vmsFormTypeCd(this.vmsFormTypeCd)
                 .vmsFormTypeNm(this.vmsFormTypeNm)
-                .edtnCd(this.edtnCd)
                 .build();
 
         return dto;
     }
 
-    public TbVmsFormType(Integer vmsFormTypeCd) {
-        this.vmsFormTypeCd = vmsFormTypeCd;
-    }
-
-    public void updateInfo(TbVmsFormTypeDto.TbVmsFormTypeUpdReq req) {
-        this.vmsFormTypeNm = req.getVmsFormTypeNm();
-        this.edtnCd = req.getEdtnCd();
-    }
-
 }

+ 56 - 0
src/main/java/com/its/api/its/model/entity/vms/TbVmsMsgDsplDrct.java

@@ -0,0 +1,56 @@
+package com.its.api.its.model.entity.vms;
+
+import com.its.api.its.model.dto.vms.TbVmsMsgDsplDrctDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * VMS 메시지 표출 방향 Entity Class
+ */
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+@AllArgsConstructor
+@ApiModel("VMS 메시지 표출 방향")
+@Entity
+@Table(name = "TB_VMS_MSG_DSPL_DRCT")
+public class TbVmsMsgDsplDrct implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("VMS 메시지 표출 방향 코드")  // N NUMBER(3)
+    @Id
+    @Column(name = "VMS_MSG_DSPL_DRCT_CD", nullable = false, columnDefinition = "NUMBER", length = 3)
+    private Integer vmsMsgDsplDrctCd;
+
+    @ApiModelProperty("VMS 메시지 표출 방향 명")  // Y VARCHAR(60)
+    @Column(name = "VMS_MSG_DSPL_DRCT_NM", length = 60)
+    private String vmsMsgDsplDrctNm;
+
+    @ApiModelProperty("편집 코드")  // Y VARCHAR(7)
+    @Column(name = "EDTN_CD", length = 7)
+    private String edtnCd;
+
+    @ApiModelProperty("표출 방법 설명")  // Y VARCHAR(200)
+    @Column(name = "DSPL_MTHD_EXPL", length = 200)
+    private String dsplMthdExpl;
+
+    public TbVmsMsgDsplDrctDto toDto() {
+        TbVmsMsgDsplDrctDto dto = TbVmsMsgDsplDrctDto.builder()
+                .vmsMsgDsplDrctCd(this.vmsMsgDsplDrctCd)
+                .vmsMsgDsplDrctNm(this.vmsMsgDsplDrctNm)
+                .dsplMthdExpl(this.dsplMthdExpl)
+                .build();
+
+        dto.setVmsMsgDsplDrctDesc("[" + dto.getVmsMsgDsplDrctCd() + "] " + dto.getVmsMsgDsplDrctNm());
+        return dto;
+    }
+
+
+}

+ 55 - 0
src/main/java/com/its/api/its/model/entity/vms/TbVmsMsgDsplMthd.java

@@ -0,0 +1,55 @@
+package com.its.api.its.model.entity.vms;
+
+import com.its.api.its.model.dto.vms.TbVmsMsgDsplMthdDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * VMS 메시지 표출 방법 Entity Class
+ */
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+@AllArgsConstructor
+@ApiModel("VMS 메시지 표출 방법")
+@Entity
+@Table(name = "TB_VMS_MSG_DSPL_MTHD")
+public class TbVmsMsgDsplMthd implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("VMS 메시지 표출 방법 코드")  // N NUMBER(3)
+    @Id
+    @Column(name = "VMS_MSG_DSPL_MTHD_CD", nullable = false, columnDefinition = "NUMBER", length = 3)
+    private Integer vmsMsgDsplMthdCd;
+
+    @ApiModelProperty("VMS 메시지 표출 방법 명")  // Y VARCHAR(60)
+    @Column(name = "VMS_MSG_DSPL_MTHD_NM", length = 60)
+    private String vmsMsgDsplMthdNm;
+
+    @ApiModelProperty("편집 코드")  // Y VARCHAR(7)
+    @Column(name = "EDTN_CD", length = 7)
+    private String edtnCd;
+
+    @ApiModelProperty("표출 방법 설명")  // Y VARCHAR(200)
+    @Column(name = "DSPL_MTHD_EXPL", length = 200)
+    private String dsplMthdExpl;
+
+    public TbVmsMsgDsplMthdDto toDto() {
+        TbVmsMsgDsplMthdDto dto = TbVmsMsgDsplMthdDto.builder()
+                .vmsMsgDsplMthdCd(this.vmsMsgDsplMthdCd)
+                .vmsMsgDsplMthdNm(this.vmsMsgDsplMthdNm)
+                .dsplMthdExpl(this.dsplMthdExpl)
+                .build();
+
+        dto.setVmsMsgDsplMthdDesc("[" + dto.getVmsMsgDsplMthdCd() + "] " + dto.getVmsMsgDsplMthdNm());
+        return dto;
+    }
+
+}

+ 11 - 0
src/main/java/com/its/api/its/repository/vms/TbVmsFontShpeRepository.java

@@ -0,0 +1,11 @@
+package com.its.api.its.repository.vms;
+
+import com.its.api.its.model.entity.vms.TbVmsFontShpe;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TbVmsFontShpeRepository extends JpaRepository<TbVmsFontShpe, Integer>, JpaSpecificationExecutor<TbVmsFontShpe> {
+
+}

+ 5 - 0
src/main/java/com/its/api/its/repository/vms/TbVmsFormObjectTypeRepository.java

@@ -4,9 +4,14 @@ import com.its.api.its.model.entity.vms.TbVmsFormObjectType;
 import com.its.api.its.model.entity.vms.TbVmsFormObjectTypeKey;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface TbVmsFormObjectTypeRepository extends JpaRepository<TbVmsFormObjectType, TbVmsFormObjectTypeKey>, JpaSpecificationExecutor<TbVmsFormObjectType> {
 
+    @Query("select p from TbVmsFormObjectType p where p.vmsFormTypeCd = :formType")
+    List<TbVmsFormObjectType> findAllByFormType(Integer formType);
 }

+ 11 - 0
src/main/java/com/its/api/its/repository/vms/TbVmsMsgDsplDrctRepository.java

@@ -0,0 +1,11 @@
+package com.its.api.its.repository.vms;
+
+import com.its.api.its.model.entity.vms.TbVmsMsgDsplDrct;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TbVmsMsgDsplDrctRepository extends JpaRepository<TbVmsMsgDsplDrct, Integer>, JpaSpecificationExecutor<TbVmsMsgDsplDrct> {
+
+}

+ 11 - 0
src/main/java/com/its/api/its/repository/vms/TbVmsMsgDsplMthdRepository.java

@@ -0,0 +1,11 @@
+package com.its.api.its.repository.vms;
+
+import com.its.api.its.model.entity.vms.TbVmsMsgDsplMthd;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TbVmsMsgDsplMthdRepository extends JpaRepository<TbVmsMsgDsplMthd, Integer>, JpaSpecificationExecutor<TbVmsMsgDsplMthd> {
+
+}

+ 7 - 7
src/main/java/com/its/api/its/service/analysis/PtrnDataService.java

@@ -25,8 +25,8 @@ public class PtrnDataService {
 
     public List<PtrnDataDto> findAllByDateRange(PtrnDataParam cond) {
 
-        if (cond.getPTRN_TYPE().equalsIgnoreCase("LINK")) {
-            if (cond.getPTRN_DATA().equalsIgnoreCase("5M")) {
+        if ("LINK".equalsIgnoreCase(cond.getPTRN_TYPE())) {
+            if ("5M".equalsIgnoreCase(cond.getPTRN_DATA())) {
                 cond.setTABLE_NAME("TB_LINK_5M_PTRN");
             }
             else {
@@ -34,8 +34,8 @@ public class PtrnDataService {
             }
             return this.mapper.findAllByDateRangeLINK(cond);
         }
-        else if (cond.getPTRN_TYPE().equalsIgnoreCase("IFSC")) {
-            if (cond.getPTRN_DATA().equalsIgnoreCase("5M")) {
+        else if ("IFSC".equalsIgnoreCase(cond.getPTRN_TYPE())) {
+            if ("5M".equalsIgnoreCase(cond.getPTRN_DATA())) {
                 cond.setTABLE_NAME("TB_IFSC_5M_PTRN");
             }
             else {
@@ -43,8 +43,8 @@ public class PtrnDataService {
             }
             return this.mapper.findAllByDateRangeIFSC(cond);
         }
-        else if (cond.getPTRN_TYPE().equalsIgnoreCase("ROAD")) {
-            if (cond.getPTRN_DATA().equalsIgnoreCase("5M")) {
+        else if ("ROAD".equalsIgnoreCase(cond.getPTRN_TYPE())) {
+            if ("5M".equalsIgnoreCase(cond.getPTRN_DATA())) {
                 cond.setTABLE_NAME("TB_ROAD_5M_PTRN");
             }
             else {
@@ -67,7 +67,7 @@ public class PtrnDataService {
         List<TbCmmnCdDto> data = this.cmmnCdService.findAllByCmmnClsfCd(CodeManager.DAY_TYPE_CD);
         if (data != null) {
 	        data.forEach(obj -> {
-	            if (obj.getUseYn().equals("Y")) {
+	            if (("Y").equals(obj.getUseYn())) {
 	                result.add(new PtrnDataDto.PtrnDataDayType(obj));
 	            }
 	        });

+ 1 - 1
src/main/java/com/its/api/its/service/atrd/AtrdTrafficStatisticsService.java

@@ -380,7 +380,7 @@ public class AtrdTrafficStatisticsService {
         List<TbAtrd> data = this.atrdRepo.findAll();
         if (data != null) {
 	        data.forEach(obj -> {
-	            if (obj.getDelYn().equals("N")) {
+	            if (("N").equals(obj.getDelYn())) {
 	                result.add(obj.toDto(new ArrayList<>()));
 	            }
 	        });

+ 1 - 1
src/main/java/com/its/api/its/service/code/TbClctSystStupService.java

@@ -33,7 +33,7 @@ public class TbClctSystStupService {
         List<TbClctSystStup> data = this.repo.findAll();
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getUseYn().equals("Y")) {
+                if (("Y").equals(obj.getUseYn())) {
                     result.add(obj.toDto());
                 }
             });

+ 1 - 1
src/main/java/com/its/api/its/service/code/TbCmmnCdService.java

@@ -121,7 +121,7 @@ public class TbCmmnCdService {
         List<TbCmmnCd> data = this.repo.findAllByCmmnClsfCd(CodeManager.FCLT_TYPE_CD);
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getUseYn().equals("Y")) {
+                if (("Y").equals(obj.getUseYn())) {
                     result.add(FcltTypeDto.makeDto(obj));
                 }
             });

+ 3 - 3
src/main/java/com/its/api/its/service/dashboard/facility/BisService.java

@@ -21,7 +21,7 @@ public class BisService {
         List<ProcessSttsDto> result = this.mapper.findAllProcessStts();
         if (result != null) {
 	        result.forEach(obj -> {
-	            if (obj.getRUNST().equals("0")) {
+	            if (("0").equals(obj.getRUNST())) {
 	                obj.setCOMST("0");
 	                obj.setDBSTS("0");
 	            }
@@ -44,10 +44,10 @@ public class BisService {
         List<BitCommSttsDto> result = this.mapper.findAllBitComm();
         if (result != null) {
             result.forEach(obj -> {
-                if (obj.getWCOMMSTATUS().equals("0")) {
+                if (("0").equals(obj.getWCOMMSTATUS())) {
                     obj.setCOMM_DESC("장애");
                 }
-                else if (obj.getWCOMMSTATUS().equals("1")) {
+                else if (("1").equals(obj.getWCOMMSTATUS())) {
                     obj.setCOMM_DESC("정상");
                 }
                 else {

+ 8 - 8
src/main/java/com/its/api/its/service/dashboard/facility/ItsService.java

@@ -19,7 +19,7 @@ public class ItsService {
         List<ProcessSttsDto> result = this.mapper.findAllProcessStts();
         if (result != null) {
 	        result.forEach(obj -> {
-	            if (obj.getRUNST().equals("0")) {
+	            if (("0").equals(obj.getRUNST())) {
 	                obj.setCOMST("0");
 	                obj.setDBSTS("0");
 	            }
@@ -42,17 +42,17 @@ public class ItsService {
         List<VdsCommSttsDto> result = this.mapper.findAllVdsComm();
         if (result != null) {
             result.forEach(obj -> {
-                if (obj.getCOMM_CD().equals("CMS0")) {
+                if (("CMS0").equals(obj.getCOMM_CD())) {
                     obj.setCOMM_DESC("정상");
                 }
-                else if (obj.getCOMM_CD().equals("CMS1")) {
+                else if (("CMS1").equals(obj.getCOMM_CD())) {
                     obj.setCOMM_DESC("장애");
                 }
                 else {
                     obj.setCOMM_DESC("?");
                 }
 
-                if (obj.getCOMM_CD().equals("CMS0")) {
+                if (("CMS0").equals(obj.getCOMM_CD())) {
                     if (obj.getCOLCNT() == 0) {
                         obj.setCOL_DESC("이상");
                     }
@@ -72,10 +72,10 @@ public class ItsService {
         List<VmsCommSttsDto> result = this.mapper.findAllVmsComm();
         if (result != null) {
             result.forEach(obj -> {
-                if (obj.getCOMM_CD().equals("CMS0")) {
+                if (("CMS0").equals(obj.getCOMM_CD())) {
                     obj.setCOMM_DESC("정상");
                 }
-                else if (obj.getCOMM_CD().equals("CMS1")) {
+                else if (("CMS1").equals(obj.getCOMM_CD())) {
                     obj.setCOMM_DESC("장애");
                 }
                 else {
@@ -90,10 +90,10 @@ public class ItsService {
         List<CctvCommSttsDto> result = this.mapper.findAllCctvComm();
         if (result != null) {
             result.forEach(obj -> {
-                if (obj.getCOMM_CD().equals("CMS0")) {
+                if (("CMS0").equals(obj.getCOMM_CD())) {
                     obj.setCOMM_DESC("정상");
                 }
-                else if (obj.getCOMM_CD().equals("CMS1")) {
+                else if (("CMS1").equals(obj.getCOMM_CD())) {
                     obj.setCOMM_DESC("장애");
                 }
                 else {

+ 1 - 1
src/main/java/com/its/api/its/service/database/TbCnctIntnService.java

@@ -109,7 +109,7 @@ public class TbCnctIntnService {
         List<TbCmmnCdDto> data = this.cmmnCdService.findAllByCmmnClsfCd(CodeManager.CNCT_INTN_TYPE_CD);
         if (data != null) {
 	        data.forEach(obj -> {
-	            if (obj.getUseYn().equals("Y")) {
+	            if (("Y").equals(obj.getUseYn())) {
 	                result.add(new TbCnctIntnDto.TbCnctType(obj));
 	            }
 	        });

+ 1 - 1
src/main/java/com/its/api/its/service/database/TbLeglHldyInfrService.java

@@ -109,7 +109,7 @@ public class TbLeglHldyInfrService {
         List<TbCmmnCdDto> data = this.cmmnCdService.findAllByCmmnClsfCd(CodeManager.HLDY_DAY_CD);
         if (data != null) {
 	        data.forEach(obj -> {
-	            if (obj.getUseYn().equals("Y")) {
+	            if (("Y").equals(obj.getUseYn())) {
 	                result.add(new TbLeglHldyInfrDto.LeglHldyType(obj));
 	            }
 	        });

+ 2 - 2
src/main/java/com/its/api/its/service/ifsc/TbIfscService.java

@@ -101,7 +101,7 @@ public class TbIfscService {
         List<TbIfscDto> result = new ArrayList<>();
         List<TbIfsc> data = this.repo.findAll();
         for (TbIfsc entity : data) {
-            if (entity.getAreaCd().equals("LAT001")) {
+            if (("LAT001").equals(entity.getAreaCd())) {
                 result.add(entity.toDto());
             }
         }
@@ -126,7 +126,7 @@ public class TbIfscService {
         List<TbIfscDto> result = new ArrayList<>();
         List<TbIfsc> data = this.repo.findAll();
         data.forEach(obj -> {
-            if (obj.getDelYn().equals("Y")) {
+            if (("Y").equals(obj.getDelYn())) {
                 return;
             }
             if (filter == null || filter.isEmpty()) {

+ 1 - 1
src/main/java/com/its/api/its/service/incident/TbIncdOcrrService.java

@@ -231,7 +231,7 @@ public class TbIncdOcrrService {
         List<IncdCodeDto> result = new ArrayList<>();
         List<TbCmmnCd> data = this.codeRepo.findAllByCmmnClsfCd(cmmnClsfCd);
         data.forEach(obj -> {
-            if (obj.getUseYn().equals("Y")) {
+            if (("Y").equals(obj.getUseYn())) {
                 result.add(IncdCodeDto.makeDto(obj));
             }
         });

+ 1 - 1
src/main/java/com/its/api/its/service/link/LinkParaDetlService.java

@@ -65,7 +65,7 @@ public class LinkParaDetlService {
         try {
             List<TbLink> links = this.linkRepo.findAll();
             for (TbLink link : links) {
-                if (link.getDelYn().equals("Y")) {
+                if (("Y").equals(link.getDelYn())) {
                     continue;
                 }
 

+ 1 - 1
src/main/java/com/its/api/its/service/link/LinkParaStupService.java

@@ -65,7 +65,7 @@ public class LinkParaStupService {
         try {
             List<TbLink> links = this.linkRepo.findAll();
             for (TbLink link : links) {
-                if (link.getDelYn().equals("Y")) {
+                if (("Y").equals(link.getDelYn())) {
                     continue;
                 }
 

+ 2 - 2
src/main/java/com/its/api/its/service/link/TbLinkService.java

@@ -45,7 +45,7 @@ public class TbLinkService {
         List<TbLinkDto> result = new ArrayList<>();
         List<TbLink> data = this.repo.findAll();
         for (TbLink entity : data) {
-            if (entity.getAreaCd().equals("LAT001")) {
+            if (("LAT001").equals(entity.getAreaCd())) {
                 result.add(entity.toDto());
             }
         }
@@ -142,7 +142,7 @@ public class TbLinkService {
         List<TbLinkDto> result = new ArrayList<>();
         List<TbLink> data = this.repo.findAll();
         data.forEach(obj -> {
-            if (obj.getDelYn().equals("Y")) {
+            if (("Y").equals(obj.getDelYn())) {
                 return;
             }
             if (filter == null || filter.isEmpty()) {

+ 4 - 4
src/main/java/com/its/api/its/service/link/TbTrfcPrcnStatService.java

@@ -40,19 +40,19 @@ public class TbTrfcPrcnStatService {
         int totCnt = 0;
         List<TbTrfcPrcnStatInf> data = null;
 
-        if (OFFR_TYPE.equalsIgnoreCase("LINK")) {
+        if (("LINK").equalsIgnoreCase(OFFR_TYPE)) {
             totCnt = this.linkRepo.findAllCount();
             data = this.repo.findAllByDateRangeLINK(fromDt, toDt);
         }
-        else if (OFFR_TYPE.equalsIgnoreCase("IFSC")) {
+        else if (("IFSC").equalsIgnoreCase(OFFR_TYPE)) {
             totCnt = this.ifscRepo.findAllCount();
             data = this.repo.findAllByDateRangeIFSC(fromDt, toDt);
         }
-        else if (OFFR_TYPE.equalsIgnoreCase("ROAD")) {
+        else if (("ROAD").equalsIgnoreCase(OFFR_TYPE)) {
             totCnt = this.roadRepo.findAllCount();
             data = this.repo.findAllByDateRangeROAD(fromDt, toDt);
         }
-        else if (OFFR_TYPE.equalsIgnoreCase("VMS")) {
+        else if (("VMS").equalsIgnoreCase(OFFR_TYPE)) {
             totCnt = this.vmsIfscRepo.findAllCount();
             data = this.repo.findAllByDateRangeVMS(fromDt, toDt);
         }

+ 3 - 3
src/main/java/com/its/api/its/service/oper/TbGropMenuAthrService.java

@@ -42,7 +42,7 @@ public class TbGropMenuAthrService {
         // 메뉴 중에 최상위 메뉴 선택
         HashMap<String, String> systMenuMap = new HashMap<>();
         for (TbOperSystMenu systMenu : systMenus) {
-            if (systMenu.getDelYn().equals("N") & systMenu.getMenuLevl() == 1) {
+            if (("N").equals(systMenu.getDelYn()) & systMenu.getMenuLevl() == 1) {
                 // 레벨이 1 인 것이 최상위 메뉴이다, OPERSYST_MENU_ID, OPER_SYST_ID 는 NULL 로 들어가 있다.
                 systMenuMap.put(systMenu.getOperSystMenuId(), systMenu.getMenuName());
             }
@@ -56,13 +56,13 @@ public class TbGropMenuAthrService {
 
         // 권한별로 모든 메뉴 생성
         for (TbUserGropInfr userGrop : userGrops) {
-            if (userGrop.getDelYn().equals("Y")) {
+            if (("Y").equals(userGrop.getDelYn())) {
                 continue;
             }
 
             // 모든 메뉴에 대해서
             for (TbOperSystMenu systMenu : systMenus) {
-                if (systMenu.getDelYn().equals("Y") || systMenu.getMenuLevl() == 1) {
+                if (("Y").equals(systMenu.getDelYn()) || systMenu.getMenuLevl() == 1) {
                     // 메뉴레벨이 1인 최상위 메뉴는 제외한다.
                     continue;
                 }

+ 1 - 1
src/main/java/com/its/api/its/service/oper/TbOperSystService.java

@@ -102,7 +102,7 @@ public class TbOperSystService {
         List<TbOperSyst> data = this.repo.findAll();
         if (data != null) {
 	        data.forEach(obj -> {
-	            if (obj.getDelYn().equals("N")) {
+	            if (("N").equals(obj.getDelYn())) {
 	                result.add(obj.toDto());
 	            }
 	        });

+ 1 - 1
src/main/java/com/its/api/its/service/oper/TbUserGropInfrService.java

@@ -102,7 +102,7 @@ public class TbUserGropInfrService {
         List<TbUserGropInfr> data = this.repo.findAll();
         if (data != null) {
 	        data.forEach(obj -> {
-	            if (obj.getDelYn().equals("N")) {
+	            if (("N").equals(obj.getDelYn())) {
 	                result.add(obj.toDto());
 	            }
 	        });

+ 2 - 2
src/main/java/com/its/api/its/service/road/TbRoadService.java

@@ -43,7 +43,7 @@ public class TbRoadService {
         List<TbRoadDto> result = new ArrayList<>();
         List<TbRoad> data = this.repo.findAll();
         for (TbRoad entity : data) {
-            if (entity.getAreaCd().equals("LAT001")) {
+            if (("LAT001").equals(entity.getAreaCd())) {
                 result.add(entity.toDto());
             }
         }
@@ -126,7 +126,7 @@ public class TbRoadService {
         List<TbRoadDto> result = new ArrayList<>();
         List<TbRoad> data = this.repo.findAll();
         data.forEach(obj -> {
-            if (obj.getDelYn().equals("Y")) {
+            if (("Y").equals(obj.getDelYn())) {
                 return;
             }
             if (filter == null || filter.isEmpty()) {

+ 3 - 3
src/main/java/com/its/api/its/service/statistics/FcltSttsStatisticsService.java

@@ -29,15 +29,15 @@ public class FcltSttsStatisticsService {
         param.put("FROM_DT", fromDt);
         param.put("TO_DT", toDt);
 
-        if (FCLT_CD.equalsIgnoreCase("CCTV")) {
+        if (("CCTV").equalsIgnoreCase(FCLT_CD)) {
             return this.mapper.findAllFcltSttsCCTV(param);
         }
         else
-        if (FCLT_CD.equalsIgnoreCase("VMS")) {
+        if (("VMS").equalsIgnoreCase(FCLT_CD)) {
             return this.mapper.findAllFcltSttsVMS(param);
         }
         else
-        if (FCLT_CD.equalsIgnoreCase("VDS")) {
+        if (("VDS").equalsIgnoreCase(FCLT_CD)) {
             return this.mapper.findAllFcltSttsVDS(param);
         }
         else {

+ 5 - 5
src/main/java/com/its/api/its/service/unit/TbUnitSystSttsHsService.java

@@ -97,19 +97,19 @@ public class TbUnitSystSttsHsService {
                     return;
                 }
 
-                if (stat.getSystSttsCd().equals("SPS0")) {
+                if (("SPS0").equals(stat.getSystSttsCd())) {
                     unitDto.setCntSps0(stat.getSttsCnt());
                 }
-                else if (stat.getSystSttsCd().equals("SPS1")) {
+                else if (("SPS1").equals(stat.getSystSttsCd())) {
                     unitDto.setCntSps1(stat.getSttsCnt());
                 }
-                else if (stat.getSystSttsCd().equals("SPS2")) {
+                else if (("SPS2").equals(stat.getSystSttsCd())) {
                     unitDto.setCntSps2(stat.getSttsCnt());
                 }
-                else if (stat.getSystSttsCd().equals("SPS3")) {
+                else if (("SPS3").equals(stat.getSystSttsCd())) {
                     unitDto.setCntSps3(stat.getSttsCnt());
                 }
-                else if (stat.getSystSttsCd().equals("SPS4")) {
+                else if (("SPS4").equals(stat.getSystSttsCd())) {
                     unitDto.setCntSps4(stat.getSttsCnt());
                 }
             });

+ 2 - 2
src/main/java/com/its/api/its/service/unit/TbUnitSystSttsService.java

@@ -59,9 +59,9 @@ public class TbUnitSystSttsService {
             TbUnitSystSttsDto sttsDto = unitMap.get(obj.getSystId());
             if (sttsDto != null) {
                 sttsDto.setUpdtDt(obj.getUpdtDt());
-                if (obj.getSystSttsCd().equals("SPS1")) {
+                if (("SPS1").equals(obj.getSystSttsCd())) {
                     String missYn = ItsUtils.getMissSttsYn(sttsDto.getUpdtDt());
-                    if (!missYn.equals("Y")) {
+                    if (!("Y").equals(missYn)) {
                         sttsDto.setSystSttsCd("1");
                         sttsDto.setSystSttsDesc("정상");
                     }

+ 1 - 1
src/main/java/com/its/api/its/service/vds/TbVdsCtlrSttsHsService.java

@@ -49,7 +49,7 @@ public class TbVdsCtlrSttsHsService {
         List<TbVdsCtlrSttsHs> data = this.repo.findAllByDateRange(fromDt, toDt, ids);
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getVds() != null && obj.getVds().getDelYn().equals("N")) {
+                if (obj.getVds() != null && ("N").equals(obj.getVds().getDelYn())) {
                     result.add(obj.toDto());
                 }
             });

+ 1 - 1
src/main/java/com/its/api/its/service/vds/TbVdsCtlrSttsService.java

@@ -32,7 +32,7 @@ public class TbVdsCtlrSttsService {
         List<TbVdsCtlrStts> data = this.repo.findAll();
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getVds() != null && obj.getVds().getDelYn().equals("N")) {
+                if (obj.getVds() != null && ("N").equals(obj.getVds().getDelYn())) {
                     result.add(obj.toDto());
                 }
             });

+ 3 - 3
src/main/java/com/its/api/its/service/vms/TbVmsCtlrService.java

@@ -44,7 +44,7 @@ public class TbVmsCtlrService {
         List<TbVmsCtlrDto> result = new ArrayList<>();
         List<TbVmsCtlr> data = this.repo.findAll();
         for (TbVmsCtlr entity : data) {
-            if (entity.getDelYn().equals("N")) {
+            if (("N").equals(entity.getDelYn())) {
                 result.add(entity.toDto());
             }
         }
@@ -114,7 +114,7 @@ public class TbVmsCtlrService {
         List<TbCmmnCdDto> data = this.cmmnCdService.findAllByCmmnClsfCd(CodeManager.VMS_USAG_TYPE_CD);
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getUseYn().equals("Y")) {
+                if (("Y").equals(obj.getUseYn())) {
                     result.add(new TbVmsCtlrDto.TbVmsUsageType(obj));
                 }
             });
@@ -133,7 +133,7 @@ public class TbVmsCtlrService {
         List<TbCmmnCdDto> data = this.cmmnCdService.findAllByCmmnClsfCd(CodeManager.VMS_TYPE_CD);
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getUseYn().equals("Y")) {
+                if (("Y").equals(obj.getUseYn())) {
                     result.add(new TbVmsCtlrDto.TbVmsType(obj));
                 }
             });

+ 2 - 2
src/main/java/com/its/api/its/service/vms/TbVmsDsplHsService.java

@@ -127,7 +127,7 @@ public class TbVmsDsplHsService {
         int width = obj.getType().getVmsWdth();
         int height = obj.getType().getVmsHght();
         // TYPE_INT_ARGB specifies the image format: 8-bit RGBA packed
-        BufferedImage formImage = new BufferedImage(width, height, (imagFmt.equals("png") ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB));
+        BufferedImage formImage = new BufferedImage(width, height, (("png").equals(imagFmt) ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB));
         Graphics2D 	g2d = (Graphics2D)formImage.createGraphics();  //createGraphics();getGraphics();
         //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setColor(getColor(formColor));
@@ -206,7 +206,7 @@ public class TbVmsDsplHsService {
                                 floodFill.setAntialiased(false);
 
                                 tmp = trafList.get(1);
-                                if (!tmp.equals("X")) {
+                                if (!("X").equals(tmp)) {
                                     int vertex = Integer.parseInt(tmp.substring(0, 2), 16);
                                     for (int jj = 0; jj < vertex; jj++) {
                                         int idx = jj * 7;

+ 48 - 0
src/main/java/com/its/api/its/service/vms/TbVmsFontShpeService.java

@@ -0,0 +1,48 @@
+package com.its.api.its.service.vms;
+
+import com.its.api.its.model.dto.vms.TbVmsFontShpeDto;
+import com.its.api.its.model.entity.vms.TbVmsFontShpe;
+import com.its.api.its.repository.vms.TbVmsFontShpeRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class TbVmsFontShpeService {
+
+    private final TbVmsFontShpeRepository repo;
+
+    // 데이터 1건 조회, 없으면 exception
+    private TbVmsFontShpe requireOne(Integer id) {
+        return this.repo.findById(id)
+                .orElseThrow(() -> new NoSuchElementException("데이터가 존재하지 않습니다: " + id));
+    }
+
+    // 전체 데이터 조회
+    @Transactional(readOnly = true)
+    public List<TbVmsFontShpeDto> findAll() {
+        List<TbVmsFontShpeDto> result = new ArrayList<>();
+        List<TbVmsFontShpe> data = this.repo.findAll();
+        data.forEach(obj -> {
+            if (!("EDI2").equals(obj.getEdtnCd())) {
+                result.add(obj.toDto());
+            }
+        });
+        return result;
+    }
+
+    // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
+    @Transactional(readOnly = true)
+    public TbVmsFontShpeDto findById(Integer id) {
+        TbVmsFontShpe entity = requireOne(id);
+        return entity.toDto();
+    }
+
+}

+ 16 - 51
src/main/java/com/its/api/its/service/vms/TbVmsFormObjectTypeService.java

@@ -12,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -32,9 +31,11 @@ public class TbVmsFormObjectTypeService {
     public List<TbVmsFormObjectTypeDto> findAll() {
         List<TbVmsFormObjectTypeDto> result = new ArrayList<>();
         List<TbVmsFormObjectType> data = this.repo.findAll();
-        for (TbVmsFormObjectType entity : data) {
-            result.add(entity.toDto());
-        }
+        data.forEach(obj -> {
+            if (!("EDI2").equals(obj.getEdtnCd())) {
+                result.add(obj.toDto());
+            }
+        });
         return result;
     }
 
@@ -45,55 +46,19 @@ public class TbVmsFormObjectTypeService {
         return entity.toDto();
     }
 
-    // 데이터 변경
-    @Transactional
-    public TbVmsFormObjectTypeDto updateById(TbVmsFormObjectTypeKey id, TbVmsFormObjectTypeDto.TbVmsFormObjectTypeUpdReq req) {
-        TbVmsFormObjectType entity = requireOne(id);
-        entity.updateInfo(req);
-        this.repo.save(entity);
-        return entity.toDto();
-    }
-
-    // 데이터 변경 또는 생성-목록(데이터가 존재하면 업데이트 없으면 신규로 생성)
-    @Transactional
-    public List<TbVmsFormObjectTypeDto> mergeInfoList(List<TbVmsFormObjectTypeDto.TbVmsFormObjectTypeUpdReq> reqList) {
-        List<TbVmsFormObjectTypeDto> result = new ArrayList<>();
-        for (TbVmsFormObjectTypeDto.TbVmsFormObjectTypeUpdReq req : reqList) {
-            TbVmsFormObjectType obj = req.toEntity();
-            this.repo.save(obj);
-            result.add(obj.toDto());
-        }
-        return result;
-    }
-
-    // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
-    @Transactional
-    public TbVmsFormObjectTypeDto mergeInfo(TbVmsFormObjectTypeDto.TbVmsFormObjectTypeUpdReq req) {
-        TbVmsFormObjectType obj = req.toEntity();
-        this.repo.save(obj);
-        return obj.toDto();
-    }
-
-    // 정보 삭제-개별, 데이터 존재하지 않으면 Exception
-    @Transactional
-    public TbVmsFormObjectTypeDto deleteById(TbVmsFormObjectTypeKey id) {
-        TbVmsFormObjectType entity = requireOne(id);
-        this.repo.deleteById(id);
-        return entity.toDto();
-    }
-
-    // 정보 삭제-목록, 존재하는 데이터 만 삭제
-    @Transactional
-    public List<TbVmsFormObjectTypeDto> deleteByIds(List<TbVmsFormObjectTypeKey> ids) {
+    /**
+     * 폼 유형별 객체 목록 조회
+     * @param type
+     * @return
+     */
+    public List<TbVmsFormObjectTypeDto> findAllByFormType(Integer type) {
         List<TbVmsFormObjectTypeDto> result = new ArrayList<>();
-        for (TbVmsFormObjectTypeKey id : ids) {
-            Optional<TbVmsFormObjectType> obj = this.repo.findById(id);
-            if (obj.isPresent()) {
-                this.repo.deleteById(id);
-                result.add(obj.get().toDto());
+        List<TbVmsFormObjectType> data = this.repo.findAllByFormType(type);
+        data.forEach(obj -> {
+            if (!("EDI2").equals(obj.getEdtnCd())) {
+                result.add(obj.toDto());
             }
-        }
+        });
         return result;
     }
-
 }

+ 1 - 53
src/main/java/com/its/api/its/service/vms/TbVmsFormTypeService.java

@@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -32,7 +31,7 @@ public class TbVmsFormTypeService {
         List<TbVmsFormTypeDto> result = new ArrayList<>();
         List<TbVmsFormType> data = this.repo.findAll();
         data.forEach(obj -> {
-            if ("EDI0".equals(obj.getEdtnCd())) {
+            if (!("EDI2").equals(obj.getEdtnCd())) {
                 result.add(obj.toDto());
             }
         });
@@ -46,55 +45,4 @@ public class TbVmsFormTypeService {
         return entity.toDto();
     }
 
-    // 데이터 변경
-    @Transactional
-    public TbVmsFormTypeDto updateById(Integer id, TbVmsFormTypeDto.TbVmsFormTypeUpdReq req) {
-        TbVmsFormType entity = requireOne(id);
-        entity.updateInfo(req);
-        this.repo.save(entity);
-        return entity.toDto();
-    }
-
-    // 데이터 변경 또는 생성-목록(데이터가 존재하면 업데이트 없으면 신규로 생성)
-    @Transactional
-    public List<TbVmsFormTypeDto> mergeInfoList(List<TbVmsFormTypeDto.TbVmsFormTypeUpdReq> reqList) {
-        List<TbVmsFormTypeDto> result = new ArrayList<>();
-        for (TbVmsFormTypeDto.TbVmsFormTypeUpdReq req : reqList) {
-            TbVmsFormType obj = req.toEntity();
-            this.repo.save(obj);
-            result.add(obj.toDto());
-        }
-        return result;
-    }
-
-    // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
-    @Transactional
-    public TbVmsFormTypeDto mergeInfo(TbVmsFormTypeDto.TbVmsFormTypeUpdReq req) {
-        TbVmsFormType obj = req.toEntity();
-        this.repo.save(obj);
-        return obj.toDto();
-    }
-
-    // 정보 삭제-개별, 데이터 존재하지 않으면 Exception
-    @Transactional
-    public TbVmsFormTypeDto deleteById(Integer id) {
-        TbVmsFormType entity = requireOne(id);
-        this.repo.deleteById(id);
-        return entity.toDto();
-    }
-
-    // 정보 삭제-목록, 존재하는 데이터 만 삭제
-    @Transactional
-    public List<TbVmsFormTypeDto> deleteByIds(List<Integer> ids) {
-        List<TbVmsFormTypeDto> result = new ArrayList<>();
-        for (Integer id : ids) {
-            Optional<TbVmsFormType> obj = this.repo.findById(id);
-            if (obj.isPresent()) {
-                this.repo.deleteById(id);
-                result.add(obj.get().toDto());
-            }
-        }
-        return result;
-    }
-
 }

+ 3 - 3
src/main/java/com/its/api/its/service/vms/TbVmsIfscRltnService.java

@@ -101,8 +101,8 @@ public class TbVmsIfscRltnService {
         List<TbVmsIfscRltnDto> result = new ArrayList<>();
         List<TbVmsIfscRltn> list = this.repo.findDataAll();
         for (TbVmsIfscRltn obj : list) {
-            if (obj.getIfsc() != null && obj.getVms() != null && obj.getVms().getVmsTypeCd().equals("VMP1")) {
-                if (!obj.getVms().getDelYn().equals("Y") && !obj.getIfsc().getEdtnCd().equals("EDI2")) {
+            if (obj.getIfsc() != null && obj.getVms() != null && ("VMP1").equals(obj.getVms().getVmsTypeCd())) {
+                if (!("Y").equals(obj.getVms().getDelYn()) && !("EDI2").equals(obj.getIfsc().getEdtnCd())) {
                     // 삭제 된것 제외
                     result.add(obj.toDto());
                 }
@@ -116,7 +116,7 @@ public class TbVmsIfscRltnService {
         List<TbVmsIfscRltn> list = this.repo.findDataById(vmsCtlrNmbr);
         for (TbVmsIfscRltn obj : list) {
             if (obj.getIfsc() != null && obj.getVms() != null) {
-                if (!obj.getVms().getDelYn().equals("Y") && !obj.getIfsc().getEdtnCd().equals("EDI2")) {
+                if (!("Y").equals(obj.getVms().getDelYn()) && !("EDI2").equals(obj.getIfsc().getEdtnCd())) {
                     // 삭제 된것 제외
                     result.add(obj.toDto());
                 }

+ 3 - 3
src/main/java/com/its/api/its/service/vms/TbVmsIfscService.java

@@ -55,15 +55,15 @@ public class TbVmsIfscService {
         List<TbVmsIfscCmtrGradDto> gradList = this.cmtrGradService.findDataById(id);
         if (gradList != null) {
             for (TbVmsIfscCmtrGradDto grad : gradList) {
-                if (grad.getCmtrGradCd().equals("1")) {
+                if (("1").equals(grad.getCmtrGradCd())) {
                     grad1.setHghssped(grad.getHghssped());
                     grad1.setLwstsped(grad.getLwstsped());
                 }
-                else if (grad.getCmtrGradCd().equals("2")) {
+                else if (("2").equals(grad.getCmtrGradCd())) {
                     grad2.setHghssped(grad.getHghssped());
                     grad2.setLwstsped(grad.getLwstsped());
                 }
-                else if (grad.getCmtrGradCd().equals("3")) {
+                else if (("3").equals(grad.getCmtrGradCd())) {
                     grad3.setHghssped(grad.getHghssped());
                     grad3.setLwstsped(grad.getLwstsped());
                 }

+ 1 - 1
src/main/java/com/its/api/its/service/vms/TbVmsLinkIfscService.java

@@ -97,7 +97,7 @@ public class TbVmsLinkIfscService {
         List<TbVmsLinkIfscDto> result = new ArrayList<>();
         List<TbVmsLinkIfsc> list = this.repo.findDataById(id);
         for (TbVmsLinkIfsc obj : list) {
-            if (obj.getIfsc() != null && obj.getIfsc().getDelYn().equals("N")) {
+            if (obj.getIfsc() != null && ("N").equals(obj.getIfsc().getDelYn())) {
                 // 삭제 된것 제외
                 TbVmsLinkIfscDto dto = obj.toDto();
                 dto.setIfscInfo(obj.getIfsc()); // 정보제공구간 정보 설정

+ 48 - 0
src/main/java/com/its/api/its/service/vms/TbVmsMsgDsplDrctService.java

@@ -0,0 +1,48 @@
+package com.its.api.its.service.vms;
+
+import com.its.api.its.model.dto.vms.TbVmsMsgDsplDrctDto;
+import com.its.api.its.model.entity.vms.TbVmsMsgDsplDrct;
+import com.its.api.its.repository.vms.TbVmsMsgDsplDrctRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class TbVmsMsgDsplDrctService {
+
+    private final TbVmsMsgDsplDrctRepository repo;
+
+    // 데이터 1건 조회, 없으면 exception
+    private TbVmsMsgDsplDrct requireOne(Integer id) {
+        return this.repo.findById(id)
+                .orElseThrow(() -> new NoSuchElementException("데이터가 존재하지 않습니다: " + id));
+    }
+
+    // 전체 데이터 조회
+    @Transactional(readOnly = true)
+    public List<TbVmsMsgDsplDrctDto> findAll() {
+        List<TbVmsMsgDsplDrctDto> result = new ArrayList<>();
+        List<TbVmsMsgDsplDrct> data = this.repo.findAll();
+        data.forEach(obj -> {
+            if (!("EDI2").equals(obj.getEdtnCd())) {
+                result.add(obj.toDto());
+            }
+        });
+        return result;
+    }
+
+    // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
+    @Transactional(readOnly = true)
+    public TbVmsMsgDsplDrctDto findById(Integer id) {
+        TbVmsMsgDsplDrct entity = requireOne(id);
+        return entity.toDto();
+    }
+
+}

+ 48 - 0
src/main/java/com/its/api/its/service/vms/TbVmsMsgDsplMthdService.java

@@ -0,0 +1,48 @@
+package com.its.api.its.service.vms;
+
+import com.its.api.its.model.dto.vms.TbVmsMsgDsplMthdDto;
+import com.its.api.its.model.entity.vms.TbVmsMsgDsplMthd;
+import com.its.api.its.repository.vms.TbVmsMsgDsplMthdRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class TbVmsMsgDsplMthdService {
+
+    private final TbVmsMsgDsplMthdRepository repo;
+
+    // 데이터 1건 조회, 없으면 exception
+    private TbVmsMsgDsplMthd requireOne(Integer id) {
+        return this.repo.findById(id)
+                .orElseThrow(() -> new NoSuchElementException("데이터가 존재하지 않습니다: " + id));
+    }
+
+    // 전체 데이터 조회
+    @Transactional(readOnly = true)
+    public List<TbVmsMsgDsplMthdDto> findAll() {
+        List<TbVmsMsgDsplMthdDto> result = new ArrayList<>();
+        List<TbVmsMsgDsplMthd> data = this.repo.findAll();
+        data.forEach(obj -> {
+            if (!("EDI2").equals(obj.getEdtnCd())) {
+                result.add(obj.toDto());
+            }
+        });
+        return result;
+    }
+
+    // 데이터 1건 조회(기존 데이터가 반드시 존재해야 함)
+    @Transactional(readOnly = true)
+    public TbVmsMsgDsplMthdDto findById(Integer id) {
+        TbVmsMsgDsplMthd entity = requireOne(id);
+        return entity.toDto();
+    }
+
+}

+ 1 - 1
src/main/java/com/its/api/its/service/vms/TbVmsSttsHsService.java

@@ -50,7 +50,7 @@ public class TbVmsSttsHsService {
         List<TbVmsSttsHs> data = this.repo.findAllByDateRange(fromDt, toDt, ids);
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getVms() != null && obj.getVms().getDelYn().equals("N")) {
+                if (obj.getVms() != null && ("N").equals(obj.getVms().getDelYn())) {
                     result.add(obj.toDto());
                 }
             });

+ 1 - 1
src/main/java/com/its/api/its/service/vms/TbVmsSttsService.java

@@ -32,7 +32,7 @@ public class TbVmsSttsService {
         List<TbVmsStts> data = this.repo.findAll();
         if (data != null) {
             data.forEach(obj -> {
-                if (obj.getVms() != null && obj.getVms().getDelYn().equals("N")) {
+                if (obj.getVms() != null && ("N").equals(obj.getVms().getDelYn())) {
                     result.add(obj.toDto());
                 }
             });

+ 1 - 1
src/main/java/com/its/api/its/service/vms/TbVmsSymbLibService.java

@@ -56,7 +56,7 @@ public class TbVmsSymbLibService {
         List<TbVmsSymbLibDto> result = new ArrayList<>();
         List<TbVmsSymbLib> data = this.repo.findAll();
         for (TbVmsSymbLib entity : data) {
-            if (entity.getVmsTypeCd() != null && entity.getVmsTypeCd().equals(this.VMP_TYPE_CD)) {
+            if (entity.getVmsTypeCd() != null && this.VMP_TYPE_CD.equals(entity.getVmsTypeCd())) {
                 result.add(entity.toDto());
             }
         }

+ 1 - 1
src/main/java/com/its/api/its/service/vms/TbVmsTypeService.java

@@ -32,7 +32,7 @@ public class TbVmsTypeService {
         List<TbVmsTypeDto> result = new ArrayList<>();
         List<TbVmsType> data = this.repo.findAll();
         for (TbVmsType entity : data) {
-            if (entity.getUseYn().equals("Y")) {
+            if (("Y").equals(entity.getUseYn())) {
                 result.add(entity.toDto());
             }
         }

+ 1 - 1
src/main/java/com/its/api/its/service/vms/TbVmsUsagTypeService.java

@@ -32,7 +32,7 @@ public class TbVmsUsagTypeService {
         List<TbVmsUsagTypeDto> result = new ArrayList<>();
         List<TbVmsUsagType> data = this.repo.findAll();
         for (TbVmsUsagType entity : data) {
-            if (entity.getUseYn().equals("Y")) {
+            if (("Y").equals(entity.getUseYn())) {
                 result.add(entity.toDto());
             }
         }