dev

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

@@ -1,6 +1,5 @@
 package com.its.op.entity.its.cctv;
 
-import com.its.op.config.AppUtils;
 import com.its.op.dto.its.cctv.TbCctvCtlrDto;
 import com.its.op.dto.its.cctv.TbCctvCtlrSttsDto;
 import com.its.op.dto.its.facility.TbFcltSttsAlrmStupDto;
@@ -239,7 +238,6 @@ public class TbCctvCtlr implements Serializable {
     }
 
     public TbCctvCtlrSttsDto toSttsDto() {
-        CmmnCdManager cmmnCdManager = (CmmnCdManager)AppUtils.getBean(CmmnCdManager.class);
         TbCctvCtlrSttsDto dto = TbCctvCtlrSttsDto.builder()
                 .cctvCtlrNmbr(this.cctvCtlrNmbr)
                 .collCnt(100)
@@ -266,12 +264,12 @@ public class TbCctvCtlr implements Serializable {
             dto.setZoom(this.state.getZoom());
             dto.setFocus(this.state.getFocus());
 
-            dto.setCboxDoorSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));
-            dto.setFrontDoorSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getFrontDoorSttsCd()));
-            dto.setBackDoorSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getBackDoorSttsCd()));
-            dto.setFanSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.FAN_STTS_CD, dto.getFanSttsCd()));
-            dto.setHetrSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.HETR_STTS_CD, dto.getHetrSttsCd()));
-            dto.setVideoInputDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.VIDEO_INPUT_CD, dto.getVideoInput()));
+            dto.setCboxDoorSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));
+            dto.setFrontDoorSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getFrontDoorSttsCd()));
+            dto.setBackDoorSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getBackDoorSttsCd()));
+            dto.setFanSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.FAN_STTS_CD, dto.getFanSttsCd()));
+            dto.setHetrSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.HETR_STTS_CD, dto.getHetrSttsCd()));
+            dto.setVideoInputDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.VIDEO_INPUT_CD, dto.getVideoInput()));
         }
         if ("N".equals(this.syopCntlYn)) {
             // 제어불가 CCTV 는 정상으로 설정
@@ -292,19 +290,19 @@ public class TbCctvCtlr implements Serializable {
             dto.setZoom(0);
             dto.setFocus(0);
 
-            dto.setCboxDoorSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));
-            dto.setFrontDoorSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getFrontDoorSttsCd()));
-            dto.setBackDoorSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getBackDoorSttsCd()));
-            dto.setFanSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.FAN_STTS_CD, dto.getFanSttsCd()));
-            dto.setHetrSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.HETR_STTS_CD, dto.getHetrSttsCd()));
-            dto.setVideoInputDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.VIDEO_INPUT_CD, dto.getVideoInput()));
+            dto.setCboxDoorSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getCboxDoorSttsCd()));
+            dto.setFrontDoorSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getFrontDoorSttsCd()));
+            dto.setBackDoorSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.DOOR_STTS_CD, dto.getBackDoorSttsCd()));
+            dto.setFanSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.FAN_STTS_CD, dto.getFanSttsCd()));
+            dto.setHetrSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.HETR_STTS_CD, dto.getHetrSttsCd()));
+            dto.setVideoInputDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.VIDEO_INPUT_CD, dto.getVideoInput()));
         }
         dto.setMissSttsYn(ItsUtils.getMissSttsYn(dto.getUpdtDt()));
         if (("Y").equals(dto.getMissSttsYn())) {
             // 기준시각 보다 크기 때문에 상태정보를 통신두절로 설정
             dto.setCmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR);
         }
-        dto.setCmncSttsDesc(cmmnCdManager.getCodeDescShort(CmmnCdManager.CMNC_STTS_CD, dto.getCmncSttsCd()));
+        dto.setCmncSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.CMNC_STTS_CD, dto.getCmncSttsCd()));
 
         return dto;
     }

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

@@ -1,6 +1,7 @@
 package com.its.op.entity.its.cctv;
 
 import com.its.op.dto.its.cctv.TbCctvCtlrSttsDto;
+import com.its.op.global.CmmnCdManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -87,7 +88,7 @@ public class TbCctvCtlrStts implements Serializable {
     private Integer focus;
 
     public TbCctvCtlrSttsDto toDto() {
-        return TbCctvCtlrSttsDto.builder()
+        TbCctvCtlrSttsDto dto = TbCctvCtlrSttsDto.builder()
                 .cctvCtlrNmbr(this.cctvCtlrNmbr)
                 .updtDt(this.updtDt)
                 .cmncSttsCd(this.cmncSttsCd)
@@ -104,6 +105,8 @@ public class TbCctvCtlrStts implements Serializable {
                 .zoom(this.zoom)
                 .focus(this.focus)
                 .build();
+        dto.setCmncSttsDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMNC_STTS_CD, this.cmncSttsCd));
+        return dto;
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.its.op.entity.its.wcam;
 
 import com.its.op.dto.its.wcam.TbWcamCtlrSttsDto;
+import com.its.op.global.CmmnCdManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -39,11 +40,13 @@ public class TbWcamCtlrStts implements Serializable {
     private String cmncSttsCd;
 
     public TbWcamCtlrSttsDto toDto() {
-        return TbWcamCtlrSttsDto.builder()
+        TbWcamCtlrSttsDto dto = TbWcamCtlrSttsDto.builder()
                 .wcamCtlrNmbr(this.wcamCtlrNmbr)
                 .updtDt(this.updtDt)
                 .cmncSttsCd(this.cmncSttsCd)
                 .build();
+        dto.setCmncSttsDesc(CmmnCdManager.getCodeDesc(CmmnCdManager.CMNC_STTS_CD, this.cmncSttsCd));
+        return dto;
     }
 
     public TbWcamCtlrStts(Long wcamCtlrNmbr) {

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

@@ -1,6 +1,7 @@
 package com.its.op.entity.its.wcam;
 
 import com.its.op.dto.its.wcam.TbWcamCtlrSttsHsDto;
+import com.its.op.global.CmmnCdManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -47,11 +48,13 @@ public class TbWcamCtlrSttsHs implements Serializable {
     private TbWcamCtlr wcam;
 
     public TbWcamCtlrSttsHsDto toDto() {
-        return TbWcamCtlrSttsHsDto.builder()
+        TbWcamCtlrSttsHsDto dto = TbWcamCtlrSttsHsDto.builder()
                 .crtnDt(this.crtnDt)
                 .wcamCtlrNmbr(this.wcamCtlrNmbr)
                 .cmncSttsCd(this.cmncSttsCd)
                 .build();
+        dto.setCmncSttsDesc(CmmnCdManager.getCodeDescShort(CmmnCdManager.CMNC_STTS_CD, dto.getCmncSttsCd()));
+        return dto;
     }
 
     public void updateInfo(TbWcamCtlrSttsHsDto.TbWcamCtlrSttsHsUpdReq req) {

src/test/java/com/its/op/ItsOpServerApplicationTests.java

@@ -72,11 +72,13 @@ public class ItsOpServerApplicationTests {
         Optional<String> ss = Optional.of(sss);
         log.error("{}", ss.ofNullable(ss.get()));
     }
+
     @Test
     void res() {
         //Result result = new Result(1, null);
         log.error("{}", sqlSessionFactory.getConfiguration().getDefaultFetchSize());
     }
+
     @Test
     void qry() {
         List<TbAtrd> result = em.createQuery("select m from TbAtrd m", TbAtrd.class)
@@ -170,7 +172,6 @@ public class ItsOpServerApplicationTests {
         log.error("compareTo: {}", svcDt.compareTo(prcsDt));
     }
 
-
     @Test
     void jasypt() {
         String encKey = "asdkjfaslkjflkajslfjkajlkf";
@@ -228,4 +229,5 @@ public class ItsOpServerApplicationTests {
         double tLtc1 = Double.parseDouble(String.format("%.1f", ltc1 / TOTAL * 100.0));
         log.error("{}, {}, {}, {}", ltc1, TOTAL, tLtc1, (ltc1 / (float)TOTAL * 100.0));
     }
+
 }