shjung пре 2 година
родитељ
комит
21f37842f1

+ 7 - 0
src/main/java/com/its/op/controller/its/facility/TbUserMsgController.java

@@ -1,5 +1,6 @@
 package com.its.op.controller.its.facility;
 
+import com.its.op.dto.its.common.NewIdLongDto;
 import com.its.op.dto.its.oper.TbUserMsgDto;
 import com.its.op.dto.its.oper.TbUserMsgToDto;
 import com.its.op.entity.its.oper.TbUserMsgToKey;
@@ -75,6 +76,12 @@ public class TbUserMsgController {
         return this.service.findAllListHistory(FROM_DT, TO_DT);
     }
 
+    @ApiOperation(value = "유지보수 신규 메시지 번호 조회(TB_USER_MSG)", response = NewIdLongDto.class)
+    @GetMapping(value = "/new-id", produces = {"application/json; charset=utf8"})
+    public NewIdLongDto getNewMsgNmbr() {
+        return this.service.getNewMsgNmbr();
+    }
+
     /**
      * 사용자 메시지 대상 테이블 Controller
      * @param msgNmbr

+ 4 - 1
src/main/java/com/its/op/dao/repository/its/oper/TbUserMsgRepository.java

@@ -18,10 +18,13 @@ public interface TbUserMsgRepository extends JpaRepository<TbUserMsg, Long>, Jpa
     @Query("select p from TbUserMsg p")
     List<TbUserMsg> findAllList();
 
-    @Query("select p from TbUserMsg p where p.msgNmbr in (select t.msgNmbr from TbUserMsgTo t where t.userId = :userId and t.cnfmYn = 'N') and p.strDt >= to_char(sysdate, 'YYYYMMDDHH24MISS') and p.endDt <= to_char(sysdate, 'YYYYMMDDHH24MISS')")
+    @Query("select p from TbUserMsg p where p.msgNmbr in (select t.msgNmbr from TbUserMsgTo t where t.userId = :userId and t.cnfmYn = 'N') and p.strDt <= to_char(sysdate, 'YYYYMMDDHH24MISS') and p.endDt >= to_char(sysdate, 'YYYYMMDDHH24MISS')")
     List<TbUserMsg> findAllListNotify(@Param("userId") String userId);
 
     @Query("select p from TbUserMsg p where p.regDt between :fromDt and :toDt")
     List<TbUserMsg> findAllListHistory(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
+    @Query(value = "SELECT NVL(MAX(MSG_NMBR), 0) + 1 AS NEWID FROM TB_USER_MSG", nativeQuery = true)
+    Long getNewMsgNmbr();
+
 }

+ 10 - 0
src/main/java/com/its/op/service/its/oper/TbUserMsgService.java

@@ -1,6 +1,7 @@
 package com.its.op.service.its.oper;
 
 import com.its.op.dao.repository.its.oper.TbUserMsgRepository;
+import com.its.op.dto.its.common.NewIdLongDto;
 import com.its.op.dto.its.oper.TbUserMsgDto;
 import com.its.op.dto.its.oper.TbUserMsgToDto;
 import com.its.op.entity.its.oper.TbUserMsg;
@@ -144,4 +145,13 @@ public class TbUserMsgService {
     }
 
 
+    /**
+     * 사용자메시지 신규 메시지 번호 조회
+     * @return
+     */
+    @Transactional(readOnly = true)
+    public NewIdLongDto getNewMsgNmbr() {
+        Long newId = this.repo.getNewMsgNmbr();
+        return NewIdLongDto.builder().newId(newId).build();
+    }
 }