analysis update

src/main/java/com/its/api/op/controller/analysis/TrafHistController.java

@@ -23,9 +23,6 @@ public class TrafHistController {
     private final TrafHistService service;
 
     @ApiOperation(value = "0.이력목록조회(TB_IFSC_15M_STAT)", response = TrafHistDto.class, responseContainer = "ArrayList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "hist_type", dataType = "string", value = "LINK(링크), IFSC(서비스링크), ROAD(도로)")
-    })
     @GetMapping(value = "/stat", produces = {"application/json; charset=utf8"})
     public List<TrafHistDto> findAllByDateRange(
             @ApiParam(name = "HIST_TYPE", value = "LINK(링크), IFSC(서비스링크), ROAD(도로)", example = "IFSC", required = true)
@@ -40,9 +37,6 @@ public class TrafHistController {
     }
 
     @ApiOperation(value = "1.이력리스트조회(TB_IFSC_15M_STAT)", response = TrafHistListDto.class, responseContainer = "ArrayList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "hist_type", dataType = "string", value = "LINK(링크), IFSC(서비스링크), ROAD(도로)")
-    })
     @GetMapping(value = "/hist", produces = {"application/json; charset=utf8"})
     public List<TrafHistListDto> findAllByDateRangeList(
             @ApiParam(name = "HIST_TYPE", value = "LINK(링크), IFSC(서비스링크), ROAD(도로)", example = "IFSC", required = true)

src/main/java/com/its/api/op/controller/report/ReportController.java

@@ -26,48 +26,48 @@ public class ReportController {
 
     private final ReportService service;
 
-    @ApiOperation(value = "시설물 현황", response = ReportFacilitySummaryDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "시설물보고서-시설물 현황", response = ReportFacilitySummaryDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/facility/summary", produces = {"application/json; charset=utf8"})
     public List<ReportFacilitySummaryDto> findAllFacilitySummary(
-            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220112000000", required = true)
+            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220302000000", required = true)
             @RequestParam String FROM_DT,
-            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220112235959", required = true)
+            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220302235959", required = true)
             @RequestParam String TO_DT) {
 
         return this.service.findAllFacilitySummary(FROM_DT, TO_DT);
     }
 
-    @ApiOperation(value = "장애 현황", response = ReportFacilityErrorDto.class, responseContainer = "ArrayList")
+    @ApiOperation(value = "시설물보고서-장애 현황", response = ReportFacilityErrorDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/facility/error", produces = {"application/json; charset=utf8"})
     public List<ReportFacilityErrorDto> findAllFacilityError(
-            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220112000000", required = true)
+            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220302000000", required = true)
             @RequestParam String FROM_DT,
-            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220112235959", required = true)
+            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220302235959", required = true)
             @RequestParam String TO_DT) {
 
         return this.service.findAllFacilityError(FROM_DT, TO_DT);
     }
 
-    @ApiOperation(value = "돌발 현황", response = ReportTrafficIncidentDto.class, responseContainer = "ArrayList")
-    @GetMapping(value = "/traffic/incident", produces = {"application/json; charset=utf8"})
-    public List<ReportTrafficIncidentDto> findAllTrafficIncident(
-            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220112000000", required = true)
+    @ApiOperation(value = "교통보고서-지/정체 현황", response = ReportTrafficCongestDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/traffic/congest", produces = {"application/json; charset=utf8"})
+    public List<ReportTrafficCongestDto> findAllTrafficCongest(
+            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220127000000", required = true)
             @RequestParam String FROM_DT,
-            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220112235959", required = true)
+            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220127235959", required = true)
             @RequestParam String TO_DT) {
 
-        return this.service.findAllTrafficIncident(FROM_DT, TO_DT);
+        return this.service.findAllTrafficCongest(FROM_DT, TO_DT);
     }
 
-    @ApiOperation(value = "지/정체 현황", response = ReportTrafficCongestDto.class, responseContainer = "ArrayList")
-    @GetMapping(value = "/traffic/congest", produces = {"application/json; charset=utf8"})
-    public List<ReportTrafficCongestDto> findAllTrafficCongest(
-            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220112000000", required = true)
+    @ApiOperation(value = "교통보고서-돌발 현황", response = ReportTrafficIncidentDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/traffic/incident", produces = {"application/json; charset=utf8"})
+    public List<ReportTrafficIncidentDto> findAllTrafficIncident(
+            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220127000000", required = true)
             @RequestParam String FROM_DT,
-            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220112235959", required = true)
+            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24MI59)", example = "20220127235959", required = true)
             @RequestParam String TO_DT) {
 
-        return this.service.findAllTrafficCongest(FROM_DT, TO_DT);
+        return this.service.findAllTrafficIncident(FROM_DT, TO_DT);
     }
 
 }

src/main/java/com/its/api/op/model/dto/report/ReportFacilityErrorDto.java

@@ -2,25 +2,33 @@ package com.its.api.op.model.dto.report;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("ReportFacilityErrorDto(시설물보고서-장애 현황)")
-public class ReportFacilityErrorDto {
+public class ReportFacilityErrorDto  implements Serializable {
+    @ApiModelProperty("일련번호")
     @JsonProperty("fclt_seq")
     private int    FCLT_SEQ;
+    @ApiModelProperty("시설물유형")
     @JsonProperty("fclt_type")
     private String FCLT_TYPE;
+    @ApiModelProperty("시설물 ID")
     @JsonProperty("fclt_id")
     private String FCLT_ID;
+    @ApiModelProperty("시설물명")
     @JsonProperty("fclt_nm")
     private String FCLT_NM;
+    @ApiModelProperty("등록시각")
     @JsonProperty("rgst_dt")
     private String RGST_DT;
 }

src/main/java/com/its/api/op/model/dto/report/ReportFacilitySummaryDto.java

@@ -2,20 +2,27 @@ package com.its.api.op.model.dto.report;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.io.Serializable;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("ReportFacilitySummaryDto(시설물보고서-현황)")
-public class ReportFacilitySummaryDto {
+@ApiModel("ReportFacilitySummaryDto(시설물보고서-시설물 현황)")
+public class ReportFacilitySummaryDto  implements Serializable {
+    @ApiModelProperty("일련번호")
     @JsonProperty("fclt_seq")
     private int    FCLT_SEQ;
+    @ApiModelProperty("시설물 유형")
     @JsonProperty("fclt_type")
     private String FCLT_TYPE;
+    @ApiModelProperty("정상건수")
     @JsonProperty("cms0_cnt")
     private int    CMS0_CNT;
+    @ApiModelProperty("장애건수")
     @JsonProperty("cms1_cnt")
     private int    CMS1_CNT;
 }

src/main/java/com/its/api/op/model/dto/report/ReportTrafficCongestDto.java

@@ -2,20 +2,27 @@ package com.its.api.op.model.dto.report;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.io.Serializable;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("ReportTrafficCongestDto(교통보고서-지/정체 현황)")
-public class ReportTrafficCongestDto {
+public class ReportTrafficCongestDto  implements Serializable {
+    @ApiModelProperty("링크 ID")
     @JsonProperty("link_id")
     private String LINK_ID;
+    @ApiModelProperty("가공시각")
     @JsonProperty("prcn_Dt")
     private String PRCN_DT;
+    @ApiModelProperty("소통등급")
     @JsonProperty("cmtr_grad_cd")
     private String CMTR_GRAD_CD;
+    @ApiModelProperty("속도")
     @JsonProperty("sped")
     private int    SPED;
 }

src/main/java/com/its/api/op/model/dto/report/ReportTrafficIncidentDto.java

@@ -2,20 +2,27 @@ package com.its.api.op.model.dto.report;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.io.Serializable;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel("ReportTrafficIncidentDto(교통보고서-돌발 현황)")
-public class ReportTrafficIncidentDto {
+public class ReportTrafficIncidentDto  implements Serializable {
+    @ApiModelProperty("돌발시작시각")
     @JsonProperty("incd_strt_dt")
     private String INCD_STRT_DT;
+    @ApiModelProperty("돌발유형")
     @JsonProperty("cmmn_cd_kor_nm")
     private String CMMN_CD_KOR_NM;
+    @ApiModelProperty("링크 ID")
     @JsonProperty("link_id")
     private String LINK_ID;
+    @ApiModelProperty("돌발내용")
     @JsonProperty("incd_titl")
     private String INCD_TITL;
 }

src/main/java/com/its/api/op/repository/link/LinkParaClctSystRepository.java → src/main/java/com/its/api/op/repository/link/TbLinkParaClctSystRepository.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface LinkParaClctSystRepository extends JpaRepository<LinkParaClctSyst, LinkParaClctSystKey> {
+public interface TbLinkParaClctSystRepository extends JpaRepository<LinkParaClctSyst, LinkParaClctSystKey> {
 
     @Query(value = "select distinct p from LinkParaClctSyst p where p.LINK_ID = ?1")
     List<LinkParaClctSyst> findListById(Long LINK_ID);

src/main/java/com/its/api/op/repository/link/LinkParaDetlRepository.java → src/main/java/com/its/api/op/repository/link/TbLinkParaDetlRepository.java

@@ -5,5 +5,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface LinkParaDetlRepository extends JpaRepository<LinkParaDetl, Long> {
+public interface TbLinkParaDetlRepository extends JpaRepository<LinkParaDetl, Long> {
 }

src/main/java/com/its/api/op/repository/link/LinkParaStupRepository.java → src/main/java/com/its/api/op/repository/link/TbLinkParaStupRepository.java

@@ -5,5 +5,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface LinkParaStupRepository extends JpaRepository<LinkParaStup, Long> {
+public interface TbLinkParaStupRepository extends JpaRepository<LinkParaStup, Long> {
 }

src/main/java/com/its/api/op/service/link/LinkParaClctSystService.java

@@ -4,7 +4,7 @@ import com.its.api.op.model.dto.link.LinkParaClctSystDto;
 import com.its.api.op.model.entity.link.LinkParaClctSyst;
 import com.its.api.op.model.entity.link.TbLink;
 import com.its.api.op.repository.dao.LinkPrcsParaDao;
-import com.its.api.op.repository.link.LinkParaClctSystRepository;
+import com.its.api.op.repository.link.TbLinkParaClctSystRepository;
 import com.its.api.op.repository.link.TbLinkRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +20,7 @@ import java.util.List;
 @Service
 public class LinkParaClctSystService {
 
-    private final LinkParaClctSystRepository repo;
+    private final TbLinkParaClctSystRepository repo;
     private final TbLinkRepository linkRepo;
     private final LinkPrcsParaDao dao;
 

src/main/java/com/its/api/op/service/link/LinkParaDetlService.java

@@ -3,7 +3,7 @@ package com.its.api.op.service.link;
 import com.its.api.op.model.dto.link.LinkParaDetlDto;
 import com.its.api.op.model.entity.link.LinkParaDetl;
 import com.its.api.op.model.entity.link.TbLink;
-import com.its.api.op.repository.link.LinkParaDetlRepository;
+import com.its.api.op.repository.link.TbLinkParaDetlRepository;
 import com.its.api.op.repository.link.TbLinkRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,7 @@ import java.util.Optional;
 @Service
 public class LinkParaDetlService {
 
-    private final LinkParaDetlRepository repo;
+    private final TbLinkParaDetlRepository repo;
     private final TbLinkRepository linkRepo;
 
     public List<LinkParaDetl> findAll() {

src/main/java/com/its/api/op/service/link/LinkParaStupService.java

@@ -3,7 +3,7 @@ package com.its.api.op.service.link;
 import com.its.api.op.model.dto.link.LinkParaStupDto;
 import com.its.api.op.model.entity.link.LinkParaStup;
 import com.its.api.op.model.entity.link.TbLink;
-import com.its.api.op.repository.link.LinkParaStupRepository;
+import com.its.api.op.repository.link.TbLinkParaStupRepository;
 import com.its.api.op.repository.link.TbLinkRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,7 @@ import java.util.Optional;
 @Service
 public class LinkParaStupService {
 
-    private final LinkParaStupRepository repo;
+    private final TbLinkParaStupRepository repo;
     private final TbLinkRepository linkRepo;
 
     public List<LinkParaStup> findAll() {

src/main/java/com/its/api/op/service/link/LinkPrcsParaService.java

@@ -7,9 +7,9 @@ import com.its.api.op.model.entity.link.LinkParaDetl;
 import com.its.api.op.model.entity.link.LinkParaStup;
 import com.its.api.op.model.entity.link.TbLink;
 import com.its.api.op.repository.dao.LinkPrcsParaDao;
-import com.its.api.op.repository.link.LinkParaClctSystRepository;
-import com.its.api.op.repository.link.LinkParaDetlRepository;
-import com.its.api.op.repository.link.LinkParaStupRepository;
+import com.its.api.op.repository.link.TbLinkParaClctSystRepository;
+import com.its.api.op.repository.link.TbLinkParaDetlRepository;
+import com.its.api.op.repository.link.TbLinkParaStupRepository;
 import com.its.api.op.repository.link.TbLinkRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,9 +24,9 @@ import java.util.Optional;
 @Service
 public class LinkPrcsParaService {
 
-    private final LinkParaStupRepository stupRepo;
-    private final LinkParaDetlRepository detlRepo;
-    private final LinkParaClctSystRepository systRepo;
+    private final TbLinkParaStupRepository stupRepo;
+    private final TbLinkParaDetlRepository detlRepo;
+    private final TbLinkParaClctSystRepository systRepo;
 
     private final TbLinkRepository linkRepo;
     private final LinkPrcsParaDao dao;

src/main/java/com/its/api/op/service/vms/TbVmsDsplHsService.java

@@ -90,38 +90,45 @@ public class TbVmsDsplHsService {
                 try {
                     dto.setImagData(createVmsDsplImage(dto.getImagFmt(), obj.getVms(), id, obj.getVmsDsplMsgData(), obj.getDsplPhaseNum()));
                     result.add(dto);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } catch (ImageReadException e) {
-                    e.printStackTrace();
+                } catch (IOException | ImageReadException e) {
+                    log.error("{}", e.getMessage());
                 }
             });
         }
         return result;
     }
 
+    /**
+     * VMS 이미지를 그린다
+     * @param imagFmt
+     * @param obj
+     * @param id
+     * @param msgData
+     * @param phaseNum
+     * @return
+     * @throws IOException
+     * @throws ImageReadException
+     */
     public byte[] createVmsDsplImage(String imagFmt, TbVmsCtlr obj, Long id, String msgData, int phaseNum) throws IOException, ImageReadException {
+
         String saveDir = ItsUtils.createUserDir("/image/vms/dspl-hs/");
         if (obj == null || obj.getType() == null) {
             log.error("Not Found VMS Controller: {}, {}", id, obj);
             return null;
         }
 
-        //log.error("msgData: {}, {}", phaseNum, msgData);
-
         //int formKind  = Integer.parseInt(msgData.substring(0, 2), 16);
         //int dispTime  = Integer.parseInt(msgData.substring(2, 4), 16);
         int formColor = Integer.parseInt(msgData.substring(4, 6), 16);
-        //log.error("{}, {}, {}", formKind, dispTime, formColor);
 
         /**
          * 배경 이미지를 만든다.
          */
         int width = obj.getType().getVmsWdth();
         int height = obj.getType().getVmsHght();
-        //BufferedImage imgBack = createBitmap(obj.getType().getVmsWdth(), obj.getType().getVmsHght(), getCodeColor(formColor));
-        BufferedImage formImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);//TYPE_INT_ARGB);
-        Graphics2D 	g2d = (Graphics2D)formImage.getGraphics();
+        // TYPE_INT_ARGB specifies the image format: 8-bit RGBA packed
+        BufferedImage formImage = new BufferedImage(width, height, (imagFmt.equals("png") ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB));
+        Graphics2D 	g2d = (Graphics2D)formImage.createGraphics();  //createGraphics();getGraphics();
         //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setColor(getColor(formColor));
         g2d.fillRect(0, 0, width, height);
@@ -148,19 +155,19 @@ public class TbVmsDsplHsService {
 
                     /**
                      * 문자를 이미지에 그린다.
+                     * 1.35f : 텍스트상자 패딩값
                      */
-                    //int screenRes = Toolkit.getDefaultToolkit().getScreenResolution();
-                    //fontSize = (int)Math.round(fontSize * screenRes / 72.0);
-
                     //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                    fontSize = (int)(fontSize * (float)1.35);
-                    int fontStyle = fontBold == 1 ? Font.BOLD : Font.PLAIN;
+                    //g2d.setFont(g2d.getFont().deriveFont(g2d.getFont().getSize() * 1.35f));
+                    int fontStyle = (fontBold == 1) ? Font.BOLD : Font.PLAIN;
                     Font txtFont = new Font(getFontName(fontName), fontStyle, fontSize);
+                    txtFont = txtFont.deriveFont(fontSize * 1.35f);
                     g2d.setFont(txtFont);
+                    FontMetrics fm = g2d.getFontMetrics(txtFont);
                     g2d.setColor(getColor(fontColor));
-                    /*FontMetrics fontMetrics = g2d.getFontMetrics(txtFont);
-                    g2d.drawString(text, left, top + fontMetrics.getHeight() - fontMetrics.getDescent() - fontMetrics.getLeading());*/
-                    g2d.drawString(text, left, top + fontSize);
+                    g2d.drawString(text, left, top + fm.getAscent());//fm.getHeight() - fm.getDescent() - fm.getLeading());
+                    //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                    //g2d.drawString(text, left, top + fontSize);
                 }
                 else if (objType == 2) {    // symbol id
                     String symbLibId = tmp.substring(16, tmp.length());
@@ -215,7 +222,7 @@ public class TbVmsDsplHsService {
                                             floodFill.fill(cellX, cellY, getTrafColor(gradF));
                                         }
                                     }
-                                    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                                    //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                                     g2d.drawImage(floodFill.getImage(), left, top, imgBmp.getWidth(null), imgBmp.getHeight(null), null);
                                 }
                             }
@@ -231,7 +238,6 @@ public class TbVmsDsplHsService {
             }
         }
 
-        //ItsUtils.saveImageFile(formImage, "bmp", saveDir+phaseNum + ".bmp");
         ItsUtils.saveImageFile(formImage, imagFmt, saveDir + obj.getVmsCtlrNmbr() + "_" + phaseNum + "." + imagFmt);
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -280,13 +286,5 @@ public class TbVmsDsplHsService {
         if (grad == 3) return Color.RED;
         return Color.GRAY;
     }
-    public BufferedImage createBitmap(int w, int h, int bkColor) {
-        final BufferedImage res = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
-        for (int x = 0; x < w; x++){
-            for (int y = 0; y < h; y++){
-                res.setRGB(x, y, bkColor);
-            }
-        }
-        return res;
-    }
+
 }

src/main/resources/mybatis/mapper/analysis/ClctResultMapper.xml

@@ -11,7 +11,7 @@
 -->
 
     <select id="findAllByDateRange" parameterType="java.util.HashMap" resultType="com.its.api.op.model.dto.analysis.ClctResultDto">
-        SELECT PRCN_DT, 
+        SELECT PRCN_DT
                ,SUM(OPER01)+SUM(VDS01)+SUM(MOCT01)+SUM(UTIS01)+SUM(UTIS02) AS CLCT_TOT
                ,SUM(OPER01) AS OPER01
                ,SUM(VDS01)  AS VDS01