link info individual req update

src/main/java/com/its/api/bis/repository/BitStatusHistoryRepository.java

@@ -6,6 +6,7 @@ import com.its.api.its.model.dto.common.SttsHsErrCntInf;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
@@ -20,7 +21,7 @@ public interface BitStatusHistoryRepository extends JpaRepository<BitStatusHisto
             "          from BitStatusHistory h " +
             "         where h.recorddate >= :fromDt " +
             "         group by h.bitid) ")
-    List<BitStatusHistory> findAllStts(LocalDateTime fromDt);
+    List<BitStatusHistory> findAllStts(@Param("fromDt") LocalDateTime fromDt);
 
     @Query("select p from BitStatusHistory p " +
             " where (p.bitid, p.recorddate, p.recordtimestamp) " +
@@ -29,13 +30,13 @@ public interface BitStatusHistoryRepository extends JpaRepository<BitStatusHisto
             "         where h.recorddate >= :fromDt " +
             "         group by h.bitid) " +
             "  and p.wcommstatus <> '1'")
-    List<BitStatusHistory> findAllCommError(LocalDateTime fromDt);
+    List<BitStatusHistory> findAllCommError(@Param("fromDt") LocalDateTime fromDt);
 
     @Query("select p.bitid as nmbr, count(p.bitid) as errCnt " +
             "  from BitStatusHistory p " +
             " where p.recorddate >= :fromDt " +
             "   and p.wcommstatus <> '1' " +
             " group by p.bitid")
-    List<SttsHsErrCntInf> findAllCommErrorCount(LocalDateTime fromDt);
+    List<SttsHsErrCntInf> findAllCommErrorCount(@Param("fromDt") LocalDateTime fromDt);
 
 }

src/main/java/com/its/api/bis/service/BitService.java

@@ -273,9 +273,9 @@ public class BitService {
         summaryDto.setFanRun(fanRun.get());
         summaryDto.setHetrRun(hetrRun.get());
         summaryDto.setModlErr(modlErr.get());
+        summaryDto.setFcltObjs(sttsDtoList);
 
-        result.getCntList().add(summaryDto);
-        result.getSttsMap().put(fcltType, sttsDtoList);
+        result.getFcltList().add(summaryDto);
 
         return result;
     }
@@ -287,6 +287,6 @@ public class BitService {
     @Transactional(readOnly = true)
     public List<FcltSttsDto> findAllListCommStts() {
         FcltSttsListDto result = findAllListSttsTotal();
-        return result.getSttsMap().get("BIT");
+        return result.getFcltList().get(0).getFcltObjs();
     }
 }

src/main/java/com/its/api/its/model/dto/cctv/TbCctvSttsDto.java

@@ -21,6 +21,10 @@ public class TbCctvSttsDto implements Serializable {
     @JsonProperty("cctv_mngm_nmbr")
     private Long cctvMngmNmbr;
 
+    @ApiModelProperty("관리 번호")  // N NUMBER(10)
+    @JsonProperty("nmbr")
+    private Long nmbr;
+
     @ApiModelProperty("갱신 일시")  // Y VARCHAR(14)
     @JsonProperty("updt_dt")
     private String updtDt;
@@ -78,4 +82,8 @@ public class TbCctvSttsDto implements Serializable {
     @JsonProperty("miss_stts_yn")
     private String missSttsYn;
 
+    @ApiModelProperty("수집건수")
+    @JsonProperty("coll_cnt")
+    private Integer collCnt;
+
 }

src/main/java/com/its/api/its/model/dto/common/FcltSttsListDto.java

@@ -7,9 +7,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  *  DTO Class
@@ -20,15 +18,10 @@ public class FcltSttsListDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("시설물유형")
-    @JsonProperty("cnt_list")
-    private List<FcltSttsSummaryDto> cntList;
-
-    @ApiModelProperty("시설물 상태 맵(CCTV, VMS, VDS, RSE, ...)")
-    @JsonProperty("stts_map")
-    private Map<String, List<FcltSttsDto>> sttsMap;
+    @JsonProperty("fclt_list")
+    private List<FcltSttsSummaryDto> fcltList;
 
     public FcltSttsListDto() {
-        this.cntList = new ArrayList<>();
-        this.sttsMap = new HashMap<>();
+        this.fcltList = new ArrayList<>();
     }
 }

src/main/java/com/its/api/its/model/dto/common/FcltSttsSummaryDto.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *  DTO Class
@@ -69,6 +71,10 @@ public class FcltSttsSummaryDto implements Serializable {
     @JsonProperty("dtct_err")
     private Integer dtctErr = 0;
 
+    @ApiModelProperty("시설물 목록")
+    @JsonProperty("fclt_objs")
+    private List<FcltSttsDto> fcltObjs;
+
     public void init() {
         this.doorOpen = 0;
         this.fanRun = 0;
@@ -80,5 +86,7 @@ public class FcltSttsSummaryDto implements Serializable {
         this.camErr = 0;
         this.dtctErr = 0;
 
+        this.fcltObjs = new ArrayList<>();
+
     }
 }

src/main/java/com/its/api/its/model/dto/link/TbLinkDto.java

@@ -141,6 +141,22 @@ public class TbLinkDto implements Serializable {
     @JsonProperty("sect_grad_desc")
     private String sectGradDesc;
 
+    @ApiModelProperty("시점 X 좌표")  // Y NUMBER(11,8)
+    @JsonProperty("from_x_crdn")
+    private Double fromXCrdn;
+
+    @ApiModelProperty("시점 Y 좌표")  // Y NUMBER(10,8)
+    @JsonProperty("from_y_crdn")
+    private Double fromYCrdn;
+
+    @ApiModelProperty("종점 X 좌표")  // Y NUMBER(11,8)
+    @JsonProperty("to_x_crdn")
+    private Double toXCrdn;
+
+    @ApiModelProperty("종점 Y 좌표")  // Y NUMBER(10,8)
+    @JsonProperty("to_y_crdn")
+    private Double toYCrdn;
+
     @ApiModel("TbLinkUpdReq(링크정보 정보변경)")
     @Getter
     @Setter

src/main/java/com/its/api/its/model/dto/vds/TbVdsCtlrSttsDto.java

@@ -21,6 +21,10 @@ public class TbVdsCtlrSttsDto implements Serializable {
     @JsonProperty("ctlr_mngm_nmbr")
     private String ctlrMngmNmbr;
 
+    @ApiModelProperty("관리 번호")  // N NUMBER(10)
+    @JsonProperty("nmbr")
+    private String nmbr;
+
     @ApiModelProperty("통신 상태 코드(0:정상, 1:통신이상, 2:알수없음)")  // Y VARCHAR(7)
     @JsonProperty("cmnc_stts_cd")
     private String cmncSttsCd;
@@ -93,4 +97,8 @@ public class TbVdsCtlrSttsDto implements Serializable {
     @JsonProperty("miss_stts_yn")
     private String missSttsYn;
 
+    @ApiModelProperty("수집건수")
+    @JsonProperty("coll_cnt")
+    private Integer collCnt;
+
 }

src/main/java/com/its/api/its/model/dto/vms/TbVmsSttsDto.java

@@ -22,6 +22,10 @@ public class TbVmsSttsDto implements Serializable {
     @JsonProperty("vms_ctlr_nmbr")
     private Long vmsCtlrNmbr;
 
+    @ApiModelProperty("관리 번호")  // N NUMBER(10)
+    @JsonProperty("nmbr")
+    private Long nmbr;
+
     @ApiModelProperty("등록 일시")  // Y VARCHAR(14)
     @JsonProperty("updt_dt")
     private String updtDt;
@@ -102,4 +106,8 @@ public class TbVmsSttsDto implements Serializable {
     @ApiModelProperty("상태정보 결측 여부")
     @JsonProperty("miss_stts_yn")
     private String missSttsYn;
+
+    @ApiModelProperty("수집건수")
+    @JsonProperty("coll_cnt")
+    private Integer collCnt;
 }

src/main/java/com/its/api/its/model/entity/cctv/TbCctvCtlr.java

@@ -221,6 +221,8 @@ public class TbCctvCtlr implements Serializable {
     public TbCctvSttsDto toSttsDto() {
         TbCctvSttsDto dto = TbCctvSttsDto.builder()
                 .cctvMngmNmbr(this.cctvMngmNmbr)
+                .nmbr(this.cctvMngmNmbr)
+                .collCnt(100)
                 .cctvCtlrId(this.cctvCtlrId)
                 .istlLctnNm(this.istlLctnNm)
                 .updtDt(CodeManager.CMNC_STTS_ERROR_DT)

src/main/java/com/its/api/its/model/entity/link/TbLink.java

@@ -155,8 +155,25 @@ public class TbLink implements Serializable {
                 .paraId(this.paraId)
                 .build();
 
-        dto.setFromNodeInfo(this.getFromNode() == null ? "" : this.getFromNode().getNodeName());
-        dto.setToNodeInfo(this.getToNode() == null ? "" : this.getToNode().getNodeName());
+        if (this.getFromNode() != null) {
+            dto.setFromNodeInfo(this.getFromNode().getNodeName());
+            dto.setFromXCrdn(this.getFromNode().getXCrdn());
+            dto.setFromYCrdn(this.getFromNode().getYCrdn());
+        } else {
+            dto.setFromNodeInfo("");
+            dto.setFromXCrdn(0.);
+            dto.setFromYCrdn(0.);
+        }
+
+        if (this.getToNode() != null) {
+            dto.setToNodeInfo(this.getToNode().getNodeName());
+            dto.setToXCrdn(this.getFromNode().getXCrdn());
+            dto.setToYCrdn(this.getFromNode().getYCrdn());
+        } else {
+            dto.setToNodeInfo("");
+            dto.setToXCrdn(0.);
+            dto.setToYCrdn(0.);
+        }
 
         dto.setRoadUseDesc(CodeManager.getCodeDesc(CodeManager.ROAD_USE, this.roadUse));
         dto.setRoadRankDesc(CodeManager.getCodeDesc(CodeManager.ROAD_RANK, this.roadRank));

src/main/java/com/its/api/its/model/entity/vds/TbVdsCtlr.java

@@ -129,6 +129,8 @@ public class TbVdsCtlr implements Serializable {
     public TbVdsCtlrSttsDto toSttsDto() {
         TbVdsCtlrSttsDto dto = TbVdsCtlrSttsDto.builder()
                 .ctlrMngmNmbr(this.ctlrMngmNmbr)
+                .nmbr(this.ctlrMngmNmbr)
+                .collCnt(0)
                 .vdsCtlrId(this.vdsCtlrId)
                 .vdsNm(this.lctn)
                 .build();

src/main/java/com/its/api/its/model/entity/vms/TbVmsCtlr.java

@@ -276,6 +276,8 @@ public class TbVmsCtlr implements Serializable {
     public TbVmsSttsDto toSttsDto() {
         TbVmsSttsDto dto = TbVmsSttsDto.builder()
                 .vmsCtlrNmbr(this.vmsCtlrNmbr)
+                .nmbr(this.vmsCtlrNmbr)
+                .collCnt(100)
                 .vmsCtlrId(this.vmsCtlrId)
                 .vmsNm(this.vmsNm)
                 .updtDt(CodeManager.CMNC_STTS_ERROR_DT)

src/main/java/com/its/api/its/service/cctv/TbCctvCtlrService.java

@@ -184,9 +184,9 @@ public class TbCctvCtlrService {
                 .build();
 
         summaryDto.init();
+        summaryDto.setFcltObjs(sttsDtoList);
 
-        result.getCntList().add(summaryDto);
-        result.getSttsMap().put(fcltType, sttsDtoList);
+        result.getFcltList().add(summaryDto);
 
         return result;
     }

src/main/java/com/its/api/its/service/common/CommonSttsService.java

@@ -31,23 +31,19 @@ public class CommonSttsService {
 
         // CCTV
         FcltSttsListDto cctv = this.cctvService.findAllSttsListTotal();
-        result.getCntList().add(cctv.getCntList().get(0));
-        result.getSttsMap().put("CCTV", cctv.getSttsMap().get("CCTV"));
+        result.getFcltList().add(cctv.getFcltList().get(0));
 
         // VMS
         FcltSttsListDto vms = this.vmsService.findAllSttsListTotal();
-        result.getCntList().add(vms.getCntList().get(0));
-        result.getSttsMap().put("VMS", vms.getSttsMap().get("VMS"));
+        result.getFcltList().add(vms.getFcltList().get(0));
 
         // VMS
         FcltSttsListDto vds = this.vdsService.findAllSttsListTotal();
-        result.getCntList().add(vds.getCntList().get(0));
-        result.getSttsMap().put("VDS", vds.getSttsMap().get("VDS"));
+        result.getFcltList().add(vds.getFcltList().get(0));
 
         // RSE
         FcltSttsListDto rse = this.rseService.findAllListSttsTotal();
-        result.getCntList().add(rse.getCntList().get(0));
-        result.getSttsMap().put("RSE", rse.getSttsMap().get("RSE"));
+        result.getFcltList().add(rse.getFcltList().get(0));
 
         return result;
     }

src/main/java/com/its/api/its/service/parking/ParkingLotService.java

@@ -127,9 +127,9 @@ public class ParkingLotService {
                 .build();
 
         summaryDto.init();;
+        summaryDto.setFcltObjs(sttsDtoList);
 
-        result.getCntList().add(summaryDto);
-        result.getSttsMap().put(fcltType, sttsDtoList);
+        result.getFcltList().add(summaryDto);
 
         return result;
     }

src/main/java/com/its/api/its/service/vds/TbVdsCtlrService.java

@@ -64,9 +64,19 @@ public class TbVdsCtlrService {
     @Transactional(readOnly = true)
     public List<TbVdsCtlrSttsDto> findAllStts() {
         List<TbVdsCtlrSttsDto> result = new ArrayList<>();
+        Map<String, TbVdsCtlrSttsDto> tmp = new HashMap<>();
         List<TbVdsCtlr> data = this.repo.findAllList();
+        List<SttsHsErrCntInf> colList = this.rawPnstRepo.findAllCommError();
         data.forEach(obj -> {
-            result.add(obj.toSttsDto());
+            TbVdsCtlrSttsDto dto = obj.toSttsDto();
+            result.add(dto);
+            tmp.put(dto.getCtlrMngmNmbr(), dto);
+        });
+        colList.forEach(obj -> {
+            TbVdsCtlrSttsDto dto = tmp.get(obj.getNmbr());
+            if (dto != null) {
+                dto.setCollCnt(obj.getErrCnt().intValue());
+            }
         });
         return result;
     }
@@ -276,9 +286,9 @@ public class TbVdsCtlrService {
         summaryDto.setHetrRun(hetrRun.get());
         summaryDto.setPwerErr(pwerErr.get());
         summaryDto.setTempErr(tempErr.get());
+        summaryDto.setFcltObjs(sttsDtoList);
 
-        result.getCntList().add(summaryDto);
-        result.getSttsMap().put(fcltType, sttsDtoList);
+        result.getFcltList().add(summaryDto);
 
         return result;
     }

src/main/java/com/its/api/its/service/vms/TbVmsCtlrService.java

@@ -294,9 +294,8 @@ public class TbVmsCtlrService {
         summaryDto.setModlErr(modlErr.get());
         summaryDto.setModlPwerErr(modlPwerErr.get());
         summaryDto.setTempErr(tempErr.get());
-
-        result.getCntList().add(summaryDto);
-        result.getSttsMap().put(fcltType, sttsDtoList);
+        summaryDto.setFcltObjs(sttsDtoList);
+        result.getFcltList().add(summaryDto);
 
         return result;
     }

src/main/java/com/its/api/utis/service/RsemstService.java

@@ -79,7 +79,7 @@ public class RsemstService {
     @Transactional(readOnly = true)
     public List<FcltSttsDto> findAllListCommStts() {
         FcltSttsListDto result = findAllListSttsTotal();
-        return result.getSttsMap().get("RSE");
+        return result.getFcltList().get(0).getFcltObjs();
     }
 
     /**
@@ -129,9 +129,8 @@ public class RsemstService {
                 .errorCnt(error.get())
                 .colErrCnt(0)
                 .build();
-
-        result.getCntList().add(cntCctv);
-        result.getSttsMap().put(fcltType, sttsDtoList);
+        cntCctv.setFcltObjs(sttsDtoList);
+        result.getFcltList().add(cntCctv);
 
         return result;
     }