dev

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

@@ -209,8 +209,10 @@ public class TbScIxrCmraMngm implements Serializable {
                 .streUrl(this.streUrl)
                 .cmraUrl(this.cmraUrl)
                 .cmraType(this.cmraType)
-                .cmraXCrdn(SignalUtils.crdnEntity2Dto(this.cmraXCrdn))
-                .cmraYCrdn(SignalUtils.crdnEntity2Dto(this.cmraYCrdn))
+                .cmraXCrdn(SignalUtils.crdnStr2Double(this.cmraXCrdn))
+                .cmraYCrdn(SignalUtils.crdnStr2Double(this.cmraYCrdn))
+//                .cmraXCrdn(SignalUtils.crdnEntity2Dto(this.cmraXCrdn))
+//                .cmraYCrdn(SignalUtils.crdnEntity2Dto(this.cmraYCrdn))
                 .cmraAngl(this.cmraAngl)
                 .hmpgDsplEn(this.hmpgDsplEn)
                 .busDvrsLaneEn(this.busDvrsLaneEn)
@@ -274,8 +276,10 @@ public class TbScIxrCmraMngm implements Serializable {
         this.streUrl = req.getStreUrl();
         this.cmraUrl = req.getCmraUrl();
         this.cmraType = req.getCmraType();
-        this.cmraXCrdn = SignalUtils.crdnDto2Entity(req.getCmraXCrdn());
-        this.cmraYCrdn = SignalUtils.crdnDto2Entity(req.getCmraYCrdn());
+        this.cmraXCrdn = SignalUtils.crdnDouble2Str(req.getCmraXCrdn());
+        this.cmraYCrdn = SignalUtils.crdnDouble2Str(req.getCmraYCrdn());
+//        this.cmraXCrdn = SignalUtils.crdnDto2Entity(req.getCmraXCrdn());
+//        this.cmraYCrdn = SignalUtils.crdnDto2Entity(req.getCmraYCrdn());
         this.cmraAngl = req.getCmraAngl();
         this.hmpgDsplEn = req.getHmpgDsplEn();
         this.busDvrsLaneEn = req.getBusDvrsLaneEn();

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

@@ -81,8 +81,10 @@ public class TbScIxrMngm implements Serializable {
                 .ixrNm(this.ixrNm)
                 .phasCnt(this.phasCnt)
                 .spotFetr(this.spotFetr)
-                .ixrXCrdn(SignalUtils.crdnEntity2Dto(this.ixrXCrdn))
-                .ixrYCrdn(SignalUtils.crdnEntity2Dto(this.ixrYCrdn))
+                .ixrXCrdn(SignalUtils.crdnStr2Double(this.ixrXCrdn))
+                .ixrYCrdn(SignalUtils.crdnStr2Double(this.ixrYCrdn))
+//                .ixrXCrdn(SignalUtils.crdnEntity2Dto(this.ixrXCrdn))
+//                .ixrYCrdn(SignalUtils.crdnEntity2Dto(this.ixrYCrdn))
                 .ixrType(this.ixrType)
                 .dvsn(this.dvsn)
                 .useEn(this.useEn)
@@ -99,8 +101,10 @@ public class TbScIxrMngm implements Serializable {
         this.ixrNm = req.getIxrNm();
         this.phasCnt = req.getPhasCnt();
         this.spotFetr = req.getSpotFetr();
-        this.ixrXCrdn = SignalUtils.crdnDto2Entity(req.getIxrXCrdn());
-        this.ixrYCrdn = SignalUtils.crdnDto2Entity(req.getIxrYCrdn());
+        this.ixrXCrdn = SignalUtils.crdnDouble2Str(req.getIxrXCrdn());
+        this.ixrYCrdn = SignalUtils.crdnDouble2Str(req.getIxrYCrdn());
+//        this.ixrXCrdn = SignalUtils.crdnStr2Double(req.getIxrXCrdn());
+//        this.ixrYCrdn = SignalUtils.crdnStr2Double(req.getIxrYCrdn());
         this.ixrType = req.getIxrType();
         this.dvsn = req.getDvsn();
         this.useEn = req.getUseEn();

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

@@ -187,13 +187,10 @@ public class TbScSgnlCtlr implements Serializable {
             return dto;
         }
 
-        // Dir, 1: 직진, 2: 좌회전, 5: 보행자: 1: 좌회전, 2: 직진, 5: 보행자==> 평택
+        // Dir, 1: 직진, 2: 좌회전, 5: 보행자
         dto.setCntlMode(this.stts.getCntlMode());   // 제어모드(0: TRC, 1: TOD, 2: MAN)
         dto.setCntlStts(this.stts.getCntlStts());   // 제어상태(0: 온라인, 1: 오프라인, 2: 트랜스, 3: 통신장애)
         dto.setSpclCntl(this.stts.getSpclCntl());   // 특수제어(0: 없음, 1: 점멸, 2: 소등, 3: 수동, 4: 감응)
-//        if (this.stts.getPrstAringPhas() == 0 && this.stts.getPrstBringPhas() == 0) {
-//            dto.setCntlStts(3); // 통신장애
-//        }
 
         int aRingPhase = -1;
         int bRingPhase = -1;
@@ -314,9 +311,6 @@ public class TbScSgnlCtlr implements Serializable {
                 dto.setUpdtDt(ItsUtils.getSysTime());
             }
         }
-//        if (dto.getPrstAringPhas() == 0 && dto.getPrstBringPhas() == 0) {
-//            dto.setCmncSttsCd(CmmnCdManager.CMNC_STTS_ERROR);
-//        }
 
         dto.setMissSttsYn(ItsUtils.getMissSttsYn(dto.getUpdtDt()));
         if (("Y").equals(dto.getMissSttsYn())) {

src/main/java/com/its/op/service/its/scrs/TbScIxrCmraMngmService.java

@@ -190,8 +190,10 @@ public class TbScIxrCmraMngmService {
                         .fcltId(obj.getCmraId())
                         .fcltNm(obj.getIstlLctn())
                         .fcltKind(String.valueOf(obj.getDrctDvsnCd()))
-                        .xCrdn(SignalUtils.crdnEntity2Dto(obj.getCmraXCrdn()))
-                        .yCrdn(SignalUtils.crdnEntity2Dto(obj.getCmraYCrdn()))
+                        .xCrdn(SignalUtils.crdnStr2Double(obj.getCmraXCrdn()))
+                        .yCrdn(SignalUtils.crdnStr2Double(obj.getCmraYCrdn()))
+//                        .xCrdn(SignalUtils.crdnEntity2Dto(obj.getCmraXCrdn()))
+//                        .yCrdn(SignalUtils.crdnEntity2Dto(obj.getCmraYCrdn()))
                         .sttsCd(dto.getCmncSttsCd())
                         .sttsDesc(dto.getCmncSttsDesc())
                         .fcltInfo1(String.valueOf(tfvl))

src/main/java/com/its/utils/SignalUtils.java

@@ -33,6 +33,20 @@ public final class SignalUtils
 		return crdnEntity2Dto(inValue);
 	}
 
+	public static Double crdnStr2Double(String value) {
+		double inValue;
+		try {
+			inValue = Double.parseDouble(value);
+		} catch(Exception e) {
+			inValue = 0;
+		}
+		return inValue;
+	}
+
+	public static String crdnDouble2Str(Double value) {
+		return String.valueOf(value);
+	}
+
 	/**
 	 * 사용자 입력 값을 데이터베이스 값으로 변환
 	 * @param value : 127.065236