From d3557618ed25944e52165454edd48a94b15756e7 Mon Sep 17 00:00:00 2001 From: Hyung Geun Date: Fri, 21 Oct 2022 15:10:40 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=95=88=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- settings.gradle | 2 +- .../SimsApplication.java} | 6 +-- .../authMgt/AuthMgtController.java | 13 +++--- .../authMgt/mapper/AuthMgtMapper.java | 7 ++- .../authMgt/model/AccessConfig.java | 2 +- .../authMgt/model/ApprovalConfig.java | 2 +- .../authMgt/model/AuthMgt.java | 2 +- .../repository/AccessConfigRepository.java | 4 +- .../repository/ApprovalConfigRepository.java | 4 +- .../authMgt/service/AuthMgtService.java | 15 +++---- .../codeMgt/CodeMgtController.java | 6 +-- .../codeMgt/model/CodeCatg.java | 2 +- .../codeMgt/model/CodeMgt.java | 2 +- .../repository/CodeCatgRepository.java | 4 +- .../codeMgt/repository/CodeMgtRepository.java | 4 +- .../codeMgt/service/CodeMgtService.java | 10 ++--- .../config/BaseController.java | 12 +++--- .../{faisp => sims}/config/BaseModel.java | 2 +- .../{faisp => sims}/config/BaseService.java | 2 +- .../config/FileController.java | 12 +++--- .../dbnt/{faisp => sims}/config/FileInfo.java | 2 +- .../{faisp => sims}/config/LogStatus.java | 2 +- .../config/ModalController.java | 8 ++-- .../com/dbnt/{faisp => sims}/config/Role.java | 2 +- .../config/SecurityConfig.java | 4 +- .../equip/EquipController.java | 24 +++++------ .../equip/mapper/EquipMapper.java | 12 +++--- .../equip/model/CellPhone.java | 4 +- .../{faisp => sims}/equip/model/Equip.java | 7 +-- .../equip/model/EquipFile.java | 8 +--- .../{faisp => sims}/equip/model/EquipLog.java | 4 +- .../{faisp => sims}/equip/model/UseList.java | 4 +- .../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 | 36 ++++++++-------- .../faRpt/FaRptController.java | 11 +++-- .../faRpt/mapper/FaRptMapper.java | 4 +- .../faRpt/model/FaRptBoard.java | 6 +-- .../faRpt/model/FaRptFile.java | 4 +- .../faRpt/model/FaRptReadUser.java | 4 +- .../repository/FaRptBoardRepository.java | 4 +- .../faRpt/repository/FaRptFileRepository.java | 4 +- .../repository/FaRptReadUserRepository.java | 4 +- .../faRpt/service/FaRptService.java | 23 +++------- .../InternationalCrimeArrestController.java | 20 ++++----- .../InternationalCrimeArrestMapper.java | 4 +- .../model/InternationalCrimeArrest.java | 4 +- .../model/SuspectPersonInfo.java | 4 +- .../InternationalCrimeArrestRepository.java | 4 +- .../SuspectPersonInfoRepository.java | 4 +- .../InternationalCrimeArrestService.java | 14 +++--- .../fipTarget/FipTargetController.java | 28 ++++++------ .../fipTarget/mapper/FipTargetMapper.java | 12 +++--- .../fipTarget/model/PartInfo.java | 6 +-- .../fipTarget/model/PartInfoFile.java | 8 +--- .../fipTarget/model/PartWork.java | 4 +- .../fipTarget/model/PartWorkFile.java | 8 +--- .../fipTarget/model/VulnFile.java | 8 +--- .../fipTarget/model/Vulnerable.java | 4 +- .../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 | 43 +++++++++---------- .../fpiMgt/affair/AffairController.java | 17 +++----- .../fpiMgt/affair/mapper/AffairMapper.java | 4 +- .../fpiMgt/affair/model/AffairBoard.java | 4 +- .../fpiMgt/affair/model/AffairFile.java | 4 +- .../fpiMgt/affair/model/AffairRating.java | 2 +- .../fpiMgt/affair/model/HashTag.java | 2 +- .../fpiMgt/affair/model/HashTagLink.java | 4 +- .../repository/AffairBoardRepository.java | 4 +- .../repository/AffairFileRepository.java | 4 +- .../repository/AffairRatingRepository.java | 4 +- .../repository/HashTagLinkRepository.java | 4 +- .../affair/repository/HashTagRepository.java | 4 +- .../fpiMgt/affair/service/AffairService.java | 14 +++--- .../fpiMgt/affairPlan/PlanController.java | 14 +++--- .../fpiMgt/affairPlan/mapper/PlanMapper.java | 4 +- .../fpiMgt/affairPlan/model/PlanApprv.java | 2 +- .../fpiMgt/affairPlan/model/PlanBoard.java | 4 +- .../fpiMgt/affairPlan/model/PlanFile.java | 4 +- .../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 | 25 ++++++----- .../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 | 6 +-- .../fpiMgt/affairResult/model/ResultFile.java | 4 +- .../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 | 12 +++--- .../boardInvestigation/IvsgtController.java | 14 +++--- .../mapper/BoardInvestigationMapper.java | 8 ++-- .../boardInvestigation/model/ArrestType.java | 4 +- .../model/BoardInvestigation.java | 4 +- .../model/HashTagLinkIvsgt.java | 2 +- .../boardInvestigation/model/IvsgtFile.java | 4 +- .../model/RelatedReports.java | 4 +- .../repository/ArrestTypeRepository.java | 4 +- .../BoardInvestigationRepository.java | 4 +- .../HashTagLinkIvsgtRepository.java | 4 +- .../repository/IvsgtFileRepository.java | 4 +- .../repository/RelatedReportsRepository.java | 4 +- .../service/BoardInvestigationService.java | 16 +++---- .../menuMgt/MenuMgtController.java | 8 ++-- .../menuMgt/mapper/MenuMgtMapper.java | 4 +- .../menuMgt/model/MenuMgt.java | 4 +- .../menuMgt/repository/MenuMgtRepository.java | 4 +- .../menuMgt/service/MenuMgtService.java | 8 ++-- .../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 | 14 +++--- .../publicBoard/mapper/PublicBoardMapper.java | 4 +- .../publicBoard/model/PublicBoard.java | 4 +- .../publicBoard/model/PublicComment.java | 2 +- .../publicBoard/model/PublicFile.java | 4 +- .../repository/PublicBoardRepository.java | 4 +- .../repository/PublicCommentRepository.java | 4 +- .../repository/PublicFileRepository.java | 4 +- .../service/PublicBoardService.java | 20 ++++----- .../translator/TranslatorController.java | 16 +++---- .../translator/mapper/TranslatorMapper.java | 8 ++-- .../translator/model/Translator.java | 4 +- .../translator/model/TranslatorCrr.java | 4 +- .../TranslatorCareerRepository.java | 4 +- .../repository/TranslatorRepository.java | 4 +- .../translator/service/TranslatorService.java | 16 +++---- .../userInfo/MyInfoController.java | 9 ++-- .../userInfo/UserInfoController.java | 6 +-- .../userInfo/mapper/UserInfoMapper.java | 8 ++-- .../userInfo/model/DashboardConfig.java | 2 +- .../userInfo/model/UserInfo.java | 8 ++-- .../repository/DashboardConfigRepository.java | 4 +- .../repository/UserInfoRepository.java | 4 +- .../userInfo/service/UserInfoService.java | 16 +++---- .../userInfo/userMgtController.java | 8 ++-- .../dbnt/{faisp => sims}/util/ParamMap.java | 2 +- .../com/dbnt/{faisp => sims}/util/Utils.java | 10 ++--- src/main/resources/application-dev.properties | 8 ++-- .../resources/application-test.properties | 8 ++-- .../resources/mybatisMapper/AffairMapper.xml | 2 +- .../resources/mybatisMapper/AuthMgtMapper.xml | 2 +- .../BoardInvestigationMapper.xml | 2 +- .../resources/mybatisMapper/EquipMapper.xml | 8 ++-- .../resources/mybatisMapper/FaRptMapper.xml | 2 +- .../resources/mybatisMapper/FipTarget.xml | 10 ++--- .../InternationalCrimeArrestMapper.xml | 2 +- .../mybatisMapper/OrganConfigMapper.xml | 2 +- .../resources/mybatisMapper/PlanMapper.xml | 2 +- .../mybatisMapper/PublicBoardMapper.xml | 2 +- .../resources/mybatisMapper/ResultMapper.xml | 2 +- .../mybatisMapper/TranslatorMapper.xml | 8 ++-- .../mybatisMapper/UserInfoMapper.xml | 4 +- .../resources/mybatisMapper/menuMgtMapper.xml | 2 +- .../templates/adminPage/userMgt/userMgt.html | 4 +- .../templates/equip/equipLogList.html | 2 +- .../templates/equip/equipStatus.html | 2 +- .../resources/templates/faRpt/faRptBoard.html | 4 +- .../templates/faRpt/faRptEditModal.html | 2 +- .../fipTarget/partInfoEditModal.html | 2 +- .../templates/fipTarget/partInfoHistory.html | 2 +- .../templates/fipTarget/partInfoList.html | 2 +- .../fipTarget/partInfoModifyModal.html | 2 +- .../fipTarget/partWorkEditModal.html | 2 +- .../templates/fipTarget/partWorkList.html | 4 +- .../fipTarget/partWorkModifyModal.html | 2 +- .../templates/fipTarget/vulnEditModal.html | 2 +- .../templates/fipTarget/vulnerableList.html | 2 +- .../resources/templates/fragments/header.html | 2 +- .../igActivities/fpiMgt/affair/affairMgt.html | 2 +- .../fpiMgt/affair/affairMgtDashboard.html | 2 +- .../fpiMgt/affairPlan/planMgt.html | 2 +- .../fpiMgt/affairResult/resultMgt.html | 2 +- .../resources/templates/layout/layout.html | 2 +- src/main/resources/templates/login/login.html | 2 +- 198 files changed, 569 insertions(+), 619 deletions(-) rename src/main/java/com/dbnt/{faisp/FaispApplication.java => sims/SimsApplication.java} (63%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/AuthMgtController.java (82%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/mapper/AuthMgtMapper.java (60%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/model/AccessConfig.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/model/ApprovalConfig.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/model/AuthMgt.java (83%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/repository/AccessConfigRepository.java (65%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/repository/ApprovalConfigRepository.java (65%) rename src/main/java/com/dbnt/{faisp => sims}/authMgt/service/AuthMgtService.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/codeMgt/CodeMgtController.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/codeMgt/model/CodeCatg.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/codeMgt/model/CodeMgt.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/codeMgt/repository/CodeCatgRepository.java (62%) rename src/main/java/com/dbnt/{faisp => sims}/codeMgt/repository/CodeMgtRepository.java (83%) rename src/main/java/com/dbnt/{faisp => sims}/codeMgt/service/CodeMgtService.java (88%) rename src/main/java/com/dbnt/{faisp => sims}/config/BaseController.java (88%) rename src/main/java/com/dbnt/{faisp => sims}/config/BaseModel.java (97%) rename src/main/java/com/dbnt/{faisp => sims}/config/BaseService.java (97%) rename src/main/java/com/dbnt/{faisp => sims}/config/FileController.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/config/FileInfo.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/config/LogStatus.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/config/ModalController.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/config/Role.java (86%) rename src/main/java/com/dbnt/{faisp => sims}/config/SecurityConfig.java (98%) rename src/main/java/com/dbnt/{faisp => sims}/equip/EquipController.java (97%) rename src/main/java/com/dbnt/{faisp => sims}/equip/mapper/EquipMapper.java (78%) rename src/main/java/com/dbnt/{faisp => sims}/equip/model/CellPhone.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/equip/model/Equip.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/equip/model/EquipFile.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/equip/model/EquipLog.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/equip/model/UseList.java (97%) rename src/main/java/com/dbnt/{faisp => sims}/equip/repository/CellPhoneRepository.java (64%) rename src/main/java/com/dbnt/{faisp => sims}/equip/repository/EquipFileRepository.java (70%) rename src/main/java/com/dbnt/{faisp => sims}/equip/repository/EquipLogRepository.java (64%) rename src/main/java/com/dbnt/{faisp => sims}/equip/repository/EquipRepository.java (79%) rename src/main/java/com/dbnt/{faisp => sims}/equip/repository/UseListRepository.java (82%) rename src/main/java/com/dbnt/{faisp => sims}/equip/service/EquipService.java (93%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/FaRptController.java (93%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/mapper/FaRptMapper.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/model/FaRptBoard.java (89%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/model/FaRptFile.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/model/FaRptReadUser.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/repository/FaRptBoardRepository.java (63%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/repository/FaRptFileRepository.java (79%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/repository/FaRptReadUserRepository.java (74%) rename src/main/java/com/dbnt/{faisp => sims}/faRpt/service/FaRptService.java (58%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java (89%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java (68%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java (51%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java (80%) rename src/main/java/com/dbnt/{faisp => sims}/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java (82%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/FipTargetController.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/mapper/FipTargetMapper.java (80%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/model/PartInfo.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/model/PartInfoFile.java (86%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/model/PartWork.java (97%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/model/PartWorkFile.java (86%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/model/VulnFile.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/model/Vulnerable.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/repository/PartInfoFileRepository.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/repository/PartInfoRepository.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/repository/PartWorkFileRepository.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/repository/PartWorkRepository.java (77%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/repository/VulnFileRepository.java (81%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/repository/VulnRepository.java (61%) rename src/main/java/com/dbnt/{faisp => sims}/fipTarget/service/FipTargetService.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/AffairController.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/mapper/AffairMapper.java (73%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/model/AffairBoard.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/model/AffairFile.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/model/AffairRating.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/model/HashTag.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/model/HashTagLink.java (89%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/repository/AffairBoardRepository.java (59%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/repository/AffairFileRepository.java (77%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/repository/AffairRatingRepository.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/repository/HashTagLinkRepository.java (67%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/repository/HashTagRepository.java (68%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affair/service/AffairService.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/PlanController.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/mapper/PlanMapper.java (68%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/model/PlanApprv.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/model/PlanBoard.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/model/PlanFile.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/model/PlanMainInfo.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/repository/PlanApprvRepository.java (75%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/repository/PlanBoardRepository.java (57%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/repository/PlanFileRepository.java (75%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java (69%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairPlan/service/PlanService.java (85%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/ResultController.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/mapper/ResultMapper.java (57%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ClearInfo.java (90%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ResultApprv.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ResultBoard.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ResultFile.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ResultInfo.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ResultToAffair.java (93%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/model/ResultToPlan.java (93%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ClearInfoRepository.java (71%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ResultApprvRepository.java (75%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ResultBoardRepository.java (56%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ResultFileRepository.java (75%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ResultInfoRepository.java (71%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ResultToAffairRepository.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/repository/ResultToPlanRepository.java (59%) rename src/main/java/com/dbnt/{faisp => sims}/fpiMgt/affairResult/service/ResultService.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/IvsgtController.java (90%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java (62%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/model/ArrestType.java (88%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/model/IvsgtFile.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/model/RelatedReports.java (90%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java (53%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java (54%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java (62%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java (81%) rename src/main/java/com/dbnt/{faisp => sims}/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/menuMgt/MenuMgtController.java (89%) rename src/main/java/com/dbnt/{faisp => sims}/menuMgt/mapper/MenuMgtMapper.java (83%) rename src/main/java/com/dbnt/{faisp => sims}/menuMgt/model/MenuMgt.java (93%) rename src/main/java/com/dbnt/{faisp => sims}/menuMgt/repository/MenuMgtRepository.java (72%) rename src/main/java/com/dbnt/{faisp => sims}/menuMgt/service/MenuMgtService.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/organMgt/OrganConfigController.java (86%) rename src/main/java/com/dbnt/{faisp => sims}/organMgt/mapper/OrganConfigMapper.java (73%) rename src/main/java/com/dbnt/{faisp => sims}/organMgt/model/OrganConfig.java (90%) rename src/main/java/com/dbnt/{faisp => sims}/organMgt/repository/OrganConfigRepository.java (74%) rename src/main/java/com/dbnt/{faisp => sims}/organMgt/service/OrganConfigService.java (82%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/PublicBoardController.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/mapper/PublicBoardMapper.java (76%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/model/PublicBoard.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/model/PublicComment.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/model/PublicFile.java (92%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/repository/PublicBoardRepository.java (60%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/repository/PublicCommentRepository.java (80%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/repository/PublicFileRepository.java (77%) rename src/main/java/com/dbnt/{faisp => sims}/publicBoard/service/PublicBoardService.java (88%) rename src/main/java/com/dbnt/{faisp => sims}/translator/TranslatorController.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/translator/mapper/TranslatorMapper.java (76%) rename src/main/java/com/dbnt/{faisp => sims}/translator/model/Translator.java (96%) rename src/main/java/com/dbnt/{faisp => sims}/translator/model/TranslatorCrr.java (94%) rename src/main/java/com/dbnt/{faisp => sims}/translator/repository/TranslatorCareerRepository.java (81%) rename src/main/java/com/dbnt/{faisp => sims}/translator/repository/TranslatorRepository.java (73%) rename src/main/java/com/dbnt/{faisp => sims}/translator/service/TranslatorService.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/MyInfoController.java (86%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/UserInfoController.java (79%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/mapper/UserInfoMapper.java (66%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/model/DashboardConfig.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/model/UserInfo.java (95%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/repository/DashboardConfigRepository.java (69%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/repository/UserInfoRepository.java (75%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/service/UserInfoService.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/userInfo/userMgtController.java (91%) rename src/main/java/com/dbnt/{faisp => sims}/util/ParamMap.java (99%) rename src/main/java/com/dbnt/{faisp => sims}/util/Utils.java (99%) diff --git a/README.md b/README.md index 30d4149..77e4421 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -#해양경찰청 외사종합포털 +#해양경찰청 보안정보관리시스템 java 11 postgreSql 14.2 diff --git a/settings.gradle b/settings.gradle index 5ebe3ea..c7d0550 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'faisp' +rootProject.name = 'sims' diff --git a/src/main/java/com/dbnt/faisp/FaispApplication.java b/src/main/java/com/dbnt/sims/SimsApplication.java similarity index 63% rename from src/main/java/com/dbnt/faisp/FaispApplication.java rename to src/main/java/com/dbnt/sims/SimsApplication.java index 7871175..df57014 100644 --- a/src/main/java/com/dbnt/faisp/FaispApplication.java +++ b/src/main/java/com/dbnt/sims/SimsApplication.java @@ -1,13 +1,13 @@ -package com.dbnt.faisp; +package com.dbnt.sims; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class FaispApplication { +public class SimsApplication { public static void main(String[] args) { - SpringApplication.run(FaispApplication.class, args); + SpringApplication.run(SimsApplication.class, args); } } diff --git a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java b/src/main/java/com/dbnt/sims/authMgt/AuthMgtController.java similarity index 82% rename from src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java rename to src/main/java/com/dbnt/sims/authMgt/AuthMgtController.java index a1f5ec2..0655ae0 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java +++ b/src/main/java/com/dbnt/sims/authMgt/AuthMgtController.java @@ -1,16 +1,13 @@ -package com.dbnt.faisp.authMgt; +package com.dbnt.sims.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.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.authMgt.model.AuthMgt; +import com.dbnt.sims.userInfo.service.UserInfoService; +import com.dbnt.sims.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/sims/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/sims/authMgt/mapper/AuthMgtMapper.java index 6011cc1..8f036d7 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java +++ b/src/main/java/com/dbnt/sims/authMgt/mapper/AuthMgtMapper.java @@ -1,8 +1,7 @@ -package com.dbnt.faisp.authMgt.mapper; +package com.dbnt.sims.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.sims.authMgt.model.AccessConfig; +import com.dbnt.sims.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/sims/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/sims/authMgt/model/AccessConfig.java index 9124443..6bc4480 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java +++ b/src/main/java/com/dbnt/sims/authMgt/model/AccessConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt.model; +package com.dbnt.sims.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/sims/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/sims/authMgt/model/ApprovalConfig.java index 96f3084..bd7d7c0 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java +++ b/src/main/java/com/dbnt/sims/authMgt/model/ApprovalConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt.model; +package com.dbnt.sims.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/sims/authMgt/model/AuthMgt.java similarity index 83% rename from src/main/java/com/dbnt/faisp/authMgt/model/AuthMgt.java rename to src/main/java/com/dbnt/sims/authMgt/model/AuthMgt.java index 813349f..7f28031 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/model/AuthMgt.java +++ b/src/main/java/com/dbnt/sims/authMgt/model/AuthMgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.authMgt.model; +package com.dbnt.sims.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/sims/authMgt/repository/AccessConfigRepository.java similarity index 65% rename from src/main/java/com/dbnt/faisp/authMgt/repository/AccessConfigRepository.java rename to src/main/java/com/dbnt/sims/authMgt/repository/AccessConfigRepository.java index a3c484f..a8cd351 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/repository/AccessConfigRepository.java +++ b/src/main/java/com/dbnt/sims/authMgt/repository/AccessConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.authMgt.repository; +package com.dbnt.sims.authMgt.repository; -import com.dbnt.faisp.authMgt.model.AccessConfig; +import com.dbnt.sims.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/sims/authMgt/repository/ApprovalConfigRepository.java similarity index 65% rename from src/main/java/com/dbnt/faisp/authMgt/repository/ApprovalConfigRepository.java rename to src/main/java/com/dbnt/sims/authMgt/repository/ApprovalConfigRepository.java index c83ae09..5708831 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/repository/ApprovalConfigRepository.java +++ b/src/main/java/com/dbnt/sims/authMgt/repository/ApprovalConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.authMgt.repository; +package com.dbnt.sims.authMgt.repository; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; +import com.dbnt.sims.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/sims/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/sims/authMgt/service/AuthMgtService.java index 1344cfd..b8e36b0 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java +++ b/src/main/java/com/dbnt/sims/authMgt/service/AuthMgtService.java @@ -1,12 +1,11 @@ -package com.dbnt.faisp.authMgt.service; +package com.dbnt.sims.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.sims.authMgt.mapper.AuthMgtMapper; +import com.dbnt.sims.authMgt.model.AccessConfig; +import com.dbnt.sims.authMgt.model.ApprovalConfig; +import com.dbnt.sims.authMgt.model.AuthMgt; +import com.dbnt.sims.authMgt.repository.AccessConfigRepository; +import com.dbnt.sims.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/sims/codeMgt/CodeMgtController.java similarity index 85% rename from src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java rename to src/main/java/com/dbnt/sims/codeMgt/CodeMgtController.java index 22788e2..edd8e42 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtController.java +++ b/src/main/java/com/dbnt/sims/codeMgt/CodeMgtController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.codeMgt; +package com.dbnt.sims.codeMgt; -import com.dbnt.faisp.codeMgt.model.CodeCatg; -import com.dbnt.faisp.codeMgt.service.CodeMgtService; +import com.dbnt.sims.codeMgt.model.CodeCatg; +import com.dbnt.sims.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/sims/codeMgt/model/CodeCatg.java similarity index 94% rename from src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java rename to src/main/java/com/dbnt/sims/codeMgt/model/CodeCatg.java index e719bc8..740473b 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/model/CodeCatg.java +++ b/src/main/java/com/dbnt/sims/codeMgt/model/CodeCatg.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.codeMgt.model; +package com.dbnt.sims.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/sims/codeMgt/model/CodeMgt.java similarity index 96% rename from src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java rename to src/main/java/com/dbnt/sims/codeMgt/model/CodeMgt.java index 0ce6f80..3cf0bec 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/model/CodeMgt.java +++ b/src/main/java/com/dbnt/sims/codeMgt/model/CodeMgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.codeMgt.model; +package com.dbnt.sims.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/sims/codeMgt/repository/CodeCatgRepository.java similarity index 62% rename from src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java rename to src/main/java/com/dbnt/sims/codeMgt/repository/CodeCatgRepository.java index 55c94e7..89470d0 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeCatgRepository.java +++ b/src/main/java/com/dbnt/sims/codeMgt/repository/CodeCatgRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.codeMgt.repository; +package com.dbnt.sims.codeMgt.repository; -import com.dbnt.faisp.codeMgt.model.CodeCatg; +import com.dbnt.sims.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/sims/codeMgt/repository/CodeMgtRepository.java similarity index 83% rename from src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java rename to src/main/java/com/dbnt/sims/codeMgt/repository/CodeMgtRepository.java index c34bb06..04b4403 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/repository/CodeMgtRepository.java +++ b/src/main/java/com/dbnt/sims/codeMgt/repository/CodeMgtRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.codeMgt.repository; +package com.dbnt.sims.codeMgt.repository; -import com.dbnt.faisp.codeMgt.model.CodeMgt; +import com.dbnt.sims.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/sims/codeMgt/service/CodeMgtService.java similarity index 88% rename from src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java rename to src/main/java/com/dbnt/sims/codeMgt/service/CodeMgtService.java index c03b559..26b7f99 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/service/CodeMgtService.java +++ b/src/main/java/com/dbnt/sims/codeMgt/service/CodeMgtService.java @@ -1,9 +1,9 @@ -package com.dbnt.faisp.codeMgt.service; +package com.dbnt.sims.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.sims.codeMgt.model.CodeCatg; +import com.dbnt.sims.codeMgt.model.CodeMgt; +import com.dbnt.sims.codeMgt.repository.CodeCatgRepository; +import com.dbnt.sims.codeMgt.repository.CodeMgtRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/sims/config/BaseController.java similarity index 88% rename from src/main/java/com/dbnt/faisp/config/BaseController.java rename to src/main/java/com/dbnt/sims/config/BaseController.java index 6fb3d4e..cd4b685 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/sims/config/BaseController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.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.sims.menuMgt.service.MenuMgtService; +import com.dbnt.sims.organMgt.service.OrganConfigService; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.sims.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/BaseModel.java b/src/main/java/com/dbnt/sims/config/BaseModel.java similarity index 97% rename from src/main/java/com/dbnt/faisp/config/BaseModel.java rename to src/main/java/com/dbnt/sims/config/BaseModel.java index 9305411..7587853 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseModel.java +++ b/src/main/java/com/dbnt/sims/config/BaseModel.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/config/BaseService.java b/src/main/java/com/dbnt/sims/config/BaseService.java similarity index 97% rename from src/main/java/com/dbnt/faisp/config/BaseService.java rename to src/main/java/com/dbnt/sims/config/BaseService.java index e36d5ac..5bb5707 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseService.java +++ b/src/main/java/com/dbnt/sims/config/BaseService.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/sims/config/FileController.java similarity index 91% rename from src/main/java/com/dbnt/faisp/config/FileController.java rename to src/main/java/com/dbnt/sims/config/FileController.java index 49b4cbc..44fb45c 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/sims/config/FileController.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; -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.sims.fpiMgt.affair.service.AffairService; +import com.dbnt.sims.fpiMgt.affairPlan.service.PlanService; +import com.dbnt.sims.fpiMgt.affairResult.service.ResultService; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; +import com.dbnt.sims.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/FileInfo.java b/src/main/java/com/dbnt/sims/config/FileInfo.java similarity index 91% rename from src/main/java/com/dbnt/faisp/config/FileInfo.java rename to src/main/java/com/dbnt/sims/config/FileInfo.java index ffb2120..7c5c5ed 100644 --- a/src/main/java/com/dbnt/faisp/config/FileInfo.java +++ b/src/main/java/com/dbnt/sims/config/FileInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/config/LogStatus.java b/src/main/java/com/dbnt/sims/config/LogStatus.java similarity index 94% rename from src/main/java/com/dbnt/faisp/config/LogStatus.java rename to src/main/java/com/dbnt/sims/config/LogStatus.java index c136364..2254a11 100644 --- a/src/main/java/com/dbnt/faisp/config/LogStatus.java +++ b/src/main/java/com/dbnt/sims/config/LogStatus.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/sims/config/ModalController.java similarity index 85% rename from src/main/java/com/dbnt/faisp/config/ModalController.java rename to src/main/java/com/dbnt/sims/config/ModalController.java index f8568d0..8dc7157 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/src/main/java/com/dbnt/sims/config/ModalController.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; -import com.dbnt.faisp.menuMgt.model.MenuMgt; -import com.dbnt.faisp.menuMgt.service.MenuMgtService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.sims.menuMgt.model.MenuMgt; +import com.dbnt.sims.menuMgt.service.MenuMgtService; +import com.dbnt.sims.userInfo.model.UserInfo; 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/Role.java b/src/main/java/com/dbnt/sims/config/Role.java similarity index 86% rename from src/main/java/com/dbnt/faisp/config/Role.java rename to src/main/java/com/dbnt/sims/config/Role.java index 4aecfbc..8245e5e 100644 --- a/src/main/java/com/dbnt/faisp/config/Role.java +++ b/src/main/java/com/dbnt/sims/config/Role.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/sims/config/SecurityConfig.java similarity index 98% rename from src/main/java/com/dbnt/faisp/config/SecurityConfig.java rename to src/main/java/com/dbnt/sims/config/SecurityConfig.java index 1939c12..88e2a71 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/sims/config/SecurityConfig.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.config; +package com.dbnt.sims.config; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.sims.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/sims/equip/EquipController.java similarity index 97% rename from src/main/java/com/dbnt/faisp/equip/EquipController.java rename to src/main/java/com/dbnt/sims/equip/EquipController.java index c08a685..2fd69bb 100644 --- a/src/main/java/com/dbnt/faisp/equip/EquipController.java +++ b/src/main/java/com/dbnt/sims/equip/EquipController.java @@ -1,17 +1,17 @@ -package com.dbnt.faisp.equip; +package com.dbnt.sims.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.util.ParamMap; -import com.dbnt.faisp.util.Utils; +import com.dbnt.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.equip.model.CellPhone; +import com.dbnt.sims.equip.model.Equip; +import com.dbnt.sims.equip.model.EquipLog; +import com.dbnt.sims.equip.model.UseList; +import com.dbnt.sims.equip.service.EquipService; +import com.dbnt.sims.organMgt.service.OrganConfigService; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.userInfo.service.UserInfoService; +import com.dbnt.sims.util.ParamMap; +import com.dbnt.sims.util.Utils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/sims/equip/mapper/EquipMapper.java similarity index 78% rename from src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java rename to src/main/java/com/dbnt/sims/equip/mapper/EquipMapper.java index 26c2178..8771e67 100644 --- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/sims/equip/mapper/EquipMapper.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.equip.mapper; +package com.dbnt.sims.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.util.ParamMap; +import com.dbnt.sims.equip.model.CellPhone; +import com.dbnt.sims.equip.model.Equip; +import com.dbnt.sims.equip.model.EquipLog; +import com.dbnt.sims.equip.model.UseList; +import com.dbnt.sims.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/sims/equip/model/CellPhone.java similarity index 95% rename from src/main/java/com/dbnt/faisp/equip/model/CellPhone.java rename to src/main/java/com/dbnt/sims/equip/model/CellPhone.java index 91718c9..9321fb4 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/CellPhone.java +++ b/src/main/java/com/dbnt/sims/equip/model/CellPhone.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.sims.equip.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/equip/model/Equip.java b/src/main/java/com/dbnt/sims/equip/model/Equip.java similarity index 92% rename from src/main/java/com/dbnt/faisp/equip/model/Equip.java rename to src/main/java/com/dbnt/sims/equip/model/Equip.java index 966c0cc..39ed6c4 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/Equip.java +++ b/src/main/java/com/dbnt/sims/equip/model/Equip.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.sims.equip.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -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/sims/equip/model/EquipFile.java similarity index 85% rename from src/main/java/com/dbnt/faisp/equip/model/EquipFile.java rename to src/main/java/com/dbnt/sims/equip/model/EquipFile.java index 9369070..f6bb794 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/EquipFile.java +++ b/src/main/java/com/dbnt/sims/equip/model/EquipFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.sims.equip.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -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/sims/equip/model/EquipLog.java similarity index 94% rename from src/main/java/com/dbnt/faisp/equip/model/EquipLog.java rename to src/main/java/com/dbnt/sims/equip/model/EquipLog.java index 435c1f2..426bb4b 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/EquipLog.java +++ b/src/main/java/com/dbnt/sims/equip/model/EquipLog.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.sims.equip.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/equip/model/UseList.java b/src/main/java/com/dbnt/sims/equip/model/UseList.java similarity index 97% rename from src/main/java/com/dbnt/faisp/equip/model/UseList.java rename to src/main/java/com/dbnt/sims/equip/model/UseList.java index d24f3d7..246e668 100644 --- a/src/main/java/com/dbnt/faisp/equip/model/UseList.java +++ b/src/main/java/com/dbnt/sims/equip/model/UseList.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.model; +package com.dbnt.sims.equip.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java b/src/main/java/com/dbnt/sims/equip/repository/CellPhoneRepository.java similarity index 64% rename from src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java rename to src/main/java/com/dbnt/sims/equip/repository/CellPhoneRepository.java index c7c7c6d..f35d5f6 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/CellPhoneRepository.java +++ b/src/main/java/com/dbnt/sims/equip/repository/CellPhoneRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.sims.equip.repository; -import com.dbnt.faisp.equip.model.CellPhone; +import com.dbnt.sims.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/sims/equip/repository/EquipFileRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/equip/repository/EquipFileRepository.java rename to src/main/java/com/dbnt/sims/equip/repository/EquipFileRepository.java index 78c0e4c..0036dd2 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipFileRepository.java +++ b/src/main/java/com/dbnt/sims/equip/repository/EquipFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.sims.equip.repository; -import com.dbnt.faisp.equip.model.EquipFile; +import com.dbnt.sims.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/sims/equip/repository/EquipLogRepository.java similarity index 64% rename from src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java rename to src/main/java/com/dbnt/sims/equip/repository/EquipLogRepository.java index b54b44c..3354ab7 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipLogRepository.java +++ b/src/main/java/com/dbnt/sims/equip/repository/EquipLogRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.sims.equip.repository; -import com.dbnt.faisp.equip.model.EquipLog; +import com.dbnt.sims.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/sims/equip/repository/EquipRepository.java similarity index 79% rename from src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java rename to src/main/java/com/dbnt/sims/equip/repository/EquipRepository.java index b2e456a..68a052a 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/EquipRepository.java +++ b/src/main/java/com/dbnt/sims/equip/repository/EquipRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.sims.equip.repository; -import com.dbnt.faisp.equip.model.Equip; +import com.dbnt.sims.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/sims/equip/repository/UseListRepository.java similarity index 82% rename from src/main/java/com/dbnt/faisp/equip/repository/UseListRepository.java rename to src/main/java/com/dbnt/sims/equip/repository/UseListRepository.java index 42211e2..6ed7126 100644 --- a/src/main/java/com/dbnt/faisp/equip/repository/UseListRepository.java +++ b/src/main/java/com/dbnt/sims/equip/repository/UseListRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.equip.repository; +package com.dbnt.sims.equip.repository; -import com.dbnt.faisp.equip.model.UseList; +import com.dbnt.sims.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/sims/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/sims/equip/service/EquipService.java index a6024ca..f15a059 100644 --- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/sims/equip/service/EquipService.java @@ -1,23 +1,23 @@ -package com.dbnt.faisp.equip.service; +package com.dbnt.sims.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.util.ParamMap; -import com.dbnt.faisp.util.Utils; +import com.dbnt.sims.equip.mapper.EquipMapper; +import com.dbnt.sims.equip.model.CellPhone; +import com.dbnt.sims.equip.model.Equip; +import com.dbnt.sims.equip.model.Equip.EquipId; +import com.dbnt.sims.equip.model.EquipFile; +import com.dbnt.sims.equip.model.EquipFile.EquipFileId; +import com.dbnt.sims.equip.model.EquipLog; +import com.dbnt.sims.equip.model.UseList; +import com.dbnt.sims.equip.model.UseList.UseListId; +import com.dbnt.sims.equip.repository.CellPhoneRepository; +import com.dbnt.sims.equip.repository.EquipFileRepository; +import com.dbnt.sims.equip.repository.EquipLogRepository; +import com.dbnt.sims.equip.repository.EquipRepository; +import com.dbnt.sims.equip.repository.UseListRepository; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.util.ParamMap; +import com.dbnt.sims.util.Utils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java b/src/main/java/com/dbnt/sims/faRpt/FaRptController.java similarity index 93% rename from src/main/java/com/dbnt/faisp/faRpt/FaRptController.java rename to src/main/java/com/dbnt/sims/faRpt/FaRptController.java index 4ca0c3a..a9fa298 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/FaRptController.java +++ b/src/main/java/com/dbnt/sims/faRpt/FaRptController.java @@ -1,10 +1,9 @@ -package com.dbnt.faisp.faRpt; +package com.dbnt.sims.faRpt; -import com.dbnt.faisp.authMgt.service.AuthMgtService; -import com.dbnt.faisp.faRpt.model.FaRptBoard; -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.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.faRpt.model.FaRptBoard; +import com.dbnt.sims.faRpt.service.FaRptService; +import com.dbnt.sims.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/sims/faRpt/mapper/FaRptMapper.java similarity index 72% rename from src/main/java/com/dbnt/faisp/faRpt/mapper/FaRptMapper.java rename to src/main/java/com/dbnt/sims/faRpt/mapper/FaRptMapper.java index 5f5b300..bf1bcdf 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/mapper/FaRptMapper.java +++ b/src/main/java/com/dbnt/sims/faRpt/mapper/FaRptMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.mapper; +package com.dbnt.sims.faRpt.mapper; -import com.dbnt.faisp.faRpt.model.FaRptBoard; +import com.dbnt.sims.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/sims/faRpt/model/FaRptBoard.java similarity index 89% rename from src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java rename to src/main/java/com/dbnt/sims/faRpt/model/FaRptBoard.java index 192d33d..cb6a51c 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptBoard.java +++ b/src/main/java/com/dbnt/sims/faRpt/model/FaRptBoard.java @@ -1,8 +1,6 @@ -package com.dbnt.faisp.faRpt.model; +package com.dbnt.sims.faRpt.model; -import com.dbnt.faisp.config.BaseModel; -import com.dbnt.faisp.publicBoard.model.PublicComment; -import com.dbnt.faisp.publicBoard.model.PublicFile; +import com.dbnt.sims.config.BaseModel; 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/sims/faRpt/model/FaRptFile.java similarity index 92% rename from src/main/java/com/dbnt/faisp/faRpt/model/FaRptFile.java rename to src/main/java/com/dbnt/sims/faRpt/model/FaRptFile.java index 6b5138b..ac4218a 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptFile.java +++ b/src/main/java/com/dbnt/sims/faRpt/model/FaRptFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.model; +package com.dbnt.sims.faRpt.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptReadUser.java b/src/main/java/com/dbnt/sims/faRpt/model/FaRptReadUser.java similarity index 92% rename from src/main/java/com/dbnt/faisp/faRpt/model/FaRptReadUser.java rename to src/main/java/com/dbnt/sims/faRpt/model/FaRptReadUser.java index b87ad1d..5430081 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/model/FaRptReadUser.java +++ b/src/main/java/com/dbnt/sims/faRpt/model/FaRptReadUser.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.model; +package com.dbnt.sims.faRpt.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptBoardRepository.java b/src/main/java/com/dbnt/sims/faRpt/repository/FaRptBoardRepository.java similarity index 63% rename from src/main/java/com/dbnt/faisp/faRpt/repository/FaRptBoardRepository.java rename to src/main/java/com/dbnt/sims/faRpt/repository/FaRptBoardRepository.java index 1a62339..e9d87f9 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptBoardRepository.java +++ b/src/main/java/com/dbnt/sims/faRpt/repository/FaRptBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.sims.faRpt.repository; -import com.dbnt.faisp.faRpt.model.FaRptBoard; +import com.dbnt.sims.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/sims/faRpt/repository/FaRptFileRepository.java similarity index 79% rename from src/main/java/com/dbnt/faisp/faRpt/repository/FaRptFileRepository.java rename to src/main/java/com/dbnt/sims/faRpt/repository/FaRptFileRepository.java index 61505fa..74decc5 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptFileRepository.java +++ b/src/main/java/com/dbnt/sims/faRpt/repository/FaRptFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.sims.faRpt.repository; -import com.dbnt.faisp.faRpt.model.FaRptFile; +import com.dbnt.sims.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/sims/faRpt/repository/FaRptReadUserRepository.java similarity index 74% rename from src/main/java/com/dbnt/faisp/faRpt/repository/FaRptReadUserRepository.java rename to src/main/java/com/dbnt/sims/faRpt/repository/FaRptReadUserRepository.java index d9a1d42..9cf8af8 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/repository/FaRptReadUserRepository.java +++ b/src/main/java/com/dbnt/sims/faRpt/repository/FaRptReadUserRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faRpt.repository; +package com.dbnt.sims.faRpt.repository; -import com.dbnt.faisp.faRpt.model.FaRptReadUser; +import com.dbnt.sims.faRpt.model.FaRptReadUser; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/faRpt/service/FaRptService.java b/src/main/java/com/dbnt/sims/faRpt/service/FaRptService.java similarity index 58% rename from src/main/java/com/dbnt/faisp/faRpt/service/FaRptService.java rename to src/main/java/com/dbnt/sims/faRpt/service/FaRptService.java index 0f307cf..a7de031 100644 --- a/src/main/java/com/dbnt/faisp/faRpt/service/FaRptService.java +++ b/src/main/java/com/dbnt/sims/faRpt/service/FaRptService.java @@ -1,24 +1,15 @@ -package com.dbnt.faisp.faRpt.service; +package com.dbnt.sims.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.FaRptReadUser; -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.publicBoard.model.PublicBoard; -import com.dbnt.faisp.publicBoard.model.PublicComment; -import com.dbnt.faisp.publicBoard.model.PublicFile; +import com.dbnt.sims.config.BaseService; +import com.dbnt.sims.faRpt.mapper.FaRptMapper; +import com.dbnt.sims.faRpt.model.FaRptBoard; +import com.dbnt.sims.faRpt.repository.FaRptBoardRepository; +import com.dbnt.sims.faRpt.repository.FaRptFileRepository; +import com.dbnt.sims.faRpt.repository.FaRptReadUserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.util.List; -import java.util.UUID; @Service diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java similarity index 89% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java rename to src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index 2759466..7056716 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -1,14 +1,14 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest; +package com.dbnt.sims.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.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.codeMgt.model.CodeMgt; +import com.dbnt.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService; +import com.dbnt.sims.organMgt.model.OrganConfig; +import com.dbnt.sims.organMgt.service.OrganConfigService; +import com.dbnt.sims.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/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java similarity index 68% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java rename to src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java index 11686f6..7bb9baa 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper; +package com.dbnt.sims.faStatistics.internationalCrimeArrest.mapper; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java similarity index 96% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java rename to src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java index 1e35b1b..6629a2c 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model; +package com.dbnt.sims.faStatistics.internationalCrimeArrest.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java similarity index 91% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java rename to src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java index c70258f..a29442f 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model; +package com.dbnt.sims.faStatistics.internationalCrimeArrest.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java similarity index 51% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java rename to src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java index 6d1d977..56e2223 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository; +package com.dbnt.sims.faStatistics.internationalCrimeArrest.repository; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.sims.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/sims/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/sims/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java index f4ad9db..8e3d53a 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository; +package com.dbnt.sims.faStatistics.internationalCrimeArrest.repository; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; +import com.dbnt.sims.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/sims/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java similarity index 82% rename from src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java rename to src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 85fc39a..2b4d3e5 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/sims/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.faStatistics.internationalCrimeArrest.service; +package com.dbnt.sims.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.sims.config.BaseService; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.repository.InternationalCrimeArrestRepository; +import com.dbnt.sims.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/sims/fipTarget/FipTargetController.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java rename to src/main/java/com/dbnt/sims/fipTarget/FipTargetController.java index 570caf8..ebc2921 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/sims/fipTarget/FipTargetController.java @@ -1,19 +1,19 @@ -package com.dbnt.faisp.fipTarget; +package com.dbnt.sims.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.util.ParamMap; -import com.dbnt.faisp.util.Utils; +import com.dbnt.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.fipTarget.model.PartInfo; +import com.dbnt.sims.fipTarget.model.PartInfoFile; +import com.dbnt.sims.fipTarget.model.PartWork; +import com.dbnt.sims.fipTarget.model.PartWorkFile; +import com.dbnt.sims.fipTarget.model.VulnFile; +import com.dbnt.sims.fipTarget.model.Vulnerable; +import com.dbnt.sims.fipTarget.service.FipTargetService; +import com.dbnt.sims.organMgt.service.OrganConfigService; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.userInfo.service.UserInfoService; +import com.dbnt.sims.util.ParamMap; +import com.dbnt.sims.util.Utils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/mapper/FipTargetMapper.java b/src/main/java/com/dbnt/sims/fipTarget/mapper/FipTargetMapper.java similarity index 80% rename from src/main/java/com/dbnt/faisp/fipTarget/mapper/FipTargetMapper.java rename to src/main/java/com/dbnt/sims/fipTarget/mapper/FipTargetMapper.java index 2d4223f..13cb520 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/mapper/FipTargetMapper.java +++ b/src/main/java/com/dbnt/sims/fipTarget/mapper/FipTargetMapper.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.fipTarget.mapper; +package com.dbnt.sims.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.util.ParamMap; +import com.dbnt.sims.fipTarget.model.PartInfo; +import com.dbnt.sims.fipTarget.model.PartInfoFile; +import com.dbnt.sims.fipTarget.model.PartWork; +import com.dbnt.sims.fipTarget.model.Vulnerable; +import com.dbnt.sims.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/sims/fipTarget/model/PartInfo.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartInfo.java rename to src/main/java/com/dbnt/sims/fipTarget/model/PartInfo.java index 92becf1..d385bb2 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartInfo.java +++ b/src/main/java/com/dbnt/sims/fipTarget/model/PartInfo.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.sims.fipTarget.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -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/sims/fipTarget/model/PartInfoFile.java similarity index 86% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartInfoFile.java rename to src/main/java/com/dbnt/sims/fipTarget/model/PartInfoFile.java index efef253..c12fa64 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartInfoFile.java +++ b/src/main/java/com/dbnt/sims/fipTarget/model/PartInfoFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.sims.fipTarget.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -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/sims/fipTarget/model/PartWork.java similarity index 97% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartWork.java rename to src/main/java/com/dbnt/sims/fipTarget/model/PartWork.java index 342be80..9a3a090 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWork.java +++ b/src/main/java/com/dbnt/sims/fipTarget/model/PartWork.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.sims.fipTarget.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWorkFile.java b/src/main/java/com/dbnt/sims/fipTarget/model/PartWorkFile.java similarity index 86% rename from src/main/java/com/dbnt/faisp/fipTarget/model/PartWorkFile.java rename to src/main/java/com/dbnt/sims/fipTarget/model/PartWorkFile.java index 7e25415..4b93de8 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/PartWorkFile.java +++ b/src/main/java/com/dbnt/sims/fipTarget/model/PartWorkFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.sims.fipTarget.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -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/sims/fipTarget/model/VulnFile.java similarity index 85% rename from src/main/java/com/dbnt/faisp/fipTarget/model/VulnFile.java rename to src/main/java/com/dbnt/sims/fipTarget/model/VulnFile.java index 2d25266..f22ac25 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/VulnFile.java +++ b/src/main/java/com/dbnt/sims/fipTarget/model/VulnFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.sims.fipTarget.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; @@ -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/sims/fipTarget/model/Vulnerable.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fipTarget/model/Vulnerable.java rename to src/main/java/com/dbnt/sims/fipTarget/model/Vulnerable.java index 035ce4f..9dac872 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/Vulnerable.java +++ b/src/main/java/com/dbnt/sims/fipTarget/model/Vulnerable.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.sims.fipTarget.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoFileRepository.java b/src/main/java/com/dbnt/sims/fipTarget/repository/PartInfoFileRepository.java similarity index 85% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoFileRepository.java rename to src/main/java/com/dbnt/sims/fipTarget/repository/PartInfoFileRepository.java index 93971f7..e2365e6 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoFileRepository.java +++ b/src/main/java/com/dbnt/sims/fipTarget/repository/PartInfoFileRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.sims.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartInfoFile; +import com.dbnt.sims.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/sims/fipTarget/repository/PartInfoRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoRepository.java rename to src/main/java/com/dbnt/sims/fipTarget/repository/PartInfoRepository.java index a37ef8a..0a22975 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartInfoRepository.java +++ b/src/main/java/com/dbnt/sims/fipTarget/repository/PartInfoRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.sims.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartInfo; +import com.dbnt.sims.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/sims/fipTarget/repository/PartWorkFileRepository.java similarity index 85% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkFileRepository.java rename to src/main/java/com/dbnt/sims/fipTarget/repository/PartWorkFileRepository.java index d47c1d2..1419250 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkFileRepository.java +++ b/src/main/java/com/dbnt/sims/fipTarget/repository/PartWorkFileRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.sims.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartWorkFile; +import com.dbnt.sims.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/sims/fipTarget/repository/PartWorkRepository.java similarity index 77% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkRepository.java rename to src/main/java/com/dbnt/sims/fipTarget/repository/PartWorkRepository.java index 2fb186b..d51217a 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/PartWorkRepository.java +++ b/src/main/java/com/dbnt/sims/fipTarget/repository/PartWorkRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.sims.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.PartWork; +import com.dbnt.sims.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/sims/fipTarget/repository/VulnFileRepository.java similarity index 81% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/VulnFileRepository.java rename to src/main/java/com/dbnt/sims/fipTarget/repository/VulnFileRepository.java index 7bf1282..a93fd0f 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/VulnFileRepository.java +++ b/src/main/java/com/dbnt/sims/fipTarget/repository/VulnFileRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.sims.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.VulnFile; +import com.dbnt.sims.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/sims/fipTarget/repository/VulnRepository.java similarity index 61% rename from src/main/java/com/dbnt/faisp/fipTarget/repository/VulnRepository.java rename to src/main/java/com/dbnt/sims/fipTarget/repository/VulnRepository.java index ce1452a..24a6a1a 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/repository/VulnRepository.java +++ b/src/main/java/com/dbnt/sims/fipTarget/repository/VulnRepository.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fipTarget.repository; +package com.dbnt.sims.fipTarget.repository; -import com.dbnt.faisp.fipTarget.model.Vulnerable; +import com.dbnt.sims.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/sims/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/sims/fipTarget/service/FipTargetService.java index c435d4a..3e29329 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/sims/fipTarget/service/FipTargetService.java @@ -1,28 +1,27 @@ -package com.dbnt.faisp.fipTarget.service; +package com.dbnt.sims.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.util.ParamMap; +import com.dbnt.sims.config.BaseService; +import com.dbnt.sims.fipTarget.mapper.FipTargetMapper; +import com.dbnt.sims.fipTarget.model.PartInfo; +import com.dbnt.sims.fipTarget.model.PartInfo.PartInfoId; +import com.dbnt.sims.fipTarget.model.PartInfoFile; +import com.dbnt.sims.fipTarget.model.PartInfoFile.PartInfoFileId; +import com.dbnt.sims.fipTarget.model.PartWork; +import com.dbnt.sims.fipTarget.model.PartWork.PartWorkId; +import com.dbnt.sims.fipTarget.model.PartWorkFile; +import com.dbnt.sims.fipTarget.model.PartWorkFile.PartWorkFileId; +import com.dbnt.sims.fipTarget.model.VulnFile; +import com.dbnt.sims.fipTarget.model.VulnFile.VulnFileId; +import com.dbnt.sims.fipTarget.model.Vulnerable; +import com.dbnt.sims.fipTarget.repository.PartInfoFileRepository; +import com.dbnt.sims.fipTarget.repository.PartInfoRepository; +import com.dbnt.sims.fipTarget.repository.PartWorkFileRepository; +import com.dbnt.sims.fipTarget.repository.PartWorkRepository; +import com.dbnt.sims.fipTarget.repository.VulnFileRepository; +import com.dbnt.sims.fipTarget.repository.VulnRepository; +import com.dbnt.sims.util.ParamMap; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/AffairController.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/AffairController.java index c6833ec..fbaac1c 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/AffairController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.fpiMgt.affair; +package com.dbnt.sims.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.service.AffairService; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.fpiMgt.affair.model.AffairBoard; +import com.dbnt.sims.fpiMgt.affair.model.AffairRating; +import com.dbnt.sims.fpiMgt.affair.service.AffairService; +import com.dbnt.sims.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -14,10 +14,7 @@ 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.List; -import java.util.Map; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/mapper/AffairMapper.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/mapper/AffairMapper.java similarity index 73% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/mapper/AffairMapper.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/mapper/AffairMapper.java index b104f25..d27cedf 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/mapper/AffairMapper.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/mapper/AffairMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.mapper; +package com.dbnt.sims.fpiMgt.affair.mapper; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; +import com.dbnt.sims.fpiMgt.affair.model.AffairBoard; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairBoard.java similarity index 96% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairBoard.java index 059cb69..87ee179 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairBoard.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.sims.fpiMgt.affair.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairFile.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairFile.java similarity index 92% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairFile.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairFile.java index e8ac62c..84bb577 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairFile.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.sims.fpiMgt.affair.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java b/src/main/java/com/dbnt/sims/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/sims/fpiMgt/affair/model/AffairRating.java index f6b595a..4bee835 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairRating.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/AffairRating.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.sims.fpiMgt.affair.model; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTag.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/HashTag.java similarity index 91% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTag.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/model/HashTag.java index 3967365..703cff7 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTag.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/HashTag.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.sims.fpiMgt.affair.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTagLink.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/HashTagLink.java similarity index 89% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTagLink.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/model/HashTagLink.java index 5470a72..e45e4e3 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/HashTagLink.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/model/HashTagLink.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.model; +package com.dbnt.sims.fpiMgt.affair.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairBoardRepository.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairBoardRepository.java similarity index 59% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairBoardRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairBoardRepository.java index 36d44c2..a7265d8 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairBoardRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.sims.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; +import com.dbnt.sims.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/sims/fpiMgt/affair/repository/AffairFileRepository.java similarity index 77% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairFileRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairFileRepository.java index 1311a1d..40f3a9c 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairFileRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.sims.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.AffairFile; +import com.dbnt.sims.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/sims/fpiMgt/affair/repository/AffairRatingRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairRatingRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairRatingRepository.java index 8979863..32fe8c5 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/AffairRatingRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/AffairRatingRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.sims.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.AffairRating; +import com.dbnt.sims.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/sims/fpiMgt/affair/repository/HashTagLinkRepository.java similarity index 67% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagLinkRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/repository/HashTagLinkRepository.java index 5c0b308..c21837d 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagLinkRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/HashTagLinkRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.sims.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.HashTagLink; +import com.dbnt.sims.fpiMgt.affair.model.HashTagLink; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagRepository.java b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/HashTagRepository.java similarity index 68% rename from src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affair/repository/HashTagRepository.java index bdc5315..95f3918 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/repository/HashTagRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/repository/HashTagRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affair.repository; +package com.dbnt.sims.fpiMgt.affair.repository; -import com.dbnt.faisp.fpiMgt.affair.model.HashTag; +import com.dbnt.sims.fpiMgt.affair.model.HashTag; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/sims/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/sims/fpiMgt/affair/service/AffairService.java index b206564..d09d9fa 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affair/service/AffairService.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.fpiMgt.affair.service; +package com.dbnt.sims.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.userInfo.model.UserInfo; +import com.dbnt.sims.config.BaseService; +import com.dbnt.sims.config.FileInfo; +import com.dbnt.sims.fpiMgt.affair.mapper.AffairMapper; +import com.dbnt.sims.fpiMgt.affair.model.*; +import com.dbnt.sims.fpiMgt.affair.repository.*; +import com.dbnt.sims.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/sims/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/sims/fpiMgt/affairPlan/PlanController.java index a11d0ab..271bad8 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/PlanController.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.fpiMgt.affairPlan; +package com.dbnt.sims.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.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.fpiMgt.affairPlan.model.PlanApprv; +import com.dbnt.sims.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.sims.fpiMgt.affairPlan.service.PlanService; +import com.dbnt.sims.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/sims/fpiMgt/affairPlan/mapper/PlanMapper.java similarity index 68% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/mapper/PlanMapper.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/mapper/PlanMapper.java index 9e0e414..8dc00a3 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/mapper/PlanMapper.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/mapper/PlanMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.mapper; +package com.dbnt.sims.fpiMgt.affairPlan.mapper; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.sims.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/sims/fpiMgt/affairPlan/model/PlanApprv.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanApprv.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanApprv.java index 88885a5..20dcc26 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanApprv.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanApprv.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.sims.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/sims/fpiMgt/affairPlan/model/PlanBoard.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanBoard.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanBoard.java index 084c461..49cfad0 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanBoard.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanBoard.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.sims.fpiMgt.affairPlan.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanFile.java similarity index 91% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanFile.java index 7d83834..5280a25 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanFile.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.sims.fpiMgt.affairPlan.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanMainInfo.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanMainInfo.java index c003ebd..13b9a59 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/model/PlanMainInfo.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/model/PlanMainInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.model; +package com.dbnt.sims.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/sims/fpiMgt/affairPlan/repository/PlanApprvRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanApprvRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanApprvRepository.java index ec760b8..d9c7b51 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanApprvRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanApprvRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.sims.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanApprv; +import com.dbnt.sims.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/sims/fpiMgt/affairPlan/repository/PlanBoardRepository.java similarity index 57% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanBoardRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanBoardRepository.java index 7ea9112..f2e621f 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanBoardRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.sims.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.sims.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/sims/fpiMgt/affairPlan/repository/PlanFileRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanFileRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanFileRepository.java index 039fdf8..eb3bd33 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanFileRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.sims.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanFile; +import com.dbnt.sims.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/sims/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java similarity index 69% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java index b3683e9..07dec14 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/repository/PlanMainInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.repository; +package com.dbnt.sims.fpiMgt.affairPlan.repository; -import com.dbnt.faisp.fpiMgt.affairPlan.model.PlanMainInfo; +import com.dbnt.sims.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/sims/fpiMgt/affairPlan/service/PlanService.java similarity index 85% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/service/PlanService.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairPlan/service/PlanService.java index 93853b0..2d19372 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairPlan/service/PlanService.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairPlan/service/PlanService.java @@ -1,18 +1,17 @@ -package com.dbnt.faisp.fpiMgt.affairPlan.service; +package com.dbnt.sims.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.sims.config.BaseService; +import com.dbnt.sims.config.FileInfo; +import com.dbnt.sims.fpiMgt.affairPlan.mapper.PlanMapper; +import com.dbnt.sims.fpiMgt.affairPlan.model.PlanApprv; +import com.dbnt.sims.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.sims.fpiMgt.affairPlan.model.PlanFile; +import com.dbnt.sims.fpiMgt.affairPlan.model.PlanMainInfo; +import com.dbnt.sims.fpiMgt.affairPlan.repository.PlanApprvRepository; +import com.dbnt.sims.fpiMgt.affairPlan.repository.PlanBoardRepository; +import com.dbnt.sims.fpiMgt.affairPlan.repository.PlanFileRepository; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/ResultController.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/ResultController.java index b152f61..94d0ca5 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/ResultController.java @@ -1,15 +1,15 @@ -package com.dbnt.faisp.fpiMgt.affairResult; +package com.dbnt.sims.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.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.fpiMgt.affair.model.AffairBoard; +import com.dbnt.sims.fpiMgt.affair.service.AffairService; +import com.dbnt.sims.fpiMgt.affairResult.model.ResultApprv; +import com.dbnt.sims.fpiMgt.affairResult.model.ResultBoard; +import com.dbnt.sims.fpiMgt.affairResult.model.ClearInfo; +import com.dbnt.sims.fpiMgt.affairResult.model.ResultInfo; +import com.dbnt.sims.fpiMgt.affairResult.service.ResultService; +import com.dbnt.sims.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/sims/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/sims/fpiMgt/affairResult/mapper/ResultMapper.java index b24687f..ac55f91 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/mapper/ResultMapper.java @@ -1,8 +1,7 @@ -package com.dbnt.faisp.fpiMgt.affairResult.mapper; +package com.dbnt.sims.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.sims.fpiMgt.affair.model.AffairBoard; +import com.dbnt.sims.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/sims/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/sims/fpiMgt/affairResult/model/ClearInfo.java index 6bb42d8..7ae9daf 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ClearInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.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/sims/fpiMgt/affairResult/model/ResultApprv.java similarity index 95% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultApprv.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultApprv.java index 02bad24..599a3ff 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultApprv.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultApprv.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.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/sims/fpiMgt/affairResult/model/ResultBoard.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultBoard.java index 2e0de92..55ff80d 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultBoard.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.fpiMgt.affairResult.model; -import com.dbnt.faisp.config.BaseModel; -import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; +import com.dbnt.sims.config.BaseModel; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/model/ResultFile.java similarity index 91% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultFile.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultFile.java index 56a792d..a7ce8c5 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultFile.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.fpiMgt.affairResult.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultInfo.java b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultInfo.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultInfo.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultInfo.java index bb46353..de43129 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultInfo.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.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/sims/fpiMgt/affairResult/model/ResultToAffair.java similarity index 93% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToAffair.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultToAffair.java index d889614..e75a933 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToAffair.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultToAffair.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.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/sims/fpiMgt/affairResult/model/ResultToPlan.java similarity index 93% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToPlan.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultToPlan.java index 3b28401..9e4dcf2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultToPlan.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/model/ResultToPlan.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fpiMgt.affairResult.model; +package com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ClearInfoRepository.java similarity index 71% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ClearInfoRepository.java index 30f9d7a..509c885 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ClearInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ClearInfo; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ResultApprvRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultApprvRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultApprvRepository.java index 8db6c39..140c220 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultApprvRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultApprvRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultApprv; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ResultBoardRepository.java similarity index 56% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultBoardRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultBoardRepository.java index 0338ebb..d1527b1 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultBoardRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ResultFileRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultFileRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultFileRepository.java index a073001..4b6c493 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultFileRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultFile; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ResultInfoRepository.java similarity index 71% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultInfoRepository.java index 9b4849b..960fab2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultInfo; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ResultToAffairRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultToAffairRepository.java index 23206f7..abd42a0 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultToAffairRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToAffair; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/repository/ResultToPlanRepository.java similarity index 59% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToPlanRepository.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultToPlanRepository.java index e35c5e1..90914a4 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToPlanRepository.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/repository/ResultToPlanRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.fpiMgt.affairResult.repository; +package com.dbnt.sims.fpiMgt.affairResult.repository; -import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToPlan; +import com.dbnt.sims.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/sims/fpiMgt/affairResult/service/ResultService.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java rename to src/main/java/com/dbnt/sims/fpiMgt/affairResult/service/ResultService.java index eaf2a7c..7958ad2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/sims/fpiMgt/affairResult/service/ResultService.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.fpiMgt.affairResult.service; +package com.dbnt.sims.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.sims.config.BaseService; +import com.dbnt.sims.config.FileInfo; +import com.dbnt.sims.fpiMgt.affairResult.mapper.ResultMapper; +import com.dbnt.sims.fpiMgt.affairResult.model.*; +import com.dbnt.sims.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/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/sims/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/sims/ivsgtMgt/boardInvestigation/IvsgtController.java index f60cc05..5f49b8c 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation; +package com.dbnt.sims.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.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.model.ArrestType; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.model.RelatedReports; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java similarity index 62% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java index db3ee3c..9fd7a43 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/mapper/BoardInvestigationMapper.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.mapper; +package com.dbnt.sims.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.sims.ivsgtMgt.boardInvestigation.model.ArrestType; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/model/ArrestType.java similarity index 88% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/ArrestType.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/ArrestType.java index 3ac3fde..6690330 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/ArrestType.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/ArrestType.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java similarity index 95% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java index 3954fee..7c1c971 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/BoardInvestigation.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java similarity index 92% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java index de1aee9..6103198 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/HashTagLinkIvsgt.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/model/IvsgtFile.java similarity index 91% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/IvsgtFile.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/IvsgtFile.java index 86b7bee..70a9521 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/IvsgtFile.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/IvsgtFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/RelatedReports.java b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/RelatedReports.java similarity index 90% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/RelatedReports.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/RelatedReports.java index 5e95155..d6a427e 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/model/RelatedReports.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/model/RelatedReports.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.model; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java similarity index 53% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java index cd59d91..65a2a12 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/ArrestTypeRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.ArrestType; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java similarity index 54% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java index 5c2304c..97039a5 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/BoardInvestigationRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java similarity index 62% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java index d6e406b..7d18533 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/HashTagLinkIvsgtRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.HashTagLinkIvsgt; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java index f2c767f..ee91ef1 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/IvsgtFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.IvsgtFile; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java similarity index 81% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java index f4f3f0e..3c9e223 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/repository/RelatedReportsRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.repository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.RelatedReports; +import com.dbnt.sims.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/sims/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java similarity index 92% rename from src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java rename to src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java index 49baeec..43475e5 100644 --- a/src/main/java/com/dbnt/faisp/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java +++ b/src/main/java/com/dbnt/sims/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java @@ -1,13 +1,13 @@ -package com.dbnt.faisp.ivsgtMgt.boardInvestigation.service; +package com.dbnt.sims.ivsgtMgt.boardInvestigation.service; -import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.fpiMgt.affair.model.HashTag; -import com.dbnt.faisp.fpiMgt.affair.repository.HashTagRepository; -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.sims.config.BaseService; +import com.dbnt.sims.config.FileInfo; +import com.dbnt.sims.fpiMgt.affair.model.HashTag; +import com.dbnt.sims.fpiMgt.affair.repository.HashTagRepository; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper; +import com.dbnt.sims.ivsgtMgt.boardInvestigation.model.*; +import com.dbnt.sims.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/sims/menuMgt/MenuMgtController.java similarity index 89% rename from src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java rename to src/main/java/com/dbnt/sims/menuMgt/MenuMgtController.java index c834028..66be122 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/MenuMgtController.java +++ b/src/main/java/com/dbnt/sims/menuMgt/MenuMgtController.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.menuMgt; +package com.dbnt.sims.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.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.menuMgt.service.MenuMgtService; +import com.dbnt.sims.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/sims/menuMgt/mapper/MenuMgtMapper.java similarity index 83% rename from src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java rename to src/main/java/com/dbnt/sims/menuMgt/mapper/MenuMgtMapper.java index 5478d9d..6824757 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/mapper/MenuMgtMapper.java +++ b/src/main/java/com/dbnt/sims/menuMgt/mapper/MenuMgtMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.menuMgt.mapper; +package com.dbnt.sims.menuMgt.mapper; -import com.dbnt.faisp.menuMgt.model.MenuMgt; +import com.dbnt.sims.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/sims/menuMgt/model/MenuMgt.java similarity index 93% rename from src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java rename to src/main/java/com/dbnt/sims/menuMgt/model/MenuMgt.java index 9c465d8..ffdec28 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java +++ b/src/main/java/com/dbnt/sims/menuMgt/model/MenuMgt.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.menuMgt.model; +package com.dbnt.sims.menuMgt.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java b/src/main/java/com/dbnt/sims/menuMgt/repository/MenuMgtRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java rename to src/main/java/com/dbnt/sims/menuMgt/repository/MenuMgtRepository.java index e167349..17efe9a 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/repository/MenuMgtRepository.java +++ b/src/main/java/com/dbnt/sims/menuMgt/repository/MenuMgtRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.menuMgt.repository; +package com.dbnt.sims.menuMgt.repository; -import com.dbnt.faisp.menuMgt.model.MenuMgt; +import com.dbnt.sims.menuMgt.model.MenuMgt; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java b/src/main/java/com/dbnt/sims/menuMgt/service/MenuMgtService.java similarity index 96% rename from src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java rename to src/main/java/com/dbnt/sims/menuMgt/service/MenuMgtService.java index 2ff0b94..423467d 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/service/MenuMgtService.java +++ b/src/main/java/com/dbnt/sims/menuMgt/service/MenuMgtService.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.menuMgt.service; +package com.dbnt.sims.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.sims.menuMgt.mapper.MenuMgtMapper; +import com.dbnt.sims.menuMgt.model.MenuMgt; +import com.dbnt.sims.menuMgt.repository.MenuMgtRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java b/src/main/java/com/dbnt/sims/organMgt/OrganConfigController.java similarity index 86% rename from src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java rename to src/main/java/com/dbnt/sims/organMgt/OrganConfigController.java index 68f133a..7e4cb5f 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/OrganConfigController.java +++ b/src/main/java/com/dbnt/sims/organMgt/OrganConfigController.java @@ -1,10 +1,10 @@ -package com.dbnt.faisp.organMgt; +package com.dbnt.sims.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.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.codeMgt.model.CodeMgt; +import com.dbnt.sims.organMgt.service.OrganConfigService; +import com.dbnt.sims.organMgt.model.OrganConfig; +import com.dbnt.sims.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/sims/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/sims/organMgt/mapper/OrganConfigMapper.java index d838e48..18bb1e3 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java +++ b/src/main/java/com/dbnt/sims/organMgt/mapper/OrganConfigMapper.java @@ -1,6 +1,5 @@ -package com.dbnt.faisp.organMgt.mapper; +package com.dbnt.sims.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/sims/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/sims/organMgt/model/OrganConfig.java index bf70f34..46605fc 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/model/OrganConfig.java +++ b/src/main/java/com/dbnt/sims/organMgt/model/OrganConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.organMgt.model; +package com.dbnt.sims.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/sims/organMgt/repository/OrganConfigRepository.java similarity index 74% rename from src/main/java/com/dbnt/faisp/organMgt/repository/OrganConfigRepository.java rename to src/main/java/com/dbnt/sims/organMgt/repository/OrganConfigRepository.java index ff2892b..7a900a3 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/repository/OrganConfigRepository.java +++ b/src/main/java/com/dbnt/sims/organMgt/repository/OrganConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.organMgt.repository; +package com.dbnt.sims.organMgt.repository; -import com.dbnt.faisp.organMgt.model.OrganConfig; +import com.dbnt.sims.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/sims/organMgt/service/OrganConfigService.java similarity index 82% rename from src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java rename to src/main/java/com/dbnt/sims/organMgt/service/OrganConfigService.java index 92145de..587be48 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java +++ b/src/main/java/com/dbnt/sims/organMgt/service/OrganConfigService.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.organMgt.service; +package com.dbnt.sims.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.sims.organMgt.mapper.OrganConfigMapper; +import com.dbnt.sims.organMgt.model.OrganConfig; +import com.dbnt.sims.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/sims/publicBoard/PublicBoardController.java similarity index 95% rename from src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java rename to src/main/java/com/dbnt/sims/publicBoard/PublicBoardController.java index bf2dbcc..cc026e9 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/sims/publicBoard/PublicBoardController.java @@ -1,11 +1,11 @@ -package com.dbnt.faisp.publicBoard; +package com.dbnt.sims.publicBoard; -import com.dbnt.faisp.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.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.config.Role; +import com.dbnt.sims.publicBoard.model.PublicBoard; +import com.dbnt.sims.publicBoard.model.PublicComment; +import com.dbnt.sims.publicBoard.service.PublicBoardService; +import com.dbnt.sims.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/sims/publicBoard/mapper/PublicBoardMapper.java similarity index 76% rename from src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java rename to src/main/java/com/dbnt/sims/publicBoard/mapper/PublicBoardMapper.java index 0188d86..5eec770 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/mapper/PublicBoardMapper.java +++ b/src/main/java/com/dbnt/sims/publicBoard/mapper/PublicBoardMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.mapper; +package com.dbnt.sims.publicBoard.mapper; -import com.dbnt.faisp.publicBoard.model.PublicBoard; +import com.dbnt.sims.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/sims/publicBoard/model/PublicBoard.java similarity index 94% rename from src/main/java/com/dbnt/faisp/publicBoard/model/PublicBoard.java rename to src/main/java/com/dbnt/sims/publicBoard/model/PublicBoard.java index 362da93..15b7a57 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicBoard.java +++ b/src/main/java/com/dbnt/sims/publicBoard/model/PublicBoard.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.model; +package com.dbnt.sims.publicBoard.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicComment.java b/src/main/java/com/dbnt/sims/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/sims/publicBoard/model/PublicComment.java index 1c9fe69..b27cdd0 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicComment.java +++ b/src/main/java/com/dbnt/sims/publicBoard/model/PublicComment.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.publicBoard.model; +package com.dbnt.sims.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/sims/publicBoard/model/PublicFile.java similarity index 92% rename from src/main/java/com/dbnt/faisp/publicBoard/model/PublicFile.java rename to src/main/java/com/dbnt/sims/publicBoard/model/PublicFile.java index 079a2b9..a12c4bf 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/model/PublicFile.java +++ b/src/main/java/com/dbnt/sims/publicBoard/model/PublicFile.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.model; +package com.dbnt.sims.publicBoard.model; -import com.dbnt.faisp.config.FileInfo; +import com.dbnt.sims.config.FileInfo; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicBoardRepository.java b/src/main/java/com/dbnt/sims/publicBoard/repository/PublicBoardRepository.java similarity index 60% rename from src/main/java/com/dbnt/faisp/publicBoard/repository/PublicBoardRepository.java rename to src/main/java/com/dbnt/sims/publicBoard/repository/PublicBoardRepository.java index 5bad135..706b3f1 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicBoardRepository.java +++ b/src/main/java/com/dbnt/sims/publicBoard/repository/PublicBoardRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.repository; +package com.dbnt.sims.publicBoard.repository; -import com.dbnt.faisp.publicBoard.model.PublicBoard; +import com.dbnt.sims.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/sims/publicBoard/repository/PublicCommentRepository.java similarity index 80% rename from src/main/java/com/dbnt/faisp/publicBoard/repository/PublicCommentRepository.java rename to src/main/java/com/dbnt/sims/publicBoard/repository/PublicCommentRepository.java index 250fd20..58e42c9 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicCommentRepository.java +++ b/src/main/java/com/dbnt/sims/publicBoard/repository/PublicCommentRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.repository; +package com.dbnt.sims.publicBoard.repository; -import com.dbnt.faisp.publicBoard.model.PublicComment; +import com.dbnt.sims.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/sims/publicBoard/repository/PublicFileRepository.java similarity index 77% rename from src/main/java/com/dbnt/faisp/publicBoard/repository/PublicFileRepository.java rename to src/main/java/com/dbnt/sims/publicBoard/repository/PublicFileRepository.java index af4862e..3d4b21a 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/repository/PublicFileRepository.java +++ b/src/main/java/com/dbnt/sims/publicBoard/repository/PublicFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.publicBoard.repository; +package com.dbnt.sims.publicBoard.repository; -import com.dbnt.faisp.publicBoard.model.PublicFile; +import com.dbnt.sims.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/sims/publicBoard/service/PublicBoardService.java similarity index 88% rename from src/main/java/com/dbnt/faisp/publicBoard/service/PublicBoardService.java rename to src/main/java/com/dbnt/sims/publicBoard/service/PublicBoardService.java index bc95baf..0738abf 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/service/PublicBoardService.java +++ b/src/main/java/com/dbnt/sims/publicBoard/service/PublicBoardService.java @@ -1,14 +1,14 @@ -package com.dbnt.faisp.publicBoard.service; +package com.dbnt.sims.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.sims.config.BaseService; +import com.dbnt.sims.config.FileInfo; +import com.dbnt.sims.publicBoard.mapper.PublicBoardMapper; +import com.dbnt.sims.publicBoard.model.PublicBoard; +import com.dbnt.sims.publicBoard.model.PublicComment; +import com.dbnt.sims.publicBoard.model.PublicFile; +import com.dbnt.sims.publicBoard.repository.PublicBoardRepository; +import com.dbnt.sims.publicBoard.repository.PublicCommentRepository; +import com.dbnt.sims.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/sims/translator/TranslatorController.java similarity index 95% rename from src/main/java/com/dbnt/faisp/translator/TranslatorController.java rename to src/main/java/com/dbnt/sims/translator/TranslatorController.java index 7e4dd3b..d131bc7 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/sims/translator/TranslatorController.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.translator; +package com.dbnt.sims.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.util.ParamMap; -import com.dbnt.faisp.util.Utils; +import com.dbnt.sims.authMgt.service.AuthMgtService; +import com.dbnt.sims.translator.model.Translator; +import com.dbnt.sims.translator.model.TranslatorCrr; +import com.dbnt.sims.translator.service.TranslatorService; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.util.ParamMap; +import com.dbnt.sims.util.Utils; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java b/src/main/java/com/dbnt/sims/translator/mapper/TranslatorMapper.java similarity index 76% rename from src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java rename to src/main/java/com/dbnt/sims/translator/mapper/TranslatorMapper.java index 3856fb8..131beee 100644 --- a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java +++ b/src/main/java/com/dbnt/sims/translator/mapper/TranslatorMapper.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.translator.mapper; +package com.dbnt.sims.translator.mapper; -import com.dbnt.faisp.translator.model.Translator; -import com.dbnt.faisp.translator.model.TranslatorCrr; -import com.dbnt.faisp.util.ParamMap; +import com.dbnt.sims.translator.model.Translator; +import com.dbnt.sims.translator.model.TranslatorCrr; +import com.dbnt.sims.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/sims/translator/model/Translator.java similarity index 96% rename from src/main/java/com/dbnt/faisp/translator/model/Translator.java rename to src/main/java/com/dbnt/sims/translator/model/Translator.java index 6c729c0..f0f8372 100644 --- a/src/main/java/com/dbnt/faisp/translator/model/Translator.java +++ b/src/main/java/com/dbnt/sims/translator/model/Translator.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.translator.model; +package com.dbnt.sims.translator.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java b/src/main/java/com/dbnt/sims/translator/model/TranslatorCrr.java similarity index 94% rename from src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java rename to src/main/java/com/dbnt/sims/translator/model/TranslatorCrr.java index 48d1fd2..c9e2b86 100644 --- a/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java +++ b/src/main/java/com/dbnt/sims/translator/model/TranslatorCrr.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.translator.model; +package com.dbnt.sims.translator.model; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.config.BaseModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorCareerRepository.java b/src/main/java/com/dbnt/sims/translator/repository/TranslatorCareerRepository.java similarity index 81% rename from src/main/java/com/dbnt/faisp/translator/repository/TranslatorCareerRepository.java rename to src/main/java/com/dbnt/sims/translator/repository/TranslatorCareerRepository.java index d742669..23772d8 100644 --- a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorCareerRepository.java +++ b/src/main/java/com/dbnt/sims/translator/repository/TranslatorCareerRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.translator.repository; +package com.dbnt.sims.translator.repository; -import com.dbnt.faisp.translator.model.TranslatorCrr; +import com.dbnt.sims.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/sims/translator/repository/TranslatorRepository.java similarity index 73% rename from src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java rename to src/main/java/com/dbnt/sims/translator/repository/TranslatorRepository.java index bb67125..e52b5c0 100644 --- a/src/main/java/com/dbnt/faisp/translator/repository/TranslatorRepository.java +++ b/src/main/java/com/dbnt/sims/translator/repository/TranslatorRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.translator.repository; +package com.dbnt.sims.translator.repository; -import com.dbnt.faisp.translator.model.Translator; +import com.dbnt.sims.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/sims/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/sims/translator/service/TranslatorService.java index 427e039..cfc2107 100644 --- a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java +++ b/src/main/java/com/dbnt/sims/translator/service/TranslatorService.java @@ -1,13 +1,13 @@ -package com.dbnt.faisp.translator.service; +package com.dbnt.sims.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.util.ParamMap; +import com.dbnt.sims.translator.mapper.TranslatorMapper; +import com.dbnt.sims.translator.model.Translator; +import com.dbnt.sims.translator.model.Translator.TranslatorId; +import com.dbnt.sims.translator.model.TranslatorCrr; +import com.dbnt.sims.translator.repository.TranslatorCareerRepository; +import com.dbnt.sims.translator.repository.TranslatorRepository; +import com.dbnt.sims.util.ParamMap; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java b/src/main/java/com/dbnt/sims/userInfo/MyInfoController.java similarity index 86% rename from src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java rename to src/main/java/com/dbnt/sims/userInfo/MyInfoController.java index ca5514e..3e8ef00 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/sims/userInfo/MyInfoController.java @@ -1,9 +1,8 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.sims.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.sims.userInfo.model.DashboardConfig; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.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/sims/userInfo/UserInfoController.java similarity index 79% rename from src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java rename to src/main/java/com/dbnt/sims/userInfo/UserInfoController.java index 0fdd28a..8de6921 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/UserInfoController.java +++ b/src/main/java/com/dbnt/sims/userInfo/UserInfoController.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.sims.userInfo; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.userInfo.service.UserInfoService; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.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/sims/userInfo/mapper/UserInfoMapper.java similarity index 66% rename from src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java rename to src/main/java/com/dbnt/sims/userInfo/mapper/UserInfoMapper.java index b5a5894..9299d08 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/mapper/UserInfoMapper.java +++ b/src/main/java/com/dbnt/sims/userInfo/mapper/UserInfoMapper.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.userInfo.mapper; +package com.dbnt.sims.userInfo.mapper; -import com.dbnt.faisp.userInfo.model.DashboardConfig; -import com.dbnt.faisp.userInfo.model.UserInfo; -import com.dbnt.faisp.util.ParamMap; +import com.dbnt.sims.userInfo.model.DashboardConfig; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.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/sims/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/sims/userInfo/model/DashboardConfig.java index 733652b..8a12c68 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/model/DashboardConfig.java +++ b/src/main/java/com/dbnt/sims/userInfo/model/DashboardConfig.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.userInfo.model; +package com.dbnt.sims.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/sims/userInfo/model/UserInfo.java similarity index 95% rename from src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java rename to src/main/java/com/dbnt/sims/userInfo/model/UserInfo.java index 30ba59c..2d42954 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/model/UserInfo.java +++ b/src/main/java/com/dbnt/sims/userInfo/model/UserInfo.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.userInfo.model; +package com.dbnt.sims.userInfo.model; -import com.dbnt.faisp.authMgt.model.AccessConfig; -import com.dbnt.faisp.authMgt.model.ApprovalConfig; -import com.dbnt.faisp.config.BaseModel; +import com.dbnt.sims.authMgt.model.AccessConfig; +import com.dbnt.sims.authMgt.model.ApprovalConfig; +import com.dbnt.sims.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java b/src/main/java/com/dbnt/sims/userInfo/repository/DashboardConfigRepository.java similarity index 69% rename from src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java rename to src/main/java/com/dbnt/sims/userInfo/repository/DashboardConfigRepository.java index 31a3e3b..50c647c 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/repository/DashboardConfigRepository.java +++ b/src/main/java/com/dbnt/sims/userInfo/repository/DashboardConfigRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.userInfo.repository; +package com.dbnt.sims.userInfo.repository; -import com.dbnt.faisp.userInfo.model.DashboardConfig; +import com.dbnt.sims.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/sims/userInfo/repository/UserInfoRepository.java similarity index 75% rename from src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java rename to src/main/java/com/dbnt/sims/userInfo/repository/UserInfoRepository.java index 4f79526..a7785ba 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/repository/UserInfoRepository.java +++ b/src/main/java/com/dbnt/sims/userInfo/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.userInfo.repository; +package com.dbnt.sims.userInfo.repository; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.sims.userInfo.model.UserInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/sims/userInfo/service/UserInfoService.java similarity index 91% rename from src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java rename to src/main/java/com/dbnt/sims/userInfo/service/UserInfoService.java index 6ddaa22..6002c7b 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/service/UserInfoService.java +++ b/src/main/java/com/dbnt/sims/userInfo/service/UserInfoService.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.userInfo.service; +package com.dbnt.sims.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.util.ParamMap; +import com.dbnt.sims.config.Role; +import com.dbnt.sims.userInfo.mapper.UserInfoMapper; +import com.dbnt.sims.userInfo.model.DashboardConfig; +import com.dbnt.sims.userInfo.model.UserInfo; +import com.dbnt.sims.userInfo.repository.DashboardConfigRepository; +import com.dbnt.sims.userInfo.repository.UserInfoRepository; +import com.dbnt.sims.util.ParamMap; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java b/src/main/java/com/dbnt/sims/userInfo/userMgtController.java similarity index 91% rename from src/main/java/com/dbnt/faisp/userInfo/userMgtController.java rename to src/main/java/com/dbnt/sims/userInfo/userMgtController.java index f79a79f..352eac3 100644 --- a/src/main/java/com/dbnt/faisp/userInfo/userMgtController.java +++ b/src/main/java/com/dbnt/sims/userInfo/userMgtController.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.userInfo; +package com.dbnt.sims.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.sims.codeMgt.service.CodeMgtService; +import com.dbnt.sims.userInfo.service.UserInfoService; +import com.dbnt.sims.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/util/ParamMap.java b/src/main/java/com/dbnt/sims/util/ParamMap.java similarity index 99% rename from src/main/java/com/dbnt/faisp/util/ParamMap.java rename to src/main/java/com/dbnt/sims/util/ParamMap.java index 87d6df3..75b9e42 100644 --- a/src/main/java/com/dbnt/faisp/util/ParamMap.java +++ b/src/main/java/com/dbnt/sims/util/ParamMap.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.util; +package com.dbnt.sims.util; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/com/dbnt/faisp/util/Utils.java b/src/main/java/com/dbnt/sims/util/Utils.java similarity index 99% rename from src/main/java/com/dbnt/faisp/util/Utils.java rename to src/main/java/com/dbnt/sims/util/Utils.java index 03c19b6..2e4a7db 100644 --- a/src/main/java/com/dbnt/faisp/util/Utils.java +++ b/src/main/java/com/dbnt/sims/util/Utils.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.util; +package com.dbnt.sims.util; import java.io.IOException; @@ -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.sims.equip.model.CellPhone; +import com.dbnt.sims.equip.model.UseList; +import com.dbnt.sims.fipTarget.model.PartInfo; +import com.dbnt.sims.fipTarget.model.PartWork; public class Utils { diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index bf66644..25ab272 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ spring.devtools.livereload.enabled=true #file upload -spring.servlet.multipart.location=C:\\faispUploadFiles +spring.servlet.multipart.location=C:\\simsUploadFiles spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=500MB @@ -17,8 +17,8 @@ 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.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/sims +#spring.datasource.url=jdbc:postgresql://106.247.244.146:50503/sims spring.datasource.username=dbnt0031 spring.datasource.password=dbnt0928! @@ -30,5 +30,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.sims.**.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 d37a8f0..e2e41cd 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -1,6 +1,6 @@ #file upload -spring.servlet.multipart.location=/docker/faisp/uploadFiles +spring.servlet.multipart.location=/docker/sims/uploadFiles spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-request-size=500MB @@ -15,8 +15,8 @@ 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.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/sims +spring.datasource.url=jdbc:postgresql://118.219.150.34:50503/sims spring.datasource.username=dbnt0031 spring.datasource.password=dbnt0928! @@ -28,5 +28,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.sims.**.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 62e1dba..489c8e8 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 cbd7888..d100e16 100644 --- a/src/main/resources/mybatisMapper/AuthMgtMapper.xml +++ b/src/main/resources/mybatisMapper/AuthMgtMapper.xml @@ -3,7 +3,7 @@ - + + - select (select item_value from code_mgt cm where cm.item_cd = a.category_cd) as equ_type, (select item_value from code_mgt cm where cm.item_cd = a.item_cd) as detail_type from code_mgt a @@ -445,7 +445,7 @@ ) a - select item_cd, item_value from code_mgt cm, diff --git a/src/main/resources/mybatisMapper/FaRptMapper.xml b/src/main/resources/mybatisMapper/FaRptMapper.xml index b7753e5..3d8b74c 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 ae8a44a..604dcf3 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -3,7 +3,7 @@ - + - select sum(mp_sangju) as mp_sangju, sum(mp_sangju_cnt) as mp_sangju_total, sum(mp_bsangju) as mp_bsangju, @@ -308,7 +308,7 @@ limit 1 - select pi.pi_seq, terminal_nm from part_info pi, @@ -438,7 +438,7 @@ and pw.pi_seq = #{piSeq} - select item_cd, item_value from code_mgt cm, @@ -453,7 +453,7 @@ order by item_cd asc - select gubun, parent_organ, item_cd, diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 51a0ffe..e62442b 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/OrganConfigMapper.xml b/src/main/resources/mybatisMapper/OrganConfigMapper.xml index 220a26b..6e60f61 100644 --- a/src/main/resources/mybatisMapper/OrganConfigMapper.xml +++ b/src/main/resources/mybatisMapper/OrganConfigMapper.xml @@ -3,7 +3,7 @@ - + select a.translator_key, @@ -169,7 +169,7 @@ order by career_seq desc - select (ROW_NUMBER() OVER()) AS rownum, cm.item_value as lang , sum(center+west+south+east+jeju) as cnt_total, @@ -210,7 +210,7 @@ group by cm.item_value - select sum(cnt_total) as total_total, sum(cnt_center) as total_center, sum(cnt_west) as total_west, @@ -258,7 +258,7 @@ ) a - select a.translator_key, version_no, c.item_value as ogdp1, diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index b187afe..78f8263 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -3,7 +3,7 @@ - + @@ -49,7 +49,7 @@ - select user_seq, user_id user_name diff --git a/src/main/resources/mybatisMapper/menuMgtMapper.xml b/src/main/resources/mybatisMapper/menuMgtMapper.xml index 214e5da..06ff2e5 100644 --- a/src/main/resources/mybatisMapper/menuMgtMapper.xml +++ b/src/main/resources/mybatisMapper/menuMgtMapper.xml @@ -3,7 +3,7 @@ - + and cat1_cd = #{cat1Cd} diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html index 755b496..3619f5a 100644 --- a/src/main/resources/templates/adminPage/userMgt/userMgt.html +++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html @@ -7,7 +7,7 @@
-

외사경찰 관리

+

보안경찰 관리