From 880a2487b6aa43d9b1b67d5cee3469523e88c1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 27 Oct 2022 09:02:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=82=AC=EC=8B=9C=EC=8A=A4=ED=85=9C?= =?UTF-8?q?=20=EC=97=B0=EB=8F=99=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +- .../com/dbnt/faisp/config/BaseController.java | 12 +- .../com/dbnt/faisp/config/FileController.java | 12 +- .../dbnt/faisp/config/KwmsDatabaseConfig.java | 59 ++++++ .../dbnt/faisp/config/MainDatabaseConfig.java | 64 +++++++ .../dbnt/faisp/config/ModalController.java | 10 +- .../com/dbnt/faisp/config/SecurityConfig.java | 16 +- .../com/dbnt/faisp/kwms/KwmsController.java | 21 +++ .../com/dbnt/faisp/kwms/model/VEmployee.java | 44 +++++ .../kwms/repository/VEmployeeRepository.java | 12 ++ .../dbnt/faisp/kwms/service/KwmsService.java | 40 ++++ .../{ => main}/authMgt/AuthMgtController.java | 13 +- .../authMgt/mapper/AuthMgtMapper.java | 7 +- .../authMgt/model/AccessConfig.java | 2 +- .../authMgt/model/ApprovalConfig.java | 2 +- .../{ => main}/authMgt/model/AuthMgt.java | 2 +- .../repository/AccessConfigRepository.java | 4 +- .../repository/ApprovalConfigRepository.java | 4 +- .../authMgt/service/AuthMgtService.java | 15 +- .../{ => main}/codeMgt/CodeMgtController.java | 6 +- .../{ => main}/codeMgt/model/CodeCatg.java | 2 +- .../{ => main}/codeMgt/model/CodeMgt.java | 2 +- .../repository/CodeCatgRepository.java | 4 +- .../codeMgt/repository/CodeMgtRepository.java | 4 +- .../codeMgt/service/CodeMgtService.java | 19 +- .../{ => main}/equip/EquipController.java | 20 +- .../{ => main}/equip/mapper/EquipMapper.java | 10 +- .../{ => main}/equip/model/CellPhone.java | 2 +- .../faisp/{ => main}/equip/model/Equip.java | 5 +- .../{ => main}/equip/model/EquipFile.java | 6 +- .../{ => main}/equip/model/EquipLog.java | 2 +- .../faisp/{ => main}/equip/model/UseList.java | 2 +- .../equip/repository/CellPhoneRepository.java | 4 +- .../equip/repository/EquipFileRepository.java | 4 +- .../equip/repository/EquipLogRepository.java | 4 +- .../equip/repository/EquipRepository.java | 4 +- .../equip/repository/UseListRepository.java | 4 +- .../equip/service/EquipService.java | 32 ++-- .../{ => main}/faRpt/FaRptController.java | 15 +- .../{ => main}/faRpt/mapper/FaRptMapper.java | 4 +- .../{ => main}/faRpt/model/FaRptBoard.java | 4 +- .../{ => main}/faRpt/model/FaRptFile.java | 2 +- .../{ => main}/faRpt/model/FaRptReadUser.java | 2 +- .../faRpt/model/HashTagLinkFaRpt.java | 2 +- .../repository/FaRptBoardRepository.java | 4 +- .../faRpt/repository/FaRptFileRepository.java | 4 +- .../repository/FaRptReadUserRepository.java | 4 +- .../HashTagLinkFaRptRepository.java | 4 +- .../faRpt/service/FaRptService.java | 22 +-- .../InternationalCrimeArrestController.java | 20 +- .../InternationalCrimeArrestMapper.java | 5 +- .../model/InternationalCrimeArrest.java | 2 +- .../model/SuspectPersonInfo.java | 2 +- .../InternationalCrimeArrestRepository.java | 4 +- .../SuspectPersonInfoRepository.java | 4 +- .../InternationalCrimeArrestService.java | 12 +- .../fipTarget/FipTargetController.java | 24 +-- .../fipTarget/mapper/FipTargetMapper.java | 10 +- .../{ => main}/fipTarget/model/PartInfo.java | 4 +- .../fipTarget/model/PartInfoFile.java | 6 +- .../{ => main}/fipTarget/model/PartWork.java | 2 +- .../fipTarget/model/PartWorkFile.java | 6 +- .../{ => main}/fipTarget/model/VulnFile.java | 6 +- .../fipTarget/model/Vulnerable.java | 2 +- .../repository/PartInfoFileRepository.java | 4 +- .../repository/PartInfoRepository.java | 4 +- .../repository/PartWorkFileRepository.java | 4 +- .../repository/PartWorkRepository.java | 4 +- .../repository/VulnFileRepository.java | 4 +- .../fipTarget/repository/VulnRepository.java | 4 +- .../fipTarget/service/FipTargetService.java | 39 ++-- .../fpiMgt/affair/AffairController.java | 17 +- .../fpiMgt/affair/mapper/AffairMapper.java | 6 +- .../fpiMgt/affair/model/AffairBoard.java | 2 +- .../fpiMgt/affair/model/AffairFile.java | 2 +- .../fpiMgt/affair/model/AffairRating.java | 2 +- .../fpiMgt/affair/model/HashTagLink.java | 2 +- .../fpiMgt/affair/model/TypeStatistics.java | 2 +- .../repository/AffairBoardRepository.java | 4 +- .../repository/AffairFileRepository.java | 4 +- .../repository/AffairRatingRepository.java | 4 +- .../repository/HashTagLinkRepository.java | 4 +- .../fpiMgt/affair/service/AffairService.java | 12 +- .../fpiMgt/affairPlan/PlanController.java | 14 +- .../fpiMgt/affairPlan/mapper/PlanMapper.java | 4 +- .../fpiMgt/affairPlan/model/PlanApprv.java | 2 +- .../fpiMgt/affairPlan/model/PlanBoard.java | 2 +- .../fpiMgt/affairPlan/model/PlanFile.java | 2 +- .../fpiMgt/affairPlan/model/PlanMainInfo.java | 2 +- .../repository/PlanApprvRepository.java | 4 +- .../repository/PlanBoardRepository.java | 4 +- .../repository/PlanFileRepository.java | 4 +- .../repository/PlanMainInfoRepository.java | 4 +- .../affairPlan/service/PlanService.java | 21 +-- .../fpiMgt/affairResult/ResultController.java | 22 +-- .../affairResult/mapper/ResultMapper.java | 7 +- .../fpiMgt/affairResult/model/ClearInfo.java | 3 +- .../affairResult/model/ResultApprv.java | 2 +- .../affairResult/model/ResultBoard.java | 4 +- .../fpiMgt/affairResult/model/ResultFile.java | 2 +- .../fpiMgt/affairResult/model/ResultInfo.java | 2 +- .../affairResult/model/ResultToAffair.java | 2 +- .../affairResult/model/ResultToPlan.java | 2 +- .../repository/ClearInfoRepository.java | 4 +- .../repository/ResultApprvRepository.java | 4 +- .../repository/ResultBoardRepository.java | 4 +- .../repository/ResultFileRepository.java | 4 +- .../repository/ResultInfoRepository.java | 4 +- .../repository/ResultToAffairRepository.java | 4 +- .../repository/ResultToPlanRepository.java | 4 +- .../affairResult/service/ResultService.java | 8 +- .../{ => main}/hashTag/model/HashTag.java | 2 +- .../hashTag/repository/HashTagRepository.java | 4 +- .../hashTag/service/HashTagService.java | 6 +- .../boardInvestigation/IvsgtController.java | 14 +- .../mapper/BoardInvestigationMapper.java | 8 +- .../boardInvestigation/model/ArrestType.java | 2 +- .../model/BoardInvestigation.java | 2 +- .../model/HashTagLinkIvsgt.java | 2 +- .../boardInvestigation/model/IvsgtFile.java | 2 +- .../model/RelatedReports.java | 2 +- .../repository/ArrestTypeRepository.java | 4 +- .../BoardInvestigationRepository.java | 4 +- .../HashTagLinkIvsgtRepository.java | 4 +- .../repository/IvsgtFileRepository.java | 4 +- .../repository/RelatedReportsRepository.java | 4 +- .../service/BoardInvestigationService.java | 10 +- .../{ => main}/menuMgt/MenuMgtController.java | 8 +- .../menuMgt/mapper/MenuMgtMapper.java | 4 +- .../{ => main}/menuMgt/model/MenuMgt.java | 2 +- .../menuMgt/repository/MenuMgtRepository.java | 11 ++ .../menuMgt/service/MenuMgtService.java | 10 +- .../organMgt/OrganConfigController.java | 12 +- .../organMgt/mapper/OrganConfigMapper.java | 3 +- .../organMgt/model/OrganConfig.java | 3 +- .../repository/OrganConfigRepository.java | 4 +- .../organMgt/service/OrganConfigService.java | 8 +- .../publicBoard/PublicBoardController.java | 12 +- .../publicBoard/mapper/PublicBoardMapper.java | 4 +- .../publicBoard/model/PublicBoard.java | 2 +- .../publicBoard/model/PublicComment.java | 2 +- .../publicBoard/model/PublicFile.java | 2 +- .../repository/PublicBoardRepository.java | 4 +- .../repository/PublicCommentRepository.java | 4 +- .../repository/PublicFileRepository.java | 4 +- .../service/PublicBoardService.java | 16 +- .../translator/TranslatorController.java | 12 +- .../translator/mapper/TranslatorMapper.java | 6 +- .../translator/model/Translator.java | 2 +- .../translator/model/TranslatorCrr.java | 2 +- .../TranslatorCareerRepository.java | 4 +- .../repository/TranslatorRepository.java | 4 +- .../translator/service/TranslatorService.java | 14 +- .../{ => main}/userInfo/MyInfoController.java | 9 +- .../userInfo/UserInfoController.java | 6 +- .../userInfo/mapper/UserInfoMapper.java | 6 +- .../userInfo/model/DashboardConfig.java | 2 +- .../{ => main}/userInfo/model/UserInfo.java | 6 +- .../repository/DashboardConfigRepository.java | 4 +- .../repository/UserInfoRepository.java | 6 +- .../userInfo/service/UserInfoService.java | 15 +- .../userInfo/userMgtController.java | 8 +- .../menuMgt/repository/MenuMgtRepository.java | 9 - src/main/java/com/dbnt/faisp/util/Utils.java | 8 +- src/main/resources/application-dev.properties | 23 ++- .../resources/application-test.properties | 21 ++- .../resources/mybatisMapper/AffairMapper.xml | 2 +- .../resources/mybatisMapper/AuthMgtMapper.xml | 2 +- .../BoardInvestigationMapper.xml | 2 +- .../resources/mybatisMapper/EquipMapper.xml | 2 +- .../resources/mybatisMapper/FaRptMapper.xml | 2 +- .../resources/mybatisMapper/FipTarget.xml | 2 +- .../InternationalCrimeArrestMapper.xml | 2 +- .../mybatisMapper/OrganConfigMapper.xml | 2 +- .../resources/mybatisMapper/PlanMapper.xml | 2 +- .../mybatisMapper/PublicBoardMapper.xml | 2 +- .../resources/mybatisMapper/ResultMapper.xml | 2 +- .../mybatisMapper/TranslatorMapper.xml | 2 +- .../mybatisMapper/UserInfoMapper.xml | 2 +- .../resources/mybatisMapper/menuMgtMapper.xml | 2 +- src/main/resources/static/js/login/login.js | 36 +++- src/main/resources/templates/login/login.html | 177 +++++++++--------- 182 files changed, 892 insertions(+), 635 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java create mode 100644 src/main/java/com/dbnt/faisp/config/MainDatabaseConfig.java create mode 100644 src/main/java/com/dbnt/faisp/kwms/KwmsController.java create mode 100644 src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java create mode 100644 src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java create mode 100644 src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/AuthMgtController.java (82%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/mapper/AuthMgtMapper.java (60%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/model/AccessConfig.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/model/ApprovalConfig.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/model/AuthMgt.java (81%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/repository/AccessConfigRepository.java (62%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/repository/ApprovalConfigRepository.java (63%) rename src/main/java/com/dbnt/faisp/{ => main}/authMgt/service/AuthMgtService.java (72%) rename src/main/java/com/dbnt/faisp/{ => main}/codeMgt/CodeMgtController.java (84%) rename src/main/java/com/dbnt/faisp/{ => main}/codeMgt/model/CodeCatg.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/codeMgt/model/CodeMgt.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/codeMgt/repository/CodeCatgRepository.java (59%) rename src/main/java/com/dbnt/faisp/{ => main}/codeMgt/repository/CodeMgtRepository.java (81%) rename src/main/java/com/dbnt/faisp/{ => main}/codeMgt/service/CodeMgtService.java (77%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/EquipController.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/mapper/EquipMapper.java (80%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/model/CellPhone.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/model/Equip.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/model/EquipFile.java (88%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/model/EquipLog.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/model/UseList.java (98%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/repository/CellPhoneRepository.java (61%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/repository/EquipFileRepository.java (68%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/repository/EquipLogRepository.java (61%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/repository/EquipRepository.java (77%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/repository/UseListRepository.java (80%) rename src/main/java/com/dbnt/faisp/{ => main}/equip/service/EquipService.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/FaRptController.java (92%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/mapper/FaRptMapper.java (74%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/model/FaRptBoard.java (92%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/model/FaRptFile.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/model/FaRptReadUser.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/model/HashTagLinkFaRpt.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/repository/FaRptBoardRepository.java (60%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/repository/FaRptFileRepository.java (77%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/repository/FaRptReadUserRepository.java (75%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/repository/HashTagLinkFaRptRepository.java (69%) rename src/main/java/com/dbnt/faisp/{ => main}/faRpt/service/FaRptService.java (88%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java (91%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java (76%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java (50%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java (80%) rename src/main/java/com/dbnt/faisp/{ => main}/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java (85%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/FipTargetController.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/mapper/FipTargetMapper.java (82%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/model/PartInfo.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/model/PartInfoFile.java (89%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/model/PartWork.java (98%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/model/PartWorkFile.java (89%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/model/VulnFile.java (88%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/model/Vulnerable.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/repository/PartInfoFileRepository.java (84%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/repository/PartInfoRepository.java (70%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/repository/PartWorkFileRepository.java (84%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/repository/PartWorkRepository.java (75%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/repository/VulnFileRepository.java (79%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/repository/VulnRepository.java (58%) rename src/main/java/com/dbnt/faisp/{ => main}/fipTarget/service/FipTargetService.java (92%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/AffairController.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/mapper/AffairMapper.java (83%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/model/AffairBoard.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/model/AffairFile.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/model/AffairRating.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/model/HashTagLink.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/model/TypeStatistics.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/repository/AffairBoardRepository.java (57%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/repository/AffairFileRepository.java (75%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/repository/AffairRatingRepository.java (70%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/repository/HashTagLinkRepository.java (65%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affair/service/AffairService.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/PlanController.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/mapper/PlanMapper.java (66%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/model/PlanApprv.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/model/PlanBoard.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/model/PlanFile.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/model/PlanMainInfo.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/repository/PlanApprvRepository.java (73%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/repository/PlanBoardRepository.java (55%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/repository/PlanFileRepository.java (73%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java (67%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairPlan/service/PlanService.java (86%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/ResultController.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/mapper/ResultMapper.java (57%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ClearInfo.java (90%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ResultApprv.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ResultBoard.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ResultFile.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ResultInfo.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ResultToAffair.java (92%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/model/ResultToPlan.java (92%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ClearInfoRepository.java (69%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ResultApprvRepository.java (74%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ResultBoardRepository.java (54%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ResultFileRepository.java (74%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ResultInfoRepository.java (70%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ResultToAffairRepository.java (70%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/repository/ResultToPlanRepository.java (57%) rename src/main/java/com/dbnt/faisp/{ => main}/fpiMgt/affairResult/service/ResultService.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/hashTag/model/HashTag.java (91%) rename src/main/java/com/dbnt/faisp/{ => main}/hashTag/repository/HashTagRepository.java (69%) rename src/main/java/com/dbnt/faisp/{ => main}/hashTag/service/HashTagService.java (79%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/IvsgtController.java (90%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java (61%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/model/ArrestType.java (92%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java (91%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/model/IvsgtFile.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/model/RelatedReports.java (93%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java (51%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java (52%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java (61%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java (71%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java (80%) rename src/main/java/com/dbnt/faisp/{ => main}/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java (94%) rename src/main/java/com/dbnt/faisp/{ => main}/menuMgt/MenuMgtController.java (88%) rename src/main/java/com/dbnt/faisp/{ => main}/menuMgt/mapper/MenuMgtMapper.java (81%) rename src/main/java/com/dbnt/faisp/{ => main}/menuMgt/model/MenuMgt.java (96%) create mode 100644 src/main/java/com/dbnt/faisp/main/menuMgt/repository/MenuMgtRepository.java rename src/main/java/com/dbnt/faisp/{ => main}/menuMgt/service/MenuMgtService.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/organMgt/OrganConfigController.java (84%) rename src/main/java/com/dbnt/faisp/{ => main}/organMgt/mapper/OrganConfigMapper.java (73%) rename src/main/java/com/dbnt/faisp/{ => main}/organMgt/model/OrganConfig.java (90%) rename src/main/java/com/dbnt/faisp/{ => main}/organMgt/repository/OrganConfigRepository.java (72%) rename src/main/java/com/dbnt/faisp/{ => main}/organMgt/service/OrganConfigService.java (81%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/PublicBoardController.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/mapper/PublicBoardMapper.java (74%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/model/PublicBoard.java (97%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/model/PublicComment.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/model/PublicFile.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/repository/PublicBoardRepository.java (58%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/repository/PublicCommentRepository.java (79%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/repository/PublicFileRepository.java (76%) rename src/main/java/com/dbnt/faisp/{ => main}/publicBoard/service/PublicBoardService.java (89%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/TranslatorController.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/mapper/TranslatorMapper.java (80%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/model/Translator.java (98%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/model/TranslatorCrr.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/repository/TranslatorCareerRepository.java (80%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/repository/TranslatorRepository.java (71%) rename src/main/java/com/dbnt/faisp/{ => main}/translator/service/TranslatorService.java (91%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/MyInfoController.java (86%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/UserInfoController.java (77%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/mapper/UserInfoMapper.java (71%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/model/DashboardConfig.java (95%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/model/UserInfo.java (96%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/repository/DashboardConfigRepository.java (67%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/repository/UserInfoRepository.java (59%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/service/UserInfoService.java (90%) rename src/main/java/com/dbnt/faisp/{ => main}/userInfo/userMgtController.java (90%) delete mode 100644 src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java diff --git a/build.gradle b/build.gradle index 1225f8f2..29cb35be 100644 --- a/build.gradle +++ b/build.gradle @@ -28,13 +28,17 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web:2.7.2' implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2' implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE' + developmentOnly 'org.springframework.boot:spring-boot-devtools:2.7.2' + implementation 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4.1:1.16' + runtimeOnly 'org.postgresql:postgresql:42.3.6' + implementation 'com.oracle.database.jdbc:ojdbc8:21.7.0.0' + + //엑셀다운 implementation 'org.apache.poi:poi:4.1.0' implementation 'org.apache.poi:poi-ooxml:4.1.0' - - developmentOnly 'org.springframework.boot:spring-boot-devtools:2.7.2' - runtimeOnly 'org.postgresql:postgresql:42.3.6' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:2.7.2' annotationProcessor 'org.projectlombok:lombok:1.18.24' } diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 6fb3d4e4..26dbf3ec 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -1,11 +1,11 @@ package com.dbnt.faisp.config; -import com.dbnt.faisp.menuMgt.service.MenuMgtService; -import com.dbnt.faisp.organMgt.service.OrganConfigService; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; +import com.dbnt.faisp.main.organMgt.service.OrganConfigService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; @@ -39,6 +39,7 @@ public class BaseController { ModelAndView mav = new ModelAndView("login/login"); mav.addObject("OgList", codeMgtService.selectCodeMgtList("OG")); mav.addObject("OfcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); return mav; } @@ -47,6 +48,7 @@ public class BaseController { ModelAndView mav = new ModelAndView("login/login"); mav.addObject("OgList", codeMgtService.selectCodeMgtList("OG")); mav.addObject("OfcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); mav.addObject("loginError", true); return mav; } diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 058cc65e..d22e2af5 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -1,11 +1,11 @@ package com.dbnt.faisp.config; -import com.dbnt.faisp.faRpt.service.FaRptService; -import com.dbnt.faisp.fpiMgt.affair.service.AffairService; -import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService; -import com.dbnt.faisp.fpiMgt.affairResult.service.ResultService; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; -import com.dbnt.faisp.publicBoard.service.PublicBoardService; +import com.dbnt.faisp.main.faRpt.service.FaRptService; +import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; +import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; +import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; +import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; import lombok.RequiredArgsConstructor; import org.springframework.util.FileCopyUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java b/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java new file mode 100644 index 00000000..28cfe66b --- /dev/null +++ b/src/main/java/com/dbnt/faisp/config/KwmsDatabaseConfig.java @@ -0,0 +1,59 @@ +package com.dbnt.faisp.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; + +import javax.sql.DataSource; +import java.util.HashMap; + +@Configuration +@EnableJpaRepositories( + basePackages = "com.dbnt.faisp.kwms.repository", + entityManagerFactoryRef = "kwmsEntityManager", + transactionManagerRef = "kwmsTransactionManager" +) +public class KwmsDatabaseConfig { + @Autowired + private Environment env; + + @Bean + public LocalContainerEntityManagerFactoryBean kwmsEntityManager(){ + LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(kwmsDataSource()); + + //Entity 패키지 경로 + em.setPackagesToScan(new String[] { "com.dbnt.faisp.kwms.model" }); + + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + em.setJpaVendorAdapter(vendorAdapter); + + //Hibernate 설정 + HashMap properties = new HashMap<>(); + properties.put("hibernate.hbm2ddl.auto", "none"); + properties.put("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect"); + em.setJpaPropertyMap(properties); + return em; + } + + @Bean + @ConfigurationProperties(prefix="spring.datasource-kwms") + public DataSource kwmsDataSource() { + return DataSourceBuilder.create().build(); + } + + @Bean + public PlatformTransactionManager kwmsTransactionManager() { + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(kwmsEntityManager().getObject()); + return transactionManager; + } +} diff --git a/src/main/java/com/dbnt/faisp/config/MainDatabaseConfig.java b/src/main/java/com/dbnt/faisp/config/MainDatabaseConfig.java new file mode 100644 index 00000000..e2d74c22 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/config/MainDatabaseConfig.java @@ -0,0 +1,64 @@ +package com.dbnt.faisp.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; + +import javax.sql.DataSource; +import java.util.HashMap; + +@Configuration +@EnableJpaRepositories( + basePackages = "com.dbnt.faisp.main.**.repository", + entityManagerFactoryRef = "masterEntityManager", + transactionManagerRef = "masterTransactionManager" +) +public class MainDatabaseConfig { + @Autowired + private Environment env; + + @Bean + @Primary + public LocalContainerEntityManagerFactoryBean masterEntityManager(){ + LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(masterDataSource()); + + //Entity 패키지 경로 + em.setPackagesToScan(new String[] { "com.dbnt.faisp.main.**.model" }); + + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + em.setJpaVendorAdapter(vendorAdapter); + + //Hibernate 설정 + HashMap properties = new HashMap<>(); + properties.put("hibernate.hbm2ddl.auto", "none"); + properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect"); + em.setJpaPropertyMap(properties); + return em; + } + + @Primary + @Bean + @ConfigurationProperties(prefix="spring.datasource-main") + public DataSource masterDataSource() { + return DataSourceBuilder.create().build(); + } + + @Primary + @Bean + public PlatformTransactionManager masterTransactionManager() { + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(masterEntityManager().getObject()); + return transactionManager; + } +} diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index bdf2639d..e9b33221 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/src/main/java/com/dbnt/faisp/config/ModalController.java @@ -1,10 +1,10 @@ package com.dbnt.faisp.config; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.menuMgt.service.MenuMgtService; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.menuMgt.model.MenuMgt; +import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 1939c123..ecf2867b 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -1,6 +1,6 @@ package com.dbnt.faisp.config; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder; import org.springframework.security.web.AuthenticationEntryPoint; @@ -34,11 +33,6 @@ public class SecurityConfig{ return new Pbkdf2PasswordEncoder(); } - @Bean - public WebSecurityCustomizer webSecurityCustomizer() { - return (web) -> web.ignoring().antMatchers("/css/**", "/img/**", "/js/**", "/vendor/**"); - } - @Bean public AccessDeniedHandler accessDeniedHandler() { log.warn("accessDeniedHandler"); @@ -101,7 +95,13 @@ public class SecurityConfig{ "/codeMgt/**", "/menuMgt/**" ).hasRole(Role.ADMIN.name()) // ADMIN 접근 허용 - .antMatchers("/login").permitAll() // 로그인 페이지는 권한 없이 접근 허용 + .antMatchers( + "/login", + "/css/**", + "/img/**", + "/js/**", + "/vendor/**" + ).permitAll() // 로그인 페이지는 권한 없이 접근 허용 .and() // 로그인 설정 .formLogin().loginPage("/login") // Custom login form 사용 .failureUrl("/login-error") // 로그인 실패 시 이동 diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java new file mode 100644 index 00000000..a2241236 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -0,0 +1,21 @@ +package com.dbnt.faisp.kwms; + +import com.dbnt.faisp.kwms.model.VEmployee; +import com.dbnt.faisp.kwms.service.KwmsService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/kwms") +public class KwmsController { + private final KwmsService kwmsService; + + @GetMapping("/getEmpInfo") + public UserInfo getEmpInfo(VEmployee empInfo){ + return kwmsService.selectEmpInfo(empInfo.getDicCode()); + } +} diff --git a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java new file mode 100644 index 00000000..72e982ce --- /dev/null +++ b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java @@ -0,0 +1,44 @@ +package com.dbnt.faisp.kwms.model; + +import com.dbnt.faisp.config.BaseModel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "V_EMPLOYEE") +public class VEmployee extends BaseModel{ + @Id + @Column(name = "DIC_CODE") + private String dicCode; + @Column(name = "EMP_NM") + private String empNm; + @Column(name = "BIRTH_DATE") + private String birthDate; + @Column(name = "SEX") + private String sex; + @Column(name = "POLICE_BMNG_IL") + private String policeBmngIl; + @Column(name = "JIKGEUP") + private String jikgeup; + @Column(name = "HN_JIKGEUP_IMYNGIL") + private String hnJikgeupImyngil; + @Column(name = "CALL_BUSEO_NM") + private String callBuseoNm; + @Column(name = "SAYONG_YN") + private String sayongYn; + @Column(name = "GYUNGGWA") + private String gyunggwa; + @Column(name = "JIKBYUL") + private String jikbyul; + +} diff --git a/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java b/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java new file mode 100644 index 00000000..79c4b302 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/kwms/repository/VEmployeeRepository.java @@ -0,0 +1,12 @@ +package com.dbnt.faisp.kwms.repository; + +import com.dbnt.faisp.kwms.model.VEmployee; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + + +public interface VEmployeeRepository extends JpaRepository { + + Optional findByDicCode(String dicCode); +} diff --git a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java new file mode 100644 index 00000000..df0ac800 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java @@ -0,0 +1,40 @@ +package com.dbnt.faisp.kwms.service; + +import com.dbnt.faisp.kwms.model.VEmployee; +import com.dbnt.faisp.kwms.repository.VEmployeeRepository; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class KwmsService { + private final VEmployeeRepository vEmployeeRepository; + private final CodeMgtService codeMgtService; + + public UserInfo selectEmpInfo(String dicCode) { + VEmployee empInfo = vEmployeeRepository.findByDicCode(dicCode).orElse(null); + return convertVEmployeeToUserInfo(empInfo); + } + + private UserInfo convertVEmployeeToUserInfo(VEmployee empInfo){ + UserInfo userInfo = new UserInfo(); + userInfo.setDicCode(empInfo.getDicCode()); + userInfo.setUserNm(empInfo.getEmpNm()); + userInfo.setSex(empInfo.getSex()); + String[] positionAry = empInfo.getCallBuseoNm().split(" "); + userInfo.setOgCd(codeMgtService.searchCode("OG", positionAry[0])); + if (positionAry.length>1){ + userInfo.setOfcCd(codeMgtService.searchCode("OFC", positionAry[1])); + } + userInfo.setTitleCd(codeMgtService.searchCode("JT", empInfo.getJikgeup())); + userInfo.setOutturnCd(codeMgtService.searchCode("OTC", empInfo.getGyunggwa())); + userInfo.setSeriesCd(codeMgtService.searchCode("SRC", empInfo.getJikbyul())); + + return userInfo; + } +} diff --git a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java b/src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java similarity index 82% rename from src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java rename to src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java index a1f5ec2f..f0d23e4c 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/AuthMgtController.java @@ -1,16 +1,13 @@ -package com.dbnt.faisp.authMgt; +package com.dbnt.faisp.main.authMgt; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.authMgt.model.AuthMgt; -import com.dbnt.faisp.userInfo.service.UserInfoService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.authMgt.model.AuthMgt; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.util.HashMap; -import java.util.Map; - @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java b/src/main/java/com/dbnt/faisp/main/authMgt/mapper/AuthMgtMapper.java similarity index 60% rename from src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java rename to src/main/java/com/dbnt/faisp/main/authMgt/mapper/AuthMgtMapper.java index 6011cc1a..bb27eefc 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/mapper/AuthMgtMapper.java @@ -1,8 +1,7 @@ -package com.dbnt.faisp.authMgt.mapper; +package com.dbnt.faisp.main.authMgt.mapper; -import com.dbnt.faisp.authMgt.model.AccessConfig; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.model.AccessConfig; +import com.dbnt.faisp.main.authMgt.model.ApprovalConfig; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java b/src/main/java/com/dbnt/faisp/main/authMgt/model/AccessConfig.java similarity index 95% rename from src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java rename to src/main/java/com/dbnt/faisp/main/authMgt/model/AccessConfig.java index 91244430..1bee354d 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/model/AccessConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt.model; +package com.dbnt.faisp.main.authMgt.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java b/src/main/java/com/dbnt/faisp/main/authMgt/model/ApprovalConfig.java similarity index 95% rename from src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java rename to src/main/java/com/dbnt/faisp/main/authMgt/model/ApprovalConfig.java index 96f30841..00472a7d 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/model/ApprovalConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt.model; +package com.dbnt.faisp.main.authMgt.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/authMgt/model/AuthMgt.java b/src/main/java/com/dbnt/faisp/main/authMgt/model/AuthMgt.java similarity index 81% rename from src/main/java/com/dbnt/faisp/authMgt/model/AuthMgt.java rename to src/main/java/com/dbnt/faisp/main/authMgt/model/AuthMgt.java index 813349f1..d6b5b4c6 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/model/AuthMgt.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/model/AuthMgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt.model; +package com.dbnt.faisp.main.authMgt.model; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/authMgt/repository/AccessConfigRepository.java b/src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java similarity index 62% rename from src/main/java/com/dbnt/faisp/authMgt/repository/AccessConfigRepository.java rename to src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java index a3c484f9..418870bd 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/repository/AccessConfigRepository.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.authMgt.repository; +package com.dbnt.faisp.main.authMgt.repository; -import com.dbnt.faisp.authMgt.model.AccessConfig; +import com.dbnt.faisp.main.authMgt.model.AccessConfig; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/authMgt/repository/ApprovalConfigRepository.java b/src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java similarity index 63% rename from src/main/java/com/dbnt/faisp/authMgt/repository/ApprovalConfigRepository.java rename to src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java index c83ae095..106ea3e1 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/repository/ApprovalConfigRepository.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/repository/ApprovalConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.authMgt.repository; +package com.dbnt.faisp.main.authMgt.repository; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; +import com.dbnt.faisp.main.authMgt.model.ApprovalConfig; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java b/src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java similarity index 72% rename from src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java rename to src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java index 1344cfd3..14475192 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/authMgt/service/AuthMgtService.java @@ -1,12 +1,11 @@ -package com.dbnt.faisp.authMgt.service; +package com.dbnt.faisp.main.authMgt.service; -import com.dbnt.faisp.authMgt.mapper.AuthMgtMapper; -import com.dbnt.faisp.authMgt.model.AccessConfig; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; -import com.dbnt.faisp.authMgt.model.AuthMgt; -import com.dbnt.faisp.authMgt.repository.AccessConfigRepository; -import com.dbnt.faisp.authMgt.repository.ApprovalConfigRepository; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.mapper.AuthMgtMapper; +import com.dbnt.faisp.main.authMgt.model.AccessConfig; +import com.dbnt.faisp.main.authMgt.model.ApprovalConfig; +import com.dbnt.faisp.main.authMgt.model.AuthMgt; +import com.dbnt.faisp.main.authMgt.repository.AccessConfigRepository; +import com.dbnt.faisp.main.authMgt.repository.ApprovalConfigRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java b/src/main/java/com/dbnt/faisp/main/codeMgt/CodeMgtController.java similarity index 84% rename from src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java rename to src/main/java/com/dbnt/faisp/main/codeMgt/CodeMgtController.java index 22788e29..74044df4 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/CodeMgtController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.codeMgt; +package com.dbnt.faisp.main.codeMgt; -import com.dbnt.faisp.codeMgt.model.CodeCatg; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeCatg; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java b/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeCatg.java similarity index 93% rename from src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java rename to src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeCatg.java index e719bc81..64e8613e 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeCatg.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.codeMgt.model; +package com.dbnt.faisp.main.codeMgt.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java b/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java similarity index 95% rename from src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java rename to src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java index 0ce6f803..476cdc60 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.codeMgt.model; +package com.dbnt.faisp.main.codeMgt.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeCatgRepository.java similarity index 59% rename from src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java rename to src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeCatgRepository.java index 55c94e7f..258c9db1 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeCatgRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.codeMgt.repository; +package com.dbnt.faisp.main.codeMgt.repository; -import com.dbnt.faisp.codeMgt.model.CodeCatg; +import com.dbnt.faisp.main.codeMgt.model.CodeCatg; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java similarity index 81% rename from src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java rename to src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java index c34bb062..9d854026 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.codeMgt.repository; +package com.dbnt.faisp.main.codeMgt.repository; -import com.dbnt.faisp.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java similarity index 77% rename from src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java rename to src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java index c03b5591..3b256722 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java @@ -1,9 +1,9 @@ -package com.dbnt.faisp.codeMgt.service; +package com.dbnt.faisp.main.codeMgt.service; -import com.dbnt.faisp.codeMgt.model.CodeCatg; -import com.dbnt.faisp.codeMgt.model.CodeMgt; -import com.dbnt.faisp.codeMgt.repository.CodeCatgRepository; -import com.dbnt.faisp.codeMgt.repository.CodeMgtRepository; +import com.dbnt.faisp.main.codeMgt.model.CodeCatg; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.codeMgt.repository.CodeCatgRepository; +import com.dbnt.faisp.main.codeMgt.repository.CodeMgtRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -63,4 +63,13 @@ public class CodeMgtService{ public List selectCodeMgtList(String categoryCd) { return codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T"); } + public String searchCode(String categoryCd, String value){ + List codeList = selectCodeMgtList(categoryCd); + for(CodeMgt code: codeList){ + if(code.getItemValue().equals(value)){ + return code.getItemCd(); + } + } + return null; + } } diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java similarity index 97% rename from src/main/java/com/dbnt/faisp/equip/EquipController.java rename to src/main/java/com/dbnt/faisp/main/equip/EquipController.java index c08a6858..b00dbc86 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -1,15 +1,15 @@ -package com.dbnt.faisp.equip; +package com.dbnt.faisp.main.equip; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.equip.model.CellPhone; -import com.dbnt.faisp.equip.model.Equip; -import com.dbnt.faisp.equip.model.EquipLog; -import com.dbnt.faisp.equip.model.UseList; -import com.dbnt.faisp.equip.service.EquipService; -import com.dbnt.faisp.organMgt.service.OrganConfigService; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.equip.model.CellPhone; +import com.dbnt.faisp.main.equip.model.Equip; +import com.dbnt.faisp.main.equip.model.EquipLog; +import com.dbnt.faisp.main.equip.model.UseList; +import com.dbnt.faisp.main.equip.service.EquipService; +import com.dbnt.faisp.main.organMgt.service.OrganConfigService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; diff --git a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java similarity index 80% rename from src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java rename to src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java index 26c21788..3f12fff5 100644 --- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java @@ -1,9 +1,9 @@ -package com.dbnt.faisp.equip.mapper; +package com.dbnt.faisp.main.equip.mapper; -import com.dbnt.faisp.equip.model.CellPhone; -import com.dbnt.faisp.equip.model.Equip; -import com.dbnt.faisp.equip.model.EquipLog; -import com.dbnt.faisp.equip.model.UseList; +import com.dbnt.faisp.main.equip.model.CellPhone; +import com.dbnt.faisp.main.equip.model.Equip; +import com.dbnt.faisp.main.equip.model.EquipLog; +import com.dbnt.faisp.main.equip.model.UseList; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java b/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java similarity index 97% rename from src/main/java/com/dbnt/faisp/equip/model/CellPhone.java rename to src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java index 91718c9a..7fff30af 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/CellPhone.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.faisp.main.equip.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/equip/model/Equip.java b/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java similarity index 94% rename from src/main/java/com/dbnt/faisp/equip/model/Equip.java rename to src/main/java/com/dbnt/faisp/main/equip/model/Equip.java index 966c0cce..96175013 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/Equip.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.faisp.main.equip.model; import com.dbnt.faisp.config.BaseModel; @@ -9,14 +9,11 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Date; @Getter diff --git a/src/main/java/com/dbnt/faisp/equip/model/EquipFile.java b/src/main/java/com/dbnt/faisp/main/equip/model/EquipFile.java similarity index 88% rename from src/main/java/com/dbnt/faisp/equip/model/EquipFile.java rename to src/main/java/com/dbnt/faisp/main/equip/model/EquipFile.java index 93690703..221126d8 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/EquipFile.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/EquipFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.faisp.main.equip.model; import com.dbnt.faisp.config.BaseModel; @@ -9,14 +9,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; @Getter diff --git a/src/main/java/com/dbnt/faisp/equip/model/EquipLog.java b/src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java similarity index 97% rename from src/main/java/com/dbnt/faisp/equip/model/EquipLog.java rename to src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java index 435c1f24..299008aa 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/EquipLog.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/EquipLog.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.faisp.main.equip.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/equip/model/UseList.java b/src/main/java/com/dbnt/faisp/main/equip/model/UseList.java similarity index 98% rename from src/main/java/com/dbnt/faisp/equip/model/UseList.java rename to src/main/java/com/dbnt/faisp/main/equip/model/UseList.java index d24f3d7b..945951ad 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/UseList.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/UseList.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.faisp.main.equip.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java b/src/main/java/com/dbnt/faisp/main/equip/repository/CellPhoneRepository.java similarity index 61% rename from src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java rename to src/main/java/com/dbnt/faisp/main/equip/repository/CellPhoneRepository.java index c7c7c6dc..5f3160e1 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java +++ b/src/main/java/com/dbnt/faisp/main/equip/repository/CellPhoneRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.faisp.main.equip.repository; -import com.dbnt.faisp.equip.model.CellPhone; +import com.dbnt.faisp.main.equip.model.CellPhone; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/equip/repository/EquipFileRepository.java b/src/main/java/com/dbnt/faisp/main/equip/repository/EquipFileRepository.java similarity index 68% rename from src/main/java/com/dbnt/faisp/equip/repository/EquipFileRepository.java rename to src/main/java/com/dbnt/faisp/main/equip/repository/EquipFileRepository.java index 78c0e4c7..99867a9c 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/equip/repository/EquipFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.faisp.main.equip.repository; -import com.dbnt.faisp.equip.model.EquipFile; +import com.dbnt.faisp.main.equip.model.EquipFile; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java b/src/main/java/com/dbnt/faisp/main/equip/repository/EquipLogRepository.java similarity index 61% rename from src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java rename to src/main/java/com/dbnt/faisp/main/equip/repository/EquipLogRepository.java index b54b44c3..6f307ee5 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java +++ b/src/main/java/com/dbnt/faisp/main/equip/repository/EquipLogRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.faisp.main.equip.repository; -import com.dbnt.faisp.equip.model.EquipLog; +import com.dbnt.faisp.main.equip.model.EquipLog; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java b/src/main/java/com/dbnt/faisp/main/equip/repository/EquipRepository.java similarity index 77% rename from src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java rename to src/main/java/com/dbnt/faisp/main/equip/repository/EquipRepository.java index b2e456a3..c8bdc546 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java +++ b/src/main/java/com/dbnt/faisp/main/equip/repository/EquipRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.faisp.main.equip.repository; -import com.dbnt.faisp.equip.model.Equip; +import com.dbnt.faisp.main.equip.model.Equip; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/equip/repository/UseListRepository.java b/src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java similarity index 80% rename from src/main/java/com/dbnt/faisp/equip/repository/UseListRepository.java rename to src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java index 42211e23..1cacbc4c 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/UseListRepository.java +++ b/src/main/java/com/dbnt/faisp/main/equip/repository/UseListRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.faisp.main.equip.repository; -import com.dbnt.faisp.equip.model.UseList; +import com.dbnt.faisp.main.equip.model.UseList; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java similarity index 93% rename from src/main/java/com/dbnt/faisp/equip/service/EquipService.java rename to src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java index a6024ca2..fb535350 100644 --- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java @@ -1,21 +1,21 @@ -package com.dbnt.faisp.equip.service; +package com.dbnt.faisp.main.equip.service; -import com.dbnt.faisp.equip.mapper.EquipMapper; -import com.dbnt.faisp.equip.model.CellPhone; -import com.dbnt.faisp.equip.model.Equip; -import com.dbnt.faisp.equip.model.Equip.EquipId; -import com.dbnt.faisp.equip.model.EquipFile; -import com.dbnt.faisp.equip.model.EquipFile.EquipFileId; -import com.dbnt.faisp.equip.model.EquipLog; -import com.dbnt.faisp.equip.model.UseList; -import com.dbnt.faisp.equip.model.UseList.UseListId; -import com.dbnt.faisp.equip.repository.CellPhoneRepository; -import com.dbnt.faisp.equip.repository.EquipFileRepository; -import com.dbnt.faisp.equip.repository.EquipLogRepository; -import com.dbnt.faisp.equip.repository.EquipRepository; -import com.dbnt.faisp.equip.repository.UseListRepository; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.equip.mapper.EquipMapper; +import com.dbnt.faisp.main.equip.model.CellPhone; +import com.dbnt.faisp.main.equip.model.Equip; +import com.dbnt.faisp.main.equip.model.Equip.EquipId; +import com.dbnt.faisp.main.equip.model.EquipFile; +import com.dbnt.faisp.main.equip.model.EquipFile.EquipFileId; +import com.dbnt.faisp.main.equip.model.EquipLog; +import com.dbnt.faisp.main.equip.model.UseList; +import com.dbnt.faisp.main.equip.model.UseList.UseListId; +import com.dbnt.faisp.main.equip.repository.CellPhoneRepository; +import com.dbnt.faisp.main.equip.repository.EquipFileRepository; +import com.dbnt.faisp.main.equip.repository.EquipLogRepository; +import com.dbnt.faisp.main.equip.repository.EquipRepository; +import com.dbnt.faisp.main.equip.repository.UseListRepository; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; diff --git a/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java similarity index 92% rename from src/main/java/com/dbnt/faisp/faRpt/FaRptController.java rename to src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java index b35d2866..5334c35f 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java @@ -1,12 +1,11 @@ -package com.dbnt.faisp.faRpt; +package com.dbnt.faisp.main.faRpt; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.faRpt.model.FaRptBoard; -import com.dbnt.faisp.faRpt.model.FaRptReadUser; -import com.dbnt.faisp.faRpt.service.FaRptService; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.model.FaRptReadUser; +import com.dbnt.faisp.main.faRpt.service.FaRptService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dbnt/faisp/faRpt/mapper/FaRptMapper.java b/src/main/java/com/dbnt/faisp/main/faRpt/mapper/FaRptMapper.java similarity index 74% rename from src/main/java/com/dbnt/faisp/faRpt/mapper/FaRptMapper.java rename to src/main/java/com/dbnt/faisp/main/faRpt/mapper/FaRptMapper.java index 9e224dbc..d8ff968a 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/mapper/FaRptMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/mapper/FaRptMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.mapper; +package com.dbnt.faisp.main.faRpt.mapper; -import com.dbnt.faisp.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.model.FaRptBoard; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptBoard.java similarity index 92% rename from src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptBoard.java index c646bc65..6037410d 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptBoard.java @@ -1,8 +1,6 @@ -package com.dbnt.faisp.faRpt.model; +package com.dbnt.faisp.main.faRpt.model; import com.dbnt.faisp.config.BaseModel; -import com.dbnt.faisp.publicBoard.model.PublicComment; -import com.dbnt.faisp.publicBoard.model.PublicFile; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptFile.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptFile.java similarity index 96% rename from src/main/java/com/dbnt/faisp/faRpt/model/FaRptFile.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptFile.java index 6b5138bb..ede3c4ed 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptFile.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faRpt.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/faRpt/model/FaRptReadUser.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptReadUser.java similarity index 96% rename from src/main/java/com/dbnt/faisp/faRpt/model/FaRptReadUser.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptReadUser.java index b87ad1dc..522960ae 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptReadUser.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/FaRptReadUser.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faRpt.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/faRpt/model/HashTagLinkFaRpt.java b/src/main/java/com/dbnt/faisp/main/faRpt/model/HashTagLinkFaRpt.java similarity index 94% rename from src/main/java/com/dbnt/faisp/faRpt/model/HashTagLinkFaRpt.java rename to src/main/java/com/dbnt/faisp/main/faRpt/model/HashTagLinkFaRpt.java index 71b11164..39db389c 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/HashTagLinkFaRpt.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/model/HashTagLinkFaRpt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faRpt.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/faRpt/repository/FaRptBoardRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java similarity index 60% rename from src/main/java/com/dbnt/faisp/faRpt/repository/FaRptBoardRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java index 1a623398..bc913935 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.model.FaRptBoard; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptFileRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptFileRepository.java similarity index 77% rename from src/main/java/com/dbnt/faisp/faRpt/repository/FaRptFileRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptFileRepository.java index 61505faf..55e6316c 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.faRpt.model.FaRptFile; +import com.dbnt.faisp.main.faRpt.model.FaRptFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptReadUserRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptReadUserRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/faRpt/repository/FaRptReadUserRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptReadUserRepository.java index 9a12ab3a..746e5bfc 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptReadUserRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/FaRptReadUserRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.faRpt.model.FaRptReadUser; +import com.dbnt.faisp.main.faRpt.model.FaRptReadUser; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/faRpt/repository/HashTagLinkFaRptRepository.java b/src/main/java/com/dbnt/faisp/main/faRpt/repository/HashTagLinkFaRptRepository.java similarity index 69% rename from src/main/java/com/dbnt/faisp/faRpt/repository/HashTagLinkFaRptRepository.java rename to src/main/java/com/dbnt/faisp/main/faRpt/repository/HashTagLinkFaRptRepository.java index be9442cf..a5125bf3 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/HashTagLinkFaRptRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/repository/HashTagLinkFaRptRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.faisp.main.faRpt.repository; -import com.dbnt.faisp.faRpt.model.HashTagLinkFaRpt; +import com.dbnt.faisp.main.faRpt.model.HashTagLinkFaRpt; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/faRpt/service/FaRptService.java b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java similarity index 88% rename from src/main/java/com/dbnt/faisp/faRpt/service/FaRptService.java rename to src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java index 74f91efb..94a1fe21 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/service/FaRptService.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/service/FaRptService.java @@ -1,17 +1,17 @@ -package com.dbnt.faisp.faRpt.service; +package com.dbnt.faisp.main.faRpt.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.faRpt.mapper.FaRptMapper; -import com.dbnt.faisp.faRpt.model.FaRptBoard; -import com.dbnt.faisp.faRpt.model.FaRptFile; -import com.dbnt.faisp.faRpt.model.FaRptReadUser; -import com.dbnt.faisp.faRpt.model.HashTagLinkFaRpt; -import com.dbnt.faisp.faRpt.repository.FaRptBoardRepository; -import com.dbnt.faisp.faRpt.repository.FaRptFileRepository; -import com.dbnt.faisp.faRpt.repository.FaRptReadUserRepository; -import com.dbnt.faisp.faRpt.repository.HashTagLinkFaRptRepository; -import com.dbnt.faisp.hashTag.service.HashTagService; +import com.dbnt.faisp.main.faRpt.mapper.FaRptMapper; +import com.dbnt.faisp.main.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.model.FaRptFile; +import com.dbnt.faisp.main.faRpt.model.FaRptReadUser; +import com.dbnt.faisp.main.faRpt.model.HashTagLinkFaRpt; +import com.dbnt.faisp.main.faRpt.repository.FaRptBoardRepository; +import com.dbnt.faisp.main.faRpt.repository.FaRptFileRepository; +import com.dbnt.faisp.main.faRpt.repository.FaRptReadUserRepository; +import com.dbnt.faisp.main.faRpt.repository.HashTagLinkFaRptRepository; +import com.dbnt.faisp.main.hashTag.service.HashTagService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java similarity index 91% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index 127c177e..f588d483 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -1,14 +1,14 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.codeMgt.model.CodeMgt; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService; -import com.dbnt.faisp.organMgt.model.OrganConfig; -import com.dbnt.faisp.organMgt.service.OrganConfigService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService; +import com.dbnt.faisp.main.organMgt.model.OrganConfig; +import com.dbnt.faisp.main.organMgt.service.OrganConfigService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.util.Excel; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java similarity index 76% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java index d27a3548..4a71a617 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java @@ -1,7 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper; -import com.dbnt.faisp.equip.model.Equip; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java similarity index 97% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java index 1e35b1b3..9ef39c3d 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java similarity index 94% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java index c70258f1..7a53a95f 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model; import com.dbnt.faisp.config.BaseModel; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java similarity index 50% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java index 6d1d9770..880e3146 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; import org.springframework.data.jpa.repository.JpaRepository; public interface InternationalCrimeArrestRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java similarity index 80% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java index f4ad9db6..dc1da914 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java similarity index 85% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 34a02955..248f0ea8 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.service; +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.InternationalCrimeArrestRepository; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.InternationalCrimeArrestRepository; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; import com.dbnt.faisp.util.ParamMap; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index 570caf8b..a0d3d0c5 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -1,17 +1,17 @@ -package com.dbnt.faisp.fipTarget; +package com.dbnt.faisp.main.fipTarget; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.fipTarget.model.PartInfo; -import com.dbnt.faisp.fipTarget.model.PartInfoFile; -import com.dbnt.faisp.fipTarget.model.PartWork; -import com.dbnt.faisp.fipTarget.model.PartWorkFile; -import com.dbnt.faisp.fipTarget.model.VulnFile; -import com.dbnt.faisp.fipTarget.model.Vulnerable; -import com.dbnt.faisp.fipTarget.service.FipTargetService; -import com.dbnt.faisp.organMgt.service.OrganConfigService; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.fipTarget.model.PartInfo; +import com.dbnt.faisp.main.fipTarget.model.PartInfoFile; +import com.dbnt.faisp.main.fipTarget.model.PartWork; +import com.dbnt.faisp.main.fipTarget.model.PartWorkFile; +import com.dbnt.faisp.main.fipTarget.model.VulnFile; +import com.dbnt.faisp.main.fipTarget.model.Vulnerable; +import com.dbnt.faisp.main.fipTarget.service.FipTargetService; +import com.dbnt.faisp.main.organMgt.service.OrganConfigService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/mapper/FipTargetMapper.java b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java similarity index 82% rename from src/main/java/com/dbnt/faisp/fipTarget/mapper/FipTargetMapper.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java index 2d4223fa..e0d9b87a 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/mapper/FipTargetMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java @@ -1,9 +1,9 @@ -package com.dbnt.faisp.fipTarget.mapper; +package com.dbnt.faisp.main.fipTarget.mapper; -import com.dbnt.faisp.fipTarget.model.PartInfo; -import com.dbnt.faisp.fipTarget.model.PartInfoFile; -import com.dbnt.faisp.fipTarget.model.PartWork; -import com.dbnt.faisp.fipTarget.model.Vulnerable; +import com.dbnt.faisp.main.fipTarget.model.PartInfo; +import com.dbnt.faisp.main.fipTarget.model.PartInfoFile; +import com.dbnt.faisp.main.fipTarget.model.PartWork; +import com.dbnt.faisp.main.fipTarget.model.Vulnerable; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/PartInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java similarity index 97% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartInfo.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java index 92becf1a..9f9fb61c 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; @@ -15,9 +15,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/PartInfoFile.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfoFile.java similarity index 89% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartInfoFile.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfoFile.java index efef2535..1a16065e 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartInfoFile.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartInfoFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; @@ -9,14 +9,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; @Getter diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWork.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java similarity index 98% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartWork.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java index 342be806..a0e028ec 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWork.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWork.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWorkFile.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWorkFile.java similarity index 89% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartWorkFile.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWorkFile.java index 7e254157..8105f7b2 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWorkFile.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/PartWorkFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; @@ -9,14 +9,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; @Getter diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/VulnFile.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/VulnFile.java similarity index 88% rename from src/main/java/com/dbnt/faisp/fipTarget/model/VulnFile.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/VulnFile.java index 2d252662..ddf89624 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/VulnFile.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/VulnFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; @@ -9,14 +9,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; @Getter diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/Vulnerable.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java similarity index 97% rename from src/main/java/com/dbnt/faisp/fipTarget/model/Vulnerable.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java index 035ce4fb..6db484a2 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/Vulnerable.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/Vulnerable.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoFileRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoFileRepository.java similarity index 84% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoFileRepository.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoFileRepository.java index 93971f7f..8cb6651b 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoFileRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.faisp.main.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartInfoFile; +import com.dbnt.faisp.main.fipTarget.model.PartInfoFile; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java index a37ef8aa..47114d68 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartInfoRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.faisp.main.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartInfo; +import com.dbnt.faisp.main.fipTarget.model.PartInfo; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkFileRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkFileRepository.java similarity index 84% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkFileRepository.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkFileRepository.java index d47c1d2f..651f2176 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkFileRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.faisp.main.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartWorkFile; +import com.dbnt.faisp.main.fipTarget.model.PartWorkFile; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkRepository.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java index 2fb186be..625ab15d 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/PartWorkRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.faisp.main.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartWork; +import com.dbnt.faisp.main.fipTarget.model.PartWork; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/VulnFileRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnFileRepository.java similarity index 79% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/VulnFileRepository.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnFileRepository.java index 7bf12820..29c07ff4 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/VulnFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnFileRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.faisp.main.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.VulnFile; +import com.dbnt.faisp.main.fipTarget.model.VulnFile; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/VulnRepository.java b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnRepository.java similarity index 58% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/VulnRepository.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnRepository.java index ce1452ad..620e25b3 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/VulnRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/repository/VulnRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.faisp.main.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.Vulnerable; +import com.dbnt.faisp.main.fipTarget.model.Vulnerable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java similarity index 92% rename from src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index c435d4af..2c6ccb4c 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -1,27 +1,26 @@ -package com.dbnt.faisp.fipTarget.service; +package com.dbnt.faisp.main.fipTarget.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.fipTarget.mapper.FipTargetMapper; -import com.dbnt.faisp.fipTarget.model.PartInfo; -import com.dbnt.faisp.fipTarget.model.PartInfo.PartInfoId; -import com.dbnt.faisp.fipTarget.model.PartInfoFile; -import com.dbnt.faisp.fipTarget.model.PartInfoFile.PartInfoFileId; -import com.dbnt.faisp.fipTarget.model.PartWork; -import com.dbnt.faisp.fipTarget.model.PartWork.PartWorkId; -import com.dbnt.faisp.fipTarget.model.PartWorkFile; -import com.dbnt.faisp.fipTarget.model.PartWorkFile.PartWorkFileId; -import com.dbnt.faisp.fipTarget.model.VulnFile; -import com.dbnt.faisp.fipTarget.model.VulnFile.VulnFileId; -import com.dbnt.faisp.fipTarget.model.Vulnerable; -import com.dbnt.faisp.fipTarget.repository.PartInfoFileRepository; -import com.dbnt.faisp.fipTarget.repository.PartInfoRepository; -import com.dbnt.faisp.fipTarget.repository.PartWorkFileRepository; -import com.dbnt.faisp.fipTarget.repository.PartWorkRepository; -import com.dbnt.faisp.fipTarget.repository.VulnFileRepository; -import com.dbnt.faisp.fipTarget.repository.VulnRepository; -import com.dbnt.faisp.publicBoard.model.PublicFile; +import com.dbnt.faisp.main.fipTarget.mapper.FipTargetMapper; +import com.dbnt.faisp.main.fipTarget.model.PartInfo; +import com.dbnt.faisp.main.fipTarget.model.PartInfo.PartInfoId; +import com.dbnt.faisp.main.fipTarget.model.PartInfoFile; +import com.dbnt.faisp.main.fipTarget.model.PartInfoFile.PartInfoFileId; +import com.dbnt.faisp.main.fipTarget.model.PartWork; +import com.dbnt.faisp.main.fipTarget.model.PartWork.PartWorkId; +import com.dbnt.faisp.main.fipTarget.model.PartWorkFile; +import com.dbnt.faisp.main.fipTarget.model.PartWorkFile.PartWorkFileId; +import com.dbnt.faisp.main.fipTarget.model.VulnFile; +import com.dbnt.faisp.main.fipTarget.model.VulnFile.VulnFileId; +import com.dbnt.faisp.main.fipTarget.model.Vulnerable; +import com.dbnt.faisp.main.fipTarget.repository.PartInfoFileRepository; +import com.dbnt.faisp.main.fipTarget.repository.PartInfoRepository; +import com.dbnt.faisp.main.fipTarget.repository.PartWorkFileRepository; +import com.dbnt.faisp.main.fipTarget.repository.PartWorkRepository; +import com.dbnt.faisp.main.fipTarget.repository.VulnFileRepository; +import com.dbnt.faisp.main.fipTarget.repository.VulnRepository; import com.dbnt.faisp.util.ParamMap; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index f61fe493..9f706275 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.fpiMgt.affair; +package com.dbnt.faisp.main.fpiMgt.affair; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; -import com.dbnt.faisp.fpiMgt.affair.model.AffairRating; -import com.dbnt.faisp.fpiMgt.affair.model.TypeStatistics; -import com.dbnt.faisp.fpiMgt.affair.service.AffairService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairRating; +import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics; +import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -15,7 +15,6 @@ import org.springframework.web.servlet.ModelAndView; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/mapper/AffairMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java similarity index 83% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/mapper/AffairMapper.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java index 40336580..4c808698 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/mapper/AffairMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fpiMgt.affair.mapper; +package com.dbnt.faisp.main.fpiMgt.affair.mapper; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; -import com.dbnt.faisp.fpiMgt.affair.model.TypeStatistics; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java similarity index 97% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java index 059cb69f..4e20627c 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.faisp.main.fpiMgt.affair.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairFile.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairFile.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairFile.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairFile.java index e8ac62c8..31485682 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairFile.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.faisp.main.fpiMgt.affair.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java index f6b595ae..48f0040b 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairRating.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.faisp.main.fpiMgt.affair.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTagLink.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/HashTagLink.java similarity index 93% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTagLink.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/HashTagLink.java index 5470a72f..b827d07b 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTagLink.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/HashTagLink.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.faisp.main.fpiMgt.affair.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/TypeStatistics.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/TypeStatistics.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java index 9366af8f..8a0dd342 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/TypeStatistics.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/TypeStatistics.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.faisp.main.fpiMgt.affair.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairBoardRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairBoardRepository.java similarity index 57% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairBoardRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairBoardRepository.java index 36d44c2f..c8eaf836 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.faisp.main.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairFileRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairFileRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairFileRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairFileRepository.java index 1311a1dc..c5e1b7ee 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.faisp.main.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.AffairFile; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairRatingRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairRatingRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairRatingRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairRatingRepository.java index 89798634..605e774d 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairRatingRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/AffairRatingRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.faisp.main.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.AffairRating; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairRating; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagLinkRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/HashTagLinkRepository.java similarity index 65% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagLinkRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/HashTagLinkRepository.java index 5c0b3080..f1e99d3d 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagLinkRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/repository/HashTagLinkRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.faisp.main.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.HashTagLink; +import com.dbnt.faisp.main.fpiMgt.affair.model.HashTagLink; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index 7c4e3411..1d67f28a 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -1,13 +1,13 @@ -package com.dbnt.faisp.fpiMgt.affair.service; +package com.dbnt.faisp.main.fpiMgt.affair.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.fpiMgt.affair.mapper.AffairMapper; -import com.dbnt.faisp.fpiMgt.affair.model.*; -import com.dbnt.faisp.fpiMgt.affair.repository.*; -import com.dbnt.faisp.hashTag.service.HashTagService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.fpiMgt.affair.mapper.AffairMapper; +import com.dbnt.faisp.main.fpiMgt.affair.model.*; +import com.dbnt.faisp.main.fpiMgt.affair.repository.*; +import com.dbnt.faisp.main.hashTag.service.HashTagService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/PlanController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/PlanController.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java index a11d0ab2..3d4753ce 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.fpiMgt.affairPlan; +package com.dbnt.faisp.main.fpiMgt.affairPlan; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; -import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -12,9 +12,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/mapper/PlanMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/mapper/PlanMapper.java similarity index 66% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/mapper/PlanMapper.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/mapper/PlanMapper.java index 9e0e414e..62a1bc42 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/mapper/PlanMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/mapper/PlanMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.mapper; +package com.dbnt.faisp.main.fpiMgt.affairPlan.mapper; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanApprv.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanApprv.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java index 88885a50..cc20fb81 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanApprv.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanApprv.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.faisp.main.fpiMgt.affairPlan.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanBoard.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java index 084c4612..2e1b4dd6 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanBoard.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.faisp.main.fpiMgt.affairPlan.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanFile.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanFile.java index 7d83834b..613aa4c8 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.faisp.main.fpiMgt.affairPlan.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanMainInfo.java similarity index 93% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanMainInfo.java index c003ebd9..9510dca1 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/model/PlanMainInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.faisp.main.fpiMgt.affairPlan.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanApprvRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanApprvRepository.java similarity index 73% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanApprvRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanApprvRepository.java index ec760b8b..c79b4e50 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanApprvRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanApprvRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.faisp.main.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanBoardRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java similarity index 55% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanBoardRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java index 7ea91124..eb496c9c 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.faisp.main.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanFileRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanFileRepository.java similarity index 73% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanFileRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanFileRepository.java index 039fdf8f..d9d290f0 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.faisp.main.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java similarity index 67% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java index b3683e96..8e9639ff 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.faisp.main.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanMainInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/service/PlanService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java similarity index 86% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/service/PlanService.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java index 93853b0d..cc1b7e62 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/service/PlanService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java @@ -1,18 +1,17 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.service; +package com.dbnt.faisp.main.fpiMgt.affairPlan.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.fpiMgt.affairPlan.mapper.PlanMapper; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo; -import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanApprvRepository; -import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanBoardRepository; -import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanFileRepository; -import com.dbnt.faisp.fpiMgt.affairPlan.repository.PlanMainInfoRepository; -import com.dbnt.faisp.fpiMgt.affairResult.repository.ClearInfoRepository; +import com.dbnt.faisp.main.fpiMgt.affairPlan.mapper.PlanMapper; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanFile; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanMainInfo; +import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanApprvRepository; +import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanBoardRepository; +import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanFileRepository; +import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanMainInfoRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java similarity index 93% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index b152f617..9463a978 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -1,15 +1,15 @@ -package com.dbnt.faisp.fpiMgt.affairResult; +package com.dbnt.faisp.main.fpiMgt.affairResult; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; -import com.dbnt.faisp.fpiMgt.affair.service.AffairService; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultApprv; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard; -import com.dbnt.faisp.fpiMgt.affairResult.model.ClearInfo; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultInfo; -import com.dbnt.faisp.fpiMgt.affairResult.service.ResultService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultApprv; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ClearInfo; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultInfo; +import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java similarity index 57% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java index b24687ff..bc54e032 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java @@ -1,8 +1,7 @@ -package com.dbnt.faisp.fpiMgt.affairResult.mapper; +package com.dbnt.faisp.main.fpiMgt.affairResult.mapper; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToAffair; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ClearInfo.java similarity index 90% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ClearInfo.java index 6bb42d85..f1f92d60 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ClearInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; @@ -6,7 +6,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDateTime; @Getter @Setter diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultApprv.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultApprv.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultApprv.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultApprv.java index 02bad243..90cc2ccf 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultApprv.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultApprv.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java index 2e0de927..5a689046 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import com.dbnt.faisp.config.BaseModel; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultFile.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultFile.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultFile.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultFile.java index 56a792df..15f4b03f 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultFile.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultInfo.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java similarity index 93% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultInfo.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java index bb463533..6a2723ae 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToAffair.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToAffair.java similarity index 92% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToAffair.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToAffair.java index d8896140..08c5af0d 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToAffair.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToAffair.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToPlan.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java similarity index 92% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToPlan.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java index 3b284018..9cb888b3 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToPlan.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.faisp.main.fpiMgt.affairResult.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ClearInfoRepository.java similarity index 69% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ClearInfoRepository.java index 30f9d7a1..327d2259 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ClearInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ClearInfo; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ClearInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultApprvRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultApprvRepository.java similarity index 74% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultApprvRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultApprvRepository.java index 8db6c39f..d345f69f 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultApprvRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultApprvRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultApprv; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultApprv; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultBoardRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java similarity index 54% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultBoardRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java index 0338ebb8..5439a7cd 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultFileRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultFileRepository.java similarity index 74% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultFileRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultFileRepository.java index a0730013..891086ff 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultFile; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultInfoRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultInfoRepository.java index 9b4849bc..68e5b11e 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultInfo; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToAffairRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToAffairRepository.java index 23206f78..d0499299 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToAffairRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToAffair; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultToAffair; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToPlanRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java similarity index 57% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToPlanRepository.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java index e35c5e17..7c583e19 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToPlanRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.faisp.main.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToPlan; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultToPlan; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java rename to src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index eaf2a7c2..0d395ab2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.fpiMgt.affairResult.service; +package com.dbnt.faisp.main.fpiMgt.affairResult.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.fpiMgt.affairResult.mapper.ResultMapper; -import com.dbnt.faisp.fpiMgt.affairResult.model.*; -import com.dbnt.faisp.fpiMgt.affairResult.repository.*; +import com.dbnt.faisp.main.fpiMgt.affairResult.mapper.ResultMapper; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.*; +import com.dbnt.faisp.main.fpiMgt.affairResult.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/hashTag/model/HashTag.java b/src/main/java/com/dbnt/faisp/main/hashTag/model/HashTag.java similarity index 91% rename from src/main/java/com/dbnt/faisp/hashTag/model/HashTag.java rename to src/main/java/com/dbnt/faisp/main/hashTag/model/HashTag.java index 09784e9e..f306a209 100644 --- a/src/main/java/com/dbnt/faisp/hashTag/model/HashTag.java +++ b/src/main/java/com/dbnt/faisp/main/hashTag/model/HashTag.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.hashTag.model; +package com.dbnt.faisp.main.hashTag.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/hashTag/repository/HashTagRepository.java b/src/main/java/com/dbnt/faisp/main/hashTag/repository/HashTagRepository.java similarity index 69% rename from src/main/java/com/dbnt/faisp/hashTag/repository/HashTagRepository.java rename to src/main/java/com/dbnt/faisp/main/hashTag/repository/HashTagRepository.java index 95fd7c94..399e8c42 100644 --- a/src/main/java/com/dbnt/faisp/hashTag/repository/HashTagRepository.java +++ b/src/main/java/com/dbnt/faisp/main/hashTag/repository/HashTagRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.hashTag.repository; +package com.dbnt.faisp.main.hashTag.repository; -import com.dbnt.faisp.hashTag.model.HashTag; +import com.dbnt.faisp.main.hashTag.model.HashTag; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/hashTag/service/HashTagService.java b/src/main/java/com/dbnt/faisp/main/hashTag/service/HashTagService.java similarity index 79% rename from src/main/java/com/dbnt/faisp/hashTag/service/HashTagService.java rename to src/main/java/com/dbnt/faisp/main/hashTag/service/HashTagService.java index a284f4c5..1e2855f8 100644 --- a/src/main/java/com/dbnt/faisp/hashTag/service/HashTagService.java +++ b/src/main/java/com/dbnt/faisp/main/hashTag/service/HashTagService.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.hashTag.service; +package com.dbnt.faisp.main.hashTag.service; -import com.dbnt.faisp.hashTag.model.HashTag; -import com.dbnt.faisp.hashTag.repository.HashTagRepository; +import com.dbnt.faisp.main.hashTag.model.HashTag; +import com.dbnt.faisp.main.hashTag.repository.HashTagRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java similarity index 90% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/IvsgtController.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java index f60cc055..b3145387 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.ArrestType; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.BoardInvestigation; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.RelatedReports; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.ArrestType; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.RelatedReports; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java similarity index 61% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java index db3ee3c1..119a7ea6 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.mapper; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.mapper; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.ArrestType; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.BoardInvestigation; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.RelatedReports; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.ArrestType; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.RelatedReports; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/ArrestType.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/ArrestType.java similarity index 92% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/ArrestType.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/ArrestType.java index 3ac3fdea..8b116a52 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/ArrestType.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/ArrestType.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java similarity index 96% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java index 3954feed..16a48193 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java similarity index 91% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java index de1aee93..7d8f5794 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/IvsgtFile.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/IvsgtFile.java similarity index 94% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/IvsgtFile.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/IvsgtFile.java index 86b7beed..7b2797ec 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/IvsgtFile.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/IvsgtFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/RelatedReports.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/RelatedReports.java similarity index 93% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/RelatedReports.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/RelatedReports.java index 5e951559..35089de5 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/RelatedReports.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/RelatedReports.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java similarity index 51% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java index cd59d916..1cd977c3 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.ArrestType; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.ArrestType; import org.springframework.data.jpa.repository.JpaRepository; public interface ArrestTypeRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java similarity index 52% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java index 5c2304c1..522c5cdb 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.BoardInvestigation; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java similarity index 61% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java index d6e406b7..aa9678dc 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.HashTagLinkIvsgt; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.HashTagLinkIvsgt; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java similarity index 71% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java index f2c767f7..9ef9ad7a 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.IvsgtFile; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.IvsgtFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java similarity index 80% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java index f4f3f0e8..aacd1c87 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.RelatedReports; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.RelatedReports; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java similarity index 94% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java rename to src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java index fb26cc43..882edfe2 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.service; +package com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.hashTag.service.HashTagService; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.*; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository.*; +import com.dbnt.faisp.main.hashTag.service.HashTagService; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.*; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java similarity index 88% rename from src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java rename to src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java index c8340282..879700af 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.menuMgt; +package com.dbnt.faisp.main.menuMgt; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.menuMgt.service.MenuMgtService; -import com.dbnt.faisp.menuMgt.model.MenuMgt; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; +import com.dbnt.faisp.main.menuMgt.model.MenuMgt; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java b/src/main/java/com/dbnt/faisp/main/menuMgt/mapper/MenuMgtMapper.java similarity index 81% rename from src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java rename to src/main/java/com/dbnt/faisp/main/menuMgt/mapper/MenuMgtMapper.java index 5478d9da..c03f10c4 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/mapper/MenuMgtMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.menuMgt.mapper; +package com.dbnt.faisp.main.menuMgt.mapper; -import com.dbnt.faisp.menuMgt.model.MenuMgt; +import com.dbnt.faisp.main.menuMgt.model.MenuMgt; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java b/src/main/java/com/dbnt/faisp/main/menuMgt/model/MenuMgt.java similarity index 96% rename from src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java rename to src/main/java/com/dbnt/faisp/main/menuMgt/model/MenuMgt.java index 9c465d86..d4fc44b3 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/model/MenuMgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.menuMgt.model; +package com.dbnt.faisp.main.menuMgt.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/main/menuMgt/repository/MenuMgtRepository.java b/src/main/java/com/dbnt/faisp/main/menuMgt/repository/MenuMgtRepository.java new file mode 100644 index 00000000..80030056 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/repository/MenuMgtRepository.java @@ -0,0 +1,11 @@ +package com.dbnt.faisp.main.menuMgt.repository; + +import com.dbnt.faisp.main.menuMgt.model.MenuMgt; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + + +public interface MenuMgtRepository extends JpaRepository { + Optional findTopByCat1CdAndCat2CdAndCat3Cd(String cat1Cd, String cat2Cd, String cat3Cd); +} diff --git a/src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java similarity index 95% rename from src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java rename to src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java index 2ff0b94d..802be2c1 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.menuMgt.service; +package com.dbnt.faisp.main.menuMgt.service; -import com.dbnt.faisp.menuMgt.mapper.MenuMgtMapper; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.menuMgt.repository.MenuMgtRepository; +import com.dbnt.faisp.main.menuMgt.mapper.MenuMgtMapper; +import com.dbnt.faisp.main.menuMgt.model.MenuMgt; +import com.dbnt.faisp.main.menuMgt.repository.MenuMgtRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ public class MenuMgtService { @Transient public String saveMenuMgt(MenuMgt menuMgt) { if(menuMgt.getMenuKey()==null){ - MenuMgt duplMenu = menuMgtRepository.findTopByCat1CdAndCat2CdAndCat3Cd(menuMgt.getCat1Cd(), menuMgt.getCat2Cd(), menuMgt.getCat3Cd()); + MenuMgt duplMenu = menuMgtRepository.findTopByCat1CdAndCat2CdAndCat3Cd(menuMgt.getCat1Cd(), menuMgt.getCat2Cd(), menuMgt.getCat3Cd()).orElse(null); if(duplMenu!=null){ return duplMenu.getMenuUrl(); }else{ diff --git a/src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java b/src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java similarity index 84% rename from src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java rename to src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java index 68f133a0..5ad9f0a3 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.organMgt; +package com.dbnt.faisp.main.organMgt; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.codeMgt.model.CodeMgt; -import com.dbnt.faisp.organMgt.service.OrganConfigService; -import com.dbnt.faisp.organMgt.model.OrganConfig; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.organMgt.service.OrganConfigService; +import com.dbnt.faisp.main.organMgt.model.OrganConfig; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java b/src/main/java/com/dbnt/faisp/main/organMgt/mapper/OrganConfigMapper.java similarity index 73% rename from src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java rename to src/main/java/com/dbnt/faisp/main/organMgt/mapper/OrganConfigMapper.java index d838e488..5b84e309 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/mapper/OrganConfigMapper.java @@ -1,6 +1,5 @@ -package com.dbnt.faisp.organMgt.mapper; +package com.dbnt.faisp.main.organMgt.mapper; -import com.dbnt.faisp.menuMgt.model.MenuMgt; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/organMgt/model/OrganConfig.java b/src/main/java/com/dbnt/faisp/main/organMgt/model/OrganConfig.java similarity index 90% rename from src/main/java/com/dbnt/faisp/organMgt/model/OrganConfig.java rename to src/main/java/com/dbnt/faisp/main/organMgt/model/OrganConfig.java index bf70f341..af92db6e 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/model/OrganConfig.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/model/OrganConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.organMgt.model; +package com.dbnt.faisp.main.organMgt.model; import lombok.Getter; import lombok.NoArgsConstructor; @@ -7,7 +7,6 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import java.util.List; @Getter @Setter diff --git a/src/main/java/com/dbnt/faisp/organMgt/repository/OrganConfigRepository.java b/src/main/java/com/dbnt/faisp/main/organMgt/repository/OrganConfigRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/organMgt/repository/OrganConfigRepository.java rename to src/main/java/com/dbnt/faisp/main/organMgt/repository/OrganConfigRepository.java index ff2892b4..6c54e77f 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/repository/OrganConfigRepository.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/repository/OrganConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.organMgt.repository; +package com.dbnt.faisp.main.organMgt.repository; -import com.dbnt.faisp.organMgt.model.OrganConfig; +import com.dbnt.faisp.main.organMgt.model.OrganConfig; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java b/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java similarity index 81% rename from src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java rename to src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java index 92145de7..c67d05a4 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.organMgt.service; +package com.dbnt.faisp.main.organMgt.service; -import com.dbnt.faisp.organMgt.mapper.OrganConfigMapper; -import com.dbnt.faisp.organMgt.model.OrganConfig; -import com.dbnt.faisp.organMgt.repository.OrganConfigRepository; +import com.dbnt.faisp.main.organMgt.mapper.OrganConfigMapper; +import com.dbnt.faisp.main.organMgt.model.OrganConfig; +import com.dbnt.faisp.main.organMgt.repository.OrganConfigRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java similarity index 95% rename from src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java index bf2dbcca..8032d481 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.publicBoard; +package com.dbnt.faisp.main.publicBoard; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.config.Role; -import com.dbnt.faisp.publicBoard.model.PublicBoard; -import com.dbnt.faisp.publicBoard.model.PublicComment; -import com.dbnt.faisp.publicBoard.service.PublicBoardService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.publicBoard.model.PublicBoard; +import com.dbnt.faisp.main.publicBoard.model.PublicComment; +import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java b/src/main/java/com/dbnt/faisp/main/publicBoard/mapper/PublicBoardMapper.java similarity index 74% rename from src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/mapper/PublicBoardMapper.java index 0188d86e..9fd1df85 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/mapper/PublicBoardMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.mapper; +package com.dbnt.faisp.main.publicBoard.mapper; -import com.dbnt.faisp.publicBoard.model.PublicBoard; +import com.dbnt.faisp.main.publicBoard.model.PublicBoard; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicBoard.java b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java similarity index 97% rename from src/main/java/com/dbnt/faisp/publicBoard/model/PublicBoard.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java index 362da93e..12fa85db 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicBoard.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicBoard.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.publicBoard.model; +package com.dbnt.faisp.main.publicBoard.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicComment.java b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java similarity index 96% rename from src/main/java/com/dbnt/faisp/publicBoard/model/PublicComment.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java index 1c9fe69f..6c1d0929 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicComment.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicComment.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.publicBoard.model; +package com.dbnt.faisp.main.publicBoard.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicFile.java b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicFile.java similarity index 95% rename from src/main/java/com/dbnt/faisp/publicBoard/model/PublicFile.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicFile.java index 079a2b9b..d5be4c11 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicFile.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/model/PublicFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.publicBoard.model; +package com.dbnt.faisp.main.publicBoard.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicBoardRepository.java b/src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicBoardRepository.java similarity index 58% rename from src/main/java/com/dbnt/faisp/publicBoard/repository/PublicBoardRepository.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicBoardRepository.java index 5bad1357..a6c53d2c 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicBoardRepository.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.repository; +package com.dbnt.faisp.main.publicBoard.repository; -import com.dbnt.faisp.publicBoard.model.PublicBoard; +import com.dbnt.faisp.main.publicBoard.model.PublicBoard; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicCommentRepository.java b/src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicCommentRepository.java similarity index 79% rename from src/main/java/com/dbnt/faisp/publicBoard/repository/PublicCommentRepository.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicCommentRepository.java index 250fd209..237b0d68 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicCommentRepository.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicCommentRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.repository; +package com.dbnt.faisp.main.publicBoard.repository; -import com.dbnt.faisp.publicBoard.model.PublicComment; +import com.dbnt.faisp.main.publicBoard.model.PublicComment; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicFileRepository.java b/src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicFileRepository.java similarity index 76% rename from src/main/java/com/dbnt/faisp/publicBoard/repository/PublicFileRepository.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicFileRepository.java index af4862e1..02c48fc1 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/repository/PublicFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.repository; +package com.dbnt.faisp.main.publicBoard.repository; -import com.dbnt.faisp.publicBoard.model.PublicFile; +import com.dbnt.faisp.main.publicBoard.model.PublicFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/service/PublicBoardService.java b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java similarity index 89% rename from src/main/java/com/dbnt/faisp/publicBoard/service/PublicBoardService.java rename to src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java index bc95bafd..1f5eef8e 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/service/PublicBoardService.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java @@ -1,14 +1,14 @@ -package com.dbnt.faisp.publicBoard.service; +package com.dbnt.faisp.main.publicBoard.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.publicBoard.mapper.PublicBoardMapper; -import com.dbnt.faisp.publicBoard.model.PublicBoard; -import com.dbnt.faisp.publicBoard.model.PublicComment; -import com.dbnt.faisp.publicBoard.model.PublicFile; -import com.dbnt.faisp.publicBoard.repository.PublicBoardRepository; -import com.dbnt.faisp.publicBoard.repository.PublicCommentRepository; -import com.dbnt.faisp.publicBoard.repository.PublicFileRepository; +import com.dbnt.faisp.main.publicBoard.mapper.PublicBoardMapper; +import com.dbnt.faisp.main.publicBoard.model.PublicBoard; +import com.dbnt.faisp.main.publicBoard.model.PublicComment; +import com.dbnt.faisp.main.publicBoard.model.PublicFile; +import com.dbnt.faisp.main.publicBoard.repository.PublicBoardRepository; +import com.dbnt.faisp.main.publicBoard.repository.PublicCommentRepository; +import com.dbnt.faisp.main.publicBoard.repository.PublicFileRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java similarity index 95% rename from src/main/java/com/dbnt/faisp/translator/TranslatorController.java rename to src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java index 7e4dd3b0..693642fc 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.translator; +package com.dbnt.faisp.main.translator; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.TranslatorCrr; -import com.dbnt.faisp.translator.service.TranslatorService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.translator.model.Translator; +import com.dbnt.faisp.main.translator.model.TranslatorCrr; +import com.dbnt.faisp.main.translator.service.TranslatorService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.util.ParamMap; import com.dbnt.faisp.util.Utils; diff --git a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java b/src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java similarity index 80% rename from src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java rename to src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java index 3856fb81..d06a8fb6 100644 --- a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java +++ b/src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.translator.mapper; +package com.dbnt.faisp.main.translator.mapper; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.TranslatorCrr; +import com.dbnt.faisp.main.translator.model.Translator; +import com.dbnt.faisp.main.translator.model.TranslatorCrr; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/translator/model/Translator.java b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java similarity index 98% rename from src/main/java/com/dbnt/faisp/translator/model/Translator.java rename to src/main/java/com/dbnt/faisp/main/translator/model/Translator.java index 6c729c04..5535e9c0 100644 --- a/src/main/java/com/dbnt/faisp/translator/model/Translator.java +++ b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.translator.model; +package com.dbnt.faisp.main.translator.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java b/src/main/java/com/dbnt/faisp/main/translator/model/TranslatorCrr.java similarity index 96% rename from src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java rename to src/main/java/com/dbnt/faisp/main/translator/model/TranslatorCrr.java index 48d1fd23..a6e04e34 100644 --- a/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java +++ b/src/main/java/com/dbnt/faisp/main/translator/model/TranslatorCrr.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.translator.model; +package com.dbnt.faisp.main.translator.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorCareerRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java similarity index 80% rename from src/main/java/com/dbnt/faisp/translator/repository/TranslatorCareerRepository.java rename to src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java index d7426694..888282d1 100644 --- a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorCareerRepository.java +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.translator.repository; +package com.dbnt.faisp.main.translator.repository; -import com.dbnt.faisp.translator.model.TranslatorCrr; +import com.dbnt.faisp.main.translator.model.TranslatorCrr; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java similarity index 71% rename from src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java rename to src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java index bb67125a..dc693e73 100644 --- a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.translator.repository; +package com.dbnt.faisp.main.translator.repository; -import com.dbnt.faisp.translator.model.Translator; +import com.dbnt.faisp.main.translator.model.Translator; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java b/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java similarity index 91% rename from src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java rename to src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java index 427e0393..2cf1e13b 100644 --- a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.translator.service; +package com.dbnt.faisp.main.translator.service; -import com.dbnt.faisp.translator.mapper.TranslatorMapper; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.Translator.TranslatorId; -import com.dbnt.faisp.translator.model.TranslatorCrr; -import com.dbnt.faisp.translator.repository.TranslatorCareerRepository; -import com.dbnt.faisp.translator.repository.TranslatorRepository; +import com.dbnt.faisp.main.translator.mapper.TranslatorMapper; +import com.dbnt.faisp.main.translator.model.Translator; +import com.dbnt.faisp.main.translator.model.Translator.TranslatorId; +import com.dbnt.faisp.main.translator.model.TranslatorCrr; +import com.dbnt.faisp.main.translator.repository.TranslatorCareerRepository; +import com.dbnt.faisp.main.translator.repository.TranslatorRepository; import com.dbnt.faisp.util.ParamMap; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java similarity index 86% rename from src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java rename to src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java index ca5514e4..bbe18361 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -1,9 +1,8 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.faisp.main.userInfo; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.userInfo.model.DashboardConfig; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.userInfo.model.DashboardConfig; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserInfoController.java similarity index 77% rename from src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java rename to src/main/java/com/dbnt/faisp/main/userInfo/UserInfoController.java index 0fdd28a4..6cf63368 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserInfoController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.faisp.main.userInfo; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java b/src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java similarity index 71% rename from src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java rename to src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java index b5a58945..ddf5f7a4 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.userInfo.mapper; +package com.dbnt.faisp.main.userInfo.mapper; -import com.dbnt.faisp.userInfo.model.DashboardConfig; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.model.DashboardConfig; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/userInfo/model/DashboardConfig.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/DashboardConfig.java similarity index 95% rename from src/main/java/com/dbnt/faisp/userInfo/model/DashboardConfig.java rename to src/main/java/com/dbnt/faisp/main/userInfo/model/DashboardConfig.java index 733652bd..41e84f2e 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/model/DashboardConfig.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/DashboardConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.userInfo.model; +package com.dbnt.faisp.main.userInfo.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java similarity index 96% rename from src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java rename to src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java index 30ba59ca..16eb68f7 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.userInfo.model; +package com.dbnt.faisp.main.userInfo.model; -import com.dbnt.faisp.authMgt.model.AccessConfig; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; +import com.dbnt.faisp.main.authMgt.model.AccessConfig; +import com.dbnt.faisp.main.authMgt.model.ApprovalConfig; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java b/src/main/java/com/dbnt/faisp/main/userInfo/repository/DashboardConfigRepository.java similarity index 67% rename from src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java rename to src/main/java/com/dbnt/faisp/main/userInfo/repository/DashboardConfigRepository.java index 31a3e3b2..1f52f42b 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/repository/DashboardConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.userInfo.repository; +package com.dbnt.faisp.main.userInfo.repository; -import com.dbnt.faisp.userInfo.model.DashboardConfig; +import com.dbnt.faisp.main.userInfo.model.DashboardConfig; import org.springframework.data.jpa.repository.JpaRepository; public interface DashboardConfigRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java b/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java similarity index 59% rename from src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java index 4f795266..1db0cf85 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.userInfo.repository; +package com.dbnt.faisp.main.userInfo.repository; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; @@ -9,6 +9,6 @@ import java.util.Optional; public interface UserInfoRepository extends JpaRepository { Optional findByUserId(String userId); - UserInfo findByUserSeq(Integer userSeq); + Optional findByUserSeq(Integer userSeq); } diff --git a/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java similarity index 90% rename from src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java rename to src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java index 6ddaa22f..a1c3138c 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.userInfo.service; +package com.dbnt.faisp.main.userInfo.service; import com.dbnt.faisp.config.Role; -import com.dbnt.faisp.userInfo.mapper.UserInfoMapper; -import com.dbnt.faisp.userInfo.model.DashboardConfig; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.repository.DashboardConfigRepository; -import com.dbnt.faisp.userInfo.repository.UserInfoRepository; +import com.dbnt.faisp.main.userInfo.mapper.UserInfoMapper; +import com.dbnt.faisp.main.userInfo.model.DashboardConfig; +import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.main.userInfo.repository.DashboardConfigRepository; +import com.dbnt.faisp.main.userInfo.repository.UserInfoRepository; import com.dbnt.faisp.util.ParamMap; import lombok.RequiredArgsConstructor; @@ -74,8 +74,9 @@ public class UserInfoService implements UserDetailsService { } public UserInfo selectUserInfo(Integer userSeq) { - return userInfoRepository.findByUserSeq(userSeq); + return userInfoRepository.findByUserSeq(userSeq).orElse(null); } + @Transactional public int updateUserApproval(List userInfo) { int cnt = 0; diff --git a/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java similarity index 90% rename from src/main/java/com/dbnt/faisp/userInfo/userMgtController.java rename to src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java index 1b17c4d5..c2c0f263 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.faisp.main.userInfo; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.userInfo.service.UserInfoService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; +import com.dbnt.faisp.main.userInfo.service.UserInfoService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java b/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java deleted file mode 100644 index e167349e..00000000 --- a/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.dbnt.faisp.menuMgt.repository; - -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import org.springframework.data.jpa.repository.JpaRepository; - - -public interface MenuMgtRepository extends JpaRepository { - MenuMgt findTopByCat1CdAndCat2CdAndCat3Cd(String cat1Cd, String cat2Cd, String cat3Cd); -} diff --git a/src/main/java/com/dbnt/faisp/util/Utils.java b/src/main/java/com/dbnt/faisp/util/Utils.java index d1c50820..896d4469 100644 --- a/src/main/java/com/dbnt/faisp/util/Utils.java +++ b/src/main/java/com/dbnt/faisp/util/Utils.java @@ -25,10 +25,10 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFDataFormat; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import com.dbnt.faisp.equip.model.CellPhone; -import com.dbnt.faisp.equip.model.UseList; -import com.dbnt.faisp.fipTarget.model.PartInfo; -import com.dbnt.faisp.fipTarget.model.PartWork; +import com.dbnt.faisp.main.equip.model.CellPhone; +import com.dbnt.faisp.main.equip.model.UseList; +import com.dbnt.faisp.main.fipTarget.model.PartInfo; +import com.dbnt.faisp.main.fipTarget.model.PartWork; public class Utils { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index bf666445..e117bb19 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -13,14 +13,21 @@ spring.thymeleaf.mode=HTML spring.thymeleaf.cache=false #Datasource Configuration -spring.datasource.hikari.maximum-pool-size=4 spring.sql.init.encoding=utf-8 -spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#spring.datasource.driverClassName=org.postgresql.Driver -spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/faisp -#spring.datasource.url=jdbc:postgresql://106.247.244.146:50503/faisp -spring.datasource.username=dbnt0031 -spring.datasource.password=dbnt0928! +#maximum-pool-size: CPU core count +spring.datasource.hikari.maximum-pool-size=4 +#postgresql +spring.datasource-main.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy +spring.datasource-main.jdbcUrl=jdbc:log4jdbc:postgresql://118.219.150.34:50503/faisp +spring.datasource-main.username=dbnt0031 +spring.datasource-main.password=dbnt0928! +#oracle +spring.datasource-kwms.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy +spring.datasource-kwms.jdbcUrl=jdbc:log4jdbc:oracle:thin:@118.219.150.34:51521:kwms +#spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver +#spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:51521:kwms +spring.datasource-kwms.username=kwms +spring.datasource-kwms.password=dbnt0928 #jpa spring.jpa.show-sql=true @@ -30,5 +37,5 @@ spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming. # MyBatis mybatis.mapper-locations: mybatisMapper/*.xml mybatis.configuration.map-underscore-to-camel-case=true -mybatis.type-aliases-package=com.dbnt.faisp.**.model +mybatis.type-aliases-package=com.dbnt.faisp.main.**.model logging.level.com.atoz_develop.mybatissample.repository=TRACE \ No newline at end of file diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index d37a8f02..a76d5a3f 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -11,14 +11,19 @@ spring.thymeleaf.suffix=.html spring.thymeleaf.mode=HTML #Datasource Configuration -spring.datasource.hikari.maximum-pool-size=4 spring.sql.init.encoding=utf-8 -#spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -spring.datasource.driverClassName=org.postgresql.Driver -#spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/faisp -spring.datasource.url=jdbc:postgresql://118.219.150.34:50503/faisp -spring.datasource.username=dbnt0031 -spring.datasource.password=dbnt0928! +#maximum-pool-size: CPU core count +spring.datasource.hikari.maximum-pool-size=4 +#postgresql +spring.datasource-main.driverClassName=org.postgresql.Driver +spring.datasource-main.url=jdbc:postgresql://118.219.150.34:50503/faisp +spring.datasource-main.username=dbnt0031 +spring.datasource-main.password=dbnt0928! +#oracle +spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver +spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:51521:kwms +spring.datasource-kwms.username=kwms +spring.datasource-kwms.password=dbnt0928 #jpa spring.jpa.show-sql=false @@ -28,5 +33,5 @@ spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming. # MyBatis mybatis.mapper-locations: mybatisMapper/*.xml mybatis.configuration.map-underscore-to-camel-case=true -mybatis.type-aliases-package=com.dbnt.faisp.**.model +mybatis.type-aliases-package=com.dbnt.faisp.main.**.model logging.level.com.atoz_develop.mybatissample.repository=TRACE \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 1873f043..02456e63 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/AuthMgtMapper.xml b/src/main/resources/mybatisMapper/AuthMgtMapper.xml index cbd78887..59690f0b 100644 --- a/src/main/resources/mybatisMapper/AuthMgtMapper.xml +++ b/src/main/resources/mybatisMapper/AuthMgtMapper.xml @@ -3,7 +3,7 @@ - + select (ROW_NUMBER() OVER()) AS rownum, diff --git a/src/main/resources/mybatisMapper/FaRptMapper.xml b/src/main/resources/mybatisMapper/FaRptMapper.xml index ae00ad5a..81605649 100644 --- a/src/main/resources/mybatisMapper/FaRptMapper.xml +++ b/src/main/resources/mybatisMapper/FaRptMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index ae8a44a1..35cf6aab 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -3,7 +3,7 @@ - + with recursive organ_list ( organ_cd diff --git a/src/main/resources/mybatisMapper/PlanMapper.xml b/src/main/resources/mybatisMapper/PlanMapper.xml index eadd5715..29a6f345 100644 --- a/src/main/resources/mybatisMapper/PlanMapper.xml +++ b/src/main/resources/mybatisMapper/PlanMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/PublicBoardMapper.xml b/src/main/resources/mybatisMapper/PublicBoardMapper.xml index ccd45bd2..ee9ad680 100644 --- a/src/main/resources/mybatisMapper/PublicBoardMapper.xml +++ b/src/main/resources/mybatisMapper/PublicBoardMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/ResultMapper.xml b/src/main/resources/mybatisMapper/ResultMapper.xml index c978afde..c5d8cfdd 100644 --- a/src/main/resources/mybatisMapper/ResultMapper.xml +++ b/src/main/resources/mybatisMapper/ResultMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index 27cc1e3a..ed7558ef 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -3,7 +3,7 @@ - + +
- +
+ + + +
+ +
-