Procházet zdrojové kódy

traffic grade null check

shjung před 3 roky
rodič
revize
982e0d4716

+ 3 - 0
src/main/java/com/its/api/its/model/entity/ifsc/TbIfscTraf.java

@@ -89,6 +89,9 @@ public class TbIfscTraf implements Serializable {
             dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
         }
         dto.setDrctDesc(CodeManager.getCodeDesc(CodeManager.DRCT_CD, dto.getDrctCd()));
+        if (this.cmtrGradCd == null) {
+            dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);
+        }
         dto.setCmtrGradDesc(CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.cmtrGradCd));
 
         return dto;

+ 2 - 2
src/main/java/com/its/api/its/model/entity/ifsc/TbIfscTrafSimple.java

@@ -72,8 +72,8 @@ public class TbIfscTrafSimple implements Serializable {
                 .prcnDt(this.prcnDt)
                 .build();
 
-        dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, dto.getCmtrGradCd()));
-        if (dto.getMissYn().equals("Y")) {
+        dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
+        if (this.cmtrGradCd == null || dto.getMissYn().equals("Y")) {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);

+ 3 - 0
src/main/java/com/its/api/its/model/entity/link/TbLinkTraf.java

@@ -111,6 +111,9 @@ public class TbLinkTraf implements Serializable {
                 .dataNum(this.dataNum)
                 .build();
 
+        if (this.cmtrGradCd == null) {
+            dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);
+        }
         dto.setMissYn(this.missYn.equals("N") ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");
 
         if (this.link != null) {

+ 1 - 2
src/main/java/com/its/api/its/model/entity/link/TbLinkTrafSimple.java

@@ -98,12 +98,11 @@ public class TbLinkTrafSimple implements Serializable {
                 .build();
 
         dto.setMissYn(("N").equals(this.missYn) ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");
-        if (dto.getMissYn().equals("Y")) {
+        if (this.cmtrGradCd == null || dto.getMissYn().equals("Y")) {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);
         }
-
         return dto;
     }
 }

+ 3 - 0
src/main/java/com/its/api/its/model/entity/road/TbRoadTraf.java

@@ -89,6 +89,9 @@ public class TbRoadTraf implements Serializable {
             dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
         }
         dto.setDrctDesc(CodeManager.getCodeDesc(CodeManager.DRCT_CD, dto.getDrctCd()));
+        if (this.cmtrGradCd == null) {
+            dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);
+        }
         dto.setCmtrGradDesc(CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.cmtrGradCd));
 
         return dto;

+ 2 - 2
src/main/java/com/its/api/its/model/entity/road/TbRoadTrafSimple.java

@@ -72,8 +72,8 @@ public class TbRoadTrafSimple implements Serializable {
                 .prcnDt(this.prcnDt)
                 .build();
 
-        dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, dto.getCmtrGradCd()));
-        if (dto.getMissYn().equals("Y")) {
+        dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
+        if (this.cmtrGradCd == null || dto.getMissYn().equals("Y")) {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);

+ 4 - 1
src/main/java/com/its/api/its/model/entity/vms/TbVmsCmtrInfr.java

@@ -53,6 +53,9 @@ public class TbVmsCmtrInfr implements Serializable {
     private TbVmsIfsc vmsIfsc = new TbVmsIfsc();
 
     public TbVmsCmtrInfrDto toDto() {
+        if (this.cmtrGradCd == null) {
+            this.cmtrGradCd = "0";
+        }
         TbVmsCmtrInfrDto dto = TbVmsCmtrInfrDto.builder()
                 .vmsIfscId(this.vmsIfscId)
                 .rgstDt(this.rgstDt)
@@ -92,7 +95,7 @@ public class TbVmsCmtrInfr implements Serializable {
                 .build();
 
         dto.setMissYn(ItsUtils.getMissYn(this.rgstDt, dto.getCmtrGradCd()));
-        if (dto.getMissYn().equals("Y")) {
+        if (this.cmtrGradCd == null || dto.getMissYn().equals("Y")) {
             dto.setSped(0);
             dto.setTrvlHh(0);
             dto.setCmtrGradCd(CodeManager.MISS_SPED_GRAD);