vms form usage check add

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

@@ -1,6 +1,7 @@
 package com.its.op.controller.its.vms;
 
 import com.its.op.dto.its.common.NewIdIntegerDto;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.vms.TbVmsFormDetlDto;
 import com.its.op.dto.its.vms.TbVmsFormDto;
 import com.its.op.dto.its.vms.TbVmsFormObjectDetlDto;
@@ -86,4 +87,12 @@ public class TbVmsFormController {
         return this.service.formCopyAdd(req);
     }
 
+    @ApiOperation(value = "VMS FORM 사용 여부 조회", response = UsageCountDto.class)
+    @GetMapping(value = "/usage/{id}", produces = {"application/json; charset=utf8"})
+    public UsageCountDto findUsageId(
+            @ApiParam(name = "id", value = "폼 ID", example = "10005", required = true)
+            @PathVariable final Integer id) {
+        return this.service.findUsageId(id);
+    }
+
 }

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

@@ -15,13 +15,13 @@ import java.util.List;
 @Repository
 public interface TbVmsFormRepository extends JpaRepository<TbVmsForm, Integer>, JpaSpecificationExecutor<TbVmsForm> {
 
-    @Query("select p from TbVmsForm p")
+    @Query("select p from TbVmsForm p order by p.vmsFormTypeCd, p.vmsFormId")
     List<TbVmsForm> findAll();
 
-    @Query("select p from TbVmsForm p where p.vmsTypeCd = :vmsTypeCd")
+    @Query("select p from TbVmsForm p where p.vmsTypeCd = :vmsTypeCd order by p.vmsFormTypeCd, p.vmsFormId")
     List<TbVmsForm> findAllByVmsType(@Param("vmsTypeCd") String vmsTypeCd);
 
-    @Query("select p from TbVmsForm p where p.vmsTypeCd = :vmsTypeCd and p.vmsFormTypeCd in :formTypeCd")
+    @Query("select p from TbVmsForm p where p.vmsTypeCd = :vmsTypeCd and p.vmsFormTypeCd in :formTypeCd order by p.vmsFormTypeCd, p.vmsFormId")
     List<TbVmsForm> findAllByVmsTypeAndFormType(@Param("vmsTypeCd") String vmsTypeCd, @Param("formTypeCd") List<Integer> formTypeCd);
 
 //    @Query("select a from TbVmsFormObject a, TbVmsSymbLib b, TbVmsFontShpe c, TbVmsForm d " +

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

@@ -51,4 +51,6 @@ public interface TbVmsMsgDsplSchRepository extends JpaRepository<TbVmsMsgDsplSch
             , nativeQuery = true)
     List<TbVmsMsgDsplSchInf> findAllUsage();
 
+    @Query("select count(p.vmsFormId) from TbVmsMsgDsplSch p where p.vmsFormId = :formId")
+    Integer findUsageCountByFormId(@Param("formId") Integer formId);
 }

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

@@ -12,10 +12,10 @@ import java.util.List;
 @Repository
 public interface TbVmsSymbLibRepository extends JpaRepository<TbVmsSymbLib, Integer>, JpaSpecificationExecutor<TbVmsSymbLib> {
 
-    @Query("SELECT p from TbVmsSymbLib p")
+    @Query("SELECT p from TbVmsSymbLib p order by p.symbLibNmbr")
     List<TbVmsSymbLib> findAll();
 
-    @Query("SELECT p from TbVmsSymbLib p where p.vmsTypeCd = :vmsTypeCd")
+    @Query("SELECT p from TbVmsSymbLib p where p.vmsTypeCd = :vmsTypeCd order by p.symbLibNmbr")
     List<TbVmsSymbLib> findAllSymbolImage(@Param("vmsTypeCd") String vmsTypeCd);
 
     @Query(value = "SELECT NVL(MAX(SYMBLIB_NMBR), :minVal-1)+1 AS NEWID FROM TB_VMS_SYMB_LIB WHERE SYMBLIB_NMBR BETWEEN :minVal AND :maxVal", nativeQuery = true)

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

@@ -1,7 +1,6 @@
 package com.its.op.entity.its.vms;
 
 import com.its.op.dto.its.vms.TbVmsFormDto;
-import com.its.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -78,9 +77,9 @@ public class TbVmsForm implements Serializable {
                 .vmsFormExpl(this.vmsFormExpl)
                 .vmsMsgDsplDrctCd(this.vmsMsgDsplDrctCd)
                 .symbLibNmbr(this.symbLibNmbr)
-                //.vmsFormImag(this.vmsFormImag)
-                .vmsFormImag(ItsUtils.convertBmpToPng(this.vmsFormImag))
-                .imagFmt("png")
+                .vmsFormImag(this.vmsFormImag)
+                //.vmsFormImag(ItsUtils.convertBmpToPng(this.vmsFormImag))
+                .imagFmt("bmp")
                 .vmsMsgDsplMthdCd(this.vmsMsgDsplMthdCd)
                 .cctvMngmNmbr(this.cctvMngmNmbr)
                 .build();
@@ -95,6 +94,8 @@ public class TbVmsForm implements Serializable {
                 .vmsFormExpl(this.vmsFormExpl)
                 .vmsMsgDsplDrctCd(this.vmsMsgDsplDrctCd)
                 .symbLibNmbr(this.symbLibNmbr)
+                //.vmsFormImag(this.vmsFormImag)
+                //.imagFmt("bmp")
                 .vmsMsgDsplMthdCd(this.vmsMsgDsplMthdCd)
                 .cctvMngmNmbr(this.cctvMngmNmbr)
                 .build();

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

@@ -2,7 +2,9 @@ package com.its.op.service.its.vms;
 
 import com.its.op.dao.repository.its.vms.TbVmsFormObjectRepository;
 import com.its.op.dao.repository.its.vms.TbVmsFormRepository;
+import com.its.op.dao.repository.its.vms.TbVmsMsgDsplSchRepository;
 import com.its.op.dto.its.common.NewIdIntegerDto;
+import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.vms.TbVmsFormDetlDto;
 import com.its.op.dto.its.vms.TbVmsFormDto;
 import com.its.op.dto.its.vms.TbVmsFormObjectDetlDto;
@@ -27,6 +29,7 @@ public class TbVmsFormService {
 
     private final TbVmsFormRepository repo;
     private final TbVmsFormObjectRepository objectRepo;
+    private final TbVmsMsgDsplSchRepository scheduleRepo;
 
     // 데이터 1건 조회, 없으면 exception
     private TbVmsForm requireOne(Integer id) {
@@ -282,4 +285,13 @@ public class TbVmsFormService {
         orgForm.copyForm(newFormId.getNewId(), req.getVmsFormNm());
         return orgForm.toDto();
     }
+
+    public UsageCountDto findUsageId(Integer id) {
+        UsageCountDto result = UsageCountDto.builder()
+                .count(0)
+                .build();
+        Integer data = this.scheduleRepo.findUsageCountByFormId(id);
+        result.setCount(data);
+        return result;
+    }
 }