dev

src/main/java/com/its/op/dto/its/scrs/TbScIxrCmraMngmDto.java

@@ -2,6 +2,7 @@ package com.its.op.dto.its.scrs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.scrs.TbScIxrCmraMngm;
+import com.its.utils.SignalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -73,11 +74,11 @@ public class TbScIxrCmraMngmDto implements Serializable {
 
     @ApiModelProperty("카메라 X 좌표")  // Y VARCHAR2(20)
     @JsonProperty("cmra_x_crdn")
-    private String cmraXCrdn;
+    private Double cmraXCrdn;
 
     @ApiModelProperty("카메라 Y 좌표")  // Y VARCHAR2(20)
     @JsonProperty("cmra_y_crdn")
-    private String cmraYCrdn;
+    private Double cmraYCrdn;
 
     @ApiModelProperty("카메라 각도")  // Y NUMBER(3)
     @JsonProperty("cmra_angl")
@@ -202,13 +203,13 @@ public class TbScIxrCmraMngmDto implements Serializable {
 
         @ApiModelProperty("카메라 X 좌표, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("cmra_x_crdn")
-        @Size(min=1, max=20)
-        private String cmraXCrdn;
+        @PositiveOrZero
+        private Double cmraXCrdn;
 
         @ApiModelProperty("카메라 Y 좌표, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("cmra_y_crdn")
-        @Size(min=1, max=20)
-        private String cmraYCrdn;
+        @PositiveOrZero
+        private Double cmraYCrdn;
 
         @ApiModelProperty("카메라 각도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
         @JsonProperty("cmra_angl")
@@ -266,7 +267,7 @@ public class TbScIxrCmraMngmDto implements Serializable {
         private String rtcId;
 
         @Builder
-        public TbScIxrCmraMngmUpdReq(String ixr_id, String cmra_id, Integer drct_dvsn_cd, String istl_lctn, String cmra_ip, String cmra_port, Integer use_en, String cmra_logn_id, String cmra_logn_pw, Integer cmra_http_port, String stre_url, String cmra_url, Integer cmra_type, String cmra_x_crdn, String cmra_y_crdn, Integer cmra_angl, Integer hmpg_dspl_en, Integer bus_dvrs_lane_en, Integer srvc_anly_en, Integer lane_cnt, String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, String rtc_svr_ip, Integer rtc_svr_port, String rtc_id) {
+        public TbScIxrCmraMngmUpdReq(String ixr_id, String cmra_id, Integer drct_dvsn_cd, String istl_lctn, String cmra_ip, String cmra_port, Integer use_en, String cmra_logn_id, String cmra_logn_pw, Integer cmra_http_port, String stre_url, String cmra_url, Integer cmra_type, Double cmra_x_crdn, Double cmra_y_crdn, Integer cmra_angl, Integer hmpg_dspl_en, Integer bus_dvrs_lane_en, Integer srvc_anly_en, Integer lane_cnt, String web_rtc_svr_ip, Integer web_rtc_svr_port, String web_rtc_id, String rtc_svr_ip, Integer rtc_svr_port, String rtc_id) {
             this.ixrId = ixr_id;
             this.cmraId = cmra_id;
             this.drctDvsnCd = drct_dvsn_cd;
@@ -309,10 +310,8 @@ public class TbScIxrCmraMngmDto implements Serializable {
                     .streUrl(this.streUrl)
                     .cmraUrl(this.cmraUrl)
                     .cmraType(this.cmraType)
-//                    .cmraXCrdn(this.cmraYCrdn)
-//                    .cmraYCrdn(this.cmraXCrdn)
-                    .cmraXCrdn(this.cmraXCrdn)
-                    .cmraYCrdn(this.cmraYCrdn)
+                    .cmraXCrdn(SignalUtils.crdnDto2Entity(this.cmraXCrdn))
+                    .cmraYCrdn(SignalUtils.crdnDto2Entity(this.cmraYCrdn))
                     .cmraAngl(this.cmraAngl)
                     .hmpgDsplEn(this.hmpgDsplEn)
                     .busDvrsLaneEn(this.busDvrsLaneEn)

src/main/java/com/its/op/dto/its/scrs/TbScIxrMngmDto.java

@@ -2,6 +2,7 @@ package com.its.op.dto.its.scrs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.scrs.TbScIxrMngm;
+import com.its.utils.SignalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -37,11 +38,11 @@ public class TbScIxrMngmDto implements Serializable {
 
     @ApiModelProperty("교차로 X 좌표")  // Y VARCHAR2(20)
     @JsonProperty("ixr_x_crdn")
-    private String ixrXCrdn;
+    private Double ixrXCrdn;
 
     @ApiModelProperty("교차로 Y 좌표")  // Y VARCHAR2(20)
     @JsonProperty("ixr_y_crdn")
-    private String ixrYCrdn;
+    private Double ixrYCrdn;
 
     @ApiModelProperty("교차로 유형")  // Y NUMBER(1)
     @JsonProperty("ixr_type")
@@ -93,13 +94,13 @@ public class TbScIxrMngmDto implements Serializable {
 
         @ApiModelProperty("교차로 X 좌표, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("ixr_x_crdn")
-        @Size(min=1, max=20)
-        private String ixrXCrdn;
+        @PositiveOrZero
+        private Double ixrXCrdn;
 
         @ApiModelProperty("교차로 Y 좌표, Nullable = Y, VARCHAR2(20)")  // Y VARCHAR2(20)
         @JsonProperty("ixr_y_crdn")
-        @Size(min=1, max=20)
-        private String ixrYCrdn;
+        @PositiveOrZero
+        private Double ixrYCrdn;
 
         @ApiModelProperty("교차로 유형, Nullable = Y, NUMBER(1)")  // Y NUMBER(1)
         @JsonProperty("ixr_type")
@@ -127,7 +128,7 @@ public class TbScIxrMngmDto implements Serializable {
         private Long nodeId;
 
         @Builder
-        public TbScIxrMngmUpdReq(String ixr_id, String ixr_nm, Integer phas_cnt, String spot_fetr, String ixr_x_crdn, String ixr_y_crdn, Integer ixr_type, Integer dvsn, Integer use_en, Integer sgnl_ixr_nmbr, Long node_id) {
+        public TbScIxrMngmUpdReq(String ixr_id, String ixr_nm, Integer phas_cnt, String spot_fetr, Double ixr_x_crdn, Double ixr_y_crdn, Integer ixr_type, Integer dvsn, Integer use_en, Integer sgnl_ixr_nmbr, Long node_id) {
             this.ixrId = ixr_id;
             this.ixrNm = ixr_nm;
             this.phasCnt = phas_cnt;
@@ -147,8 +148,8 @@ public class TbScIxrMngmDto implements Serializable {
                     .ixrNm(this.ixrNm)
                     .phasCnt(this.phasCnt)
                     .spotFetr(this.spotFetr)
-                    .ixrXCrdn(this.ixrXCrdn)
-                    .ixrYCrdn(this.ixrYCrdn)
+                    .ixrXCrdn(SignalUtils.crdnDto2Entity(this.ixrXCrdn))
+                    .ixrYCrdn(SignalUtils.crdnDto2Entity(this.ixrYCrdn))
                     .ixrType(this.ixrType)
                     .dvsn(this.dvsn)
                     .useEn(this.useEn)

src/main/java/com/its/op/dto/its/scrs/TbScSgnlCtlrDto.java

@@ -2,11 +2,11 @@ package com.its.op.dto.its.scrs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.scrs.TbScSgnlCtlr;
+import com.its.utils.SignalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.validation.constraints.Positive;
 import javax.validation.constraints.PositiveOrZero;
 import java.io.Serializable;
 
@@ -113,12 +113,12 @@ public class TbScSgnlCtlrDto implements Serializable {
 
         @ApiModelProperty("X 좌표, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("x_crdn")
-        @Positive
+        @PositiveOrZero
         private Double xCrdn;
 
         @ApiModelProperty("Y 좌표, Nullable = Y, NUMBER(10)")  // Y NUMBER(10)
         @JsonProperty("y_crdn")
-        @Positive
+        @PositiveOrZero
         private Double yCrdn;
 
         @ApiModelProperty("A링 1현시 코드, Nullable = Y, NUMBER(7)")  // Y NUMBER(7)
@@ -232,8 +232,8 @@ public class TbScSgnlCtlrDto implements Serializable {
         public TbScSgnlCtlr toEntity() {
             return TbScSgnlCtlr.builder()
                     .sgnlIxrNmbr(this.sgnlIxrNmbr)
-                    .xCrdn((long) (this.xCrdn * 1000000))
-                    .yCrdn((long) (this.yCrdn * 1000000))
+                    .xCrdn(SignalUtils.crdnDto2EntityLong(this.xCrdn))     // 126.940696 ==> 126940696
+                    .yCrdn(SignalUtils.crdnDto2EntityLong(this.yCrdn))     //  37.076832 ==>  37076832
                     .aring1phasCd(this.aring1phasCd)
                     .aring2phasCd(this.aring2phasCd)
                     .aring3phasCd(this.aring3phasCd)

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

@@ -5,6 +5,7 @@ import com.its.op.dto.its.scrs.TbScIxrCmraMngmDto;
 import com.its.op.dto.its.scrs.TbScIxrCmraSttsDto;
 import com.its.op.global.CmmnCdManager;
 import com.its.utils.ItsUtils;
+import com.its.utils.SignalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -155,13 +156,28 @@ public class TbScIxrCmraMngm implements Serializable {
         }
     }
 
+//    public Double getXCrdn() {
+//        double result;
+//        try {
+//            result = Double.parseDouble(this.cmraXCrdn);
+//        } catch (Exception e) {
+//            result = 0.;
+//        }
+//        return result;
+//    }
+//    public Double getYCrdn() {
+//        double result;
+//        try {
+//            result = Double.parseDouble(this.cmraYCrdn);
+//        } catch (Exception e) {
+//            result = 0.;
+//        }
+//        return result;
+//    }
     public String getCmncSttsCd() {
         String result = "CMS1";
-        if (this.state != null) {
-            if (this.state.getCmraStts() == 1)
+        if (this.state != null && this.state.getCmraStts() == 1) {
             result = "CMS0";
-        } else {
-            result = "CMS1";
         }
         return result;
     }
@@ -193,10 +209,8 @@ public class TbScIxrCmraMngm implements Serializable {
                 .streUrl(this.streUrl)
                 .cmraUrl(this.cmraUrl)
                 .cmraType(this.cmraType)
-//                .cmraXCrdn(this.cmraYCrdn)
-//                .cmraYCrdn(this.cmraXCrdn)
-                .cmraXCrdn(this.cmraXCrdn)
-                .cmraYCrdn(this.cmraYCrdn)
+                .cmraXCrdn(SignalUtils.crdnEntity2Dto(this.cmraXCrdn))
+                .cmraYCrdn(SignalUtils.crdnEntity2Dto(this.cmraYCrdn))
                 .cmraAngl(this.cmraAngl)
                 .hmpgDsplEn(this.hmpgDsplEn)
                 .busDvrsLaneEn(this.busDvrsLaneEn)
@@ -260,8 +274,8 @@ public class TbScIxrCmraMngm implements Serializable {
         this.streUrl = req.getStreUrl();
         this.cmraUrl = req.getCmraUrl();
         this.cmraType = req.getCmraType();
-        this.cmraXCrdn = req.getCmraXCrdn();
-        this.cmraYCrdn = 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

@@ -1,6 +1,7 @@
 package com.its.op.entity.its.scrs;
 
 import com.its.op.dto.its.scrs.TbScIxrMngmDto;
+import com.its.utils.SignalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -80,8 +81,8 @@ public class TbScIxrMngm implements Serializable {
                 .ixrNm(this.ixrNm)
                 .phasCnt(this.phasCnt)
                 .spotFetr(this.spotFetr)
-                .ixrXCrdn(this.ixrXCrdn)
-                .ixrYCrdn(this.ixrYCrdn)
+                .ixrXCrdn(SignalUtils.crdnEntity2Dto(this.ixrXCrdn))
+                .ixrYCrdn(SignalUtils.crdnEntity2Dto(this.ixrYCrdn))
                 .ixrType(this.ixrType)
                 .dvsn(this.dvsn)
                 .useEn(this.useEn)
@@ -98,8 +99,8 @@ public class TbScIxrMngm implements Serializable {
         this.ixrNm = req.getIxrNm();
         this.phasCnt = req.getPhasCnt();
         this.spotFetr = req.getSpotFetr();
-        this.ixrXCrdn = req.getIxrXCrdn();
-        this.ixrYCrdn = req.getIxrYCrdn();
+        this.ixrXCrdn = SignalUtils.crdnDto2Entity(req.getIxrXCrdn());
+        this.ixrYCrdn = SignalUtils.crdnDto2Entity(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

@@ -6,6 +6,7 @@ import com.its.op.dto.its.scrs.TbScSgnlCtlrPhaseDto;
 import com.its.op.dto.its.scrs.TbScSgnlIxrSttsDto;
 import com.its.op.global.CmmnCdManager;
 import com.its.utils.ItsUtils;
+import com.its.utils.SignalUtils;
 import com.its.utils.SysUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -118,25 +119,11 @@ public class TbScSgnlCtlr implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbScSgnlIxrStts stts;
 
-    public Double getXPos() {
-        String xCrdn = String.format("%09d", this.xCrdn);
-        Double x_crdn = (Integer.parseInt(xCrdn) / 1000000.);
-        return x_crdn;
-    }
-    public Double getYPos() {
-        String yCrdn = String.format("%09d", this.yCrdn);
-        Double y_crdn = (Integer.parseInt(yCrdn) / 1000000.);
-        return y_crdn;
-    }
     public TbScSgnlCtlrDto toDto() {
-//        String xCrdn = String.format("%09d", this.xCrdn);
-//        String yCrdn = String.format("%09d", this.yCrdn);
-//        Double x_crdn = (Integer.parseInt(xCrdn) / 1000000.);
-//        Double y_crdn = (Integer.parseInt(yCrdn) / 1000000.);
         return TbScSgnlCtlrDto.builder()
                 .sgnlIxrNmbr(this.sgnlIxrNmbr)
-                .xCrdn(getXPos())
-                .yCrdn(getYPos())
+                .xCrdn(SignalUtils.crdnEntity2Dto(this.xCrdn))
+                .yCrdn(SignalUtils.crdnEntity2Dto(this.yCrdn))
                 .aring1phasCd(this.aring1phasCd)
                 .aring2phasCd(this.aring2phasCd)
                 .aring3phasCd(this.aring3phasCd)
@@ -161,8 +148,8 @@ public class TbScSgnlCtlr implements Serializable {
     }
 
     public void updateInfo(TbScSgnlCtlrDto.TbScSgnlCtlrUpdReq req) {
-        this.xCrdn = (long)(req.getXCrdn() * 1000000L);
-        this.yCrdn = (long)(req.getYCrdn() * 1000000L);
+        this.xCrdn = SignalUtils.crdnDto2EntityLong(req.getXCrdn());
+        this.yCrdn = SignalUtils.crdnDto2EntityLong(req.getYCrdn());
 
         this.aring1phasCd = req.getAring1phasCd();
         this.aring2phasCd = req.getAring2phasCd();
@@ -319,7 +306,7 @@ public class TbScSgnlCtlr implements Serializable {
         }
         if (CmmnCdManager.CMNC_STTS_ERROR_DT.equals(dto.getUpdtDt())) {
             // FOR setAlrmSetup
-            if (1 == this.stts.getCntlStts() || CmmnCdManager.CMNC_STTS_NORMAL.equals(dto.getCmncSttsCd())) {
+            if (this.stts != null && (1 == this.stts.getCntlStts() || CmmnCdManager.CMNC_STTS_NORMAL.equals(dto.getCmncSttsCd()))) {
                 dto.setUpdtDt(ItsUtils.getSysTime());
             }
         }

src/main/java/com/its/op/scheduler/ItsOpSigPhaseListener.java

@@ -71,7 +71,7 @@ public class ItsOpSigPhaseListener {
      * @return : 다음 작업 까지의 대기시간(milli-seconds)
      */
     private long doJob() {
-        long delayMilliSeconds = 3000L;
+        long delayMilliSeconds = 5000L;
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
 

src/main/java/com/its/op/security/WebSecurityConfig.java

@@ -159,7 +159,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/MAPDATA/**").permitAll()
                     .antMatchers("/download/**").permitAll()
                     // 페이지 권한 설정
-                    .antMatchers("/application/**", "/facility/**").permitAll()
                     .antMatchers("/application/wall/**", "/wall/**").permitAll()
                     .antMatchers("/application/facility/**", "/facility/**").permitAll()
                     .antMatchers("/application/dashboard/**", "/dashboard/**").permitAll()
@@ -169,7 +168,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .and()
                     .formLogin()
                     .loginPage(loginPage)
-                    //.loginPage("/api/auth/login.do")
                     .loginProcessingUrl("/api/auth/login.do")
                     .defaultSuccessUrl("/application/op/00.main/main.html", true)
                     .usernameParameter("username")

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

@@ -14,6 +14,7 @@ import com.its.op.entity.its.scrs.TbScIxrCmraMngmKey;
 import com.its.op.global.CmmnCdManager;
 import com.its.op.global.TbScIxrCmraManager;
 import com.its.op.service.its.facility.TbFcltSttsAlrmStupService;
+import com.its.utils.SignalUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -189,10 +190,8 @@ public class TbScIxrCmraMngmService {
                         .fcltId(obj.getCmraId())
                         .fcltNm(obj.getIstlLctn())
                         .fcltKind(String.valueOf(obj.getDrctDvsnCd()))
-//                        .xCrdn(Double.parseDouble(obj.getCmraYCrdn()))
-//                        .yCrdn(Double.parseDouble(obj.getCmraXCrdn()))
-                        .xCrdn(Double.parseDouble(obj.getCmraXCrdn()))
-                        .yCrdn(Double.parseDouble(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/op/service/its/scrs/TbScSgnlCtlrService.java

@@ -12,6 +12,7 @@ import com.its.op.entity.its.scrs.TbScSgnlCtlr;
 import com.its.op.global.CmmnCdManager;
 import com.its.op.global.TbScSgnlCtlrManager;
 import com.its.op.service.its.facility.TbFcltSttsAlrmStupService;
+import com.its.utils.SignalUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -202,8 +203,8 @@ public class TbScSgnlCtlrService {
                         .fcltId(String.valueOf(obj.getSgnlIxrNmbr()))
                         .fcltNm(obj.getIxrNm())
                         .fcltKind("1")
-                        .xCrdn(obj.getXPos())
-                        .yCrdn(obj.getYPos())
+                        .xCrdn(SignalUtils.crdnEntity2Dto(obj.getXCrdn()))
+                        .yCrdn(SignalUtils.crdnEntity2Dto(obj.getYCrdn()))
                         .strmUrl("")
                         .sttsCd(dto.getCmncSttsCd())
                         .sttsDesc(dto.getCmncSttsDesc())

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

@@ -0,0 +1,71 @@
+package com.its.utils;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public final class SignalUtils
+{
+	private static final long SIGNAL_CRDN_LONG = 1000000;
+	private static final double SIGNAL_CRDN_DOUBLE = 1000000.;
+
+	/**
+	 * 입력 보정값을 좌표값으로 변환하여 Double 형으로 리턴
+	 * @param value : 127065236, 37121076
+	 * @return : 127.065236, 37.121076
+	 */
+	public static Double crdnEntity2Dto(long value) {
+		String strCrdn = String.format("%d", value);
+		double crdn;
+		try {
+			crdn = Long.parseLong(strCrdn);
+		} catch(Exception e) {
+			crdn = 0;
+		}
+		return crdn / SIGNAL_CRDN_DOUBLE;
+	}
+	public static Double crdnEntity2Dto(String value) {
+		long inValue;
+		try {
+			inValue = Long.parseLong(value);
+		} catch(Exception e) {
+			inValue = 0;
+		}
+		return crdnEntity2Dto(inValue);
+	}
+
+	/**
+	 * 사용자 입력 값을 데이터베이스 값으로 변환
+	 * @param value : 127.065236
+	 * @return : 1270652360
+	 */
+	public static String crdnDto2Entity(double value) {
+		return String.format("%d", (long)(value * SIGNAL_CRDN_LONG));
+	}
+	public static String crdnDto2Entity(String value) {
+		double inValue;
+		try {
+			inValue = Double.parseDouble(value);
+		} catch(Exception e) {
+			inValue = 0;
+		}
+		return crdnDto2Entity(inValue);
+	}
+
+	public static long crdnDto2EntityLong(double value) {
+		return (long)(value * SIGNAL_CRDN_LONG);
+	}
+	public static long crdnDto2EntityLong(Double value) {
+		return crdnDto2EntityLong(value == null ? 0L : value);
+	}
+	public static long crdnDto2EntityLong(String value) {
+		double inValue;
+		try {
+			inValue = Double.parseDouble(value);
+		} catch(Exception e) {
+			inValue = 0;
+		}
+		return crdnDto2EntityLong(inValue);
+	}
+
+
+}