From d42d215665646f8e8ee95a559ea60b8417d75e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 28 Feb 2023 09:42:56 +0900 Subject: [PATCH] =?UTF-8?q?sri=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/FileController.java | 5 +---- .../{fpiMgt/sri => faRpt}/SriController.java | 8 ++++---- .../{fpiMgt/sri => faRpt}/mapper/SriMapper.java | 4 ++-- .../main/{fpiMgt/sri => faRpt}/model/Sri.java | 3 +-- .../{fpiMgt/sri => faRpt}/model/SriFile.java | 2 +- .../sri => faRpt}/model/SriReadUser.java | 2 +- .../repository/SriFileRepository.java | 4 ++-- .../repository/SriReadUserRepository.java | 4 ++-- .../sri => faRpt}/repository/SriRepository.java | 4 ++-- .../sri => faRpt}/service/SriService.java | 17 ++++++++--------- src/main/resources/mybatisMapper/SriMapper.xml | 2 +- 11 files changed, 25 insertions(+), 30 deletions(-) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/SriController.java (96%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/mapper/SriMapper.java (66%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/model/Sri.java (97%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/model/SriFile.java (96%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/model/SriReadUser.java (96%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/repository/SriFileRepository.java (76%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/repository/SriReadUserRepository.java (73%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/repository/SriRepository.java (58%) rename src/main/java/com/dbnt/faisp/main/{fpiMgt/sri => faRpt}/service/SriService.java (89%) diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 1d338d98..6e81561a 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -9,12 +9,11 @@ import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService; import com.dbnt.faisp.main.fpiMgt.monitoring.service.MonitoringService; -import com.dbnt.faisp.main.fpiMgt.sri.service.SriService; +import com.dbnt.faisp.main.faRpt.service.SriService; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService; import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; @@ -23,7 +22,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.FileCopyUtils; import org.springframework.web.bind.annotation.*; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -31,7 +29,6 @@ import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java b/src/main/java/com/dbnt/faisp/main/faRpt/SriController.java similarity index 96% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java rename to src/main/java/com/dbnt/faisp/main/faRpt/SriController.java index 6e03680a..545f5f20 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/SriController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.main.fpiMgt.sri; +package com.dbnt.faisp.main.faRpt; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.faRpt.model.FaRptReadUser; -import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; -import com.dbnt.faisp.main.fpiMgt.sri.model.SriReadUser; -import com.dbnt.faisp.main.fpiMgt.sri.service.SriService; +import com.dbnt.faisp.main.faRpt.model.Sri; +import com.dbnt.faisp.main.faRpt.model.SriReadUser; +import com.dbnt.faisp.main.faRpt.service.SriService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/mapper/SriMapper.java b/src/main/java/com/dbnt/faisp/main/faRpt/mapper/SriMapper.java similarity index 66% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/mapper/SriMapper.java rename to src/main/java/com/dbnt/faisp/main/faRpt/mapper/SriMapper.java index aefcbba8..93e82ca0 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/mapper/SriMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/mapper/SriMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.fpiMgt.sri.mapper; +package com.dbnt.faisp.main.faRpt.mapper; -import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; +import com.dbnt.faisp.main.faRpt.model.Sri; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/Sri.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/Sri.java similarity index 97% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/Sri.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/Sri.java index 3877df58..a6539cb9 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/Sri.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/Sri.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.fpiMgt.sri.model; +package com.dbnt.faisp.main.faRpt.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; @@ -11,7 +11,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.persistence.*; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriFile.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/SriFile.java similarity index 96% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriFile.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/SriFile.java index 6038058a..c467e972 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriFile.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/SriFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.fpiMgt.sri.model; +package com.dbnt.faisp.main.faRpt.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriReadUser.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/SriReadUser.java similarity index 96% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriReadUser.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/SriReadUser.java index fd2bef64..d7c9ae0d 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/model/SriReadUser.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/SriReadUser.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.fpiMgt.sri.model; +package com.dbnt.faisp.main.faRpt.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriFileRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/SriFileRepository.java similarity index 76% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriFileRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/SriFileRepository.java index db866a29..94fcd6de 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/SriFileRepository.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.main.fpiMgt.sri.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.main.fpiMgt.sri.model.SriFile; +import com.dbnt.faisp.main.faRpt.model.SriFile; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriReadUserRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/SriReadUserRepository.java similarity index 73% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriReadUserRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/SriReadUserRepository.java index 853569c8..003d516d 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriReadUserRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/SriReadUserRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.fpiMgt.sri.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.main.fpiMgt.sri.model.SriReadUser; +import com.dbnt.faisp.main.faRpt.model.SriReadUser; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/SriRepository.java similarity index 58% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/SriRepository.java index 8f4ac10c..7f410185 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/repository/SriRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/SriRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.main.fpiMgt.sri.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; +import com.dbnt.faisp.main.faRpt.model.Sri; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java b/src/main/java/com/dbnt/faisp/main/faRpt/service/SriService.java similarity index 89% rename from src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java rename to src/main/java/com/dbnt/faisp/main/faRpt/service/SriService.java index 91726b5b..994499e3 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/service/SriService.java @@ -1,19 +1,18 @@ -package com.dbnt.faisp.main.fpiMgt.sri.service; +package com.dbnt.faisp.main.faRpt.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.main.fpiMgt.sri.mapper.SriMapper; -import com.dbnt.faisp.main.fpiMgt.sri.model.Sri; -import com.dbnt.faisp.main.fpiMgt.sri.model.SriFile; -import com.dbnt.faisp.main.fpiMgt.sri.model.SriReadUser; -import com.dbnt.faisp.main.fpiMgt.sri.repository.SriFileRepository; -import com.dbnt.faisp.main.fpiMgt.sri.repository.SriReadUserRepository; -import com.dbnt.faisp.main.fpiMgt.sri.repository.SriRepository; +import com.dbnt.faisp.main.faRpt.mapper.SriMapper; +import com.dbnt.faisp.main.faRpt.model.Sri; +import com.dbnt.faisp.main.faRpt.model.SriFile; +import com.dbnt.faisp.main.faRpt.model.SriReadUser; +import com.dbnt.faisp.main.faRpt.repository.SriFileRepository; +import com.dbnt.faisp.main.faRpt.repository.SriReadUserRepository; +import com.dbnt.faisp.main.faRpt.repository.SriRepository; import com.dbnt.faisp.main.userInfo.model.UserAlarm; import com.dbnt.faisp.main.userInfo.service.UserAlarmService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/resources/mybatisMapper/SriMapper.xml b/src/main/resources/mybatisMapper/SriMapper.xml index 816edb29..68cf019f 100644 --- a/src/main/resources/mybatisMapper/SriMapper.xml +++ b/src/main/resources/mybatisMapper/SriMapper.xml @@ -3,7 +3,7 @@ - +