dev

src/main/java/com/its/op/aop/LoggingAspect.java

@@ -24,7 +24,7 @@ public class LoggingAspect {
 
         stopWatch.stop();
         if (stopWatch.getTotalTimeMillis() > 1000) {
-            log.warn("[LOADING...] {}: ..END. {} ms. Completed.", proceedName, stopWatch.getTotalTimeMillis());
+            log.warn("[API-RESULT] {}: ..END. {} ms. Completed.", proceedName, stopWatch.getTotalTimeMillis());
         }
 
         return proceed;

src/main/java/com/its/op/config/UpperCaseUnderscoreStrategy.java

@@ -8,7 +8,7 @@ public class UpperCaseUnderscoreStrategy extends PropertyNamingStrategy.Property
 
     @Override
     public String translate(String propertyName) {
-        log.error("{} ==> {}", propertyName, propertyName.toUpperCase());
+        //log.error("{} ==> {}", propertyName, propertyName.toUpperCase());
         return propertyName.toUpperCase();
     }
 }

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

@@ -34,7 +34,6 @@ public class TbVmsMonitoringController {
 
     // 이름으로 등록 데이터 조회
     public List<TbVmsMonitoringDto> findByName(Integer monitoringType, String name) {
-        log.error("{}, {}", monitoringType, name);
         return this.service.findByName(monitoringType, name);
     }
 

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

@@ -19,15 +19,19 @@ public interface TbVmsDsplPrstRepository extends JpaRepository<TbVmsDsplPrst, Tb
 //           "   and (p.vmsCtlrNmbr, p.dsplDt) in (select s.vmsCtlrNmbr, max(s.dsplDt) from TbVmsDsplPrst s group by s.vmsCtlrNmbr)")
 //    List<TbVmsDsplPrst> findAll();
 
-    @Query("select p from TbVmsDsplPrst p                                                                                         " +
-            " where vms.delYn = 'N'                                                                                               " +
-            "   and (p.vmsCtlrNmbr, p.dsplDt) in (select s.vmsCtlrNmbr, max(s.dsplDt) from TbVmsDsplPrst s group by s.vmsCtlrNmbr)")
+//    @Query("select p from TbVmsDsplPrst p inner join fetch p.vms vms inner join fetch vms.type tp left outer join fetch vms.state state  " +
+//            " where vms.delYn = 'N' " +
+//            "   and p.vmsCtlrNmbr in :vmsCtlrNmbr " +
+//            "   and (p.vmsCtlrNmbr, p.dsplDt) in (select s.vmsCtlrNmbr, max(s.dsplDt) from TbVmsDsplPrst s group by s.vmsCtlrNmbr)")
+//    List<TbVmsDsplPrst> findAllByIds(@Param("vmsCtlrNmbr") List<Long> vmsCtlrNmbr);
+
+    @Query("select p from TbVmsDsplPrst p                                                                                        " +
+           " where (p.vmsCtlrNmbr, p.dsplDt) in (select s.vmsCtlrNmbr, max(s.dsplDt) from TbVmsDsplPrst s group by s.vmsCtlrNmbr)")
     List<TbVmsDsplPrst> findAll();
 
-    @Query("select p from TbVmsDsplPrst p inner join fetch p.vms vms inner join fetch vms.type tp left outer join fetch vms.state state  " +
-            " where vms.delYn = 'N' " +
-            "   and p.vmsCtlrNmbr in :vmsCtlrNmbr " +
-            "   and (p.vmsCtlrNmbr, p.dsplDt) in (select s.vmsCtlrNmbr, max(s.dsplDt) from TbVmsDsplPrst s group by s.vmsCtlrNmbr)")
+    @Query("select p from TbVmsDsplPrst p                                                                                        " +
+           " where (p.vmsCtlrNmbr, p.dsplDt) in (select s.vmsCtlrNmbr, max(s.dsplDt) from TbVmsDsplPrst s group by s.vmsCtlrNmbr)" +
+           "   and p.vmsCtlrNmbr in :vmsCtlrNmbr                                                                                 ")
     List<TbVmsDsplPrst> findAllByIds(@Param("vmsCtlrNmbr") List<Long> vmsCtlrNmbr);
 
     @Query(value =

src/main/java/com/its/op/dto/its/facility/TbFcltSttsAlrmStupDto.java

@@ -2,6 +2,7 @@ package com.its.op.dto.its.facility;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.facility.TbFcltSttsAlrmStup;
+import com.its.op.global.CmmnCdManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -92,7 +93,7 @@ public class TbFcltSttsAlrmStupDto implements Serializable {
                 .fcltType(fcltType)
                 .fcltId(fcltId)
                 .fcltNm(fcltNm)
-                .regDt("19700101000000")
+                .regDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                 .cmncStts("Y")
                 .pwerStts("Y")
                 .modlStts("Y")

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

@@ -176,6 +176,35 @@ public class TbVmsDsplPrstDto implements Serializable {
         }
     }
 
+    public void setVms(TbVmsCtlr vms) {
+        if (vms != null) {
+            setOperMode(vms.getOperMode());
+            if (("A").equals(vms.getOperMode())) {
+                setOperModeDesc("자동");
+            } else if (("F").equals(vms.getOperMode())) {
+                setOperModeDesc("고정");
+            } else { //if (("D").equals(dto.getOperMode())) {
+                setOperModeDesc("기본");
+            }
+
+            setVmsCtlrId(vms.getVmsCtlrId());
+            setVmsNm(vms.getVmsNm());
+            setVmsTypeCd(vms.getVmsTypeCd());
+
+            if (vms.getType() != null) {
+                setVmsTypeDesc(vms.getType().getVmsTypeNm());
+                setVmsWdth(vms.getType().getVmsWdth());
+                setVmsHght(vms.getType().getVmsHght());
+                setRows(vms.getType().getRowNum());
+                setCols(vms.getType().getColNum());
+                setModlRows(vms.getType().getModlRowNum());
+                setModlCols(vms.getType().getModlColNum());
+                setPowrRows(vms.getType().getPowrRowNum());
+                setPowrCols(vms.getType().getPowrColNum());
+            }
+        }
+    }
+
     @ApiModel("VmsMsgDsplInfo(VMS 표출메시지정보)")
     @Getter
     @Setter

src/main/java/com/its/op/entity/its/cctv/TbCctvCtlr.java

@@ -335,7 +335,7 @@ public class TbCctvCtlr implements Serializable {
         if (this.state == null) {
             TbCctvCtlrStts state = TbCctvCtlrStts.builder()
                     .cctvCtlrNmbr(this.cctvCtlrNmbr)
-                    .updtDt("19700101000000")
+                    .updtDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                     .cmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR)
                     .cboxDoorSttsCd("CDS2")
                     .frontDoorSttsCd("CDS2")

src/main/java/com/its/op/entity/its/rse/TbRseCtlr.java

@@ -218,7 +218,7 @@ public class TbRseCtlr implements Serializable {
         if (this.state == null) {
             TbRseCtlrStts state = TbRseCtlrStts.builder()
                     .rseCtlrNmbr(this.rseCtlrNmbr)
-                    .updtDt("19700101000000")
+                    .updtDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                     .cmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR)
                     .cntlDevcStts("4")
                     .atn1Stts("1")

src/main/java/com/its/op/entity/its/scrs/TbScIxrCmraMngm.java

@@ -170,7 +170,7 @@ public class TbScIxrCmraMngm implements Serializable {
                     .ixrId(this.ixrId)
                     .cmraId(this.cmraId)
                     .drctDvsnCd(this.drctDvsnCd)
-                    .clctDt("19700101000000")
+                    .clctDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                     .cmraStts(1)
                     .build();
             this.state = state;

src/main/java/com/its/op/entity/its/vds/TbVdsCtlr.java

@@ -245,7 +245,7 @@ public class TbVdsCtlr implements Serializable {
         if (this.state == null) {
             TbVdsCtlrStts state = TbVdsCtlrStts.builder()
                     .vdsCtlrNmbr(this.vdsCtlrNmbr)
-                    .updtDt("19700101000000")
+                    .updtDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                     .cmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR)
                     .cboxDoorSttsCd("CDS2")
                     .frontDoorSttsCd("CDS2")

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

@@ -453,7 +453,7 @@ public class TbVmsCtlr implements Serializable {
         if (this.state == null) {
             TbVmsCtlrStts state = TbVmsCtlrStts.builder()
                     .vmsCtlrNmbr(this.vmsCtlrNmbr)
-                    .updtDt("19700101000000")
+                    .updtDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                     .cmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR)
                     .pwerSttsCd("PWS2")
                     .modlSttsCd("MOS2")

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

@@ -1,19 +1,14 @@
 package com.its.op.entity.its.vms;
 
-import com.its.op.dto.its.vms.TbVmsDsplPrstDto;
-import com.its.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.ArrayList;
 
 /**
  * VMS 표출 현재 Entity Class
@@ -84,49 +79,49 @@ public class TbVmsDsplPrst implements Serializable {
     @Column(name = "DNLD_YN", columnDefinition = "CHAR", length = 1)
     private String dnldYn;
 
-    @OneToOne
-    @JoinColumn(insertable=false, updatable=false, name="VMS_CTLR_NMBR", referencedColumnName = "VMS_CTLR_NMBR")
-    @NotFound(action = NotFoundAction.IGNORE)
-    private TbVmsCtlr vms;
-
-    public TbVmsDsplPrstDto toDto() {
-        TbVmsDsplPrstDto dto = TbVmsDsplPrstDto.builder()
-                .vmsCtlrNmbr(this.vmsCtlrNmbr)
-                .dsplDt(this.dsplDt)
-                .build();
-
-        dto.setMsgs(new ArrayList<>());
-        dto.setSvcYn(ItsUtils.getServiceYn(dto.getDsplDt()));
-
-        if (this.vms != null) {
-            dto.setOperMode(this.vms.getOperMode());
-            if (("A").equals(dto.getOperMode())) {
-                dto.setOperModeDesc("자동");
-            }
-            else if (("F").equals(dto.getOperMode())) {
-                dto.setOperModeDesc("고정");
-            }
-            else { //if (("D").equals(dto.getOperMode())) {
-                dto.setOperModeDesc("기본");
-            }
-
-            dto.setVmsCtlrId(this.vms.getVmsCtlrId());
-            dto.setVmsNm(this.vms.getVmsNm());
-            dto.setVmsTypeCd(this.vms.getVmsTypeCd());
-
-            if (this.vms.getType() != null) {
-                dto.setVmsTypeDesc(this.vms.getType().getVmsTypeNm());
-                dto.setVmsWdth(this.vms.getType().getVmsWdth());
-                dto.setVmsHght(this.vms.getType().getVmsHght());
-                dto.setRows(this.vms.getType().getRowNum());
-                dto.setCols(this.vms.getType().getColNum());
-                dto.setModlRows(this.vms.getType().getModlRowNum());
-                dto.setModlCols(this.vms.getType().getModlColNum());
-                dto.setPowrRows(this.vms.getType().getPowrRowNum());
-                dto.setPowrCols(this.vms.getType().getPowrColNum());
-            }
-        }
-        return dto;
-    }
+//    @OneToOne
+//    @JoinColumn(insertable=false, updatable=false, name="VMS_CTLR_NMBR", referencedColumnName = "VMS_CTLR_NMBR")
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    private TbVmsCtlr vms;
+
+//    public TbVmsDsplPrstDto toDto() {
+//        TbVmsDsplPrstDto dto = TbVmsDsplPrstDto.builder()
+//                .vmsCtlrNmbr(this.vmsCtlrNmbr)
+//                .dsplDt(this.dsplDt)
+//                .build();
+//
+//        dto.setMsgs(new ArrayList<>());
+//        dto.setSvcYn(ItsUtils.getServiceYn(dto.getDsplDt()));
+//
+//        if (this.vms != null) {
+//            dto.setOperMode(this.vms.getOperMode());
+//            if (("A").equals(dto.getOperMode())) {
+//                dto.setOperModeDesc("자동");
+//            }
+//            else if (("F").equals(dto.getOperMode())) {
+//                dto.setOperModeDesc("고정");
+//            }
+//            else { //if (("D").equals(dto.getOperMode())) {
+//                dto.setOperModeDesc("기본");
+//            }
+//
+//            dto.setVmsCtlrId(this.vms.getVmsCtlrId());
+//            dto.setVmsNm(this.vms.getVmsNm());
+//            dto.setVmsTypeCd(this.vms.getVmsTypeCd());
+//
+//            if (this.vms.getType() != null) {
+//                dto.setVmsTypeDesc(this.vms.getType().getVmsTypeNm());
+//                dto.setVmsWdth(this.vms.getType().getVmsWdth());
+//                dto.setVmsHght(this.vms.getType().getVmsHght());
+//                dto.setRows(this.vms.getType().getRowNum());
+//                dto.setCols(this.vms.getType().getColNum());
+//                dto.setModlRows(this.vms.getType().getModlRowNum());
+//                dto.setModlCols(this.vms.getType().getModlColNum());
+//                dto.setPowrRows(this.vms.getType().getPowrRowNum());
+//                dto.setPowrCols(this.vms.getType().getPowrColNum());
+//            }
+//        }
+//        return dto;
+//    }
 
 }

src/main/java/com/its/op/entity/its/wcam/TbWcamCtlr.java

@@ -278,7 +278,7 @@ public class TbWcamCtlr implements Serializable {
         if (this.state == null) {
             TbWcamCtlrStts state = TbWcamCtlrStts.builder()
                     .wcamCtlrNmbr(this.wcamCtlrNmbr)
-                    .updtDt("19700101000000")
+                    .updtDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                     .cmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR)
                     .build();
             this.state = state;

src/main/java/com/its/op/service/its/unit/TbUnitSystService.java

@@ -184,7 +184,7 @@ public class TbUnitSystService {
                                 .systNm(obj.getSystNm())
                                 .systSttsCd("1")
                                 .systSttsDesc("이상")
-                                .updtDt("19700101000000")
+                                .updtDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
                                 .build());
             });
         }

src/main/java/com/its/op/service/its/unit/TbUnitSystSttsHsService.java

@@ -89,7 +89,7 @@ public class TbUnitSystSttsHsService {
         if (statList != null) {
             statList.forEach(stat -> {
                 TbUnitSystSttsHsStatDto unitDto = unitMap.get(stat.getSystId());
-                log.error("{}, {}, {}", stat.getSystId(), stat.getSystSttsCd(), stat.getSttsCnt());
+                //log.error("{}, {}, {}", stat.getSystId(), stat.getSystSttsCd(), stat.getSttsCnt());
                 if (unitDto == null) {
                     return;
                 }

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

@@ -59,7 +59,7 @@ public class TbVmsDsplHsService {
                 result.add(obj.toDto());
             });
         }
-        log.error("END");
+        //log.error("END");
         return result;
     }
 
@@ -127,7 +127,7 @@ public class TbVmsDsplHsService {
         if (msgList.size() > 1) {
             for (int ii = 1; ii < msgList.size(); ii++) {
                 String tmp = msgList.get(ii);
-                log.error("{}", tmp);
+                //log.error("{}", tmp);
                 int objType = Integer.parseInt(tmp.substring(0, 2), 16);
                 //int objLen  = Integer.parseInt(tmp.substring(2, 4), 16);
 

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

@@ -6,7 +6,9 @@ import com.its.op.dto.its.vms.TbVmsDsplPrstDto;
 import com.its.op.entity.its.vms.TbVmsCtlr;
 import com.its.op.entity.its.vms.TbVmsDsplPrst;
 import com.its.op.entity.its.vms.TbVmsDsplPrstKey;
+import com.its.op.global.CmmnCdManager;
 import com.its.op.global.TbVmsCtlrManager;
+import com.its.utils.ItsUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -43,8 +45,6 @@ public class TbVmsDsplPrstService {
      */
     @Transactional(readOnly = true)
     public List<TbVmsDsplPrstDto> findAll(boolean isMemory) {
-        //List<TbVmsDsplPrstDto> result = new ArrayList<>();
-        List<TbVmsDsplPrst> data = this.repo.findAll();
         List<TbVmsCtlr> stts;
         if (isMemory) {
             List<TbVmsCtlr> temp = this.ctlrManager.findAll();
@@ -53,11 +53,8 @@ public class TbVmsDsplPrstService {
             stts = this.ctlrRepo.findAllList();
         }
 
+        List<TbVmsDsplPrst> data = this.repo.findAll();
         return makeDsplPrstList(data, stts);
-//        for (TbVmsDsplPrst entity : data) {
-//            result.add(entity.toDto());
-//        }
-//        return result;
     }
 
     /**
@@ -66,7 +63,6 @@ public class TbVmsDsplPrstService {
      */
     @Transactional(readOnly = true)
     public List<TbVmsDsplPrstDto> findAllByIds(List<Long> ids, boolean isMemory) {
-        List<TbVmsDsplPrstDto> result = new ArrayList<>();
         List<TbVmsDsplPrst> data = this.repo.findAllByIds(ids);
         List<TbVmsCtlr> stts;
         if (isMemory) {
@@ -77,10 +73,6 @@ public class TbVmsDsplPrstService {
         }
 
         return makeDsplPrstList(data, stts);
-//        for (TbVmsDsplPrst entity : data) {
-//            result.add(entity.toDto());
-//        }
-//        return result;
     }
 
     /**
@@ -91,20 +83,42 @@ public class TbVmsDsplPrstService {
      */
     public List<TbVmsDsplPrstDto> makeDsplPrstList(List<TbVmsDsplPrst> data, List<TbVmsCtlr> vmsList) {
         Map<Long, TbVmsDsplPrstDto> result = new HashMap<>();
-        data.forEach(obj -> {
-            TbVmsDsplPrstDto dto = result.get(obj.getVmsCtlrNmbr());
-            if (dto == null) {
-                dto = obj.toDto();
-                result.put(obj.getVmsCtlrNmbr(), dto);
-            }
-            dto.addMsg(obj);
-        });
         vmsList.forEach(obj -> {
+            TbVmsDsplPrstDto dto = TbVmsDsplPrstDto.builder()
+                    .vmsCtlrNmbr(obj.getVmsCtlrNmbr())
+                    .msgs(new ArrayList<>())
+                    .dsplDt(CmmnCdManager.CMNC_STTS_ERROR_DT)
+                    .svcYn("N")
+                    .build();
+            dto.setVms(obj);
+            dto.setStts(obj);
+            result.put(obj.getVmsCtlrNmbr(), dto);
+        });
+
+        data.forEach(obj -> {
             TbVmsDsplPrstDto dto = result.get(obj.getVmsCtlrNmbr());
             if (dto != null) {
-                dto.setStts(obj);
+                dto.setDsplDt(obj.getDsplDt());
+                dto.setSvcYn(ItsUtils.getServiceYn(obj.getDsplDt()));
+                dto.addMsg(obj);
             }
         });
+
+//        data.forEach(obj -> {
+//            TbVmsDsplPrstDto dto = result.get(obj.getVmsCtlrNmbr());
+//            if (dto == null) {
+//                dto = obj.toDto();
+//                result.put(obj.getVmsCtlrNmbr(), dto);
+//            }
+//            dto.addMsg(obj);
+//        });
+//
+//        vmsList.forEach(obj -> {
+//            TbVmsDsplPrstDto dto = result.get(obj.getVmsCtlrNmbr());
+//            if (dto != null) {
+//                dto.setStts(obj);
+//            }
+//        });
         return new ArrayList<>(result.values());
     }
 
@@ -115,9 +129,20 @@ public class TbVmsDsplPrstService {
      * @return
      */
     public TbVmsDsplPrstDto makeDsplPrst(TbVmsDsplPrst data, TbVmsCtlr vms) {
-        TbVmsDsplPrstDto result = data.toDto();
-        result.addMsg(data);
+        TbVmsDsplPrstDto result = TbVmsDsplPrstDto.builder()
+                .vmsCtlrNmbr(vms.getVmsCtlrNmbr())
+                .msgs(new ArrayList<>())
+                .dsplDt(data.getDsplDt())
+                .svcYn(ItsUtils.getServiceYn(data.getDsplDt()))
+                .build();
+
+        result.setVms(vms);
         result.setStts(vms);
+        result.addMsg(data);
+
+//        TbVmsDsplPrstDto result = data.toDto();
+//        result.addMsg(data);
+//        result.setStts(vms);
         return result;
     }
 

src/main/java/com/its/op/xnetudp/protocol/CENTER_COMM_MESSAGE.java

@@ -57,8 +57,6 @@ public class CENTER_COMM_MESSAGE {
 			byteBuffer.get(this.body);
 
 			if (length != this.length) {
-				log.error("######################################################################");
-				log.error("######################################################################");
 				log.error("######################################################################, Length Error: {}, {}, {}", length, this.length, buffer.length);
 				log.error("RECV PACKET: {}", SysUtils.byteArrayToHex(buffer));
 			}

src/main/java/com/its/op/xnetudp/protocol/CENTER_VMS_COMM_MESSAGE.java

@@ -65,8 +65,6 @@ public class CENTER_VMS_COMM_MESSAGE {
 			byteBuffer.get(this.body);
 
 			if (length != this.length) {
-				//log.error("######################################################################");
-				//log.error("######################################################################");
 				//log.error("######################################################################, Length Error: {}, {}, {}", length, this.length, buffer.length);
 				//log.error("PACKET: {}", SysUtils.byteArrayToHex(buffer));
 			}

src/main/java/com/its/op/xnetudp/protocol/CENTER_VMS_REQ_RESET.java

@@ -7,6 +7,5 @@ public class CENTER_VMS_REQ_RESET extends CENTER_VMS_REQ_COMMON {
 
 	public CENTER_VMS_REQ_RESET(Long id, String userId, byte value) {
 		super(CENTER_COMM_DEFINE.INT_OP_VMS_RESET, 0x20, 0, id, userId, value);
-		log.error("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX: {}", value);
 	}
 }