aa

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

@@ -4,7 +4,7 @@ import com.its.op.dto.its.common.NewIdIntegerDto;
 import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.vms.TbVmsRltnIfscDto;
 import com.its.op.dto.its.vms.TbVmsSymbLibDto;
-import com.its.op.dto.its.vms.TbVmsSymbLibIfscVMP1Dto;
+import com.its.op.dto.its.vms.TbVmsSymbLibIfscSbt1Dto;
 import com.its.op.service.its.vms.TbVmsRltnIfscService;
 import com.its.op.service.its.vms.TbVmsSymbLibSbt1Service;
 import io.swagger.annotations.Api;
@@ -38,15 +38,15 @@ public class TbVmsSymbLibSbt1Controller {
         return service.findAllSymbolImage();
     }
 
-    @ApiOperation(value = "VMS 소통정보 배경이미지 개별조회(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscVMP1Dto.class)
+    @ApiOperation(value = "VMS 소통정보 배경이미지 개별조회(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscSbt1Dto.class)
     @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbVmsSymbLibIfscVMP1Dto findById(@PathVariable final Integer id) {
+    public TbVmsSymbLibIfscSbt1Dto findById(@PathVariable final Integer id) {
         return this.service.findAllById(id);
     }
 
-    @ApiOperation(value = "VMS 소통정보 배경이미지 정보변경/생성-개별(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscVMP1Dto.class)
+    @ApiOperation(value = "VMS 소통정보 배경이미지 정보변경/생성-개별(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscSbt1Dto.class)
     @PostMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbVmsSymbLibIfscVMP1Dto mergeInfo(@PathVariable("id") Integer id, @RequestBody @Valid final TbVmsSymbLibIfscVMP1Dto.TbVmsSymbLibIfscVMP1UpdReq req) {
+    public TbVmsSymbLibIfscSbt1Dto mergeInfo(@PathVariable("id") Integer id, @RequestBody @Valid final TbVmsSymbLibIfscSbt1Dto.TbVmsSymbLibIfscVMP1UpdReq req) {
         return this.service.mergeSymbIfscInfo(req);
     }
 

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

@@ -3,7 +3,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.TbVmsSymbLibDto;
-import com.its.op.dto.its.vms.TbVmsSymbLibIfscVMP2Dto;
+import com.its.op.dto.its.vms.TbVmsSymbLibIfscSbt2Dto;
 import com.its.op.service.its.vms.TbVmsSymbLibSbt2Service;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,19 +29,19 @@ public class TbVmsSymbLibSbt2Controller {
         return service.findAllSymbolImage();
     }
 
-    @ApiOperation(value = "VMS 소통정보 이미지 개별조회(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscVMP2Dto.class)
+    @ApiOperation(value = "VMS 소통정보 이미지 개별조회(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscSbt2Dto.class)
     @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbVmsSymbLibIfscVMP2Dto findById(@PathVariable final Integer id) {
+    public TbVmsSymbLibIfscSbt2Dto findById(@PathVariable final Integer id) {
         return this.service.findAllById(id);
     }
 
-    @ApiOperation(value = "VMS 소통정보 이미지 정보변경/생성-개별(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscVMP2Dto.class)
+    @ApiOperation(value = "VMS 소통정보 이미지 정보변경/생성-개별(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscSbt2Dto.class)
     @PostMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public TbVmsSymbLibIfscVMP2Dto mergeInfo(@PathVariable("id") Integer id, @RequestBody @Valid final TbVmsSymbLibIfscVMP2Dto.TbVmsSymbLibIfscVMP2UpdReq req) {
+    public TbVmsSymbLibIfscSbt2Dto mergeInfo(@PathVariable("id") Integer id, @RequestBody @Valid final TbVmsSymbLibIfscSbt2Dto.TbVmsSymbLibIfscVMP2UpdReq req) {
         return this.service.mergeSymbIfscInfo(req);
     }
 
-    @ApiOperation(value = "VMS 소통정보 이미지 정보삭제-개별(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscVMP2Dto.class)
+    @ApiOperation(value = "VMS 소통정보 이미지 정보삭제-개별(TB_VMS_SYMB_LIB)", response = TbVmsSymbLibIfscSbt2Dto.class)
     @DeleteMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
     public TbVmsSymbLibDto deleteDataById(@PathVariable("id") Integer id) {
         return this.service.deleteDataById(id);

src/main/java/com/its/op/dto/its/vms/TbVmsSymbLibIfscVMP1Dto.java → src/main/java/com/its/op/dto/its/vms/TbVmsSymbLibIfscSbt1Dto.java

@@ -20,7 +20,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel("TbVmsSymbLibIfscVMP1Dto(VMS 심벌 라이브러리 소통정보 배경 이미지 관계)")
-public class TbVmsSymbLibIfscVMP1Dto implements Serializable {
+public class TbVmsSymbLibIfscSbt1Dto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("심벌라이브러리 번호")  // N NUMBER(4)
@@ -73,8 +73,8 @@ public class TbVmsSymbLibIfscVMP1Dto implements Serializable {
     // 소통정보 이미지 셀정보(여러개 존재)
     List<TbVmsSymbIfscDto> cells;
 
-    public static TbVmsSymbLibIfscVMP1Dto toDto(TbVmsSymbLibDto lib, List<TbVmsSymbIfscDto> cells) {
-        TbVmsSymbLibIfscVMP1Dto dto = TbVmsSymbLibIfscVMP1Dto.builder()
+    public static TbVmsSymbLibIfscSbt1Dto toDto(TbVmsSymbLibDto lib, List<TbVmsSymbIfscDto> cells) {
+        TbVmsSymbLibIfscSbt1Dto dto = TbVmsSymbLibIfscSbt1Dto.builder()
                 .symbLibNmbr(lib.getSymbLibNmbr())
                 .rgstDt(lib.getRgstDt())
                 .redData(lib.getRedData())
@@ -210,6 +210,7 @@ public class TbVmsSymbLibIfscVMP1Dto implements Serializable {
                     .green_data(this.greenData)
                     .symb_expl(this.symbExpl)
                     .imag_data(this.imagData)
+                    .imag_size(this.imagSize)
                     //TODO .vms_type_cd(this.vmsTypeCd)
                     .symb_type(this.symbImagType)
                     .symb_file_nm(this.symbFileNm)

src/main/java/com/its/op/dto/its/vms/TbVmsSymbLibIfscVMP2Dto.java → src/main/java/com/its/op/dto/its/vms/TbVmsSymbLibIfscSbt2Dto.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel("TbVmsSymbLibIfscVMP2Dto(VMS 심벌 라이브러리 소통정보 이미지 관계)")
-public class TbVmsSymbLibIfscVMP2Dto implements Serializable {
+public class TbVmsSymbLibIfscSbt2Dto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("심벌라이브러리 번호")  // N NUMBER(4)
@@ -73,8 +73,8 @@ public class TbVmsSymbLibIfscVMP2Dto implements Serializable {
     @ApiModelProperty("이미지 셀 설정 정보")
     TbVmsSymbIfscDto cell;
 
-    public static TbVmsSymbLibIfscVMP2Dto toDto(TbVmsSymbLibDto lib, TbVmsSymbIfscDto cell) {
-        TbVmsSymbLibIfscVMP2Dto dto = TbVmsSymbLibIfscVMP2Dto.builder()
+    public static TbVmsSymbLibIfscSbt2Dto toDto(TbVmsSymbLibDto lib, TbVmsSymbIfscDto cell) {
+        TbVmsSymbLibIfscSbt2Dto dto = TbVmsSymbLibIfscSbt2Dto.builder()
                 .symbLibNmbr(lib.getSymbLibNmbr())
                 .rgstDt(lib.getRgstDt())
                 .redData(lib.getRedData())
@@ -205,6 +205,7 @@ public class TbVmsSymbLibIfscVMP2Dto implements Serializable {
                     .green_data(this.greenData)
                     .symb_expl(this.symbExpl)
                     .imag_data(this.imagData)
+                    .imag_size(this.imagSize)
                     //TODO .vms_type_cd(this.vmsTypeCd)
                     .symb_type(this.symbImagType)
                     .symb_file_nm(this.symbFileNm)

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

@@ -5,7 +5,7 @@ import com.its.op.dao.repository.its.vms.TbVmsSymbLibRepository;
 import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.vms.TbVmsSymbIfscDto;
 import com.its.op.dto.its.vms.TbVmsSymbLibDto;
-import com.its.op.dto.its.vms.TbVmsSymbLibIfscVMP1Dto;
+import com.its.op.dto.its.vms.TbVmsSymbLibIfscSbt1Dto;
 import com.its.op.entity.its.vms.TbVmsSymbLib;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -26,10 +26,10 @@ public class TbVmsSymbLibSbt1Service extends TbVmsSymbLibService {
         super("SBT1", 7000, 7999, repo, formObjectRepository);
         this.ifscService = ifscService;
     }
-    public TbVmsSymbLibIfscVMP1Dto findAllById(Integer id) {
+    public TbVmsSymbLibIfscSbt1Dto findAllById(Integer id) {
         TbVmsSymbLib lib = requireOne(id);
         List<TbVmsSymbIfscDto> list = ifscService.findDataById(id);
-        return TbVmsSymbLibIfscVMP1Dto.toDto(lib.toDto(), list);
+        return TbVmsSymbLibIfscSbt1Dto.toDto(lib.toDto(), list);
     }
 
     @Transactional
@@ -44,7 +44,7 @@ public class TbVmsSymbLibSbt1Service extends TbVmsSymbLibService {
     }
 
     @Transactional
-    public TbVmsSymbLibIfscVMP1Dto mergeSymbIfscInfo(TbVmsSymbLibIfscVMP1Dto.TbVmsSymbLibIfscVMP1UpdReq req) {
+    public TbVmsSymbLibIfscSbt1Dto mergeSymbIfscInfo(TbVmsSymbLibIfscSbt1Dto.TbVmsSymbLibIfscVMP1UpdReq req) {
 
         // 셀 데이터를 전체 삭제
         this.ifscService.deleteDataById(req.getSymbLibNmbr());
@@ -59,6 +59,6 @@ public class TbVmsSymbLibSbt1Service extends TbVmsSymbLibService {
             );
             cells.add(this.ifscService.mergeInfo(ifscReq));
         }
-        return TbVmsSymbLibIfscVMP1Dto.toDto(libDto, cells);
+        return TbVmsSymbLibIfscSbt1Dto.toDto(libDto, cells);
     }
 }

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

@@ -5,7 +5,7 @@ import com.its.op.dao.repository.its.vms.TbVmsSymbLibRepository;
 import com.its.op.dto.its.common.UsageCountDto;
 import com.its.op.dto.its.vms.TbVmsSymbIfscDto;
 import com.its.op.dto.its.vms.TbVmsSymbLibDto;
-import com.its.op.dto.its.vms.TbVmsSymbLibIfscVMP2Dto;
+import com.its.op.dto.its.vms.TbVmsSymbLibIfscSbt2Dto;
 import com.its.op.entity.its.vms.TbVmsSymbIfsc;
 import com.its.op.entity.its.vms.TbVmsSymbIfscKey;
 import com.its.op.entity.its.vms.TbVmsSymbLib;
@@ -27,19 +27,19 @@ public class TbVmsSymbLibSbt2Service extends TbVmsSymbLibService {
         this.ifscService = ifscService;
     }
 
-    public TbVmsSymbLibIfscVMP2Dto findAllById(Integer id) {
+    public TbVmsSymbLibIfscSbt2Dto findAllById(Integer id) {
         TbVmsSymbLib lib = requireOne(id);
 
         Integer cellId =  1;
         TbVmsSymbIfscKey key = new TbVmsSymbIfscKey(id, cellId);
         TbVmsSymbIfsc ifsc = ifscService.requireOne(key);
 
-        return TbVmsSymbLibIfscVMP2Dto.toDto(lib.toDto(), ifsc.toDto());
+        return TbVmsSymbLibIfscSbt2Dto.toDto(lib.toDto(), ifsc.toDto());
     }
 
     // 데이터 변경 또는 생성-개별(데이터가 존재하면 업데이트 없으면 신규로 생성)
     @Transactional
-    public TbVmsSymbLibIfscVMP2Dto mergeSymbIfscInfo(TbVmsSymbLibIfscVMP2Dto.TbVmsSymbLibIfscVMP2UpdReq req) {
+    public TbVmsSymbLibIfscSbt2Dto mergeSymbIfscInfo(TbVmsSymbLibIfscSbt2Dto.TbVmsSymbLibIfscVMP2UpdReq req) {
 
         // 심볼 정보 저장
         TbVmsSymbLibDto libDto = mergeInfo(req.toLibReq());
@@ -49,7 +49,7 @@ public class TbVmsSymbLibSbt2Service extends TbVmsSymbLibService {
         );
         TbVmsSymbIfscDto ifscDto = this.ifscService.mergeInfo(ifscReq);
 
-        return TbVmsSymbLibIfscVMP2Dto.toDto(libDto, ifscDto);
+        return TbVmsSymbLibIfscSbt2Dto.toDto(libDto, ifscDto);
     }
 
     @Transactional

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

@@ -82,7 +82,7 @@ public class TbVmsSymbLibService {
     public TbVmsSymbLibDto updateById(Integer id, TbVmsSymbLibDto.TbVmsSymbLibUpdReq req) {
         TbVmsSymbLib entity = requireOne(id);
         req.setSymbType(this.SYMB_TYPE);
-        req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
+        if (req.getRgstDt() == null) req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
         req.setUpdtDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
         entity.updateInfo(req);
         this.repo.save(entity);
@@ -94,7 +94,7 @@ public class TbVmsSymbLibService {
         List<TbVmsSymbLibDto> result = new ArrayList<>();
         for (TbVmsSymbLibDto.TbVmsSymbLibUpdReq req : reqList) {
             req.setSymbType(this.SYMB_TYPE);
-            req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
+            if (req.getRgstDt() == null) req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
             req.setUpdtDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
             TbVmsSymbLib obj = req.toEntity();
             this.repo.save(obj);
@@ -109,7 +109,7 @@ public class TbVmsSymbLibService {
         if (req.getDelYn() == null) {
             req.setDelYn("N");
         }
-        req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
+        if (req.getRgstDt() == null) req.setRgstDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
         req.setUpdtDt(ItsUtils.getSysTime());   // 현재시각으로 업데이트
         TbVmsSymbLib obj = req.toEntity();
         this.repo.save(obj);