dev

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

@@ -2,7 +2,6 @@ package com.its.op.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpHeaders;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
@@ -18,7 +17,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 import java.util.ArrayList;
 import java.util.List;
 
-@Profile("dev|swagger")
+//@Profile("dev|swagger")
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {

src/main/java/com/its/op/dao/repository/its/wcam/TbWcamCtlrSttsHsRepository.java

@@ -4,7 +4,6 @@ import com.its.op.dto.its.common.SttsHsErrCntInf;
 import com.its.op.dto.its.facility.FcltSttsErrorInf;
 import com.its.op.dto.its.report.ReportFcltSummaryInf;
 import com.its.op.dto.its.statistics.FcltSttsStatErrorInf;
-import com.its.op.entity.its.rse.TbRseCtlrSttsHs;
 import com.its.op.entity.its.wcam.TbWcamCtlrSttsHs;
 import com.its.op.entity.its.wcam.TbWcamCtrlSttsHsKey;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -46,7 +45,7 @@ public interface TbWcamCtlrSttsHsRepository extends JpaRepository<TbWcamCtlrStts
     @Query("select p from TbWcamCtlrSttsHs p inner join fetch p.wcam m " +
             " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
             "   and p.cmncSttsCd = 'CMS1' ")
-    List<TbRseCtlrSttsHs> findAllReportError(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
+    List<TbWcamCtlrSttsHs> findAllReportError(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
            "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +

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

@@ -191,6 +191,9 @@ public class TbScSgnlCtlr implements Serializable {
         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;
@@ -311,6 +314,9 @@ 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/report/ReportService.java

@@ -15,6 +15,7 @@ import com.its.op.entity.its.link.TbLink;
 import com.its.op.entity.its.rse.TbRseCtlrSttsHs;
 import com.its.op.entity.its.vds.TbVdsCtlrSttsHs;
 import com.its.op.entity.its.vms.TbVmsCtlrSttsHs;
+import com.its.op.entity.its.wcam.TbWcamCtlrSttsHs;
 import com.its.op.global.CmmnCdManager;
 import com.its.op.global.TbIfscManager;
 import com.its.op.global.TbLinkManager;
@@ -150,13 +151,13 @@ public class ReportService {
                     .build());
         });
 
-        List<TbRseCtlrSttsHs>  wcamError = this.wcamSttsHsRepo.findAllReportError(fromDt, toDt);
+        List<TbWcamCtlrSttsHs>  wcamError = this.wcamSttsHsRepo.findAllReportError(fromDt, toDt);
         wcamError.forEach(obj -> {
             result.add(ReportFacilityErrorDto.builder()
                     .fcltSeq(5)
                     .fcltType("WCAM")
-                    .fcltId(obj.getRse() != null ? obj.getRse().getRseCtlrId() : String.valueOf(obj.getRseCtlrNmbr()))
-                    .fcltNm(obj.getRse() != null ? obj.getRse().getRseNm() : String.valueOf(obj.getRseCtlrNmbr()))
+                    .fcltId(obj.getWcam() != null ? obj.getWcam().getWcamCtlrId() : String.valueOf(obj.getWcamCtlrNmbr()))
+                    .fcltNm(obj.getWcam() != null ? obj.getWcam().getWcamCtlrId() : String.valueOf(obj.getWcamCtlrNmbr()))
                     .rgstDt(obj.getCrtnDt())
                     .build());
         });