dev

src/main/java/com/its/op/controller/its/incident/TbIncdOcrrController.java

@@ -60,6 +60,19 @@ public class TbIncdOcrrController {
         return this.service.findAllProgressHistory(fromDt, toDt);
     }
 
+    @ApiOperation(value = "돌발 입력시각기준 이력정보조회(TB_INCD_OCRR)", response = TbIncdOcrrDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/history", produces = {"application/json; charset=utf8"})
+    public List<TbIncdOcrrDto> findAllHistory(
+            @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24)", example = "2021011200", required = true)
+            @RequestParam String FROM_DT,
+            @ApiParam(name = "TO_DT", value = "조회종료시각(YYYYMMDDHH24)", example = "2022061223", required = true)
+            @RequestParam String TO_DT
+    ) {
+        String fromDt = FROM_DT + "0000";
+        String toDt = TO_DT + "5959";
+        return this.service.findAllHistory(fromDt, toDt);
+    }
+
     @ApiOperation(value = "VMS 돌발상황 정보 조회(TB_INCD_OCRR_VMS)", response = TbIncdOcrrVmsDto.class)
     @GetMapping(value = "/vms/incd/{id}", produces = {"application/json; charset=utf8"})
     public TbIncdOcrrVmsDto findIncdOcrrVmsById(

src/main/java/com/its/op/dao/repository/its/incident/TbIncdOcrrRepository.java

@@ -18,6 +18,9 @@ public interface TbIncdOcrrRepository extends JpaRepository<TbIncdOcrr, String>,
     @Query("select p from TbIncdOcrr p where p.incdEndPrarDt between :fromDt and :toDt")
     List<TbIncdOcrr> findAllProgressHistory(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
+    @Query("select p from TbIncdOcrr p where p.rgstDt between :fromDt and :toDt")
+    List<TbIncdOcrr> findAllHistoryByRgstDt(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
+
     @Query("select p from TbIncdOcrr p where p.incdPrgrStepCd = 'ISS2' and p.incdStrtDt between :fromDt and :toDt")
     List<TbIncdOcrr> findAllProgressIncidentByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 

src/main/java/com/its/op/service/its/incident/TbIncdOcrrService.java

@@ -186,7 +186,27 @@ public class TbIncdOcrrService {
         data.forEach(obj -> {
             // 현재 진행중이거나 돌발종료 처리된 돌발 정보 조회
             if (CmmnCdManager.INCD_PRGR_STEP_ISS2.equals(obj.getIncdPrgrStepCd()) ||
-                CmmnCdManager.INCD_PRGR_STEP_ISS3.equals(obj.getIncdPrgrStepCd())) {
+                    CmmnCdManager.INCD_PRGR_STEP_ISS3.equals(obj.getIncdPrgrStepCd())) {
+                result.add(obj.toDto());
+            }
+        });
+        return result;
+    }
+
+    /**
+     * 돌발 입력시각 기준 이력정보조회
+     * @param fromDt
+     * @param toDt
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public List<TbIncdOcrrDto> findAllHistory(String fromDt, String toDt) {
+        List<TbIncdOcrrDto> result = new ArrayList<>();
+        List<TbIncdOcrr> data = this.repo.findAllHistoryByRgstDt(fromDt, toDt);
+        data.forEach(obj -> {
+            // 현재 진행중이거나 돌발종료 처리된 돌발 정보 조회
+            if (CmmnCdManager.INCD_PRGR_STEP_ISS2.equals(obj.getIncdPrgrStepCd()) ||
+                    CmmnCdManager.INCD_PRGR_STEP_ISS3.equals(obj.getIncdPrgrStepCd())) {
                 result.add(obj.toDto());
             }
         });

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

@@ -32,7 +32,7 @@ public class SHA256Util {
             MessageDigest md = MessageDigest.getInstance("SHA-256");
             //md.update(planText.getBytes());
             md.update(planText.getBytes(StandardCharsets.UTF_8));
-            byte byteData[] = md.digest();
+            byte[] byteData = md.digest();
             StringBuffer sb = new StringBuffer();
             for (int i = 0; i < byteData.length; i++) {
                 sb.append(Integer.toString((byteData[i] & 0xff) + 0x100, 16).substring(1));

src/main/resources/static/application/op/00.main/main-header.js

@@ -1374,7 +1374,7 @@ window.$Menu = _menuDataAll;
 window.$userId = getCookie('UUID');
 $(() => {
 
-    // window.$userId = 'ADMIN';
+    window.$userId = 'ADMIN';
     const uri = "/api/auth/menu-auth/" + window.$userId;
     getDataAsync(uri, fetchMenuAuth, null, null, true);
     

src/main/resources/static/application/op/00.main/main.html

@@ -270,7 +270,7 @@
                 $.ajax({
                     type: "POST",
                     dataType: "text",
-                    url: "/api/auth/keep-alive.do",
+                    url: _apiUrl + "/api/auth/keep-alive.do",
                     success: function (data) {
                         console.log("keep-alive: " + data + ", time : " + nowTime());
                     },