From 257260f7a5debdb0709f8ce5bec06371a23cf197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 26 May 2022 15:01:43 +0900 Subject: [PATCH] init clone --- .gitignore | 33 + .mvn/wrapper/MavenWrapperDownloader.java | 117 + .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + lib/opensky-api-1.3.0.jar | Bin 0 -> 18316 bytes mvnw | 310 +++ mvnw.cmd | 182 ++ pom.xml | 164 ++ .../com/palnet/ControlServerApplication.java | 15 + .../controller/AcntCrtfyhpController.java | 110 + .../crtfyhp/service/AcntCrtfyhpService.java | 177 ++ .../cstmr/controller/AcntCstmrController.java | 70 + .../acnt/cstmr/model/AcntCstmrRqModel.java | 46 + .../acnt/cstmr/model/AcntCstmrRsModel.java | 13 + .../acnt/cstmr/model/AnctCstmrTermsModel.java | 9 + .../acnt/cstmr/service/AcntCstmrService.java | 187 ++ .../JwtAuthenticationController.java | 137 ++ .../filter/JwtAuthenticationEntryPoint.java | 25 + .../api/acnt/jwt/filter/JwtRequestFilter.java | 96 + .../api/acnt/jwt/model/JwtProfileRsModel.java | 17 + .../biz/api/acnt/jwt/model/JwtRqModel.java | 20 + .../biz/api/acnt/jwt/model/JwtRsModel.java | 21 + .../biz/api/acnt/jwt/model/JwtUserModel.java | 95 + .../biz/api/acnt/jwt/service/JwtService.java | 237 ++ .../jwt/service/JwtUserDetailsService.java | 41 + .../biz/api/acnt/jwt/utils/JwtTokenUtil.java | 104 + .../terms/controller/AcntTermsController.java | 69 + .../acnt/terms/model/AcntTermsRqModel.java | 11 + .../acnt/terms/model/AcntTermsRsModel.java | 26 + .../acnt/terms/service/AcntTermsService.java | 35 + .../hstry/controller/AnlsHstryController.java | 102 + .../hstry/model/AnlsHstryDetailModel.java | 47 + .../api/anls/hstry/model/AnlsHstryModel.java | 79 + .../anls/hstry/model/AnlsHstryRqModel.java | 10 + .../anls/hstry/service/AnlsHstryService.java | 66 + .../smlt/controller/AnlsSmltController.java | 143 ++ .../anls/smlt/model/AnlsSmltDetailModel.java | 60 + .../anls/smlt/model/AnlsSmltHistModel.java | 46 + .../api/anls/smlt/model/AnlsSmltRqModel.java | 10 + .../anls/smlt/model/AnlsSmltStcsModel.java | 28 + .../anls/smlt/service/AnlsSmltService.java | 149 ++ .../dron/controller/BasDronController.java | 289 +++ .../biz/api/bas/dron/model/BasDronModel.java | 71 + .../api/bas/dron/model/BasDronRqModel.java | 21 + .../biz/api/bas/dron/model/BasIdntfModel.java | 22 + .../api/bas/dron/model/BasIdntfRqModel.java | 14 + .../biz/api/bas/dron/model/BasOwnerModel.java | 30 + .../api/bas/dron/service/BasDronService.java | 421 ++++ .../controller/BasGroupAprvController.java | 97 + .../group/controller/BasGroupController.java | 240 ++ .../controller/BasGroupJoinController.java | 108 + .../controller/BasGroupUserController.java | 91 + .../bas/group/model/BasGroupAprvModel.java | 37 + .../bas/group/model/BasGroupAprvRqModel.java | 19 + .../bas/group/model/BasGroupJoinModel.java | 34 + .../bas/group/model/BasGroupJoinRqModel.java | 16 + .../api/bas/group/model/BasGroupModel.java | 22 + .../api/bas/group/model/BasGroupRqModel.java | 14 + .../bas/group/model/BasGroupUserModel.java | 32 + .../bas/group/model/BasGroupUserRqModel.java | 19 + .../group/service/BasGroupAprvService.java | 73 + .../group/service/BasGroupJoinService.java | 113 + .../bas/group/service/BasGroupService.java | 217 ++ .../group/service/BasGroupUserService.java | 90 + .../biz/api/comn/model/ComnRqModel.java | 15 + .../biz/api/comn/response/BasicResponse.java | 5 + .../biz/api/comn/response/ErrorResponse.java | 27 + .../api/comn/response/SuccessResponse.java | 23 + .../cntrl/controller/CtrCntrlController.java | 112 + .../ctr/cntrl/controller/PingController.java | 13 + .../api/ctr/cntrl/model/CtrCntrlDtlModel.java | 31 + .../api/ctr/cntrl/model/CtrCntrlEndModel.java | 21 + .../api/ctr/cntrl/model/CtrCntrlModel.java | 123 ++ .../ctr/cntrl/service/CtrCntrlService.java | 108 + .../dash/controller/MainDashController.java | 157 ++ .../main/dash/model/MainDashListModel.java | 17 + .../main/dash/model/MainDashStcsModel.java | 13 + .../main/dash/service/MainDashService.java | 103 + .../palnet/biz/config/DatabaseJpaConfig.java | 68 + .../com/palnet/biz/config/JsonConfig.java | 44 + .../biz/config/QuerydslConfiguration.java | 19 + .../com/palnet/biz/config/WebMvcConfig.java | 150 ++ .../palnet/biz/config/WebSecurityConfig.java | 80 + .../palnet/biz/jpa/entity/ComArcrftBas.java | 89 + .../palnet/biz/jpa/entity/ComArcrftOwner.java | 134 ++ .../com/palnet/biz/jpa/entity/ComAuthBas.java | 124 ++ .../com/palnet/biz/jpa/entity/ComCdBas.java | 122 ++ .../com/palnet/biz/jpa/entity/ComCdBasPK.java | 57 + .../palnet/biz/jpa/entity/ComCdGroupBas.java | 113 + .../palnet/biz/jpa/entity/ComCdLangCtg.java | 101 + .../palnet/biz/jpa/entity/ComCdLangCtgPK.java | 68 + .../palnet/biz/jpa/entity/ComIdntfBas.java | 79 + .../com/palnet/biz/jpa/entity/ComSiteBas.java | 124 ++ .../palnet/biz/jpa/entity/ComTrmnlBas.java | 123 ++ .../palnet/biz/jpa/entity/CtrCntrlBas.java | 90 + .../palnet/biz/jpa/entity/CtrCntrlHstry.java | 273 +++ .../biz/jpa/entity/CtrCntrlHstryArea.java | 211 ++ .../palnet/biz/jpa/entity/PtyCrtfyhpBas.java | 52 + .../palnet/biz/jpa/entity/PtyCstmrBas.java | 67 + .../biz/jpa/entity/PtyCstmrConectHist.java | 89 + .../palnet/biz/jpa/entity/PtyCstmrDtl.java | 200 ++ .../palnet/biz/jpa/entity/PtyCstmrGroup.java | 135 ++ .../palnet/biz/jpa/entity/PtyGroupArcrft.java | 112 + .../palnet/biz/jpa/entity/PtyGroupBas.java | 90 + .../palnet/biz/jpa/entity/PtySnsLoginRel.java | 112 + .../biz/jpa/entity/PtyTermsAgreeTxn.java | 113 + .../palnet/biz/jpa/entity/PtyTermsBas.java | 124 ++ .../palnet/biz/jpa/entity/PtyTermsDtl.java | 102 + .../palnet/biz/jpa/entity/PtyTermsDtlPK.java | 57 + .../palnet/biz/jpa/entity/SuredataEntity.java | 64 + .../com/ComArcrftBasRepository.java | 16 + .../com/ComArcrftOwnerRepository.java | 17 + .../repository/com/ComIdntBasRepository.java | 18 + .../repository/ctr/CtrCntrlBasRepository.java | 11 + .../ctr/CtrCntrlHstryAreaRepository.java | 11 + .../ctr/CtrCntrlHstryRepository.java | 11 + .../ctr/CtrCntrlQueryRepository.java | 485 +++++ .../pty/PtyCrtfyhpBasQueryRepository.java | 40 + .../pty/PtyCrtfyhpBasRepository.java | 23 + .../repository/pty/PtyCstmrBasRepository.java | 15 + .../pty/PtyCstmrConectHistRepository.java | 12 + .../repository/pty/PtyCstmrDtlRepository.java | 13 + .../pty/PtyCstmrGroupRepository.java | 13 + .../pty/PtyCstmrQueryRepository.java | 154 ++ .../pty/PtyDronQueryRepository.java | 296 +++ .../pty/PtyGroupArcrftRepository.java | 17 + .../repository/pty/PtyGroupBasRepository.java | 13 + .../pty/PtyGroupQueryRepository.java | 380 ++++ .../pty/PtySnsLoginRelRepository.java | 13 + .../pty/PtyTermsAgreeTxnRepository.java | 12 + .../repository/pty/PtyTermsBasRepository.java | 12 + .../repository/pty/PtyTermsDtlRepository.java | 13 + .../pty/PtyTermsQueryRepository.java | 61 + .../repository/pty/SuredataRepository.java | 15 + .../jpa/service/ctr/CtrCntrlJpaService.java | 182 ++ .../biz/sample/entity/SampleEntity.java | 28 + .../sample/repository/SampleRepository.java | 11 + .../biz/sample/service/SampleService.java | 22 + .../biz/scheduler/ctr/CtrScheduler.java | 81 + .../scheduler/ctr/model/CtrTrnsLctnModel.java | 19 + .../ctr/service/CtrSchedulerService.java | 211 ++ .../ctr/service/CtrTrnsLctnService.java | 131 ++ .../java/com/palnet/comn/code/ErrorCode.java | 31 + src/main/java/com/palnet/comn/code/Level.java | 24 + .../com/palnet/comn/code/MessageType.java | 8 + .../java/com/palnet/comn/code/ObjectType.java | 9 + .../com/palnet/comn/code/RSErrorCode.java | 31 + .../java/com/palnet/comn/code/Source.java | 6 + .../comn/collection/AuthCollection.java | 45 + .../palnet/comn/collection/GPCollection.java | 138 ++ .../comn/collection/GPDatabaseCollection.java | 49 + .../comn/encrptn/kisa/KISA_SEED_CBC.java | 1923 +++++++++++++++++ .../palnet/comn/encrptn/kisa/KISA_SHA256.java | 424 ++++ .../comn/exception/CustomException.java | 136 ++ .../palnet/comn/file/util/ComnFileS3Util.java | 12 + .../palnet/comn/model/GPDatabaseModel.java | 65 + .../com/palnet/comn/model/GPHistoryModel.java | 15 + .../java/com/palnet/comn/model/GPModel.java | 70 + .../comn/storage/config/StorageConfig.java | 31 + .../storage/controller/StorageController.java | 46 + .../comn/storage/service/StorageService.java | 65 + .../java/com/palnet/comn/utils/DateUtils.java | 159 ++ .../com/palnet/comn/utils/EncryptUtils.java | 151 ++ .../java/com/palnet/comn/utils/HttpUtils.java | 271 +++ .../java/com/palnet/comn/utils/JsonUtils.java | 81 + .../com/palnet/comn/utils/LocationUtils.java | 68 + .../com/palnet/comn/utils/NumberUtils.java | 16 + .../com/palnet/comn/utils/StringUtils.java | 10 + .../java/com/palnet/server/SocketServer.java | 117 + .../java/com/palnet/server/WebServer.java | 124 ++ .../server/codec/BigIntegerDecoder.java | 53 + .../server/codec/SocketPayLoadDecoder.java | 43 + .../server/codec/SocketPayLoadEncorder.java | 38 + .../palnet/server/codec/SocketPayload.java | 23 + .../server/codec/SocketPayloadResponse.java | 19 + .../server/codec/WebPayLoadDecoder.java | 23 + .../server/codec/WebPayLoadEncorder.java | 27 + .../server/collection/ChannelCollection.java | 28 + .../palnet/server/command/SocketCommand.java | 143 ++ .../com/palnet/server/command/TempUtils.java | 81 + .../palnet/server/handler/SocketHandler.java | 101 + .../server/handler/WebCommandHandler.java | 21 + .../com/palnet/server/handler/WebHandler.java | 91 + .../server/initializer/SocketInitializer.java | 70 + .../server/initializer/WebInitializer.java | 38 + .../palnet/server/task/ctr/CtrCntrlTask.java | 38 + .../task/ctr/service/CtrCntrlTaskService.java | 117 + src/main/resources/application-database.yml | 60 + src/main/resources/application-dev.properties | 13 + .../resources/application-local.properties | 14 + .../resources/application-prod.properties | 14 + .../resources/application-prod2.properties | 14 + src/main/resources/application.properties | 27 + src/main/resources/application.yml | 194 ++ .../resources/config/log/logback-spring.xml | 79 + .../palnet/ControlServerApplicationTests.java | 13 + 196 files changed, 17216 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 lib/opensky-api-1.3.0.jar create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/palnet/ControlServerApplication.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRsModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmrTermsModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/controller/JwtAuthenticationController.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtAuthenticationEntryPoint.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRsModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtUserModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtUserDetailsService.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/terms/controller/AcntTermsController.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java create mode 100644 src/main/java/com/palnet/biz/api/acnt/terms/service/AcntTermsService.java create mode 100644 src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java create mode 100644 src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java create mode 100644 src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java create mode 100644 src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltDetailModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltHistModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltStcsModel.java create mode 100644 src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/model/BasOwnerModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupAprvController.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupJoinController.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java create mode 100644 src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java create mode 100644 src/main/java/com/palnet/biz/api/comn/model/ComnRqModel.java create mode 100644 src/main/java/com/palnet/biz/api/comn/response/BasicResponse.java create mode 100644 src/main/java/com/palnet/biz/api/comn/response/ErrorResponse.java create mode 100644 src/main/java/com/palnet/biz/api/comn/response/SuccessResponse.java create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/controller/PingController.java create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlEndModel.java create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlModel.java create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java create mode 100644 src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java create mode 100644 src/main/java/com/palnet/biz/api/main/dash/model/MainDashListModel.java create mode 100644 src/main/java/com/palnet/biz/api/main/dash/model/MainDashStcsModel.java create mode 100644 src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java create mode 100644 src/main/java/com/palnet/biz/config/DatabaseJpaConfig.java create mode 100644 src/main/java/com/palnet/biz/config/JsonConfig.java create mode 100644 src/main/java/com/palnet/biz/config/QuerydslConfiguration.java create mode 100644 src/main/java/com/palnet/biz/config/WebMvcConfig.java create mode 100644 src/main/java/com/palnet/biz/config/WebSecurityConfig.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComCdBasPK.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtgPK.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtlPK.java create mode 100644 src/main/java/com/palnet/biz/jpa/entity/SuredataEntity.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/com/ComIdntBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryAreaRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrConectHistRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrDtlRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtySnsLoginRelRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsAgreeTxnRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsBasRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsDtlRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsQueryRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/repository/pty/SuredataRepository.java create mode 100644 src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java create mode 100644 src/main/java/com/palnet/biz/sample/entity/SampleEntity.java create mode 100644 src/main/java/com/palnet/biz/sample/repository/SampleRepository.java create mode 100644 src/main/java/com/palnet/biz/sample/service/SampleService.java create mode 100644 src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java create mode 100644 src/main/java/com/palnet/biz/scheduler/ctr/model/CtrTrnsLctnModel.java create mode 100644 src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java create mode 100644 src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java create mode 100644 src/main/java/com/palnet/comn/code/ErrorCode.java create mode 100644 src/main/java/com/palnet/comn/code/Level.java create mode 100644 src/main/java/com/palnet/comn/code/MessageType.java create mode 100644 src/main/java/com/palnet/comn/code/ObjectType.java create mode 100644 src/main/java/com/palnet/comn/code/RSErrorCode.java create mode 100644 src/main/java/com/palnet/comn/code/Source.java create mode 100644 src/main/java/com/palnet/comn/collection/AuthCollection.java create mode 100644 src/main/java/com/palnet/comn/collection/GPCollection.java create mode 100644 src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java create mode 100644 src/main/java/com/palnet/comn/encrptn/kisa/KISA_SEED_CBC.java create mode 100644 src/main/java/com/palnet/comn/encrptn/kisa/KISA_SHA256.java create mode 100644 src/main/java/com/palnet/comn/exception/CustomException.java create mode 100644 src/main/java/com/palnet/comn/file/util/ComnFileS3Util.java create mode 100644 src/main/java/com/palnet/comn/model/GPDatabaseModel.java create mode 100644 src/main/java/com/palnet/comn/model/GPHistoryModel.java create mode 100644 src/main/java/com/palnet/comn/model/GPModel.java create mode 100644 src/main/java/com/palnet/comn/storage/config/StorageConfig.java create mode 100644 src/main/java/com/palnet/comn/storage/controller/StorageController.java create mode 100644 src/main/java/com/palnet/comn/storage/service/StorageService.java create mode 100644 src/main/java/com/palnet/comn/utils/DateUtils.java create mode 100644 src/main/java/com/palnet/comn/utils/EncryptUtils.java create mode 100644 src/main/java/com/palnet/comn/utils/HttpUtils.java create mode 100644 src/main/java/com/palnet/comn/utils/JsonUtils.java create mode 100644 src/main/java/com/palnet/comn/utils/LocationUtils.java create mode 100644 src/main/java/com/palnet/comn/utils/NumberUtils.java create mode 100644 src/main/java/com/palnet/comn/utils/StringUtils.java create mode 100644 src/main/java/com/palnet/server/SocketServer.java create mode 100644 src/main/java/com/palnet/server/WebServer.java create mode 100644 src/main/java/com/palnet/server/codec/BigIntegerDecoder.java create mode 100644 src/main/java/com/palnet/server/codec/SocketPayLoadDecoder.java create mode 100644 src/main/java/com/palnet/server/codec/SocketPayLoadEncorder.java create mode 100644 src/main/java/com/palnet/server/codec/SocketPayload.java create mode 100644 src/main/java/com/palnet/server/codec/SocketPayloadResponse.java create mode 100644 src/main/java/com/palnet/server/codec/WebPayLoadDecoder.java create mode 100644 src/main/java/com/palnet/server/codec/WebPayLoadEncorder.java create mode 100644 src/main/java/com/palnet/server/collection/ChannelCollection.java create mode 100644 src/main/java/com/palnet/server/command/SocketCommand.java create mode 100644 src/main/java/com/palnet/server/command/TempUtils.java create mode 100644 src/main/java/com/palnet/server/handler/SocketHandler.java create mode 100644 src/main/java/com/palnet/server/handler/WebCommandHandler.java create mode 100644 src/main/java/com/palnet/server/handler/WebHandler.java create mode 100644 src/main/java/com/palnet/server/initializer/SocketInitializer.java create mode 100644 src/main/java/com/palnet/server/initializer/WebInitializer.java create mode 100644 src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java create mode 100644 src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java create mode 100644 src/main/resources/application-database.yml create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-local.properties create mode 100644 src/main/resources/application-prod.properties create mode 100644 src/main/resources/application-prod2.properties create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/config/log/logback-spring.xml create mode 100644 src/test/java/com/palnet/ControlServerApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ffdc10e --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/lib/opensky-api-1.3.0.jar b/lib/opensky-api-1.3.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..13f5f86bd20b4ee41a32347e52b9b8c91a3659a6 GIT binary patch literal 18316 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 literal 0 HcmV?d00001 diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..e7f824a --- /dev/null +++ b/pom.xml @@ -0,0 +1,164 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.1 + + + com.palnet + control-server + 0.0.1-SNAPSHOT + control-server + Control Server + + 1.8 + + + + + + org.springframework.cloud + spring-cloud-starter-aws + 2.0.1.RELEASE + + + org.springframework.cloud + spring-cloud-aws-context + 1.2.1.RELEASE + + + org.springframework.cloud + spring-cloud-aws-autoconfigure + 1.2.1.RELEASE + + + io.jsonwebtoken + jjwt + 0.9.1 + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + + io.netty + netty-all + 4.1.9.Final + + + org.bgee.log4jdbc-log4j2 + log4jdbc-log4j2-jdbc4 + 1.16 + + + + org.projectlombok + lombok + + + + ch.qos.logback + logback-classic + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-data-jpa + + + mysql + mysql-connector-java + runtime + + + org.springframework.boot + spring-boot-starter-jdbc + + + com.h2database + h2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + com.querydsl + querydsl-apt + + + + com.querydsl + querydsl-jpa + + + + org.apache.httpcomponents + httpclient + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr353 + + + + + org.apache.commons + commons-lang3 + + + + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + + + + com.mysema.maven + apt-maven-plugin + 1.1.3 + + + + process + + + target/generated-sources/java + + com.querydsl.apt.jpa.JPAAnnotationProcessor + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/palnet/ControlServerApplication.java b/src/main/java/com/palnet/ControlServerApplication.java new file mode 100644 index 0000000..4e130b4 --- /dev/null +++ b/src/main/java/com/palnet/ControlServerApplication.java @@ -0,0 +1,15 @@ +package com.palnet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; + +@SpringBootApplication +@EnableScheduling +public class ControlServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ControlServerApplication.class, args); + } + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java new file mode 100644 index 0000000..3393991 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java @@ -0,0 +1,110 @@ +package com.palnet.biz.api.acnt.crtfyhp.controller; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.acnt.crtfyhp.service.AcntCrtfyhpService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.utils.EncryptUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/acnt/crtfyhp", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class AcntCrtfyhpController { + + @Autowired + private final AcntCrtfyhpService service; + + @Autowired + private PtyCstmrQueryRepository ptyCstmrQueryRepository; + + + @GetMapping(value = "/register/send") + public ResponseEntity send(String hpno) { + + + Map resultMap = new HashMap(); + + try { + + if(hpno == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + //회원정보에 동일한 휴대폰 번호가 있는지 확인 , 암호화 해서 검색 + String encHpno = EncryptUtils.encrypt(hpno); + boolean isHpno = ptyCstmrQueryRepository.findCstmrByHpno(encHpno); + + if(isHpno) { + resultMap.put("result" , false); + resultMap.put("code" , -1); // 동일한 휴대폰 번호 존재 + + + }else { + boolean result = service.registerSend(hpno); + resultMap.put("result" , result); + } + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + + + @GetMapping(value = "/register/confirm") + public ResponseEntity confirm(String hpno , String crtfyNo) { + + + Map resultMap = new HashMap(); + + if(hpno == null || crtfyNo == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + + try { + + boolean result = service.registerConfirm(hpno, crtfyNo); + resultMap.put("result" , result); + + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java new file mode 100644 index 0000000..bc5fb79 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java @@ -0,0 +1,177 @@ +package com.palnet.biz.api.acnt.crtfyhp.service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.Persistence; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; + +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; +import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel; +import com.palnet.biz.jpa.entity.PtyCrtfyhpBas; +import com.palnet.biz.jpa.entity.PtyCstmrBas; +import com.palnet.biz.jpa.entity.PtyCstmrDtl; +import com.palnet.biz.jpa.entity.PtyTermsAgreeTxn; +import com.palnet.biz.jpa.entity.SuredataEntity; +import com.palnet.biz.jpa.repository.pty.PtyCrtfyhpBasQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyCrtfyhpBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrDtlRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyTermsAgreeTxnRepository; +import com.palnet.biz.jpa.repository.pty.PtyTermsQueryRepository; +import com.palnet.biz.jpa.repository.pty.SuredataRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; +import com.palnet.comn.utils.EncryptUtils; +import com.palnet.comn.utils.HttpUtils; + +@Service +public class AcntCrtfyhpService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${sms.usercode}") + private String USER_CODE; + + + @Value("${sms.deptcode}") + private String DEPT_CODE; + + + @Value("${sms.reqname}") + private String REQ_NAME; + + + @Value("${sms.reqphone}") + private String REQ_PHONE; + + + @Value("${sms.result}") + private String RESULT; + + + @Value("${sms.reqtime}") + private String REQ_TIME; + + + @Value("${sms.kind}") + private String KIND; + + + @Value("${sms.subject.certify}") + private String SUBJECT_CETIFY; + + + @Value("${sms.callname.certify}") + private String CALLNAME_CERTIFY; + + + @Autowired + private PtyCrtfyhpBasQueryRepository query; + + @Autowired + private PtyCrtfyhpBasRepository ptyCrtfyhpBasRepository; + + @Autowired + private SuredataRepository sureDataRepository; + + + + /** + * + * @param rq + * @return + */ + public boolean registerSend(String hpno) throws Exception{ + + //인증번호 만들기 ( 6자리) + String certifyNo = numberGen(6, 2); + + //메시지 만들기 + String msg = "인증번호 [" + certifyNo + "] 를 입력해 주세요."; + + + //기존 인증 내역 삭제 +// String encHpno = EncryptUtils.encrypt(hpno); + ptyCrtfyhpBasRepository.prevCrtfyhpYnBlock(hpno); + + //인증 테이블 입력 + PtyCrtfyhpBas ptyEntity = new PtyCrtfyhpBas(); + ptyEntity.setHpno(hpno); + ptyEntity.setCrtfyhpNo(certifyNo); + ptyEntity.setCrtfyhpYn("N"); + ptyCrtfyhpBasRepository.save(ptyEntity); + + //발송 테이블 입력 + SuredataEntity entity = new SuredataEntity(); + entity.setCallphone(hpno); + entity.setMsg(msg); + entity.setSubject(SUBJECT_CETIFY); + entity.setCallname(CALLNAME_CERTIFY); + entity.setUsercode(USER_CODE); + entity.setDeptcode(DEPT_CODE); + entity.setReqphone(REQ_PHONE); + entity.setReqname(REQ_NAME); + entity.setReqtime(REQ_TIME); + entity.setResult(RESULT); + entity.setKind(KIND); + + + SuredataEntity result = sureDataRepository.save(entity); + + if(result == null) { + return false; + } + + return true; + + } + + public boolean registerConfirm(String hpno , String crtfyNo ) throws Exception{ + hpno = EncryptUtils.encrypt(hpno); //암호화 해서 검색 + List entity = query.confirmSms(hpno , crtfyNo); + + return entity.size() == 0 ? false : true; + } + + + public static String numberGen(int len, int dupCd){ + Random rand = new Random(); + String numStr = ""; //난수가 저장될 변수 + for(int i = 0; i < len; i++){ + //0~9 까지 난수 생성 + + String ran = Integer.toString(rand.nextInt(10)); + if(dupCd == 1){ + //중복 허용시 numStr에 append + numStr += ran; + }else if(dupCd == 2){ + //중복을 허용하지 않을시 중복된 값이 있는지 검사한다 + if(!numStr.contains(ran)){ + //중복된 값이 없으면 numStr에 append + numStr += ran; + }else{ + //생성된 난수가 중복되면 루틴을 다시 실행한다 + i -= 1; + } + } + } + return numStr; + } +} diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java new file mode 100644 index 0000000..c1fe4c1 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java @@ -0,0 +1,70 @@ +package com.palnet.biz.api.acnt.cstmr.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; +import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.hstry.service.AnlsHstryService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.api.ctr.cntrl.service.CtrCntrlService; +import com.palnet.biz.sample.entity.SampleEntity; +import com.palnet.biz.sample.service.SampleService; +import com.palnet.comn.model.GPHistoryModel; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/acnt/cstmr", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class AcntCstmrController { + + @Autowired + private final AcntCstmrService service; + + + + @PostMapping(value = "/register") + public ResponseEntity register(@RequestBody AcntCstmrRqModel rq) { + + AcntCstmrRsModel result; + log.debug("RQ>>>>>>>>" , rq.toString()); + + try { +// result = service.list(rq); + + result = service.register(rq); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java new file mode 100644 index 0000000..2b89bb1 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java @@ -0,0 +1,46 @@ +package com.palnet.biz.api.acnt.cstmr.model; + +import lombok.Data; + +@Data +public class AcntCstmrRqModel{ + + private String cstrmDivCd; + + private String cstrmStatusCd; + + private String userId; + + private String authId; + + private String siteCode; + + private String memberDivCd; + + private String userPswd; + + private String ipinDi; + + private String ipinCi; + + private String joinCrtfyCd; + + private String cntryCd; + + private String genderCd; + + private String memberName; + + private String brthdyDate; + + private String email; + + private String hpno; + + private String clncd; + + private AnctCstmrTermsModel[] terms; + + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRsModel.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRsModel.java new file mode 100644 index 0000000..ff18e86 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRsModel.java @@ -0,0 +1,13 @@ +package com.palnet.biz.api.acnt.cstmr.model; + +import lombok.Data; + +@Data +public class AcntCstmrRsModel{ + + private int errCode; // 1 : 성공 , -1 : 가입된 ID 존재 , -2 : 동일한 이메일 존재 , -3 동일한 휴대폰번호 존재 + + private String loginId; // 가입 성공된 ID 전달 + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmrTermsModel.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmrTermsModel.java new file mode 100644 index 0000000..a9d3aec --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmrTermsModel.java @@ -0,0 +1,9 @@ +package com.palnet.biz.api.acnt.cstmr.model; + +import lombok.Data; + +@Data +public class AnctCstmrTermsModel { + private int termsSno; + private String agreeYn; +} diff --git a/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java new file mode 100644 index 0000000..e0159c6 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java @@ -0,0 +1,187 @@ +package com.palnet.biz.api.acnt.cstmr.service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.Persistence; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; + +import com.palnet.biz.api.acnt.cstmr.controller.AcntCstmrController; +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; +import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; +import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel; +import com.palnet.biz.jpa.entity.PtyCstmrBas; +import com.palnet.biz.jpa.entity.PtyCstmrDtl; +import com.palnet.biz.jpa.entity.PtyTermsAgreeTxn; +import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrDtlRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyTermsAgreeTxnRepository; +import com.palnet.biz.jpa.repository.pty.PtyTermsQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; +import com.palnet.comn.utils.EncryptUtils; +import com.palnet.comn.utils.HttpUtils; +import com.palnet.comn.utils.JsonUtils; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class AcntCstmrService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + +// @Autowired +// private CtrCntrlBasRepository ctrCntrlBasRepository; + + @Autowired + private PtyCstmrQueryRepository query; + + @Autowired + private PtyCstmrBasRepository ptyCstmrBasRepository; + + @Autowired + private PtyCstmrDtlRepository ptyCstmrDtlRepository; + + @Autowired + private PtyTermsAgreeTxnRepository ptyTermsAgreeTxnRepository; + + @Autowired + private EntityManagerFactory emf; + + /** + * + * + * @param rq + * @return + */ + @Transactional + public AcntCstmrRsModel register(AcntCstmrRqModel rq) throws Exception{ + +// logger.debug("ddddddd>>>>" + JsonUtils.toJson(rq)); +// logger.debug("ddddddd>>>>" + rq.getBrthdyDate()); + AcntCstmrRsModel rs = new AcntCstmrRsModel(); + boolean isUserIdFind = false; + try { + + //사전 체크. 동일한 ID 존재 여부 확인 + isUserIdFind = query.findCstmrByUserId(rq.getUserId()); + if(isUserIdFind) { + rs.setErrCode(-1); + return rs; + } + + rq.setHpno(rq.getHpno().replaceAll("-", "")); + //처리 1. 민감정보 암호화 처리(비밀번호 , 이름 , 휴대폰번호 , 이메일) + rq.setUserPswd(EncryptUtils.sha256Encrypt(rq.getUserPswd())); + rq.setMemberName(EncryptUtils.encrypt(rq.getMemberName())); + rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); + rq.setEmail(EncryptUtils.encrypt(rq.getEmail())); + rq.setBrthdyDate(rq.getBrthdyDate().replaceAll("-", "")); + + + //처리 2. 마스터 정보 저장 + PtyCstmrBas basEntity = this.savePtyCstmrBas(rq); + if(basEntity == null) { + throw new CustomException(ErrorCode.INTERNAL_SERVER_ERROR); + } + + //처리 3. 상세 정보 저장 + this.savePtyCstmrDtl(rq ,basEntity ); + + //처리 4. 약관 동의 정보 저장 + if(rq.getTerms() != null && rq.getTerms().length > 0) { + for(AnctCstmrTermsModel agree : rq.getTerms()) { + this.savePtyTermsAgreeTxn(agree , basEntity); + } + } + + //성공 파람 담기 + if(basEntity != null) { + rs.setErrCode(1); + rs.setLoginId(basEntity.getUserId()); + } + + }catch(Exception e) { + log.error("IGNORE : {}", e); + rs.setErrCode(-2); + return rs; + } + + return rs; + } + + + public PtyCstmrBas savePtyCstmrBas(AcntCstmrRqModel rq) throws Exception{ + + + PtyCstmrBas basEntity = new PtyCstmrBas(); + basEntity.setCstmrDivCd(rq.getCstrmDivCd()); + basEntity.setCstmrStatusCd(rq.getCstrmStatusCd()); + basEntity.setUserId(rq.getUserId()); + basEntity.setAuthId(rq.getAuthId()); + basEntity.setSiteCode(rq.getSiteCode()); + basEntity.setMemberDivCd(rq.getMemberDivCd()); + basEntity.setUserPswd(rq.getUserPswd()); + basEntity.setJoinDt(DateUtils.nowDate()); + basEntity.setJoinIp(HttpUtils.getRequestIp()); + + return ptyCstmrBasRepository.save(basEntity); + + } + + public PtyCstmrDtl savePtyCstmrDtl(AcntCstmrRqModel rq , PtyCstmrBas basEntity) throws Exception{ + PtyCstmrDtl dtlEntity = new PtyCstmrDtl(); + dtlEntity.setCstmrSno(basEntity.getCstmrSno()); + dtlEntity.setIpinCi(rq.getIpinCi()); + dtlEntity.setIpinDi(rq.getIpinDi()); + dtlEntity.setJoinCrtfyCd(rq.getJoinCrtfyCd()); + dtlEntity.setCntryCd(rq.getCntryCd()); + dtlEntity.setGenderCd(rq.getGenderCd()); + dtlEntity.setMemberName(rq.getMemberName()); + dtlEntity.setBrthdyDate(DateUtils.stringToDate(rq.getBrthdyDate())); + dtlEntity.setEmail(rq.getEmail()); + dtlEntity.setHpno(rq.getHpno()); + dtlEntity.setClncd(rq.getClncd()); + dtlEntity.setUpdateDt(DateUtils.nowDate()); + dtlEntity.setUpdateUserId(rq.getUserId()); + + return ptyCstmrDtlRepository.save(dtlEntity); + + } + + public PtyTermsAgreeTxn savePtyTermsAgreeTxn(AnctCstmrTermsModel agree , PtyCstmrBas basEntity) throws Exception{ + PtyTermsAgreeTxn agreeEntity = new PtyTermsAgreeTxn(); + agreeEntity.setCstmrSno(basEntity.getCstmrSno()); + agreeEntity.setProcIp(HttpUtils.getRequestIp()); + agreeEntity.setTermsSno(agree.getTermsSno()); + agreeEntity.setUpdateDt(DateUtils.nowDate()); + agreeEntity.setUpdateUserId(basEntity.getUserId()); + agreeEntity.setAgreeYn(agree.getAgreeYn()); + if(agree.getAgreeYn().equals("Y")) { + agreeEntity.setAgreeDt(DateUtils.nowDate()); + + } + + return ptyTermsAgreeTxnRepository.save(agreeEntity); + + } + + + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/controller/JwtAuthenticationController.java b/src/main/java/com/palnet/biz/api/acnt/jwt/controller/JwtAuthenticationController.java new file mode 100644 index 0000000..e082f86 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/controller/JwtAuthenticationController.java @@ -0,0 +1,137 @@ +package com.palnet.biz.api.acnt.jwt.controller; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestAttribute; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.acnt.jwt.model.JwtProfileRsModel; +import com.palnet.biz.api.acnt.jwt.model.JwtRqModel; +import com.palnet.biz.api.acnt.jwt.model.JwtRsModel; +import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; +import com.palnet.biz.api.acnt.jwt.service.JwtService; +import com.palnet.biz.api.acnt.jwt.service.JwtUserDetailsService; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.jpa.entity.PtyCstmrBas; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.utils.EncryptUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@RestController +@RequiredArgsConstructor +@Log4j2 +@RequestMapping(value = "/api/acnt/jwt", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class JwtAuthenticationController { + + @Autowired + private JwtTokenUtil jwtTokenUtil; + + @Autowired + private JwtUserDetailsService userDetailsService; + + + @Autowired + private JwtService service; + + @PostMapping(value = "/login") + public ResponseEntity createAuthenticationToken(@RequestBody JwtRqModel authenticationRequest) throws Exception { + + Map resultMap = service.loginProcess(authenticationRequest); + + int loginError = (int) resultMap.get("loginError"); + + if(loginError < 0) { + + String errorMessage = (String) resultMap.get("errorMessage"); + return ResponseEntity.status(HttpStatus.OK) + + .body(new ErrorResponse(errorMessage, loginError + "")); // 계정 사용하지 못함 + }else { + + JwtRsModel result = (JwtRsModel) resultMap.get("result"); + return ResponseEntity.ok().body(new SuccessResponse(result)); + } + + + } + + @GetMapping(value = "/profile/{cstmrSno}") + public ResponseEntity proflie(@PathVariable int cstmrSno) throws Exception{ + + JwtProfileRsModel result = service.profile(cstmrSno); + if(result == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.DATA_NOTFOUNT)); + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + } + + + @PostMapping(value = "/refresh") +// public ResponseEntity refresh(@RequestParam("cstmrSno") int cstmrSno , @RequestParam("refreshToken") String refreshToken) throws Exception{ + public ResponseEntity refresh(@RequestBody Map body) throws Exception{ + + + //입력값 검증 + if(body.get("cstmrSno") == null || body.get("refreshToken") == null || !(body.get("cstmrSno") instanceof Integer)) { + + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + int cstmrSno = (int)body.get("cstmrSno"); + String refreshToken = (String)body.get("refreshToken"); + + + + JwtRsModel result = service.findRefreshtoken(cstmrSno, refreshToken); +// JwtRsModel result = null; + + if(result ==null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.DATA_NOTFOUNT)); + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + } + + @GetMapping(value = "/logout/{cstmrSno}") + public ResponseEntity logout(@PathVariable int cstmrSno) throws Exception{ + +// if(cstmrSno == null || !(body.get("cstmrSno") instanceof Integer)) { +// return ResponseEntity.status(HttpStatus.OK) +// .body(new ErrorResponse(RSErrorCode.ER_PARAM)); +// } +// int cstmrSno = (int)body.get("cstmrSno"); + + + PtyCstmrBas bas = service.logoutProcess(cstmrSno); + + if(bas == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.DATA_NOTFOUNT)); + } + + return ResponseEntity.ok().body(new SuccessResponse(RSErrorCode.SUCCESS)); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtAuthenticationEntryPoint.java b/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtAuthenticationEntryPoint.java new file mode 100644 index 0000000..815b81b --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtAuthenticationEntryPoint.java @@ -0,0 +1,25 @@ +package com.palnet.biz.api.acnt.jwt.filter; + +import java.io.IOException; +import java.io.Serializable; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +//허가되지 않은 사용자라면, 접근 불가 메세지를 띄워 리소스 정보획득을 못하게 막아줍니다. +@Component +public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint, Serializable { + + private static final long serialVersionUID = -7858869558953243875L; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, + AuthenticationException authException) throws IOException { + + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java b/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java new file mode 100644 index 0000000..3adad84 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java @@ -0,0 +1,96 @@ +package com.palnet.biz.api.acnt.jwt.filter; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import com.palnet.biz.api.acnt.jwt.service.JwtUserDetailsService; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; + +import io.jsonwebtoken.ExpiredJwtException; +import lombok.extern.log4j.Log4j2; + +//프론트엔드에서 매순간 request를 요청 할 때마다 이 필터를 먼저 거침 +@Component +@Log4j2 +public class JwtRequestFilter extends OncePerRequestFilter { + + @Autowired + private JwtUserDetailsService jwtUserDetailsService; + + @Autowired + private JwtTokenUtil jwtTokenUtil; + + @Value("${spring.jwt.prefix}") + private String JWT_PREFIX; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException { + + logger.info("access request uri :: " + request.getRequestURI()); + logger.info("access remote host :: " + request.getRemoteHost()); + + final String requestTokenHeader = request.getHeader("Authorization"); + + String username = null; + String jwtToken = null; + // JWT Token is in the form "Bearer token". Remove Bearer word and get + // only the Token + log.debug("=============================================================================="); + log.debug(requestTokenHeader); + log.debug("=============================================================================="); + + if (requestTokenHeader != null && requestTokenHeader.startsWith(JWT_PREFIX)) { + jwtToken = requestTokenHeader.substring(7); + try { + username = jwtTokenUtil.getUsernameFromToken(jwtToken); + } catch (IllegalArgumentException e) { + log.warn("Unable to get JWT Token"); + } catch (ExpiredJwtException e) { + log.warn("JWT Token has expired"); + } + } else { + logger.debug(">>>" + requestTokenHeader); + logger.warn("JWT Token is Error "); + logger.warn(">>>" + request.getRequestURI()); + } + log.debug(">>>>>>>>>>" + username); + + // Once we get the token validate it. + if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { + + + UserDetails userDetails = this.jwtUserDetailsService.loadUserByUsername(username); + + // if token is valid configure Spring Security to manually set + // authentication + if (jwtTokenUtil.validateToken(jwtToken, userDetails)) { + + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + usernamePasswordAuthenticationToken + .setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + // After setting the Authentication in the context, we specify + // that the current user is authenticated. So it passes the + // Spring Security Configurations successfully. + SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken); + } + } + chain.doFilter(request, response); + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java new file mode 100644 index 0000000..ea3c2c0 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtProfileRsModel.java @@ -0,0 +1,17 @@ +package com.palnet.biz.api.acnt.jwt.model; + +import lombok.Data; + +@Data +public class JwtProfileRsModel { + private int cstmrSno; + + private String authId; + + private String siteCode; + + private String userId; + + private String memberName; + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java new file mode 100644 index 0000000..7c40b46 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java @@ -0,0 +1,20 @@ +package com.palnet.biz.api.acnt.jwt.model; + +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + + +@NoArgsConstructor +@AllArgsConstructor +@Data +public class JwtRqModel implements Serializable { + + private static final long serialVersionUID = 5926468583005150707L; + + private String userId; + private String userPswd; +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRsModel.java b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRsModel.java new file mode 100644 index 0000000..d4fb3fe --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRsModel.java @@ -0,0 +1,21 @@ +package com.palnet.biz.api.acnt.jwt.model; + +import java.io.Serializable; + +import lombok.Data; + +@Data +public class JwtRsModel implements Serializable { + + private String accessToken ; + + private String refreshToken; + + private String userId; + + private Integer cstmrSno; + + private String auth; + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtUserModel.java b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtUserModel.java new file mode 100644 index 0000000..7b36a5c --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtUserModel.java @@ -0,0 +1,95 @@ +package com.palnet.biz.api.acnt.jwt.model; +import lombok.*; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import javax.persistence.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +public class JwtUserModel implements UserDetails { + + @Id + @GeneratedValue(strategy= GenerationType.IDENTITY) + @Column(name = "CSTMR_SNO", unique = true) + private Integer cstmrSno; + + @Column(name = "USER_ID", unique = true) + private String userId; + + @Column(name = "USER_PSWD") + private String userPswd; + + @Column(name = "SITE_CODE") + private String siteCode; + + @Column(name = "AUTH_ID") + private String auth; + + @Column(name = "CSTMR_STATUS_CD") + private String cstmrStatusCd; + + + + // 사용자의 권한을 콜렉션 형태로 반환 + // 단, 클래스 자료형은 GrantedAuthority를 구현해야함 + @Override + public Collection getAuthorities() { + Set roles = new HashSet<>(); + for (String role : auth.split(",")) { + roles.add(new SimpleGrantedAuthority(role)); + } + return roles; + } + + // 사용자의 id를 반환 (unique한 값) + @Override + public String getUsername() { + return userId; + } + + // 사용자의 password를 반환 + @Override + public String getPassword() { + return userPswd; + } + + // 계정 만료 여부 반환 + @Override + public boolean isAccountNonExpired() { + // 만료되었는지 확인하는 로직 + return true; // true -> 만료되지 않았음 + } + + // 계정 잠금 여부 반환 + @Override + public boolean isAccountNonLocked() { + // 계정 잠금되었는지 확인하는 로직 + if(cstmrStatusCd.equals("A")) + return true; + else + return false; +// return true; // true -> 잠금되지 않았음 + } + + // 패스워드의 만료 여부 반환 + @Override + public boolean isCredentialsNonExpired() { + // 패스워드가 만료되었는지 확인하는 로직 + return true; // true -> 만료되지 않았음 + } + + // 계정 사용 가능 여부 반환 + @Override + public boolean isEnabled() { + // 계정이 사용 가능한지 확인하는 로직 + return true; // true -> 사용 가능 + } + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java b/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java new file mode 100644 index 0000000..58efb0f --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java @@ -0,0 +1,237 @@ +package com.palnet.biz.api.acnt.jwt.service; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService; +import com.palnet.biz.api.acnt.jwt.model.JwtProfileRsModel; +import com.palnet.biz.api.acnt.jwt.model.JwtRqModel; +import com.palnet.biz.api.acnt.jwt.model.JwtRsModel; +import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrBas; +import com.palnet.biz.jpa.entity.PtyCstmrConectHist; +import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrConectHistRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; +import com.palnet.comn.utils.EncryptUtils; +import com.palnet.comn.utils.HttpUtils; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class JwtService { + @Autowired + private PtyCstmrBasRepository ptyCstmrBasRepository; + + @Autowired + private PtyCstmrConectHistRepository ptyCstmrConectHistRepository; + + @Autowired + private JwtUserDetailsService userDetailsService; + + @Autowired + private PtyCstmrQueryRepository query ; + + @Autowired + private JwtTokenUtil jwtTokenUtil; + + /** + * 로그인 처리 + * @param rq + * @return + */ + public Map loginProcess(JwtRqModel rq) throws Exception{ + + int loginError = 1; // -100 : 아이디/비밀번호가 없습니다 , -101 : 계정정보를 찾을수 없습니다 , -102 : 비밀번호가 잘못 되었습니다 , -103 : 계정을 사용할수 없습니다. + + Map resultMap = new HashMap(); + + //입력값 검증 처리 + if(StringUtils.isEmpty(rq.getUserId()) || StringUtils.isEmpty(rq.getUserPswd())) { + loginError = -100; + } + + JwtUserModel userDetails = (JwtUserModel)userDetailsService + .loadUserByUsername(rq.getUserId()); + + + //계정이 없는경우 + if(userDetails == null) { + loginError = -101; + }else{ + String password = EncryptUtils.sha256Encrypt(rq.getUserPswd()); + + //비밀번호 검증 처리 + if (!userDetails.getPassword().equals(password)) { + loginError = -102; + + } + + //계정 검증로직 + if(!userDetails.isAccountNonLocked() || !userDetails.isAccountNonExpired() || !userDetails.isEnabled() || !userDetails.isCredentialsNonExpired()) { + loginError = -103; + + } + } + + + if(loginError < 0) { + + String errorMessage = ""; + if(loginError == -100) { + errorMessage = "Please parameter Check"; + }else if(loginError == -101) { + errorMessage = "Account not found"; + + }else if(loginError == -102) { + errorMessage = "Password does not match"; + }else if(loginError == -103) { + errorMessage = "Account is unavailable"; + } + //실패 이력 저장 + //cstmrSno , String loginYn , String errorCode + if(userDetails != null) { + this.historySave(userDetails.getCstmrSno(), "N", loginError+""); + } + + resultMap.put("loginError", loginError); + resultMap.put("errorMessage", errorMessage); + + return resultMap; + + }else { + + String accessToken = jwtTokenUtil.generateToken(userDetails); + String refreshToken = jwtTokenUtil.generateRefreshToken(userDetails); + + JwtRsModel result = new JwtRsModel(); + result.setAccessToken(accessToken); + result.setRefreshToken(refreshToken); + result.setAuth(userDetails.getAuth()); + result.setUserId(userDetails.getUserId()); + result.setCstmrSno(userDetails.getCstmrSno()); + //토큰 저장 처리 + log.debug("========= refresh>>>>" + refreshToken); + this.refreshTokenSave(userDetails.getCstmrSno(), refreshToken); + + //성공이력 저장 + this.historySave(userDetails.getCstmrSno(), "Y", loginError+""); + + resultMap.put("loginError", loginError); + resultMap.put("errorMessage", ""); + resultMap.put("result", result); + + return resultMap; + } + + } + + public PtyCstmrBas logoutProcess(int cstmrSno) throws Exception{ + + Optional optional = ptyCstmrBasRepository.findById(cstmrSno); + if (optional.isPresent()) { + PtyCstmrBas entity = optional.get(); + entity.setRfrshToken(""); + return ptyCstmrBasRepository.save(entity); + }else { + return null; + } + + } + + + /** + * 로그인 이력 저장 + * @param cstmrSno + * @param loginYn + * @param errorCode + * @return + * @throws Exception + */ + public PtyCstmrConectHist historySave(int cstmrSno , String loginYn , String errorCode) throws Exception{ + String conectIp = HttpUtils.getRequestIp(); + + PtyCstmrConectHist entity = new PtyCstmrConectHist(); + entity.setCstmrSno(cstmrSno); + entity.setConectSucesYn(loginYn); + entity.setConectErrorCd(errorCode); + entity.setConectIp(conectIp); + entity.setConectDt(DateUtils.nowDate()); + return ptyCstmrConectHistRepository.save(entity); + } + + /** + * refresh Token 저장 처리 + * @param cstmrSno + * @param refreshToken + * @return + * @throws Exception + */ + public PtyCstmrBas refreshTokenSave(int cstmrSno , String refreshToken) throws Exception{ + + Optional optional = ptyCstmrBasRepository.findById(cstmrSno); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyCstmrBas entity = optional.get(); + entity.setRfrshToken(refreshToken); + + return ptyCstmrBasRepository.save(entity); + } + + /** + * 프로필 조회 + * @param cstmrSno + * @return + * @throws Exception + */ + public JwtProfileRsModel profile(int cstmrSno) throws Exception{ + JwtProfileRsModel model = query.findUserProfile(cstmrSno); + model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); + + return model; + } + + /** + * token 만료시 refresh 토큰으로 재검색 + * @param cstmrSno + * @param refreshToken + * @return + */ + public JwtRsModel findRefreshtoken(int cstmrSno , String refreshToken) { + JwtUserModel userDetails = query.findRefreshtoken(cstmrSno, refreshToken); + + if(userDetails == null) { + return null; + } + + String accessToken = jwtTokenUtil.generateToken(userDetails); + + JwtRsModel result = new JwtRsModel(); + result.setAccessToken(accessToken); + result.setRefreshToken(refreshToken); + result.setAuth(userDetails.getAuth()); + result.setUserId(userDetails.getUserId()); + result.setCstmrSno(userDetails.getCstmrSno()); + + return result; + } + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtUserDetailsService.java b/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtUserDetailsService.java new file mode 100644 index 0000000..0d92ed3 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtUserDetailsService.java @@ -0,0 +1,41 @@ +package com.palnet.biz.api.acnt.jwt.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; +import com.palnet.biz.jpa.repository.pty.PtyCstmrBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrQueryRepository; +import com.palnet.comn.utils.JsonUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Service +@RequiredArgsConstructor +@Log4j2 +public class JwtUserDetailsService implements UserDetailsService{ + + @Autowired + private PtyCstmrQueryRepository query ; + + @Autowired + private PtyCstmrBasRepository repository; + + + + @Override + public JwtUserModel loadUserByUsername(String username){ + + JwtUserModel model = query.findUserPassword(username); + log.debug("jwtUser>>>>" + JsonUtils.toJson(model)); + if(model == null) { + return null; + }else { + return model; + } + + } +} diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java new file mode 100644 index 0000000..e03e71f --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java @@ -0,0 +1,104 @@ +package com.palnet.biz.api.acnt.jwt.utils; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Component; + +import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import lombok.extern.log4j.Log4j2; + +@Component +@Log4j2 +public class JwtTokenUtil implements Serializable { + + private static final long serialVersionUID = -2550185165626007488L; + + public static final long JWT_TOKEN_VALIDITY = 5 * 60 * 60; // 5시간 +// public static final long JWT_TOKEN_VALIDITY = 10; // 10초 + public static final long JWT_REFRESH_TOKEN_VALIDTY = 21* 24 * 60 * 60; //21일 + + + @Value("${spring.jwt.secret}") + private String secret; + + //retrieve username from jwt token + // jwt token으로부터 username을 획득한다. + public String getUsernameFromToken(String token) { + return getClaimFromToken(token, Claims::getSubject); + } + + //retrieve expiration date from jwt token + // jwt token으로부터 만료일자를 알려준다. + public Date getExpirationDateFromToken(String token) { + return getClaimFromToken(token, Claims::getExpiration); + } + + public T getClaimFromToken(String token, Function claimsResolver) { + final Claims claims = getAllClaimsFromToken(token); + return claimsResolver.apply(claims); + } + //for retrieveing any information from token we will need the secret key + private Claims getAllClaimsFromToken(String token) { + return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); + } + + //check if the token has expired + // 토큰이 만료되었는지 확인한다. + private Boolean isTokenExpired(String token) { + final Date expiration = getExpirationDateFromToken(token); + log.debug(">>>" + expiration); + return expiration.before(new Date()); + } + + //generate token for user + // 유저를 위한 토큰을 발급해준다. + public String generateToken(JwtUserModel userDetails) { + Map claims = new HashMap<>(); + claims.put("userId", userDetails.getUserId()); + claims.put("cstmrSno", userDetails.getCstmrSno()); + return doGenerateToken(claims, userDetails.getUsername()); + } + + + public String generateRefreshToken(JwtUserModel userDetails) { + Map claims = new HashMap<>(); + claims.put("userId", userDetails.getUserId()); + claims.put("cstmrSno", userDetails.getCstmrSno()); + return doGenerateRefreshToken(claims, userDetails.getUsername()); + } + + + //while creating the token - + //1. Define claims of the token, like Issuer, Expiration, Subject, and the ID + //2. Sign the JWT using the HS512 algorithm and secret key. + //3. According to JWS Compact Serialization(https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41#section-3.1) + // compaction of the JWT to a URL-safe string + private String doGenerateToken(Map claims, String subject) { + + return Jwts.builder().setClaims(claims).setSubject(subject).setIssuedAt(new Date(System.currentTimeMillis())) + .setExpiration(new Date(System.currentTimeMillis() + JWT_TOKEN_VALIDITY * 1000)) + .signWith(SignatureAlgorithm.HS512, secret).compact(); + } + + private String doGenerateRefreshToken(Map claims , String subject) { + return Jwts.builder().setClaims(claims).setSubject(subject).setIssuedAt(new Date(System.currentTimeMillis())) + .setExpiration(new Date(System.currentTimeMillis() + JWT_REFRESH_TOKEN_VALIDTY * 1000)) + .signWith(SignatureAlgorithm.HS512, secret).compact(); + } + + //validate token + public Boolean validateToken(String token, UserDetails userDetails) { + final String username = getUsernameFromToken(token); + return (username.equals(userDetails.getUsername()) && !isTokenExpired(token)); + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/api/acnt/terms/controller/AcntTermsController.java b/src/main/java/com/palnet/biz/api/acnt/terms/controller/AcntTermsController.java new file mode 100644 index 0000000..772a19a --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/terms/controller/AcntTermsController.java @@ -0,0 +1,69 @@ +package com.palnet.biz.api.acnt.terms.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel; +import com.palnet.biz.api.acnt.terms.service.AcntTermsService; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.hstry.service.AnlsHstryService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.api.ctr.cntrl.service.CtrCntrlService; +import com.palnet.biz.sample.entity.SampleEntity; +import com.palnet.biz.sample.service.SampleService; +import com.palnet.comn.model.GPHistoryModel; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/acnt/terms", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class AcntTermsController { + + @Autowired + private final AcntTermsService service; + + + + @GetMapping(value = "/list") + public ResponseEntity list(AcntTermsRqModel rq) { + List result = null; + + log.debug("RQ>>>>>>>>" , rq.toString()); + + try { + result = service.list(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + + + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRqModel.java b/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRqModel.java new file mode 100644 index 0000000..ab5b360 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRqModel.java @@ -0,0 +1,11 @@ +package com.palnet.biz.api.acnt.terms.model; + +import lombok.Data; + +@Data +public class AcntTermsRqModel{ + + private String siteCd; + + private String langDivCd; +} diff --git a/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java b/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java new file mode 100644 index 0000000..6d3fee2 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java @@ -0,0 +1,26 @@ +package com.palnet.biz.api.acnt.terms.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class AcntTermsRsModel{ + + private int termsSno ; + + private String siteCd; + + private Date estbshDate; + + private String termsCtgryCd; + + private String langDivCd; + + private String termsTitleNm; + + private String termsCn; + + private String simpleCn; + +} diff --git a/src/main/java/com/palnet/biz/api/acnt/terms/service/AcntTermsService.java b/src/main/java/com/palnet/biz/api/acnt/terms/service/AcntTermsService.java new file mode 100644 index 0000000..fc41e41 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/terms/service/AcntTermsService.java @@ -0,0 +1,35 @@ +package com.palnet.biz.api.acnt.terms.service; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel; +import com.palnet.biz.jpa.repository.pty.PtyTermsQueryRepository; + +@Service +public class AcntTermsService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + +// @Autowired +// private CtrCntrlBasRepository ctrCntrlBasRepository; + + @Autowired + private PtyTermsQueryRepository query; + + + + public List list(AcntTermsRqModel rq){ + + List resultList = query.list(rq); + + return resultList; + } + + +} diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java new file mode 100644 index 0000000..e213932 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java @@ -0,0 +1,102 @@ +package com.palnet.biz.api.anls.hstry.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.hstry.service.AnlsHstryService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.utils.JsonUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/anls/hstry", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class AnlsHstryController { + + @Autowired + private final AnlsHstryService service; + + + @GetMapping(value = "/list") + public ResponseEntity list(AnlsHstryRqModel rq) { + List result = null; + + log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq)); + log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate()); + + //입력값 검증 + if(rq.getStDate() == null || !(rq.getStDate().length() == 10) || rq.getEndDate() ==null || !(rq.getEndDate().length() == 10) ) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.list(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + @GetMapping(value = "/detail/{id}") + public ResponseEntity detail(@PathVariable String id) { + AnlsHstryModel result = null; + + try { + result = service.detail(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + @GetMapping(value = "/log/{id}") + public ResponseEntity log(@PathVariable String id) { + List result = null; + + try { + result = service.hstryList(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java new file mode 100644 index 0000000..785fddb --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java @@ -0,0 +1,47 @@ +package com.palnet.biz.api.anls.hstry.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class AnlsHstryDetailModel{ + + private int hstrySno; + + private String cntrlId; + + private String idntfNum; + + private String trmnlId; + + private String mssgTypeCd; + + private String statusCd; + + private Double lat; + + private Double lon; + + private Double speed; + + private String speedType; + + private Double heading; + + private Double elev; + + private String elevType; + + private Double mvDstnc; + + private Double bttrLvl; + + private Double bttrVltg; + + private Date trmnlRcvDt; + + private Date srvrRcvDt; + + +} diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java new file mode 100644 index 0000000..2c2bc80 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java @@ -0,0 +1,79 @@ +package com.palnet.biz.api.anls.hstry.model; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.persistence.Column; +import javax.persistence.Id; + +import com.palnet.comn.utils.DateUtils; + +import io.netty.util.internal.StringUtil; +import lombok.Data; + +@Data +public class AnlsHstryModel{ + + private String cntrlId; + + private String idntfNum; + + private String statusCd; + + private String objectTypeCd; + + private Date flghtStDt; + + private Date flghtEndDt; + + private Date cntrlStDt; + + private Date cntrlEndDt; + + private Double ttlTime= 0.0; + + private String ttlTimeType; + + private Double ttlDstnc= 0.0; + + private String ttlDstncType; + + private Double avrgSpeed = 0.0; + + private String avrgSpeedType; + + private Double bttrCnsmptn= 0.0; + + private String endTypeCd; + + private String actnType; + + private String area1 = ""; + + private String area2 = ""; + + private String area3 = ""; + + private String zipCd = ""; + + private String landNm = ""; + + private String landNum = ""; + + private String areaType = ""; + + private String areaNm = ""; + + private String stArea = ""; + + private String endArea = ""; + + private Date createDt; + + private Date updateDt; + +} diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRqModel.java b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRqModel.java new file mode 100644 index 0000000..bbafc71 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRqModel.java @@ -0,0 +1,10 @@ +package com.palnet.biz.api.anls.hstry.model; + +import com.palnet.biz.api.comn.model.ComnRqModel; + +import lombok.Data; + +@Data +public class AnlsHstryRqModel extends ComnRqModel{ + +} diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java new file mode 100644 index 0000000..d70aa83 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java @@ -0,0 +1,66 @@ +package com.palnet.biz.api.anls.hstry.service; + +import java.util.List; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; + +@Service +public class AnlsHstryService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private CtrCntrlBasRepository ctrCntrlBasRepository; + + @Autowired + private CtrCntrlQueryRepository query; + + + + public List list(AnlsHstryRqModel rq){ + + List resultList = query.listCntrlBas(rq); + + return resultList; + } + + public AnlsHstryModel detail(String cntrlId) throws Exception{ + + AnlsHstryModel model = new AnlsHstryModel(); + + Optional optional = ctrCntrlBasRepository.findById(cntrlId); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + CtrCntrlBas entity = optional.get(); + + BeanUtils.copyProperties(entity , model); + + + return model; + + } + + public List hstryList(String cntrlId) { + + List resultList = query.listCntrlHstry(cntrlId); + + return resultList; + } +} diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java b/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java new file mode 100644 index 0000000..0e513f7 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java @@ -0,0 +1,143 @@ +package com.palnet.biz.api.anls.smlt.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltDetailModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel; +import com.palnet.biz.api.anls.smlt.service.AnlsSmltService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.utils.JsonUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/anls/smlt", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class AnlsSmltController { + + @Autowired + private final AnlsSmltService service; + + /** + * 비행 현황 목록 + * @param rq + * @return + */ + @GetMapping(value = "/list") + public ResponseEntity list(AnlsHstryRqModel rq) { + List result = null; + + log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq)); + log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate()); + + //입력값 검증 + if(rq.getStDate() == null || !(rq.getStDate().length() == 10) || rq.getEndDate() ==null || !(rq.getEndDate().length() == 10) ) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.list(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * 비행 이력 데이터 조회 + * @param rq + * @return + */ + @GetMapping(value = "/hist/{id}") + public ResponseEntity histList(@PathVariable String id) { + List result = null; + + try { +// result = service.list(rq); + result = service.histList(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * 통계 데이터 조회 + * @param rq + * @return + */ + @GetMapping(value = "/stcs/{id}") + public ResponseEntity stcsList(@PathVariable String id) { + List result = null; + + + try { + result = service.stcsList(id); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + /** + * 비행 상세정보 조회 + * @param id + * @return + */ + @GetMapping(value = "/detail/{id}") + public ResponseEntity detail(@PathVariable String id) { + AnlsSmltDetailModel result = null; + + try { + result = service.detail(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltDetailModel.java b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltDetailModel.java new file mode 100644 index 0000000..b16b58b --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltDetailModel.java @@ -0,0 +1,60 @@ +package com.palnet.biz.api.anls.smlt.model; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.persistence.Column; +import javax.persistence.Id; + +import com.palnet.comn.utils.DateUtils; + +import io.netty.util.internal.StringUtil; +import lombok.Data; + +@Data +public class AnlsSmltDetailModel{ + + private String cntrlId; + + private String idntfNum; + + private Date flghtStDt; + + private Date flghtEndDt; + + private Date cntrlStDt; + + private Date cntrlEndDt; + + private Double ttlTime= 0.0; + + private String ttlTimeType; + + private Double ttlDstnc= 0.0; + + private String ttlDstncType; + + private Double avrgSpeed = 0.0; + + private String avrgSpeedType; + + private Double bttrCnsmptn= 0.0; + + private String stArea = ""; + + private String endArea = ""; + + private String arcrftTypeCd = ""; + + private String prdctNum = ""; + + private String arcrftModelNm = ""; + + private String imageUrl = ""; + + +} diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltHistModel.java b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltHistModel.java new file mode 100644 index 0000000..1afa8a9 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltHistModel.java @@ -0,0 +1,46 @@ +package com.palnet.biz.api.anls.smlt.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class AnlsSmltHistModel{ + + private int hstrySno; + + private String cntrlId; + + private String trmnlId; + + private String mssgTypeCd; + + private String statusCd; + + private double lat; + + private double lon; + + private double speed; + + private String speedType; + + private double heading; + + private double elev; + + private String elevType; + + private double mvDstnc; + + private String mvDstncType; + + private double bttrLvl; + + private double bttrVltg; + + private Date trmnlRcvDt; + + private Date srvrRcvDt; + +} diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltRqModel.java b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltRqModel.java new file mode 100644 index 0000000..f5fdfee --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltRqModel.java @@ -0,0 +1,10 @@ +package com.palnet.biz.api.anls.smlt.model; + +import com.palnet.biz.api.comn.model.ComnRqModel; + +import lombok.Data; + +@Data +public class AnlsSmltRqModel extends ComnRqModel{ + +} diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltStcsModel.java b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltStcsModel.java new file mode 100644 index 0000000..2b59a52 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltStcsModel.java @@ -0,0 +1,28 @@ +package com.palnet.biz.api.anls.smlt.model; + +import lombok.Data; + +@Data +public class AnlsSmltStcsModel{ + + private String dateCd; + + private String timeCd; + + private Double avrgSpeed; + + private String speedType; + + private Double avrgElev; + + private String elevType; + + private Double avrgMvDstnc; + + private String mvDstncType; + + private Double minBttrLvl; + + private Double maxBttrLvl; + +} diff --git a/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java new file mode 100644 index 0000000..14e7ccb --- /dev/null +++ b/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java @@ -0,0 +1,149 @@ +package com.palnet.biz.api.anls.smlt.service; + +import java.util.Collections; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltDetailModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel; +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.comn.utils.NumberUtils; + +@Service +public class AnlsSmltService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private CtrCntrlBasRepository ctrCntrlBasRepository; + + @Autowired + private CtrCntrlQueryRepository query; + + + /** + * 비행 현황 목록 + * @param rq + * @return + */ + public List list(AnlsHstryRqModel rq){ + + List resultList = query.listCntrlBas(rq); + + return resultList; + } + + /** + * + * @param rq비행 이력 데이터 조회 + * @return + */ + public List histList(String id){ + + List resultList = query.listCntrlHstry(id); + + //정렬 순서 뒤집기 처리 + Collections.reverse(resultList); + + return resultList; + } + + + /** + * 통계 데이터 조회 + * @param rq + * @return + */ + public List stcsList(String id){ + + List result = query.anlsSmltStcs(id); + + + //통계 데이터 가공 처리 + //소수점 자리 1자리로 컷트 + for(AnlsSmltStcsModel model : result) { + + model.setAvrgElev(NumberUtils.formatZero2(model.getAvrgElev())); + model.setAvrgMvDstnc(NumberUtils.formatZero2(model.getAvrgMvDstnc())); + model.setAvrgSpeed(NumberUtils.formatZero2(model.getAvrgSpeed())); + } + + return result; + } + + + + /** + * 비행 상세정보 조회 + * @param cntrlId + * @return + * @throws Exception + */ + public AnlsSmltDetailModel detail(String cntrlId) throws Exception{ + + AnlsSmltDetailModel result = new AnlsSmltDetailModel(); + + + result = query.anlsSmltDetail(cntrlId); + +// Optional optional = ctrCntrlBasRepository.findById(cntrlId); +// +// if (!optional.isPresent()) { +// throw new CustomException(ErrorCode.DATA_NOTFIND); +// } +// +// CtrCntrlBas entity = optional.get(); +// +// BeanUtils.copyProperties(entity , result); + + + List areaList = query.detailArea(cntrlId); + + + for(CtrCntrlHstryArea area : areaList) { + if(area != null) { + String areaNm = ""; + if(!StringUtils.isEmpty(area.getArea1())) { + areaNm = areaNm + " " + area.getArea1(); + } + + if(!StringUtils.isEmpty(area.getArea2())) { + areaNm = areaNm + " " + area.getArea2(); + } + + if(!StringUtils.isEmpty(area.getArea3())) { + areaNm = areaNm + " " + area.getArea3(); + } + + if(!StringUtils.isEmpty(area.getLandNm())) { + areaNm = areaNm + " " + area.getLandNm(); + } + + if(!StringUtils.isEmpty(area.getLandNum())) { + areaNm = areaNm + " " + area.getLandNum(); + } + + if(area.getActnType().equals("01")) { + result.setStArea(areaNm); + }else if(area.getActnType().equals("99")) { + result.setEndArea(areaNm); + } + } + + } + return result; + + } + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java b/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java new file mode 100644 index 0000000..c6eeaa1 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java @@ -0,0 +1,289 @@ +package com.palnet.biz.api.bas.dron.controller; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import com.palnet.biz.api.bas.dron.model.BasDronModel; +import com.palnet.biz.api.bas.dron.model.BasDronRqModel; +import com.palnet.biz.api.bas.dron.model.BasIdntfModel; +import com.palnet.biz.api.bas.dron.model.BasIdntfRqModel; +import com.palnet.biz.api.bas.dron.service.BasDronService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.exception.CustomException; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/bas/dron", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class BasDronController { + + @Autowired + private final BasDronService service; + + + /** + * 목록 조회 + * @param rq + * @return + */ + @GetMapping(value = "/list") + public ResponseEntity list(BasDronRqModel rq) { + List result = null; + + //입력값 검증 + if(StringUtils.isEmpty(rq.getGroupId())) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.list(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * 식별정보 조회 + * @param rq + * @return + */ + @GetMapping(value = "/idntf/list/{id}") + public ResponseEntity mylist(@PathVariable Integer id) { + List result = null; + + //입력값 검증 + if(StringUtils.isEmpty(id)) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.listIdntf(id); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * 상세 조회 + * @param id + * @return + */ + @GetMapping(value = "/detail/{id}") + public ResponseEntity detail(@PathVariable Integer id) { + BasDronModel result = null; + + try { + //입력값 검증 + if(StringUtils.isEmpty(id)) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + + result = service.detail(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * 생성 + * @return + */ + @PostMapping(value = "/create") + public ResponseEntity create(@RequestBody BasDronModel rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.create(rq); + + resultMap.put("result", result); + + }catch(CustomException e2) { + log.error("IGNORE : {}", e2); + resultMap.put("result", false); + resultMap.put("errorCode", e2.getErrorCode()); + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + }catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 생성 + * @return + */ + @PostMapping(value = "/idntf/create") + public ResponseEntity createIdntf(@RequestBody BasIdntfRqModel rq) { + Map resultMap = new HashMap(); + + try { +// boolean result = service.create(rq); + boolean result = service.createIdntf(rq); + + resultMap.put("result", result); + + }catch(CustomException e2) { + log.error("IGNORE : {}", e2); + resultMap.put("result", false); + resultMap.put("errorCode", e2.getErrorCode()); + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + } + catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 수정 + * @return + */ + @PutMapping(value = "/update") + public ResponseEntity update(@RequestBody BasDronModel rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.update(rq); + + resultMap.put("result", result); + + } + catch(CustomException e2) { + log.error("IGNORE : {}", e2); + resultMap.put("result", false); + resultMap.put("errorCode", e2.getErrorCode()); + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + }catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 삭제 + * @param id + * @return + */ + @DeleteMapping(value = "/delete/{id}") + public ResponseEntity delete(@PathVariable Integer id) { + Map resultMap = new HashMap(); + + try { + + //입력값 검증 + if(StringUtils.isEmpty(id)) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + boolean result = service.delete(id); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 식별장치 삭제 + * @param id + * @return + */ + @DeleteMapping(value = "/idntf/delete/{id}") + public ResponseEntity deleteIdntf(@PathVariable String id) { + Map resultMap = new HashMap(); + + try { + + //입력값 검증 + if(StringUtils.isEmpty(id)) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + boolean result = service.deleteIdntf(id); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java new file mode 100644 index 0000000..02b491b --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java @@ -0,0 +1,71 @@ +package com.palnet.biz.api.bas.dron.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasDronModel { + + private String groupId; + + private int arcrftSno; + + private double arcrftHght; + + private double arcrftLngth; + + private String arcrftModelNm; + + private String arcrftTypeCd; + + private double arcrftWdth; + + private double arcrftWght; + + private String cameraYn; + + private Date createDt; + + private String createUserId; + + private String insrncYn; + + private String prdctCmpnNm; + + private Date prdctDate; + + private String prdctNum; + + private double takeoffWght; + + private Date updateDt; + + private String updateUserId; + + private String imageUrl; + + private String wghtTypeCd; + + //식별 번호 정보 + private String idntfNum; + + private String newIdntfNum; //변경된 식별 정보 + + private String idntfTypeCd; + + // 운영자 정보 + private int ownerSno; + + private String ownerNm; + + private String hpno; + + private String telno; + + private String useYn; + + + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java new file mode 100644 index 0000000..37611cc --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronRqModel.java @@ -0,0 +1,21 @@ +package com.palnet.biz.api.bas.dron.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasDronRqModel { + + private String groupId; + + private String arcrftModelNm; + + private String arcrftTypeCd; + + private String idntfNum; + + private String ownerNm; + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java new file mode 100644 index 0000000..8addabd --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java @@ -0,0 +1,22 @@ +package com.palnet.biz.api.bas.dron.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasIdntfModel { + + //식별 번호 정보 + private String idntfNum; + + private int arcrftSno; + + + private String idntfTypeCd; + + private Date updateDt; + + private Date createDt; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfRqModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfRqModel.java new file mode 100644 index 0000000..9d2cffa --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfRqModel.java @@ -0,0 +1,14 @@ +package com.palnet.biz.api.bas.dron.model; + +import java.util.List; + +import lombok.Data; + +@Data +public class BasIdntfRqModel { + + private List data; + + private int arcrftSno; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/model/BasOwnerModel.java b/src/main/java/com/palnet/biz/api/bas/dron/model/BasOwnerModel.java new file mode 100644 index 0000000..7276cf5 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/model/BasOwnerModel.java @@ -0,0 +1,30 @@ +package com.palnet.biz.api.bas.dron.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasOwnerModel { + + private int ownerSno; + + private int arcrftSno; + + private String ownerNm; + + private String hpno; + + private String telno; + + private String useYn; + + private Date createDt; + + private String createUserId; + + private Date updateDt; + + private String updateUserId; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java new file mode 100644 index 0000000..d284fa3 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java @@ -0,0 +1,421 @@ +package com.palnet.biz.api.bas.dron.service; + +import java.util.List; +import java.util.Optional; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.palnet.biz.api.bas.dron.model.BasDronModel; +import com.palnet.biz.api.bas.dron.model.BasDronRqModel; +import com.palnet.biz.api.bas.dron.model.BasIdntfModel; +import com.palnet.biz.api.bas.dron.model.BasIdntfRqModel; +import com.palnet.biz.jpa.entity.ComArcrftBas; +import com.palnet.biz.jpa.entity.ComArcrftOwner; +import com.palnet.biz.jpa.entity.ComIdntfBas; +import com.palnet.biz.jpa.entity.PtyGroupArcrft; +import com.palnet.biz.jpa.repository.com.ComArcrftBasRepository; +import com.palnet.biz.jpa.repository.com.ComArcrftOwnerRepository; +import com.palnet.biz.jpa.repository.com.ComIdntBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyDronQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupArcrftRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; +import com.palnet.comn.utils.EncryptUtils; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class BasDronService { + + @Autowired + private PtyDronQueryRepository query; + + @Autowired + private ComArcrftBasRepository comArcrftBasRepository; + + @Autowired + private ComArcrftOwnerRepository comArcrftOwnerRepository; + + @Autowired + private ComIdntBasRepository comIdntBasRepository; + + @Autowired + private PtyGroupArcrftRepository ptyGroupArcrftRepository; + + + /** + * 드론 목록 + * @param rq + * @return + */ + public List list(BasDronRqModel rq){ + List resultList = query.list(rq); + return resultList; + } + + /** + * 식별장치 목록 + * @param arcrftSno + * @return + */ + public List listIdntf(int arcrftSno){ + List resultList = query.idntfList(arcrftSno); + return resultList; + } + + /** + * 상세 조회 + * @param cntrlId + * @return + * @throws Exception + */ + public BasDronModel detail(int arcrftSno) throws Exception{ + + BasDronModel model = query.detail(arcrftSno); + + if (model == null ) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + return model; + + } + + /** + * 생성 + * @param + * @return + * @throws Exception + */ + @Transactional + public boolean create(BasDronModel rq) throws Exception{ + + // 사전 체크 , 동일한 ID 존재 여부 확인 + if(!query.isNotPrdctNum(rq.getPrdctNum() , 0)) { + throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + + // 민감정보 암호화 처리 + if(!StringUtils.isEmpty(rq.getHpno())) { + rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); + } + if(!StringUtils.isEmpty(rq.getOwnerNm())) { + rq.setOwnerNm(EncryptUtils.encrypt(rq.getOwnerNm())); + } + if(!StringUtils.isEmpty(rq.getTelno())) { + rq.setTelno(EncryptUtils.encrypt(rq.getTelno())); + } + + + + //1. 드론 기본 정보 등록 + ComArcrftBas comArcrftBas = this.insertComArcrftBas(rq); + if(comArcrftBas == null) { + throw new CustomException(ErrorCode.DB_ERROR); + } + + log.debug("===========================>" + comArcrftBas.getArcrftSno()); + rq.setArcrftSno(comArcrftBas.getArcrftSno()); // KEY 넣기 + + //2. 드론 운영자 정보 등록 + ComArcrftOwner comArcrftOwner = this.insertComArcrftOwner(rq); + if(comArcrftOwner == null) { + throw new CustomException(ErrorCode.DB_ERROR); + } + +// //3. 드론 식별 정보 등록 +// ComIdntfBas comIdntfBas = this.insertComIdntfBas(rq); +// if(comIdntfBas == null) { +// throw new CustomException(ErrorCode.DB_ERROR); +// } + + //4. 드론 그룹에 연결 등록 + PtyGroupArcrft ptyGroupArcrft = this.insertPtyGroupArcrft(rq); + if(ptyGroupArcrft == null) { + throw new CustomException(ErrorCode.DB_ERROR); + } + + return true; + + } + + /** + * 식밸장치 생성 + * @param + * @return + * @throws Exception + */ + @Transactional + public boolean createIdntf(BasIdntfRqModel rq) throws Exception{ + + if( rq == null && rq.getData().size() == 0) + throw new CustomException(ErrorCode.DATA_NOTFIND); + + + for(BasIdntfModel model : rq.getData() ) { + + Optional optional = comIdntBasRepository.findById(model.getIdntfNum()); + + if (optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + + ComIdntfBas entity = new ComIdntfBas(); + + BeanUtils.copyProperties(model , entity); + entity.setArcrftSno(rq.getArcrftSno()); + entity.setCreateDt(DateUtils.nowDate()); + entity.setUpdateDt(DateUtils.nowDate()); + log.debug(entity.toString()); + + if( comIdntBasRepository.save(entity) == null ) return false; + + } + return true; + + } + + public boolean deleteIdntf(String idntfNum) { + Optional optional = comIdntBasRepository.findById(idntfNum); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + ComIdntfBas entity = optional.get(); + comIdntBasRepository.delete(entity); + return true; + + } + + public ComArcrftBas insertComArcrftBas(BasDronModel model) throws Exception{ + + + ComArcrftBas basEntity = new ComArcrftBas(); + + BeanUtils.copyProperties(model , basEntity); + + basEntity.setCreateDt(DateUtils.nowDate()); + basEntity.setUpdateDt(DateUtils.nowDate()); + basEntity.setUseYn("Y"); + + log.debug(basEntity.toString()); + + return comArcrftBasRepository.save(basEntity); + + } + + public ComArcrftOwner insertComArcrftOwner(BasDronModel model) throws Exception{ + + + ComArcrftOwner entity = new ComArcrftOwner(); + + BeanUtils.copyProperties(model , entity); + + entity.setCreateDt(DateUtils.nowDate()); + entity.setUpdateDt(DateUtils.nowDate()); + entity.setUseYn("Y"); + log.debug(entity.toString()); + + return comArcrftOwnerRepository.save(entity); + + } + + + public ComIdntfBas insertComIdntfBas(BasDronModel model) throws Exception{ + ComIdntfBas entity = new ComIdntfBas(); + + BeanUtils.copyProperties(model , entity); + entity.setCreateDt(DateUtils.nowDate()); + entity.setUpdateDt(DateUtils.nowDate()); + log.debug(entity.toString()); + + return comIdntBasRepository.save(entity); + } + + public PtyGroupArcrft insertPtyGroupArcrft(BasDronModel model) throws Exception{ + PtyGroupArcrft entity = new PtyGroupArcrft(); + BeanUtils.copyProperties(model , entity); + entity.setCreateDt(DateUtils.nowDate()); + entity.setUpdateDt(DateUtils.nowDate()); + entity.setUseYn("Y"); + log.debug(entity.toString()); + + return ptyGroupArcrftRepository.save(entity); + + } + + + /** + * 수정 + * @param + * @return + * @throws Exception + */ + @Transactional + public boolean update(BasDronModel rq) throws Exception{ + + // 사전 체크 , 동일한 ID 존재 여부 확인 + if(!query.isNotPrdctNum(rq.getPrdctNum() , rq.getArcrftSno())) { + throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + + //1. 기체 정보 수정 + ComArcrftBas comArcrftBas = this.updateComArcrftBas(rq); + if(comArcrftBas == null) { + throw new CustomException(ErrorCode.DB_ERROR); + } + + //2-1. 식별장치 수정 필요 여부 체크 newIdnfnum -> idnftNum 비교후 다르면 +// if(!rq.getNewIdntfNum().equals(rq.getIdntfNum())) { +// //2-2 식별번호 중복 체크 +// if(!query.isNotIdntNum(rq.getNewIdntfNum())) { +// throw new CustomException(ErrorCode.DATA_DUPLICATE); +// } +// +// //2-3식별정보 수정 +// ComIdntfBas comIdntfBas = this.updateComIdntfBas(rq); +// +// if(comIdntfBas == null) { +// throw new CustomException(ErrorCode.DB_ERROR); +// } +// } + + + //민감 정보 암호화 처리 + // 민감정보 암호화 처리 + if(!StringUtils.isEmpty(rq.getHpno())) { + rq.setHpno(EncryptUtils.encrypt(rq.getHpno())); + } + if(!StringUtils.isEmpty(rq.getOwnerNm())) { + rq.setOwnerNm(EncryptUtils.encrypt(rq.getOwnerNm())); + } + if(!StringUtils.isEmpty(rq.getTelno())) { + rq.setTelno(EncryptUtils.encrypt(rq.getTelno())); + } + + + //3. 운영자 정보 수정 + ComArcrftOwner comArcrftOwner = this.updateComArcrftOwner(rq); + + if(comArcrftOwner == null) { + throw new CustomException(ErrorCode.DB_ERROR); + } + + return true; + } + + + public ComArcrftBas updateComArcrftBas(BasDronModel model) throws Exception{ + + + Optional optional = comArcrftBasRepository.findById(model.getArcrftSno()); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + ComArcrftBas entity = optional.get(); + + entity.setArcrftHght(model.getArcrftHght()); + entity.setArcrftLngth(model.getArcrftLngth()); + entity.setArcrftModelNm(model.getArcrftModelNm()); + entity.setArcrftTypeCd(model.getArcrftTypeCd()); + entity.setArcrftWdth(model.getArcrftWdth()); + entity.setArcrftWght(model.getArcrftWght()); + entity.setCameraYn(model.getCameraYn()); + entity.setImageUrl(model.getImageUrl()); + entity.setInsrncYn(model.getInsrncYn()); + entity.setPrdctCmpnNm(model.getPrdctCmpnNm()); + entity.setPrdctDate(model.getPrdctDate()); + entity.setPrdctNum(model.getPrdctNum()); + entity.setTakeoffWght(model.getTakeoffWght()); + entity.setUpdateUserId(model.getUpdateUserId()); + entity.setUpdateDt(DateUtils.nowDate()); + + return comArcrftBasRepository.save(entity); + + + } + + public ComArcrftOwner updateComArcrftOwner(BasDronModel model) throws Exception{ + + + Optional optional = comArcrftOwnerRepository.findById(model.getOwnerSno()); + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + ComArcrftOwner entity = optional.get(); + entity.setUpdateDt(DateUtils.nowDate()); + entity.setUpdateUserId(model.getUpdateUserId()); + entity.setOwnerNm(model.getOwnerNm()); + entity.setHpno(model.getHpno()); + entity.setTelno(model.getTelno()); + + log.debug(entity.toString()); + + return comArcrftOwnerRepository.save(entity); + + } + + + public ComIdntfBas updateComIdntfBas(BasDronModel model) throws Exception{ + + Optional optional = comIdntBasRepository.findById(model.getIdntfNum()); + + if (optional.isPresent()) { + ComIdntfBas entity = optional.get(); + comIdntBasRepository.delete(entity); + } + + model.setIdntfNum(model.getNewIdntfNum()); + + return this.insertComIdntfBas(model); + } + + + /** + * 삭제 + * @param + * @return + * @throws Exception + */ + @Transactional + public boolean delete(int arcrftSno) throws Exception{ + + try { + //1. 기체 정보 사용여부 N 으로 체크 + Optional optional = comArcrftBasRepository.findById(arcrftSno); + if (optional.isPresent()) { + ComArcrftBas comArcrftBas = optional.get(); + comArcrftBas.setUseYn("N"); + comArcrftBasRepository.save(comArcrftBas); + } + + //2. 식별 정보 삭제 처리 + comIdntBasRepository.deleteByArcrftSno(arcrftSno); + + //3. 기체 소유자정보 사용여부 N 처리 + comArcrftOwnerRepository.deleteByArcrftSno(arcrftSno); + + //4. 그룹기체 정보 사용여부 N 처리 + ptyGroupArcrftRepository.deleteByArcrftSno(arcrftSno); + + return true; + }catch(Exception e) { + log.error("IGNORE : {}", e); + throw new CustomException(ErrorCode.DB_ERROR); + } + + + + } + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupAprvController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupAprvController.java new file mode 100644 index 0000000..14ed6f5 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupAprvController.java @@ -0,0 +1,97 @@ +package com.palnet.biz.api.bas.group.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.bas.group.model.BasGroupAprvModel; +import com.palnet.biz.api.bas.group.model.BasGroupAprvRqModel; +import com.palnet.biz.api.bas.group.service.BasGroupAprvService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/bas/group/aprv", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class BasGroupAprvController { + + @Autowired + private final BasGroupAprvService service; + + /** + * 승인요청 조회 + * @param rq + * @return + */ + @GetMapping(value = "/list") + public ResponseEntity list(BasGroupAprvRqModel rq) { + List result = null; + log.debug(">>>>" + rq.toString()); + + if(StringUtils.isEmpty(rq.getCstmrSno())) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.mylist(rq); + + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + /** + * 승인처리 / 승인취소 처리 + * @return + */ + @PutMapping(value = "/update") + public ResponseEntity update(@RequestBody BasGroupAprvModel rq) { + Map resultMap = new HashMap(); + + if(StringUtils.isEmpty(rq.getCstmrGroupSno())) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + boolean result = service.update(rq); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java new file mode 100644 index 0000000..80b5e63 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java @@ -0,0 +1,240 @@ +package com.palnet.biz.api.bas.group.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.bas.group.model.BasGroupModel; +import com.palnet.biz.api.bas.group.model.BasGroupRqModel; +import com.palnet.biz.api.bas.group.service.BasGroupService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/bas/group", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class BasGroupController { + + @Autowired + private final BasGroupService service; + + @GetMapping(value = "/createid") + public ResponseEntity createid() { + Map resultMap = new HashMap(); + + try { + String result = service.createid(); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 나의 그룹 목록 조회 + * @param rq + * @return + */ + @GetMapping(value = "/mylist") + public ResponseEntity mylist(Integer cstmrSno) { + List result = null; + + log.debug("Param : " + cstmrSno); + + //입력값 검증 + if(StringUtils.isEmpty(cstmrSno)) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.mylist(cstmrSno); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + /** + * 참여 그룹 목록 조회 + * @param rq + * @return + */ + @GetMapping(value = "/joinlist") + public ResponseEntity joinList(Integer cstmrSno) { + List result = null; + + + //입력값 검증 + if(StringUtils.isEmpty(cstmrSno)) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.joinList(cstmrSno); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + /** + * 전체 그룹 목록 조회 + * @param rq + * @return + */ + @GetMapping(value = "/list") + public ResponseEntity list(BasGroupRqModel rq) { + List result = null; + + try { + result = service.list(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + /** + * 그룹 상세 조회 + * @param id + * @return + */ + @GetMapping(value = "/detail/{id}") + public ResponseEntity detail(@PathVariable String id) { + BasGroupModel result = null; + + try { + result = service.detail(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * 그룹 생성 + * @return + */ + @PostMapping(value = "/create") + public ResponseEntity create(@RequestBody BasGroupModel rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.create(rq); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 그룹 수정 + * @return + */ + @PutMapping(value = "/update") + public ResponseEntity update(@RequestBody BasGroupModel rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.update(rq); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + /** + * 그룹 삭제 + * @param id + * @return + */ + @DeleteMapping(value = "/delete/{id}") + public ResponseEntity delete(@PathVariable String id) { + Map resultMap = new HashMap(); + + try { + boolean result = service.delete(id); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupJoinController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupJoinController.java new file mode 100644 index 0000000..a90ee4a --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupJoinController.java @@ -0,0 +1,108 @@ +package com.palnet.biz.api.bas.group.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.bas.group.model.BasGroupJoinRqModel; +import com.palnet.biz.api.bas.group.service.BasGroupJoinService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/bas/group/join", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class BasGroupJoinController { + + @Autowired + private final BasGroupJoinService service; + + + @GetMapping(value = "/list") + public ResponseEntity list(BasGroupJoinRqModel rq) { + List result = null; + + if(StringUtils.isEmpty(rq.getCstmrSno())) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.joinFullList(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + @PostMapping(value = "/create") + public ResponseEntity create(@RequestBody BasGroupJoinModel rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.create(rq); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + @PutMapping(value = "/update") + public ResponseEntity update(@RequestBody BasGroupJoinModel rq) { + Map resultMap = new HashMap(); + + if(StringUtils.isEmpty(rq.getCstmrGroupSno())) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + boolean result = service.update(rq); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java new file mode 100644 index 0000000..fb5f811 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java @@ -0,0 +1,91 @@ +package com.palnet.biz.api.bas.group.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.hstry.service.AnlsHstryService; +import com.palnet.biz.api.bas.group.model.BasGroupUserModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel; +import com.palnet.biz.api.bas.group.service.BasGroupUserService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.utils.JsonUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/bas/group/user", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class BasGroupUserController { + + @Autowired + private final BasGroupUserService service; + + + @GetMapping(value = "/list") + public ResponseEntity list(BasGroupUserRqModel rq) { + List result = null; + + if(StringUtils.isEmpty(rq.getCstmrSno())) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.list(rq); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + @PutMapping(value = "/update") + public ResponseEntity update(@RequestBody BasGroupUserModel rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.update(rq); + + resultMap.put("result", result); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + + } + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java new file mode 100644 index 0000000..e130955 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java @@ -0,0 +1,37 @@ +package com.palnet.biz.api.bas.group.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasGroupAprvModel { + + private Integer cstmrGroupSno; + + private String groupId; + + private String groupNm; + + private String groupTypeCd; + + private Integer cstmrSno; + + private String aprvlYn; + + private String joinYn; + + private String memberName; + + private String userId; + + private Date aprvlDt; + + private Date joinDt; + + private String groupAuthCd; + + private String aprvlUserId; + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java new file mode 100644 index 0000000..b93551b --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvRqModel.java @@ -0,0 +1,19 @@ +package com.palnet.biz.api.bas.group.model; + +import com.palnet.biz.api.comn.model.ComnRqModel; + +import lombok.Data; + +@Data +public class BasGroupAprvRqModel extends ComnRqModel{ + + private String groupNm; + + private String memberName; + + private String aprvYn; + + private Integer cstmrSno; + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java new file mode 100644 index 0000000..853d209 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java @@ -0,0 +1,34 @@ +package com.palnet.biz.api.bas.group.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasGroupJoinModel { + + private Integer cstmrGroupSno; + + private String groupId; + + private String groupNm; + + private String groupTypeCd; + + private Integer cstmrSno; + + private String aprvlYn = "N"; + + private String joinYn = "N"; + + private Date joinDt; + + private Date aprvlDt; + + private String groupAuthCd; + + private Date createDt; + + private Date updateDt; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinRqModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinRqModel.java new file mode 100644 index 0000000..9a2f6a3 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinRqModel.java @@ -0,0 +1,16 @@ +package com.palnet.biz.api.bas.group.model; + +import com.palnet.biz.api.comn.model.ComnRqModel; + +import lombok.Data; + +@Data +public class BasGroupJoinRqModel extends ComnRqModel{ + + private String groupNm; + + private String groupId; + + private Integer cstmrSno; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java new file mode 100644 index 0000000..3dfb328 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java @@ -0,0 +1,22 @@ +package com.palnet.biz.api.bas.group.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasGroupModel { + + private String groupId; + + private String groupNm; + + private String groupTypeCd; + + private int cstmrSno; + + private Date createDt; + + private Date updateDt; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupRqModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupRqModel.java new file mode 100644 index 0000000..904ee84 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupRqModel.java @@ -0,0 +1,14 @@ +package com.palnet.biz.api.bas.group.model; + +import com.palnet.biz.api.comn.model.ComnRqModel; + +import lombok.Data; + +@Data +public class BasGroupRqModel extends ComnRqModel{ + + private String groupNm; + + private String groupId; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserModel.java new file mode 100644 index 0000000..d285bfa --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserModel.java @@ -0,0 +1,32 @@ +package com.palnet.biz.api.bas.group.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class BasGroupUserModel { + + private Integer cstmrGroupSno; + + private String groupId; + + private String groupNm; + + private String groupTypeCd; + + private Integer cstmrSno; + + private String memberName; + + private String userId; + + private Date aprvlDt; + + private Date joinDt; + + private String joinYn; + + private String groupAuthCd; + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserRqModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserRqModel.java new file mode 100644 index 0000000..2d35384 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserRqModel.java @@ -0,0 +1,19 @@ +package com.palnet.biz.api.bas.group.model; + +import com.palnet.biz.api.comn.model.ComnRqModel; + +import lombok.Data; + +@Data +public class BasGroupUserRqModel extends ComnRqModel{ + + private String groupNm; + + private String memberName; + + private String groupAuthCd; + + private Integer cstmrSno; + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java new file mode 100644 index 0000000..8bdd738 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java @@ -0,0 +1,73 @@ +package com.palnet.biz.api.bas.group.service; + +import java.util.List; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.bas.group.model.BasGroupAprvModel; +import com.palnet.biz.api.bas.group.model.BasGroupAprvRqModel; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; +import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; + +@Service +public class BasGroupAprvService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PtyGroupQueryRepository query; + + @Autowired + private PtyCstmrGroupRepository ptyCstmrGroupRepository; + + + /** + * 승인요청 조회 + * @param rq + * @return + */ + public List mylist(BasGroupAprvRqModel rq){ + List resultList = query.aprvList(rq); + + return resultList; + } + + + /** + * Y : 가입 , N : 탈퇴 , B : 블럭처리 , A: 가입신청 , C : 가입신청 취소 + * 승인처리 / 승인취소 처리 + * @param + * @return + * @throws Exception + */ + public boolean update(BasGroupAprvModel rq) throws Exception{ + + Optional optional = ptyCstmrGroupRepository.findById(rq.getCstmrGroupSno()); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyCstmrGroup entity = optional.get(); + if(rq.getAprvlYn().equals("Y")){ + entity.setAprvlDt(DateUtils.nowDate()); + entity.setAprvlUserId(rq.getAprvlUserId()); + } + entity.setAprvlYn(rq.getAprvlYn()); + + if(ptyCstmrGroupRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + return true; + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java new file mode 100644 index 0000000..66e56ff --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java @@ -0,0 +1,113 @@ +package com.palnet.biz.api.bas.group.service; + +import java.util.List; +import java.util.Optional; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.bas.group.model.BasGroupJoinRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupModel; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; +import com.palnet.biz.jpa.entity.PtyGroupBas; +import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; + +@Service +public class BasGroupJoinService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PtyGroupQueryRepository query; + + @Autowired + private PtyGroupBasRepository ptyGroupBasRepository; + + @Autowired + private PtyCstmrGroupRepository ptyCstmrGroupRepository; + + + /** + * 참여할 목록 조회 + * @param rq + * @return + */ + public List joinFullList(BasGroupJoinRqModel rq){ + + List resultList = query.joinFullList(rq); + + return resultList; + } + + + /** + * 가입요청 처리 + * @param + * @return + * @throws Exception + */ + public boolean create(BasGroupJoinModel rq) throws Exception{ + + boolean isNotJoin = query.isNotJoin(rq.getCstmrSno(), rq.getGroupId()); + + if(!isNotJoin) { + throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + + //참여 정보 입력 하기 + PtyCstmrGroup entity2 = new PtyCstmrGroup(); + entity2.setGroupId(rq.getGroupId()); + entity2.setGroupAuthCd(rq.getGroupAuthCd()); //생성한 사람은 최고 권한 부여 (CREATER , ADMIN , USER) 로 구분 하여 사용 + entity2.setCstmrSno(rq.getCstmrSno()); + entity2.setJoinYn("Y"); + entity2.setJoinDt(DateUtils.nowDate()); + entity2.setAprvlYn("N"); + if(ptyCstmrGroupRepository.save(entity2) == null) + throw new CustomException(ErrorCode.FAIL); + + return true; + + } + + /** + * Y : 가입 , N : 탈퇴 , B : 블럭처리 , A: 가입신청 , C : 가입신청 취소 + * 가입취소 / 탈퇴 처리 + * @param + * @return + * @throws Exception + */ + public boolean update(BasGroupJoinModel rq) throws Exception{ + + Optional optional = ptyCstmrGroupRepository.findById(rq.getCstmrGroupSno()); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyCstmrGroup entity = optional.get(); + + if(rq.getJoinYn().equals("N")) { + entity.setAprvlYn("N"); + entity.setAprvlUserId(""); + entity.setGroupAuthCd(""); + entity.setWthdrwDt(DateUtils.nowDate()); + } + + entity.setJoinYn(rq.getJoinYn()); + + if(ptyCstmrGroupRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + return true; + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java new file mode 100644 index 0000000..e609d57 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java @@ -0,0 +1,217 @@ +package com.palnet.biz.api.bas.group.service; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.bas.group.model.BasGroupModel; +import com.palnet.biz.api.bas.group.model.BasGroupRqModel; +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; +import com.palnet.biz.jpa.entity.PtyGroupBas; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; + +@Service +public class BasGroupService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PtyGroupQueryRepository query; + + @Autowired + private PtyGroupBasRepository ptyGroupBasRepository; + + @Autowired + private PtyCstmrGroupRepository ptyCstmrGroupRepository; + + + public String createid() { + + String groupId = ""; + + while(true) { + groupId = UUID.randomUUID().toString().replaceAll("-", "").toUpperCase().substring(0, 6); + Optional optional = ptyGroupBasRepository.findById(groupId); + if(!optional.isPresent()) { + break; + } + } + + return groupId; + } + + /** + * 나의 그룹 목록 + * @param rq + * @return + */ + public List mylist(int cstmrSno){ + + + List resultList = query.mylist(cstmrSno); + + return resultList; + } + + /** + * 참여 그룹 목록 + * @param rq + * @return + */ + public List joinList(int cstmrSno){ + + List resultList = query.joinList(cstmrSno); + + return resultList; + } + + + /** + * 전체 그룹 목록 + * @param rq + * @return + */ + public List list(BasGroupRqModel rq){ + + + List resultList = query.list(rq); + + return resultList; + } + + /** + * 그룹 상세 조회 + * @param cntrlId + * @return + * @throws Exception + */ + public BasGroupModel detail(String groupId) throws Exception{ + + BasGroupModel model = new BasGroupModel(); + + Optional optional = ptyGroupBasRepository.findById(groupId); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyGroupBas entity = optional.get(); + + BeanUtils.copyProperties(entity , model); + + + return model; + + } + + /** + * 그룹 생성 + * @param + * @return + * @throws Exception + */ + public boolean create(BasGroupModel rq) throws Exception{ + + Optional optional = ptyGroupBasRepository.findById(rq.getGroupId()); + + if (optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + + PtyGroupBas entity = new PtyGroupBas(); + BeanUtils.copyProperties(rq , entity); + entity.setUpdateDt(DateUtils.nowDate()); + entity.setUseYn("Y"); + entity.setCreateDt(DateUtils.nowDate()); + + //참여 정보 입력 하기 + PtyCstmrGroup entity2 = new PtyCstmrGroup(); + entity2.setGroupId(rq.getGroupId()); + entity2.setGroupAuthCd("CREATER"); //생성한 사람은 최고 권한 부여 (CREATER , ADMIN , USER) 로 구분 하여 사용 + entity2.setAprvlYn("Y"); //자동 승인 처리 함 + entity2.setAprvlDt(DateUtils.nowDate()); + entity2.setCstmrSno(rq.getCstmrSno()); + entity2.setJoinYn("Y"); + entity2.setJoinDt(DateUtils.nowDate()); + + if( ptyGroupBasRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + + if(ptyCstmrGroupRepository.save(entity2) == null) + throw new CustomException(ErrorCode.FAIL); + + return true; + + } + + /** + * 그룹 수정 + * @param + * @return + * @throws Exception + */ + public boolean update(BasGroupModel rq) throws Exception{ + + Optional optional = ptyGroupBasRepository.findById(rq.getGroupId()); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyGroupBas entity = optional.get(); + entity.setGroupNm(rq.getGroupNm()); + entity.setGroupTypeCd(rq.getGroupTypeCd()); + entity.setUpdateDt(DateUtils.nowDate()); + + if(ptyGroupBasRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + + return true; + + + + } + + /** + * 그룹 삭제 + * @param + * @return + * @throws Exception + */ + public boolean delete(String groupId) throws Exception{ + + Optional optional = ptyGroupBasRepository.findById(groupId); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyGroupBas entity = optional.get(); + entity.setUseYn("N"); + entity.setUpdateDt(DateUtils.nowDate()); + + if(ptyGroupBasRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + + return true; + + } + +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java new file mode 100644 index 0000000..a8ab533 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java @@ -0,0 +1,90 @@ +package com.palnet.biz.api.bas.group.service; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.bas.group.model.BasGroupModel; +import com.palnet.biz.api.bas.group.model.BasGroupRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel; +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; +import com.palnet.biz.jpa.entity.PtyGroupBas; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupBasRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.exception.CustomException; +import com.palnet.comn.utils.DateUtils; + +@Service +public class BasGroupUserService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PtyGroupQueryRepository query; + + @Autowired + private PtyGroupBasRepository ptyGroupBasRepository; + + @Autowired + private PtyCstmrGroupRepository ptyCstmrGroupRepository; + + + + + /** + * 그룹 사용자 조회 + * @param rq + * @return + */ + public List list(BasGroupUserRqModel rq){ + + + List resultList = query.userList(rq); + + return resultList; + } + + + + /** + * 그룹사용자 권한수정 / 블럭 처리 + * @param + * @return + * @throws Exception + */ + public boolean update(BasGroupUserModel rq) throws Exception{ + + Optional optional = ptyCstmrGroupRepository.findById(rq.getCstmrGroupSno()); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + + PtyCstmrGroup entity = optional.get(); + + entity.setGroupAuthCd(rq.getGroupAuthCd()); + entity.setJoinYn(rq.getJoinYn()); + + if(ptyCstmrGroupRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + return true; + + } + + +} diff --git a/src/main/java/com/palnet/biz/api/comn/model/ComnRqModel.java b/src/main/java/com/palnet/biz/api/comn/model/ComnRqModel.java new file mode 100644 index 0000000..85df564 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/comn/model/ComnRqModel.java @@ -0,0 +1,15 @@ +package com.palnet.biz.api.comn.model; + +import lombok.Data; + +@Data +public class ComnRqModel { + private String stDate; + + private String endDate; + + private String search1; + + private String searchType1; + +} diff --git a/src/main/java/com/palnet/biz/api/comn/response/BasicResponse.java b/src/main/java/com/palnet/biz/api/comn/response/BasicResponse.java new file mode 100644 index 0000000..adaa03f --- /dev/null +++ b/src/main/java/com/palnet/biz/api/comn/response/BasicResponse.java @@ -0,0 +1,5 @@ +package com.palnet.biz.api.comn.response; + +public abstract class BasicResponse { + +} diff --git a/src/main/java/com/palnet/biz/api/comn/response/ErrorResponse.java b/src/main/java/com/palnet/biz/api/comn/response/ErrorResponse.java new file mode 100644 index 0000000..128f9ae --- /dev/null +++ b/src/main/java/com/palnet/biz/api/comn/response/ErrorResponse.java @@ -0,0 +1,27 @@ +package com.palnet.biz.api.comn.response; + +import com.palnet.comn.code.RSErrorCode; + +import lombok.Data; + +@Data +public class ErrorResponse extends BasicResponse{ + + private String errorMessage; + private String errorCode; + + public ErrorResponse(String errorMessage) { + this.errorMessage = errorMessage; + this.errorCode = "404"; + } + + public ErrorResponse(RSErrorCode code) { + this.errorMessage = code.message(); + this.errorCode = code.code(); + } + public ErrorResponse(String errorMessage, String errorCode) { + this.errorMessage = errorMessage; + this.errorCode = errorCode; + } + +} diff --git a/src/main/java/com/palnet/biz/api/comn/response/SuccessResponse.java b/src/main/java/com/palnet/biz/api/comn/response/SuccessResponse.java new file mode 100644 index 0000000..99e1441 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/comn/response/SuccessResponse.java @@ -0,0 +1,23 @@ +package com.palnet.biz.api.comn.response; + +import java.util.List; + +import lombok.Data; + +@Data +public class SuccessResponse extends BasicResponse { + + private int count; + private T data; + + public SuccessResponse(T data) { + this.data = data; + if(data instanceof List) { + this.count = ((List)data).size(); + } else { + this.count = 1; + } + } + + +} diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java new file mode 100644 index 0000000..53f36e1 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java @@ -0,0 +1,112 @@ +package com.palnet.biz.api.ctr.cntrl.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel; +import com.palnet.biz.api.ctr.cntrl.service.CtrCntrlService; +import com.palnet.biz.sample.entity.SampleEntity; +import com.palnet.biz.sample.service.SampleService; +import com.palnet.comn.model.GPHistoryModel; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/ctr/cntrl", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class CtrCntrlController { + + @Autowired + private final CtrCntrlService service; + + @Autowired + private final SampleService sampleService; + + + @GetMapping(value = "/history/{id}") + public ResponseEntity historyList(@PathVariable String id) { + List result = null; + + try { + result = service.getListHistory(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + @GetMapping(value = "/detail/{id}") + public ResponseEntity detail(@PathVariable String id) { + CtrCntrlDtlModel result = null; + + try { + result = service.getDetail(id); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + + @GetMapping(value = "/sample") + public ResponseEntity sample() { + List result = null; + + try { + result = sampleService.find(); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + +// @GetMapping(value = "/status") +// public ResponseEntity status() { +// Map result; +// +// try { +// result = +// +// } catch (Exception e) { +// log.error("IGNORE : {}", e); +// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) +// .body(new ErrorResponse("Server Error", "-1")); +// +// } +// return ResponseEntity.ok().body(new SuccessResponse(result)); +// +// } + + + +} diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/PingController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/PingController.java new file mode 100644 index 0000000..ed25e2f --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/PingController.java @@ -0,0 +1,13 @@ +package com.palnet.biz.api.ctr.cntrl.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class PingController { + + @GetMapping("/ping") + public String ping(){ + return "SUCCESS"; + } +} diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java new file mode 100644 index 0000000..d220628 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java @@ -0,0 +1,31 @@ +package com.palnet.biz.api.ctr.cntrl.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class CtrCntrlDtlModel { + +private String messageTypeCd; + + private String cntrlId; + private Date cntrlStDt; + private Date cntrlEndDt; + private int arcrftSno; + private String prdctNum; + private String arcrftTypeCd; + private String arcrftModelNm; + private String prdctCmpnNm; + private String wghtTypeCd; + private String imageUrl; + private String cameraYn; + private String insrncYn; + private String ownerNm; + private String hpno; + private String telno; + + private String stAreaNm; + + +} diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlEndModel.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlEndModel.java new file mode 100644 index 0000000..b26cbc6 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlEndModel.java @@ -0,0 +1,21 @@ +package com.palnet.biz.api.ctr.cntrl.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class CtrCntrlEndModel { + + private String cntrlId; + + private Date cntrlStdt; + + private Date cntrlEndDt; + + private String statusCd; + + private Date srvrRcvDt; + + +} diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlModel.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlModel.java new file mode 100644 index 0000000..c475161 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlModel.java @@ -0,0 +1,123 @@ +package com.palnet.biz.api.ctr.cntrl.model; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + +import com.palnet.comn.utils.DateUtils; + +import io.netty.util.internal.StringUtil; +import lombok.Data; + +@Data +public class CtrCntrlModel implements Comparable{ + + private String messageTypeCd; + + private String controlId; + + private String objectTypeCd; + + private String objectId; + + private Double lat; + + private Double lng; + + private String elevType; + + private Double elev; + + private String speedType; + + private Double speed; + + private Double betteryLevel; + + private Double betteryVoltage; + + private String takeOffPositon; + + private String dronStatus; + + private Double heading; + + private String terminalRcvDt; + + private String serverRcvDt; + + private String controlStartDt; + + private Double moveDistance; + + private String moveDistanceType; + + // 환경센서 필드 + private Double sensorCo; + private Double sensorSo2; + private Double sensorNo2; + private Double sensorO3; + private Double sensorDust; + + private List> lastHistory; + + @Override + public int compareTo(CtrCntrlModel o) { + + if(!StringUtil.isNullOrEmpty(o.getControlStartDt()) && !StringUtil.isNullOrEmpty(controlStartDt)) { + long targetStartDt = Long.parseLong(o.getControlStartDt()); + long startDt = Long.parseLong(controlStartDt); + + if(startDt == targetStartDt) { + return 0; + }else if(startDt > targetStartDt) { + return 1; + }else if(startDt < targetStartDt) { + return -1; + } + } + + return 0; + + } + + public static void main(String [] args) { + List list = new ArrayList(); + + try { + for(int i = 0 ; i < 5 ; i++) { + Thread.sleep(1000); + System.out.println(">>>" + DateUtils.getCurrentTime()); + CtrCntrlModel model = new CtrCntrlModel(); + model.setControlStartDt(DateUtils.getCurrentTime()); + list.add(model); + } + + list.sort(Comparator.naturalOrder()); + + System.out.println("오름차순 정렬"); + for(CtrCntrlModel data :list) { + + System.out.println(data.getControlStartDt()); + } + + + list.sort(Comparator.reverseOrder()); + System.out.println("내림차순 정렬"); + for(CtrCntrlModel data :list) { + + System.out.println(data.getControlStartDt()); + } + }catch(Exception e) { + e.printStackTrace(); + } + + + + + } + + + +} diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java new file mode 100644 index 0000000..1d0c602 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -0,0 +1,108 @@ +package com.palnet.biz.api.ctr.cntrl.service; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel; +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.comn.collection.GPCollection; +import com.palnet.comn.collection.GPDatabaseCollection; +import com.palnet.comn.model.GPHistoryModel; + +import lombok.extern.log4j.Log4j2; + +@Service +@Log4j2 +public class CtrCntrlService { + + GPCollection cic = new GPCollection(); + GPDatabaseCollection gpdc = new GPDatabaseCollection(); + + @Autowired + private CtrCntrlQueryRepository query; + + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${gp.remove.time}") + private long GP_REMOVE_TIME; + + @Value("${gp.insert.count}") + private long GP_INSERT_COUNT; + + + public List getListHistory(String objectId){ + List resultList = new ArrayList(); + List filterList = new ArrayList(); + + if(cic.getHistoryData(objectId).size() > 0) { + resultList = cic.getHistoryData(objectId); + + //위경도 좌표 가 정상적인 값만 표출 + for(GPHistoryModel model : resultList) { + if(model.getLat() > 0 && model.getLng() > 0 ) { + filterList.add(model); + } + } + } + + return filterList; + + } + + public CtrCntrlDtlModel getDetail(String controlId) { + + CtrCntrlDtlModel result = new CtrCntrlDtlModel(); + + result = query.detailCntrl(controlId); + + List areaList = query.detailArea(controlId); + String stAreaNm = ""; +// log.debug(">>>>" + areaList ); + + for(CtrCntrlHstryArea data : areaList) { + if(data.getActnType().equals("01")) { + if(!StringUtils.isEmpty(data.getArea1())) { + stAreaNm = stAreaNm + " " + data.getArea1(); + } + + if(!StringUtils.isEmpty(data.getArea2())) { + stAreaNm = stAreaNm + " " + data.getArea2(); + } + + if(!StringUtils.isEmpty(data.getArea3())) { + stAreaNm = stAreaNm + " " + data.getArea3(); + } + + if(!StringUtils.isEmpty(data.getLandNm())) { + stAreaNm = stAreaNm + " " + data.getLandNm(); + } + + if(!StringUtils.isEmpty(data.getLandNum())) { + stAreaNm = stAreaNm + " " + data.getLandNum(); + } + + + } +// log.debug("data>>" + data.toString()); + } + + result.setStAreaNm(stAreaNm); + + return result; + + } + + + + + +} diff --git a/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java b/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java new file mode 100644 index 0000000..1388334 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java @@ -0,0 +1,157 @@ +package com.palnet.biz.api.main.dash.controller; + +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltDetailModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel; +import com.palnet.biz.api.anls.smlt.service.AnlsSmltService; +import com.palnet.biz.api.comn.response.BasicResponse; +import com.palnet.biz.api.comn.response.ErrorResponse; +import com.palnet.biz.api.comn.response.SuccessResponse; +import com.palnet.biz.api.main.dash.model.MainDashListModel; +import com.palnet.biz.api.main.dash.model.MainDashStcsModel; +import com.palnet.biz.api.main.dash.service.MainDashService; +import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.utils.JsonUtils; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/api/main/dash", produces = {MediaType.APPLICATION_JSON_VALUE}) +public class MainDashController { + + @Autowired + private final MainDashService service; + + /** + * @param rq + * @return + */ + @GetMapping(value = "/stcs/day") + public ResponseEntity stcsDay(String yyyymm) { + List result = null; + + log.debug(yyyymm); + + //입력값 검증 + if(yyyymm == null || !(yyyymm.length() == 7) ) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + + result = service.mainDashStcsDay(yyyymm); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + /** + * @param rq + * @return + */ + @GetMapping(value = "/stcs/area") + public ResponseEntity stcsArea(String yyyymm) { + List result = null; + + log.debug(yyyymm); + + if(yyyymm == null || !(yyyymm.length() == 7) ) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.mainDashStcsArea(yyyymm); + + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + /** + * @param rq + * @return + */ + @GetMapping(value = "/group/list") + public ResponseEntity groupList(Integer cstmrSno) { + List result = null; + + //입력값 검증 + if(cstmrSno == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.mainDashGroupList(cstmrSno); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + @GetMapping(value = "/arcrft/list") + public ResponseEntity arcrftList(Integer cstmrSno) { + List result = null; + + //입력값 검증 + if(cstmrSno == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + result = service.mainDashDronList(cstmrSno); + + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + + } + return ResponseEntity.ok().body(new SuccessResponse(result)); + + } + + + + +} diff --git a/src/main/java/com/palnet/biz/api/main/dash/model/MainDashListModel.java b/src/main/java/com/palnet/biz/api/main/dash/model/MainDashListModel.java new file mode 100644 index 0000000..e8f0073 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/main/dash/model/MainDashListModel.java @@ -0,0 +1,17 @@ +package com.palnet.biz.api.main.dash.model; + +import java.util.Date; + +import lombok.Data; + +@Data +public class MainDashListModel { + + private String arcrftModelNm = ""; + + private String prdctNum = ""; + + private Date createDt; + + +} diff --git a/src/main/java/com/palnet/biz/api/main/dash/model/MainDashStcsModel.java b/src/main/java/com/palnet/biz/api/main/dash/model/MainDashStcsModel.java new file mode 100644 index 0000000..c300d8c --- /dev/null +++ b/src/main/java/com/palnet/biz/api/main/dash/model/MainDashStcsModel.java @@ -0,0 +1,13 @@ +package com.palnet.biz.api.main.dash.model; + +import lombok.Data; + +@Data +public class MainDashStcsModel { + + private String typeCd = ""; + + private long count = 0 ; + + +} diff --git a/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java new file mode 100644 index 0000000..0f7ec84 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java @@ -0,0 +1,103 @@ +package com.palnet.biz.api.main.dash.service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.main.dash.model.MainDashListModel; +import com.palnet.biz.api.main.dash.model.MainDashStcsModel; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyDronQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; + +@Service +public class MainDashService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private CtrCntrlBasRepository ctrCntrlBasRepository; + + @Autowired + private PtyDronQueryRepository ptyDronQueryRepository; + + @Autowired + private PtyGroupQueryRepository ptyGroupQueryRepository; + + @Autowired + private CtrCntrlQueryRepository query; + + + /** + * 일별 비행횟수 통계 + * @param rq + * @return + */ + public List mainDashStcsDay(String yyyymm){ + + List resultList = query.mainDashStcsDay(yyyymm); + + return resultList; + } + + /** + * Top5 지역별 비행횟수 통계 + * @param rq + * @return + */ + public List mainDashStcsArea(String yyyymm){ + + List resultList = query.mainDashStcsArea(yyyymm); + + + return resultList; + } + + /** + * TOP3 가입 그룹 리스트 표출 + */ + public List mainDashGroupList(int cstmrSno){ + + List queryList = ptyGroupQueryRepository.joinList(cstmrSno); + List resultList = new ArrayList(); + + int cnt = 0; + for(BasGroupJoinModel model : queryList) { + + if(cnt == 3) { + break; + } + + Map data = new HashMap(); + data.put("groupId", model.getGroupId()); + data.put("groupNm", model.getGroupNm()); + data.put("createDt", model.getCreateDt()); + data.put("joinDt" , model.getJoinDt()); + resultList.add(data); + } + + return resultList; + + } + + + /** + * Top3 기체 정보 리스트 표출 + */ + public List mainDashDronList(int cstmrSno){ + List resultList = ptyDronQueryRepository.dronTop3(cstmrSno); + return resultList; + } + + + + +} diff --git a/src/main/java/com/palnet/biz/config/DatabaseJpaConfig.java b/src/main/java/com/palnet/biz/config/DatabaseJpaConfig.java new file mode 100644 index 0000000..d7ed123 --- /dev/null +++ b/src/main/java/com/palnet/biz/config/DatabaseJpaConfig.java @@ -0,0 +1,68 @@ +package com.palnet.biz.config; + +import java.util.Map; +import java.util.Objects; + +import javax.sql.DataSource; + +import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; +import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings; +import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import com.zaxxer.hikari.HikariDataSource; + +@Configuration +@EnableJpaRepositories(entityManagerFactoryRef = "controlJpaEntityManagerFactory", transactionManagerRef = "controlJpaTransactionManager", basePackages = { + "com.palnet" }) +@EnableTransactionManagement +public class DatabaseJpaConfig { + + private final JpaProperties jpaProperties; + private final HibernateProperties hibernateProperties; + + public DatabaseJpaConfig(JpaProperties jpaProperties, HibernateProperties hibernateProperties) { + this.jpaProperties = jpaProperties; + this.hibernateProperties = hibernateProperties; + } + + @Bean(name = "dataSource") + @Primary + @ConfigurationProperties(prefix = "spring.datasource.control") + public DataSource dataSource() { + return DataSourceBuilder + .create() + .type(HikariDataSource.class) + .build(); + } + + @Bean(name = "controlJpaEntityManagerFactory") + @Primary + public LocalContainerEntityManagerFactoryBean ndcJpaEntityManagerFactory(EntityManagerFactoryBuilder builder) { + Map prop = hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), + new HibernateSettings()); + return builder.dataSource(dataSource()) + .properties(prop) + .packages("com.palnet") + .persistenceUnit("biz") + .build(); + + } + + @Bean(name = "controlJpaTransactionManager") + @Primary + public PlatformTransactionManager ndcJpaTransactionManager(EntityManagerFactoryBuilder builder) { + return new JpaTransactionManager(Objects.requireNonNull(ndcJpaEntityManagerFactory(builder).getObject())); + } + +} diff --git a/src/main/java/com/palnet/biz/config/JsonConfig.java b/src/main/java/com/palnet/biz/config/JsonConfig.java new file mode 100644 index 0000000..948a017 --- /dev/null +++ b/src/main/java/com/palnet/biz/config/JsonConfig.java @@ -0,0 +1,44 @@ +package com.palnet.biz.config; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.time.format.DateTimeFormatter; +import java.util.TimeZone; + +@Configuration +public class JsonConfig { + + private static final String dateFormat = "yyyy-MM-dd"; + private static final String timeFormat = "HH:mm:ss"; + private static final String dateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + + @Bean + public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() { + return builder -> { +// builder.timeZone(TimeZone.getTimeZone("UTC")); + + builder.simpleDateFormat(dateTimeFormat); + builder.serializers(new LocalTimeSerializer(DateTimeFormatter.ofPattern(timeFormat))); + builder.serializers(new LocalDateSerializer(DateTimeFormatter.ofPattern(dateFormat))); + builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateTimeFormat))); + + builder.deserializers(new LocalTimeDeserializer(DateTimeFormatter.ofPattern(timeFormat))); + builder.deserializers(new LocalDateDeserializer(DateTimeFormatter.ofPattern(dateFormat))); + builder.deserializers(new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(dateTimeFormat))); + builder.featuresToDisable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + builder.featuresToDisable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); + builder.featuresToDisable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + }; + } +} + diff --git a/src/main/java/com/palnet/biz/config/QuerydslConfiguration.java b/src/main/java/com/palnet/biz/config/QuerydslConfiguration.java new file mode 100644 index 0000000..9fe89d8 --- /dev/null +++ b/src/main/java/com/palnet/biz/config/QuerydslConfiguration.java @@ -0,0 +1,19 @@ +package com.palnet.biz.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +@Configuration +public class QuerydslConfiguration { + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/config/WebMvcConfig.java b/src/main/java/com/palnet/biz/config/WebMvcConfig.java new file mode 100644 index 0000000..69325f0 --- /dev/null +++ b/src/main/java/com/palnet/biz/config/WebMvcConfig.java @@ -0,0 +1,150 @@ +package com.palnet.biz.config; + +import java.time.format.DateTimeFormatter; +import java.util.List; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.format.FormatterRegistry; +import org.springframework.format.datetime.standard.DateTimeFormatterRegistrar; +import org.springframework.http.HttpMethod; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer{ + + private static final String dateFormat = "yyyy-MM-dd"; + private static final String timeFormat = "HH:mm:ss"; + private static final String dateTimeFormat = "yyyy-MM-dd HH:mm:ss"; + + /*@Autowired + AccsUUIDcheckInterceptor accsUUIDcheckInterceptor;*/ + /*@Autowired + LogincheckInterceptor logincheckInterceptor; + @Autowired + QrcodecheckInterceptor qrcodecheckInterceptor; + @Autowired + DomainCheckInterceptor domainCheckInterceptor;*/ +// +// @Override +// public void configureMessageConverters(List> converters) { +// converters.add(escapingConverter()); +// } + + public void addResourceHandlers(final ResourceHandlerRegistry registry) { + /*registry.addResourceHandler("/web/**").addResourceLocations("/web/") + .setCacheControl(CacheControl.maxAge(10, TimeUnit.DAYS)).resourceChain(true) +// .setCacheControl(CacheControl.noStore()).resourceChain(true) + .addResolver(new VersionResourceResolver() + .addContentVersionStrategy("/**")) + .addTransformer(new AppCacheManifestTransformer());*/ + + // html 가능 하게 설정 + /*registry.addResourceHandler("/**").addResourceLocations("/web/hcws/html/");*/ + } + + @Bean + public ResourceUrlEncodingFilter resourceUrlEncodingFilter() { + return new ResourceUrlEncodingFilter(); + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + //임시로 크로스오리진 전체를 품 + registry.addMapping("/**").allowedOrigins("*").allowedMethods("GET", "POST","PUT", "DELETE"); + + + } + +// +// @Bean +// public HttpMessageConverter escapingConverter() { +// Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder(); +// builder.simpleDateFormat(dateTimeFormat); +// builder.serializers(new LocalTimeSerializer(DateTimeFormatter.ofPattern(timeFormat))); +// builder.serializers(new LocalDateSerializer(DateTimeFormatter.ofPattern(dateFormat))); +// builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateTimeFormat))); +// +// builder.deserializers(new LocalTimeDeserializer(DateTimeFormatter.ofPattern(timeFormat))); +// builder.deserializers(new LocalDateDeserializer(DateTimeFormatter.ofPattern(dateFormat))); +// builder.deserializers(new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(dateTimeFormat))); +// builder.featuresToDisable(SerializationFeature.FAIL_ON_EMPTY_BEANS); +// builder.featuresToDisable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); +// builder.featuresToDisable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); +// +// ObjectMapper objectMapper = builder.build(); +//// objectMapper.getFactory().setCharacterEscapes(new HTMLCharacterEscapes()); +// MappingJackson2HttpMessageConverter escapingConverter = new MappingJackson2HttpMessageConverter(); +// escapingConverter.setObjectMapper(objectMapper); +// +// return escapingConverter; +// } + + @Override + public void addFormatters(FormatterRegistry registry) { + // json + DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); + + registrar.setDateFormatter(DateTimeFormatter.ofPattern(dateFormat)); + registrar.setDateTimeFormatter(DateTimeFormatter.ofPattern(dateTimeFormat)); + registrar.registerFormatters(registry); + + /* ISO 타입. + registrar.setUseIsoFormat(true); + registrar.registerFormatters(registry); + */ + } + + + @Override + public void addInterceptors(InterceptorRegistry registry) { + + //접근고유ID 체크 Interceptor + /*registry.addInterceptor(accsUUIDcheckInterceptor) + .addPathPatterns("/sendbox/") + .addPathPatterns("/sendbox/index");*/ + +// //로그인 체크 Interceptor +/* registry.addInterceptor(logincheckInterceptor) + .addPathPatterns("/front/pass/**") + .excludePathPatterns("/front/pass/check"); //추후 삭제 +// .excludePathPatterns("/front/login/certifyhp") //추후 삭제 +// .excludePathPatterns("/front/login/index"); +// +// //QRCODE 체크 Interceptor + registry.addInterceptor(qrcodecheckInterceptor) +// .addPathPatterns("/front/login/**") +// .addPathPatterns("/front/join/**") + .addPathPatterns("/front/pass/**") +// .addPathPatterns("/front/prreg/**")//추후 추가 +// .excludePathPatterns("/") +// .excludePathPatterns("/front/login/certifyhp") //추후 삭제 + .excludePathPatterns("/front/pass/list"); //추후 삭제 +// .excludePathPatterns("/front/pass/check"); //추후 삭제 +// .excludePathPatterns("/front/login/cookieDelete"); + + registry.addInterceptor(domainCheckInterceptor) + .addPathPatterns("/","/**") + .excludePathPatterns("/web/**") + .excludePathPatterns("/rest/**"); + */ + + } +} diff --git a/src/main/java/com/palnet/biz/config/WebSecurityConfig.java b/src/main/java/com/palnet/biz/config/WebSecurityConfig.java new file mode 100644 index 0000000..76b0244 --- /dev/null +++ b/src/main/java/com/palnet/biz/config/WebSecurityConfig.java @@ -0,0 +1,80 @@ +package com.palnet.biz.config; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import com.palnet.biz.api.acnt.jwt.filter.JwtAuthenticationEntryPoint; +import com.palnet.biz.api.acnt.jwt.filter.JwtRequestFilter; + +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + private JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; + + @Autowired + private UserDetailsService jwtUserDetailsService; + + @Autowired + private JwtRequestFilter jwtRequestFilter; + + + private final String[] PERMITTED_URL = {"/api/acnt/**"}; + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // configure AuthenticationManager so that it knows from where to load + // user for matching credentials + // Use BCryptPasswordEncoder + auth.userDetailsService(jwtUserDetailsService).passwordEncoder(passwordEncoder()); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Override + protected void configure(HttpSecurity httpSecurity) throws Exception { + // We don't need CSRF for this example + httpSecurity.csrf().disable() + // dont authenticate this particular request + .authorizeRequests() + .antMatchers(HttpMethod.OPTIONS,"/api/**").permitAll() + .antMatchers(HttpMethod.GET,"/ping").permitAll() + .antMatchers(PERMITTED_URL).permitAll() + // all other requests need to be authenticated + .anyRequest().authenticated().and() + // make sure we use stateless session; session won't be used to + // store user's state. + .exceptionHandling().authenticationEntryPoint(jwtAuthenticationEntryPoint).and().sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS); + + // Add a filter to validate the tokens with every request + httpSecurity.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java new file mode 100644 index 0000000..0fd19ac --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java @@ -0,0 +1,89 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + + +/** + * The persistent class for the COM_ARCRFT_BAS database table. + * + */ +@Entity +@Table(name="COM_ARCRFT_BAS") +@Data +@NamedQuery(name="ComArcrftBas.findAll", query="SELECT c FROM ComArcrftBas c") +public class ComArcrftBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="ARCRFT_SNO") + private int arcrftSno; + + @Column(name="ARCRFT_HGHT") + private double arcrftHght; + + @Column(name="ARCRFT_LNGTH") + private double arcrftLngth; + + @Column(name="ARCRFT_MODEL_NM") + private String arcrftModelNm; + + @Column(name="ARCRFT_TYPE_CD") + private String arcrftTypeCd; + + @Column(name="ARCRFT_WDTH") + private double arcrftWdth; + + @Column(name="ARCRFT_WGHT") + private double arcrftWght; + + @Column(name="CAMERA_YN") + private String cameraYn; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Column(name="INSRNC_YN") + private String insrncYn; + + @Column(name="PRDCT_CMPN_NM") + private String prdctCmpnNm; + + @Temporal(TemporalType.DATE) + @Column(name="PRDCT_DATE") + private Date prdctDate; + + @Column(name="PRDCT_NUM") + private String prdctNum; + + @Column(name="TAKEOFF_WGHT") + private double takeoffWght; + + @Column(name="USE_YN") + private String useYn; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="IMAGE_URL") + private String imageUrl; + + @Column(name="WGHT_TYPE_CD") + private String wghtTypeCd; + + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java new file mode 100644 index 0000000..ae4480b --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComArcrftOwner.java @@ -0,0 +1,134 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_ARCRFT_OWNER database table. + * + */ +@Entity +@Table(name="COM_ARCRFT_OWNER") +@NamedQuery(name="ComArcrftOwner.findAll", query="SELECT c FROM ComArcrftOwner c") +public class ComArcrftOwner implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="OWNER_SNO") + private int ownerSno; + + @Column(name="ARCRFT_SNO") + private int arcrftSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Column(name="HPNO") + private String hpno; + + @Column(name="OWNER_NM") + private String ownerNm; + + @Column(name="TELNO") + private String telno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="USE_YN") + private String useYn; + + public ComArcrftOwner() { + } + + public int getOwnerSno() { + return this.ownerSno; + } + + public void setOwnerSno(int ownerSno) { + this.ownerSno = ownerSno; + } + + public int getArcrftSno() { + return this.arcrftSno; + } + + public void setArcrftSno(int arcrftSno) { + this.arcrftSno = arcrftSno; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getHpno() { + return this.hpno; + } + + public void setHpno(String hpno) { + this.hpno = hpno; + } + + public String getOwnerNm() { + return this.ownerNm; + } + + public void setOwnerNm(String ownerNm) { + this.ownerNm = ownerNm; + } + + public String getTelno() { + return this.telno; + } + + public void setTelno(String telno) { + this.telno = telno; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java new file mode 100644 index 0000000..7d1980f --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java @@ -0,0 +1,124 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_AUTH_BAS database table. + * + */ +@Entity +@Table(name="COM_AUTH_BAS") +@NamedQuery(name="ComAuthBas.findAll", query="SELECT c FROM ComAuthBas c") +public class ComAuthBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="AUTH_ID") + private String authId; + + @Column(name="AUTH_NM") + private String authNm; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Lob + @Column(name="RM") + private String rm; + + @Column(name="SITE_CD") + private String siteCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="USE_YN") + private String useYn; + + public ComAuthBas() { + } + + public String getAuthId() { + return this.authId; + } + + public void setAuthId(String authId) { + this.authId = authId; + } + + public String getAuthNm() { + return this.authNm; + } + + public void setAuthNm(String authNm) { + this.authNm = authNm; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getRm() { + return this.rm; + } + + public void setRm(String rm) { + this.rm = rm; + } + + public String getSiteCd() { + return this.siteCd; + } + + public void setSiteCd(String siteCd) { + this.siteCd = siteCd; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java new file mode 100644 index 0000000..f9a409d --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java @@ -0,0 +1,122 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_CD_BAS database table. + * + */ +@Entity +@Table(name="COM_CD_BAS") +@NamedQuery(name="ComCdBas.findAll", query="SELECT c FROM ComCdBas c") +public class ComCdBas implements Serializable { + private static final long serialVersionUID = 1L; + + @EmbeddedId + private ComCdBasPK id; + + @Column(name="ADD_INFO_VALUE") + private String addInfoValue; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Column(name="SORT_ORDR") + private byte sortOrdr; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDTE_DT") + private Date updteDt; + + @Column(name="UPDTE_USER_ID") + private String updteUserId; + + @Column(name="UPPER_CD") + private String upperCd; + + @Column(name="USE_YN") + private String useYn; + + public ComCdBas() { + } + + public ComCdBasPK getId() { + return this.id; + } + + public void setId(ComCdBasPK id) { + this.id = id; + } + + public String getAddInfoValue() { + return this.addInfoValue; + } + + public void setAddInfoValue(String addInfoValue) { + this.addInfoValue = addInfoValue; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public byte getSortOrdr() { + return this.sortOrdr; + } + + public void setSortOrdr(byte sortOrdr) { + this.sortOrdr = sortOrdr; + } + + public Date getUpdteDt() { + return this.updteDt; + } + + public void setUpdteDt(Date updteDt) { + this.updteDt = updteDt; + } + + public String getUpdteUserId() { + return this.updteUserId; + } + + public void setUpdteUserId(String updteUserId) { + this.updteUserId = updteUserId; + } + + public String getUpperCd() { + return this.upperCd; + } + + public void setUpperCd(String upperCd) { + this.upperCd = upperCd; + } + + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComCdBasPK.java b/src/main/java/com/palnet/biz/jpa/entity/ComCdBasPK.java new file mode 100644 index 0000000..5912044 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComCdBasPK.java @@ -0,0 +1,57 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; + +/** + * The primary key class for the COM_CD_BAS database table. + * + */ +@Embeddable +public class ComCdBasPK implements Serializable { + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name="CD_ID") + private String cdId; + + @Column(name="GROUP_CD") + private String groupCd; + + public ComCdBasPK() { + } + public String getCdId() { + return this.cdId; + } + public void setCdId(String cdId) { + this.cdId = cdId; + } + public String getGroupCd() { + return this.groupCd; + } + public void setGroupCd(String groupCd) { + this.groupCd = groupCd; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof ComCdBasPK)) { + return false; + } + ComCdBasPK castOther = (ComCdBasPK)other; + return + this.cdId.equals(castOther.cdId) + && this.groupCd.equals(castOther.groupCd); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.cdId.hashCode(); + hash = hash * prime + this.groupCd.hashCode(); + + return hash; + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java new file mode 100644 index 0000000..761dfea --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java @@ -0,0 +1,113 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_CD_GROUP_BAS database table. + * + */ +@Entity +@Table(name="COM_CD_GROUP_BAS") +@NamedQuery(name="ComCdGroupBas.findAll", query="SELECT c FROM ComCdGroupBas c") +public class ComCdGroupBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="GROUP_CD") + private String groupCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Column(name="GROUP_CD_NM") + private String groupCdNm; + + @Lob + @Column(name="RM") + private String rm; + + @Column(name="SITE_CD") + private String siteCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDTE_DT") + private Date updteDt; + + @Column(name="UPDTE_USER_ID") + private String updteUserId; + + public ComCdGroupBas() { + } + + public String getGroupCd() { + return this.groupCd; + } + + public void setGroupCd(String groupCd) { + this.groupCd = groupCd; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getGroupCdNm() { + return this.groupCdNm; + } + + public void setGroupCdNm(String groupCdNm) { + this.groupCdNm = groupCdNm; + } + + public String getRm() { + return this.rm; + } + + public void setRm(String rm) { + this.rm = rm; + } + + public String getSiteCd() { + return this.siteCd; + } + + public void setSiteCd(String siteCd) { + this.siteCd = siteCd; + } + + public Date getUpdteDt() { + return this.updteDt; + } + + public void setUpdteDt(Date updteDt) { + this.updteDt = updteDt; + } + + public String getUpdteUserId() { + return this.updteUserId; + } + + public void setUpdteUserId(String updteUserId) { + this.updteUserId = updteUserId; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java b/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java new file mode 100644 index 0000000..94c1569 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java @@ -0,0 +1,101 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_CD_LANG_CTG database table. + * + */ +@Entity +@Table(name="COM_CD_LANG_CTG") +@NamedQuery(name="ComCdLangCtg.findAll", query="SELECT c FROM ComCdLangCtg c") +public class ComCdLangCtg implements Serializable { + private static final long serialVersionUID = 1L; + + @EmbeddedId + private ComCdLangCtgPK id; + + @Column(name="CD_NM") + private String cdNm; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Lob + @Column(name="RM") + private String rm; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDTE_DT") + private Date updteDt; + + @Column(name="UPDTE_USER_ID") + private String updteUserId; + + public ComCdLangCtg() { + } + + public ComCdLangCtgPK getId() { + return this.id; + } + + public void setId(ComCdLangCtgPK id) { + this.id = id; + } + + public String getCdNm() { + return this.cdNm; + } + + public void setCdNm(String cdNm) { + this.cdNm = cdNm; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getRm() { + return this.rm; + } + + public void setRm(String rm) { + this.rm = rm; + } + + public Date getUpdteDt() { + return this.updteDt; + } + + public void setUpdteDt(Date updteDt) { + this.updteDt = updteDt; + } + + public String getUpdteUserId() { + return this.updteUserId; + } + + public void setUpdteUserId(String updteUserId) { + this.updteUserId = updteUserId; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtgPK.java b/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtgPK.java new file mode 100644 index 0000000..b49be52 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtgPK.java @@ -0,0 +1,68 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; + +/** + * The primary key class for the COM_CD_LANG_CTG database table. + * + */ +@Embeddable +public class ComCdLangCtgPK implements Serializable { + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name="CD_ID") + private String cdId; + + @Column(name="GROUP_CD") + private String groupCd; + + @Column(name="LANG_DIV_CD") + private String langDivCd; + + public ComCdLangCtgPK() { + } + public String getCdId() { + return this.cdId; + } + public void setCdId(String cdId) { + this.cdId = cdId; + } + public String getGroupCd() { + return this.groupCd; + } + public void setGroupCd(String groupCd) { + this.groupCd = groupCd; + } + public String getLangDivCd() { + return this.langDivCd; + } + public void setLangDivCd(String langDivCd) { + this.langDivCd = langDivCd; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof ComCdLangCtgPK)) { + return false; + } + ComCdLangCtgPK castOther = (ComCdLangCtgPK)other; + return + this.cdId.equals(castOther.cdId) + && this.groupCd.equals(castOther.groupCd) + && this.langDivCd.equals(castOther.langDivCd); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.cdId.hashCode(); + hash = hash * prime + this.groupCd.hashCode(); + hash = hash * prime + this.langDivCd.hashCode(); + + return hash; + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java new file mode 100644 index 0000000..7a05153 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java @@ -0,0 +1,79 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_IDNTF_BAS database table. + * + */ +@Entity +@Table(name="COM_IDNTF_BAS") +@NamedQuery(name="ComIdntfBas.findAll", query="SELECT c FROM ComIdntfBas c") +public class ComIdntfBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="IDNTF_NUM") + private String idntfNum; + + @Column(name="ARCRFT_SNO") + private int arcrftSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="IDNTF_TYPE_CD") + private String idntfTypeCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + public ComIdntfBas() { + } + + public String getIdntfNum() { + return this.idntfNum; + } + + public void setIdntfNum(String idntfNum) { + this.idntfNum = idntfNum; + } + + public int getArcrftSno() { + return this.arcrftSno; + } + + public void setArcrftSno(int arcrftSno) { + this.arcrftSno = arcrftSno; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getIdntfTypeCd() { + return this.idntfTypeCd; + } + + public void setIdntfTypeCd(String idntfTypeCd) { + this.idntfTypeCd = idntfTypeCd; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java new file mode 100644 index 0000000..6956ba5 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java @@ -0,0 +1,124 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_SITE_BAS database table. + * + */ +@Entity +@Table(name="COM_SITE_BAS") +@NamedQuery(name="ComSiteBas.findAll", query="SELECT c FROM ComSiteBas c") +public class ComSiteBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="SITE_CD") + private String siteCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Lob + @Column(name="SITE_DESC") + private String siteDesc; + + @Column(name="SITE_NM") + private String siteNm; + + @Column(name="SITE_URL") + private String siteUrl; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="USE_YN") + private String useYn; + + public ComSiteBas() { + } + + public String getSiteCd() { + return this.siteCd; + } + + public void setSiteCd(String siteCd) { + this.siteCd = siteCd; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getSiteDesc() { + return this.siteDesc; + } + + public void setSiteDesc(String siteDesc) { + this.siteDesc = siteDesc; + } + + public String getSiteNm() { + return this.siteNm; + } + + public void setSiteNm(String siteNm) { + this.siteNm = siteNm; + } + + public String getSiteUrl() { + return this.siteUrl; + } + + public void setSiteUrl(String siteUrl) { + this.siteUrl = siteUrl; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java b/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java new file mode 100644 index 0000000..85443d3 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java @@ -0,0 +1,123 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the COM_TRMNL_BAS database table. + * + */ +@Entity +@Table(name="COM_TRMNL_BAS") +@NamedQuery(name="ComTrmnlBas.findAll", query="SELECT c FROM ComTrmnlBas c") +public class ComTrmnlBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="TRMNL_ID") + private String trmnlId; + + @Column(name="AUTH_KEY") + private String authKey; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Column(name="DESC_SN") + private String descSn; + + @Column(name="TRMNL_NM") + private String trmnlNm; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DATE") + private Date updateDate; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="USE_YN") + private String useYn; + + public ComTrmnlBas() { + } + + public String getTrmnlId() { + return this.trmnlId; + } + + public void setTrmnlId(String trmnlId) { + this.trmnlId = trmnlId; + } + + public String getAuthKey() { + return this.authKey; + } + + public void setAuthKey(String authKey) { + this.authKey = authKey; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getDescSn() { + return this.descSn; + } + + public void setDescSn(String descSn) { + this.descSn = descSn; + } + + public String getTrmnlNm() { + return this.trmnlNm; + } + + public void setTrmnlNm(String trmnlNm) { + this.trmnlNm = trmnlNm; + } + + public Date getUpdateDate() { + return this.updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java new file mode 100644 index 0000000..ef8f6cf --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java @@ -0,0 +1,90 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; + +import lombok.Data; + +import java.util.Date; + + +/** + * The persistent class for the CTR_CNTRL_BAS database table. + * + */ +@Entity +@Table(name="CTR_CNTRL_BAS") +@Data +@NamedQuery(name="CtrCntrlBas.findAll", query="SELECT c FROM CtrCntrlBas c") +public class CtrCntrlBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="CNTRL_ID") + private String cntrlId; + + @Column(name="OBJECT_ID") + private String objectId; + + @Column(name="AVRG_SPEED") + private Double avrgSpeed = 0.0; + + @Column(name="AVRG_SPEED_TYPE") + private String avrgSpeedType; + + @Column(name="BTTR_CNSMPTN") + private Double bttrCnsmptn = 0.0; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CNTRL_END_DT") + private Date cntrlEndDt; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CNTRL_ST_DT") + private Date cntrlStDt; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="END_TYPE_CD") + private String endTypeCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="FLGHT_END_DT") + private Date flghtEndDt; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="FLGHT_ST_DT") + private Date flghtStDt; + + @Column(name="IDNTF_NUM") + private String idntfNum; + + @Column(name="OBJECT_TYPE_CD") + private String objectTypeCd; + + @Column(name="STATUS_CD") + private String statusCd; + + @Column(name="PROC_STATUS_YN") + private String procStatusYn; + + @Column(name="TTL_DSTNC") + private Double ttlDstnc = 0.0; + + @Column(name="TTL_DSTNC_TYPE") + private String ttlDstncType; + + @Column(name="TTL_TIME") + private Double ttlTime = 0.0; + + @Column(name="TTL_TIME_TYPE") + private String ttlTimeType; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java new file mode 100644 index 0000000..357786f --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java @@ -0,0 +1,273 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the CTR_CNTRL_HSTRY database table. + * + */ +@Entity +@Table(name="CTR_CNTRL_HSTRY") +@NamedQuery(name="CtrCntrlHstry.findAll", query="SELECT c FROM CtrCntrlHstry c") +public class CtrCntrlHstry implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="HSTRY_SNO") + private int hstrySno; + + @Column(name="BTTR_LVL") + private Double bttrLvl; + + @Column(name="BTTR_VLTG") + private Double bttrVltg; + + @Column(name="CNTRL_ID") + private String cntrlId; + + @Column(name="ELEV") + private Double elev; + + @Column(name="ELEV_TYPE") + private String elevType; + + @Column(name="HEADING") + private Double heading; + + @Column(name="LAT") + private Double lat; + + @Column(name="LON") + private Double lon; + + @Column(name="MSSG_TYPE_CD") + private String mssgTypeCd; + + @Column(name="MV_DSTNC") + private Double mvDstnc; + + @Column(name="MV_DSTNC_TYPE") + private String mvDstncType; + + @Column(name="SPEED") + private Double speed; + + @Column(name="SPEED_TYPE") + private String speedType; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="SRVR_RCV_DT") + private Date srvrRcvDt; + + @Column(name="STATUS_CD") + private String statusCd; + + @Column(name="TRMNL_ID") + private String trmnlId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="TRMNL_RCV_DT") + private Date trmnlRcvDt; + + // 환경센서 필드 + @Column(name="SENSOR_CO") + private Double sensorCo; + @Column(name="SENSOR_SO2") + private Double sensorSo2; + @Column(name="SENSOR_NO2") + private Double sensorNo2; + @Column(name="SENSOR_O3") + private Double sensorO3; + @Column(name="SENSOR_DUST") + private Double sensorDust; + + public CtrCntrlHstry() { + } + + public int getHstrySno() { + return this.hstrySno; + } + + public void setHstrySno(int hstrySno) { + this.hstrySno = hstrySno; + } + + public double getBttrLvl() { + return this.bttrLvl; + } + + public void setBttrLvl(double bttrLvl) { + this.bttrLvl = bttrLvl; + } + + public double getBttrVltg() { + return this.bttrVltg; + } + + public void setBttrVltg(double bttrVltg) { + this.bttrVltg = bttrVltg; + } + + public String getCntrlId() { + return this.cntrlId; + } + + public void setCntrlId(String cntrlId) { + this.cntrlId = cntrlId; + } + + public double getElev() { + return this.elev; + } + + public void setElev(double elev) { + this.elev = elev; + } + + public String getElevType() { + return this.elevType; + } + + public void setElevType(String elevType) { + this.elevType = elevType; + } + + public double getHeading() { + return this.heading; + } + + public void setHeading(double heading) { + this.heading = heading; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public double getLon() { + return this.lon; + } + + public void setLon(double lon) { + this.lon = lon; + } + + public String getMssgTypeCd() { + return this.mssgTypeCd; + } + + public void setMssgTypeCd(String mssgTypeCd) { + this.mssgTypeCd = mssgTypeCd; + } + + public double getMvDstnc() { + return this.mvDstnc; + } + + public void setMvDstnc(double mvDstnc) { + this.mvDstnc = mvDstnc; + } + + public String getMvDstncType() { + return this.mvDstncType; + } + + public void setMvDstncType(String mvDstncType) { + this.mvDstncType = mvDstncType; + } + + public double getSpeed() { + return this.speed; + } + + public void setSpeed(double speed) { + this.speed = speed; + } + + public String getSpeedType() { + return this.speedType; + } + + public void setSpeedType(String speedType) { + this.speedType = speedType; + } + + public Date getSrvrRcvDt() { + return this.srvrRcvDt; + } + + public void setSrvrRcvDt(Date srvrRcvDt) { + this.srvrRcvDt = srvrRcvDt; + } + + public String getStatusCd() { + return this.statusCd; + } + + public void setStatusCd(String statusCd) { + this.statusCd = statusCd; + } + + public String getTrmnlId() { + return this.trmnlId; + } + + public void setTrmnlId(String trmnlId) { + this.trmnlId = trmnlId; + } + + public Date getTrmnlRcvDt() { + return this.trmnlRcvDt; + } + + public void setTrmnlRcvDt(Date trmnlRcvDt) { + this.trmnlRcvDt = trmnlRcvDt; + } + + public Double getSensorCo(){ + return sensorCo; + } + + public void setSensorCo(Double sensorCo){ + this.sensorCo = sensorCo; + } + + public Double getSensorSo2(){ + return sensorSo2; + } + + public void setSensorSo2(Double sensorSo2){ + this.sensorSo2 = sensorSo2; + } + + public Double getSensorNo2(){ + return sensorNo2; + } + + public void setSensorNo2(Double sensorNo2){ + this.sensorNo2 = sensorNo2; + } + + public Double getSensorO3(){ + return sensorO3; + } + + public void setSensorO3(Double sensorO3){ + this.sensorO3 = sensorO3; + } + + public Double getSensorDust(){ + return sensorDust; + } + + public void setSensorDust(Double sensorDust){ + this.sensorDust = sensorDust; + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java new file mode 100644 index 0000000..589575e --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java @@ -0,0 +1,211 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the CTR_CNTRL_HSTRY_AREA database table. + * + */ +@Entity +@Table(name="CTR_CNTRL_HSTRY_AREA") +@NamedQuery(name="CtrCntrlHstryArea.findAll", query="SELECT c FROM CtrCntrlHstryArea c") +public class CtrCntrlHstryArea implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="HSTRY_AREA_SNO") + private int hstryAreaSno; + + @Column(name="ACTN_TYPE") + private String actnType; + + @Column(name="AREA_NM") + private String areaNm; + + @Column(name="AREA_TYPE") + private String areaType; + + @Column(name="AREA1") + private String area1; + + @Column(name="AREA2") + private String area2; + + @Column(name="AREA3") + private String area3; + + @Column(name="CNTRL_ID") + private String cntrlId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="HSTRY_SNO") + private int hstrySno; + + @Column(name="LAND_NM") + private String landNm; + + @Column(name="LAND_NUM") + private String landNum; + + @Column(name="LAT") + private double lat; + + @Column(name="LON") + private double lon; + + @Column(name="PRCS_YN") + private String prcsYn; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="ZIP_CD") + private String zipCd; + + public CtrCntrlHstryArea() { + } + + public int getHstryAreaSno() { + return this.hstryAreaSno; + } + + public void setHstryAreaSno(int hstryAreaSno) { + this.hstryAreaSno = hstryAreaSno; + } + + public String getActnType() { + return this.actnType; + } + + public void setActnType(String actnType) { + this.actnType = actnType; + } + + public String getAreaNm() { + return this.areaNm; + } + + public void setAreaNm(String areaNm) { + this.areaNm = areaNm; + } + + public String getAreaType() { + return this.areaType; + } + + public void setAreaType(String areaType) { + this.areaType = areaType; + } + + public String getArea1() { + return this.area1; + } + + public void setArea1(String area1) { + this.area1 = area1; + } + + public String getArea2() { + return this.area2; + } + + public void setArea2(String area2) { + this.area2 = area2; + } + + public String getArea3() { + return this.area3; + } + + public void setArea3(String area3) { + this.area3 = area3; + } + + public String getCntrlId() { + return this.cntrlId; + } + + public void setCntrlId(String cntrlId) { + this.cntrlId = cntrlId; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public int getHstrySno() { + return this.hstrySno; + } + + public void setHstrySno(int hstrySno) { + this.hstrySno = hstrySno; + } + + public String getLandNm() { + return this.landNm; + } + + public void setLandNm(String landNm) { + this.landNm = landNm; + } + + public String getLandNum() { + return this.landNum; + } + + public void setLandNum(String landNum) { + this.landNum = landNum; + } + + public double getLat() { + return this.lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public double getLon() { + return this.lon; + } + + public void setLon(double lon) { + this.lon = lon; + } + + public String getPrcsYn() { + return this.prcsYn; + } + + public void setPrcsYn(String prcsYn) { + this.prcsYn = prcsYn; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getZipCd() { + return this.zipCd; + } + + public void setZipCd(String zipCd) { + this.zipCd = zipCd; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java new file mode 100644 index 0000000..13e6035 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java @@ -0,0 +1,52 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +import org.hibernate.annotations.CreationTimestamp; + +import lombok.Data; + + +/** + * The persistent class for the PTY_CRTFYHP_BAS database table. + * + */ +@Entity +@Table(name="PTY_CRTFYHP_BAS") +@NamedQuery(name="PtyCrtfyhpBas.findAll", query="SELECT p FROM PtyCrtfyhpBas p") +@Data +public class PtyCrtfyhpBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="CRTFYHP_SNO") + private int crtfyhpSno; + + @CreationTimestamp + @Column(name="CREATE_DT") + private LocalDateTime createDt; + + @Column(name="CRTFYHP_NO") + private String crtfyhpNo; + + @Column(name="CRTFYHP_YN") + private String crtfyhpYn; + + @Column(name="HPNO") + private String hpno; + + + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java new file mode 100644 index 0000000..b6e9511 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java @@ -0,0 +1,67 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; + +import lombok.Data; + +import java.util.Date; + + +/** + * The persistent class for the PTY_CSTMR_BAS database table. + * + */ +@Entity +@Table(name="PTY_CSTMR_BAS") +@NamedQuery(name="PtyCstmrBas.findAll", query="SELECT p FROM PtyCstmrBas p") +@Data +public class PtyCstmrBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="CSTMR_SNO") + private Integer cstmrSno; + + @Column(name="AUTH_ID") + private String authId; + + @Column(name="CSTMR_DIV_CD") + private String cstmrDivCd; + + @Column(name="CSTMR_STATUS_CD") + private String cstmrStatusCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CSTMR_STATUS_CNG_DT") + private Date cstmrStatusCngDt; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="JOIN_DT") + private Date joinDt; + + @Column(name="JOIN_IP") + private String joinIp; + + @Column(name="MEMBER_DIV_CD") + private String memberDivCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="PSWD_UPDT_DT") + private Date pswdUpdtDt; + + @Column(name="SITE_CODE") + private String siteCode; + + @Column(name="USER_ID") + private String userId; + + @Column(name="USER_PSWD") + private String userPswd; + + @Column(name="RFRSH_TOKEN") + private String rfrshToken; + + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java new file mode 100644 index 0000000..5d12cf4 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java @@ -0,0 +1,89 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_CSTMR_CONECT_HIST database table. + * + */ +@Entity +@Table(name="PTY_CSTMR_CONECT_HIST") +@NamedQuery(name="PtyCstmrConectHist.findAll", query="SELECT p FROM PtyCstmrConectHist p") +public class PtyCstmrConectHist implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="CSTMR_CONECT_HIST_SNO") + private int cstmrConectHistSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CONECT_DT") + private Date conectDt; + + @Column(name="CONECT_ERROR_CD") + private String conectErrorCd; + + @Column(name="CONECT_IP") + private String conectIp; + + @Column(name="CONECT_SUCES_YN") + private String conectSucesYn; + + @Column(name="CSTMR_SNO") + private int cstmrSno; + + public PtyCstmrConectHist() { + } + + public int getCstmrConectHistSno() { + return this.cstmrConectHistSno; + } + + public void setCstmrConectHistSno(int cstmrConectHistSno) { + this.cstmrConectHistSno = cstmrConectHistSno; + } + + public Date getConectDt() { + return this.conectDt; + } + + public void setConectDt(Date conectDt) { + this.conectDt = conectDt; + } + + public String getConectErrorCd() { + return this.conectErrorCd; + } + + public void setConectErrorCd(String conectErrorCd) { + this.conectErrorCd = conectErrorCd; + } + + public String getConectIp() { + return this.conectIp; + } + + public void setConectIp(String conectIp) { + this.conectIp = conectIp; + } + + public String getConectSucesYn() { + return this.conectSucesYn; + } + + public void setConectSucesYn(String conectSucesYn) { + this.conectSucesYn = conectSucesYn; + } + + public int getCstmrSno() { + return this.cstmrSno; + } + + public void setCstmrSno(int cstmrSno) { + this.cstmrSno = cstmrSno; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java new file mode 100644 index 0000000..58c8b44 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java @@ -0,0 +1,200 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_CSTMR_DTL database table. + * + */ +@Entity +@Table(name="PTY_CSTMR_DTL") +@NamedQuery(name="PtyCstmrDtl.findAll", query="SELECT p FROM PtyCstmrDtl p") +public class PtyCstmrDtl implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="CSTMR_SNO") + private int cstmrSno; + + @Column(name="ADDR") + private String addr; + + @Column(name="ADDR_DTL_CN") + private String addrDtlCn; + + @Temporal(TemporalType.DATE) + @Column(name="BRTHDY_DATE") + private Date brthdyDate; + + @Column(name="CLNCD") + private String clncd; + + @Column(name="CNTRY_CD") + private String cntryCd; + + @Column(name="EMAIL") + private String email; + + @Column(name="GENDER_CD") + private String genderCd; + + @Column(name="HPNO") + private String hpno; + + @Column(name="IPIN_CI") + private String ipinCi; + + @Column(name="IPIN_DI") + private String ipinDi; + + @Column(name="JOIN_CRTFY_CD") + private String joinCrtfyCd; + + @Column(name="MEMBER_NAME") + private String memberName; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="ZIP") + private String zip; + + public PtyCstmrDtl() { + } + + public int getCstmrSno() { + return this.cstmrSno; + } + + public void setCstmrSno(int cstmrSno) { + this.cstmrSno = cstmrSno; + } + + public String getAddr() { + return this.addr; + } + + public void setAddr(String addr) { + this.addr = addr; + } + + public String getAddrDtlCn() { + return this.addrDtlCn; + } + + public void setAddrDtlCn(String addrDtlCn) { + this.addrDtlCn = addrDtlCn; + } + + public Date getBrthdyDate() { + return this.brthdyDate; + } + + public void setBrthdyDate(Date brthdyDate) { + this.brthdyDate = brthdyDate; + } + + public String getClncd() { + return this.clncd; + } + + public void setClncd(String clncd) { + this.clncd = clncd; + } + + public String getCntryCd() { + return this.cntryCd; + } + + public void setCntryCd(String cntryCd) { + this.cntryCd = cntryCd; + } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getGenderCd() { + return this.genderCd; + } + + public void setGenderCd(String genderCd) { + this.genderCd = genderCd; + } + + public String getHpno() { + return this.hpno; + } + + public void setHpno(String hpno) { + this.hpno = hpno; + } + + public String getIpinCi() { + return this.ipinCi; + } + + public void setIpinCi(String ipinCi) { + this.ipinCi = ipinCi; + } + + public String getIpinDi() { + return this.ipinDi; + } + + public void setIpinDi(String ipinDi) { + this.ipinDi = ipinDi; + } + + public String getJoinCrtfyCd() { + return this.joinCrtfyCd; + } + + public void setJoinCrtfyCd(String joinCrtfyCd) { + this.joinCrtfyCd = joinCrtfyCd; + } + + public String getMemberName() { + return this.memberName; + } + + public void setMemberName(String memberName) { + this.memberName = memberName; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getZip() { + return this.zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java new file mode 100644 index 0000000..d7ec6f9 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java @@ -0,0 +1,135 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_CSTMR_GROUP database table. + * + */ +@Entity +@Table(name="PTY_CSTMR_GROUP") +@NamedQuery(name="PtyCstmrGroup.findAll", query="SELECT p FROM PtyCstmrGroup p") +public class PtyCstmrGroup implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="CSTMR_GROUP_SNO") + private int cstmrGroupSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="APRVL_DT") + private Date aprvlDt; + + @Column(name="APRVL_USER_ID") + private String aprvlUserId; + + @Column(name="APRVL_YN") + private String aprvlYn; + + @Column(name="CSTMR_SNO") + private int cstmrSno; + + @Column(name="GROUP_AUTH_CD") + private String groupAuthCd; + + @Column(name="GROUP_ID") + private String groupId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="JOIN_DT") + private Date joinDt; + + @Column(name="JOIN_YN") + private String joinYn; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="WTHDRW_DT") + private Date wthdrwDt; + + public PtyCstmrGroup() { + } + + public int getCstmrGroupSno() { + return this.cstmrGroupSno; + } + + public void setCstmrGroupSno(int cstmrGroupSno) { + this.cstmrGroupSno = cstmrGroupSno; + } + + public Date getAprvlDt() { + return this.aprvlDt; + } + + public void setAprvlDt(Date aprvlDt) { + this.aprvlDt = aprvlDt; + } + + public String getAprvlUserId() { + return this.aprvlUserId; + } + + public void setAprvlUserId(String aprvlUserId) { + this.aprvlUserId = aprvlUserId; + } + + public String getAprvlYn() { + return this.aprvlYn; + } + + public void setAprvlYn(String aprvlYn) { + this.aprvlYn = aprvlYn; + } + + public int getCstmrSno() { + return this.cstmrSno; + } + + public void setCstmrSno(int cstmrSno) { + this.cstmrSno = cstmrSno; + } + + public String getGroupAuthCd() { + return this.groupAuthCd; + } + + public void setGroupAuthCd(String groupAuthCd) { + this.groupAuthCd = groupAuthCd; + } + + public String getGroupId() { + return this.groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public Date getJoinDt() { + return this.joinDt; + } + + public void setJoinDt(Date joinDt) { + this.joinDt = joinDt; + } + + public String getJoinYn() { + return this.joinYn; + } + + public void setJoinYn(String joinYn) { + this.joinYn = joinYn; + } + + public Date getWthdrwDt() { + return this.wthdrwDt; + } + + public void setWthdrwDt(Date wthdrwDt) { + this.wthdrwDt = wthdrwDt; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java new file mode 100644 index 0000000..b946cc2 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupArcrft.java @@ -0,0 +1,112 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_GROUP_ARCRFT database table. + * + */ +@Entity +@Table(name="PTY_GROUP_ARCRFT") +@NamedQuery(name="PtyGroupArcrft.findAll", query="SELECT p FROM PtyGroupArcrft p") +public class PtyGroupArcrft implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="GROUP_ARCRFT_SNO") + private int groupArcrftSno; + + @Column(name="ARCRFT_SNO") + private int arcrftSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Column(name="GROUP_ID") + private String groupId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + @Column(name="USE_YN") + private String useYn; + + public PtyGroupArcrft() { + } + + public int getGroupArcrftSno() { + return this.groupArcrftSno; + } + + public void setGroupArcrftSno(int groupArcrftSno) { + this.groupArcrftSno = groupArcrftSno; + } + + public int getArcrftSno() { + return this.arcrftSno; + } + + public void setArcrftSno(int arcrftSno) { + this.arcrftSno = arcrftSno; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getGroupId() { + return this.groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java new file mode 100644 index 0000000..61a5fa3 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java @@ -0,0 +1,90 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_GROUP_BAS database table. + * + */ +@Entity +@Table(name="PTY_GROUP_BAS") +@NamedQuery(name="PtyGroupBas.findAll", query="SELECT p FROM PtyGroupBas p") +public class PtyGroupBas implements Serializable { + private static final long serialVersionUID = 1L; + private String groupId; + private Date createDt; + private String groupNm; + private String groupTypeCd; + private Date updateDt; + private String useYn; + + public PtyGroupBas() { + } + + + @Id + @Column(name="GROUP_ID") + public String getGroupId() { + return this.groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + + @Column(name="GROUP_NM") + public String getGroupNm() { + return this.groupNm; + } + + public void setGroupNm(String groupNm) { + this.groupNm = groupNm; + } + + + @Column(name="GROUP_TYPE_CD") + public String getGroupTypeCd() { + return this.groupTypeCd; + } + + public void setGroupTypeCd(String groupTypeCd) { + this.groupTypeCd = groupTypeCd; + } + + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + + @Column(name="USE_YN") + public String getUseYn() { + return this.useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java b/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java new file mode 100644 index 0000000..0901d27 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java @@ -0,0 +1,112 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_SNS_LOGIN_REL database table. + * + */ +@Entity +@Table(name="PTY_SNS_LOGIN_REL") +@NamedQuery(name="PtySnsLoginRel.findAll", query="SELECT p FROM PtySnsLoginRel p") +public class PtySnsLoginRel implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="SNS_LOGIN_SNO") + private int snsLoginSno; + + @Column(name="CSTMR_SNO") + private int cstmrSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="LINK_DT") + private Date linkDt; + + @Column(name="LINK_IP") + private String linkIp; + + @Column(name="LINK_YN") + private String linkYn; + + @Column(name="SNS_CD") + private String snsCd; + + @Column(name="SNS_IDNTFR_ID") + private String snsIdntfrId; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="WTHDR_DT") + private Date wthdrDt; + + public PtySnsLoginRel() { + } + + public int getSnsLoginSno() { + return this.snsLoginSno; + } + + public void setSnsLoginSno(int snsLoginSno) { + this.snsLoginSno = snsLoginSno; + } + + public int getCstmrSno() { + return this.cstmrSno; + } + + public void setCstmrSno(int cstmrSno) { + this.cstmrSno = cstmrSno; + } + + public Date getLinkDt() { + return this.linkDt; + } + + public void setLinkDt(Date linkDt) { + this.linkDt = linkDt; + } + + public String getLinkIp() { + return this.linkIp; + } + + public void setLinkIp(String linkIp) { + this.linkIp = linkIp; + } + + public String getLinkYn() { + return this.linkYn; + } + + public void setLinkYn(String linkYn) { + this.linkYn = linkYn; + } + + public String getSnsCd() { + return this.snsCd; + } + + public void setSnsCd(String snsCd) { + this.snsCd = snsCd; + } + + public String getSnsIdntfrId() { + return this.snsIdntfrId; + } + + public void setSnsIdntfrId(String snsIdntfrId) { + this.snsIdntfrId = snsIdntfrId; + } + + public Date getWthdrDt() { + return this.wthdrDt; + } + + public void setWthdrDt(Date wthdrDt) { + this.wthdrDt = wthdrDt; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java new file mode 100644 index 0000000..4dce74c --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java @@ -0,0 +1,113 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_TERMS_AGREE_TXN database table. + * + */ +@Entity +@Table(name="PTY_TERMS_AGREE_TXN") +@NamedQuery(name="PtyTermsAgreeTxn.findAll", query="SELECT p FROM PtyTermsAgreeTxn p") +public class PtyTermsAgreeTxn implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="AGREE_SNO") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int agreeSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="AGREE_DT") + private Date agreeDt; + + @Column(name="AGREE_YN") + private String agreeYn; + + @Column(name="CSTMR_SNO") + private int cstmrSno; + + @Column(name="PROC_IP") + private String procIp; + + @Column(name="TERMS_SNO") + private int termsSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + public PtyTermsAgreeTxn() { + } + + public int getAgreeSno() { + return this.agreeSno; + } + + public void setAgreeSno(int agreeSno) { + this.agreeSno = agreeSno; + } + + public Date getAgreeDt() { + return this.agreeDt; + } + + public void setAgreeDt(Date agreeDt) { + this.agreeDt = agreeDt; + } + + public String getAgreeYn() { + return this.agreeYn; + } + + public void setAgreeYn(String agreeYn) { + this.agreeYn = agreeYn; + } + + public int getCstmrSno() { + return this.cstmrSno; + } + + public void setCstmrSno(int cstmrSno) { + this.cstmrSno = cstmrSno; + } + + public String getProcIp() { + return this.procIp; + } + + public void setProcIp(String procIp) { + this.procIp = procIp; + } + + public int getTermsSno() { + return this.termsSno; + } + + public void setTermsSno(int termsSno) { + this.termsSno = termsSno; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java new file mode 100644 index 0000000..ebf3263 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java @@ -0,0 +1,124 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_TERMS_BAS database table. + * + */ +@Entity +@Table(name="PTY_TERMS_BAS") +@NamedQuery(name="PtyTermsBas.findAll", query="SELECT p FROM PtyTermsBas p") +public class PtyTermsBas implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Column(name="TERMS_SNO") + private int termsSno; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Temporal(TemporalType.DATE) + @Column(name="ESTBSH_DATE") + private Date estbshDate; + + @Column(name="LAST_TXN_YN") + private String lastTxnYn; + + @Column(name="SITE_CD") + private String siteCd; + + @Column(name="TERMS_CTGRY_CD") + private String termsCtgryCd; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="UPDATE_DT") + private Date updateDt; + + @Column(name="UPDATE_USER_ID") + private String updateUserId; + + public PtyTermsBas() { + } + + public int getTermsSno() { + return this.termsSno; + } + + public void setTermsSno(int termsSno) { + this.termsSno = termsSno; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public Date getEstbshDate() { + return this.estbshDate; + } + + public void setEstbshDate(Date estbshDate) { + this.estbshDate = estbshDate; + } + + public String getLastTxnYn() { + return this.lastTxnYn; + } + + public void setLastTxnYn(String lastTxnYn) { + this.lastTxnYn = lastTxnYn; + } + + public String getSiteCd() { + return this.siteCd; + } + + public void setSiteCd(String siteCd) { + this.siteCd = siteCd; + } + + public String getTermsCtgryCd() { + return this.termsCtgryCd; + } + + public void setTermsCtgryCd(String termsCtgryCd) { + this.termsCtgryCd = termsCtgryCd; + } + + public Date getUpdateDt() { + return this.updateDt; + } + + public void setUpdateDt(Date updateDt) { + this.updateDt = updateDt; + } + + public String getUpdateUserId() { + return this.updateUserId; + } + + public void setUpdateUserId(String updateUserId) { + this.updateUserId = updateUserId; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java new file mode 100644 index 0000000..ecd574f --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java @@ -0,0 +1,102 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; +import java.util.Date; + + +/** + * The persistent class for the PTY_TERMS_DTL database table. + * + */ +@Entity +@Table(name="PTY_TERMS_DTL") +@NamedQuery(name="PtyTermsDtl.findAll", query="SELECT p FROM PtyTermsDtl p") +public class PtyTermsDtl implements Serializable { + private static final long serialVersionUID = 1L; + + @EmbeddedId + private PtyTermsDtlPK id; + + @Temporal(TemporalType.TIMESTAMP) + @Column(name="CREATE_DT") + private Date createDt; + + @Column(name="CREATE_USER_ID") + private String createUserId; + + @Lob + @Column(name="RM") + private String rm; + + @Lob + @Column(name="SIMPLE_CN") + private String simpleCn; + + @Lob + @Column(name="TERMS_CN") + private String termsCn; + + @Column(name="TERMS_TITLE_NM") + private String termsTitleNm; + + public PtyTermsDtl() { + } + + public PtyTermsDtlPK getId() { + return this.id; + } + + public void setId(PtyTermsDtlPK id) { + this.id = id; + } + + public Date getCreateDt() { + return this.createDt; + } + + public void setCreateDt(Date createDt) { + this.createDt = createDt; + } + + public String getCreateUserId() { + return this.createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + + public String getRm() { + return this.rm; + } + + public void setRm(String rm) { + this.rm = rm; + } + + public String getSimpleCn() { + return this.simpleCn; + } + + public void setSimpleCn(String simpleCn) { + this.simpleCn = simpleCn; + } + + public String getTermsCn() { + return this.termsCn; + } + + public void setTermsCn(String termsCn) { + this.termsCn = termsCn; + } + + public String getTermsTitleNm() { + return this.termsTitleNm; + } + + public void setTermsTitleNm(String termsTitleNm) { + this.termsTitleNm = termsTitleNm; + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtlPK.java b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtlPK.java new file mode 100644 index 0000000..b0f81e2 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtlPK.java @@ -0,0 +1,57 @@ +package com.palnet.biz.jpa.entity; + +import java.io.Serializable; +import javax.persistence.*; + +/** + * The primary key class for the PTY_TERMS_DTL database table. + * + */ +@Embeddable +public class PtyTermsDtlPK implements Serializable { + //default serial version id, required for serializable classes. + private static final long serialVersionUID = 1L; + + @Column(name="TERMS_SNO") + private int termsSno; + + @Column(name="LANG_DIV_CD") + private String langDivCd; + + public PtyTermsDtlPK() { + } + public int getTermsSno() { + return this.termsSno; + } + public void setTermsSno(int termsSno) { + this.termsSno = termsSno; + } + public String getLangDivCd() { + return this.langDivCd; + } + public void setLangDivCd(String langDivCd) { + this.langDivCd = langDivCd; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof PtyTermsDtlPK)) { + return false; + } + PtyTermsDtlPK castOther = (PtyTermsDtlPK)other; + return + (this.termsSno == castOther.termsSno) + && this.langDivCd.equals(castOther.langDivCd); + } + + public int hashCode() { + final int prime = 31; + int hash = 17; + hash = hash * prime + this.termsSno; + hash = hash * prime + this.langDivCd.hashCode(); + + return hash; + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/entity/SuredataEntity.java b/src/main/java/com/palnet/biz/jpa/entity/SuredataEntity.java new file mode 100644 index 0000000..28e62f0 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/entity/SuredataEntity.java @@ -0,0 +1,64 @@ + +package com.palnet.biz.jpa.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import javax.persistence.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Entity +@Table(name = "SUREData") +@Data +@EqualsAndHashCode +@NoArgsConstructor +public class SuredataEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "SEQNO") + private Integer seqno; + + @Column(name = "USERCODE") + private String usercode; + + @Column(name = "DEPTCODE") + private String deptcode; + + @Column(name = "reqname") + private String reqname; + + @Column(name = "REQPHONE") + private String reqphone; + + @Column(name = "CALLNAME") + private String callname; + + @Column(name = "CALLPHONE") + private String callphone; + + @Column(name = "SUBJECT") + private String subject; + + @Column(name = "MSG") + private String msg; + + @Column(name = "REQTIME") + private String reqtime; + + @Column(name = "RESULT") + private String result; + + @Column(name = "KIND") + private String kind; + +//// +//// @CreationTimestamp +//// @Column(name = "CREAT_DT", updatable = false) +// private LocalDateTime creatDt; + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftBasRepository.java new file mode 100644 index 0000000..44c8369 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftBasRepository.java @@ -0,0 +1,16 @@ +package com.palnet.biz.jpa.repository.com; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.ComArcrftBas; +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; +import com.palnet.biz.jpa.entity.PtyTermsBas; + +@Repository +public interface ComArcrftBasRepository extends JpaRepository{ + + + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java b/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java new file mode 100644 index 0000000..7b0f415 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/com/ComArcrftOwnerRepository.java @@ -0,0 +1,17 @@ +package com.palnet.biz.jpa.repository.com; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.ComArcrftOwner; + +@Repository +public interface ComArcrftOwnerRepository extends JpaRepository{ + + @Modifying + @Query(value = "UPDATE COM_ARCRFT_OWNER SET USE_YN ='N' WHERE ARCRFT_SNO = :arcrftSno", nativeQuery = true) + int deleteByArcrftSno(@Param("arcrftSno") int arcrftSno); +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/com/ComIdntBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/com/ComIdntBasRepository.java new file mode 100644 index 0000000..3e72c2a --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/com/ComIdntBasRepository.java @@ -0,0 +1,18 @@ +package com.palnet.biz.jpa.repository.com; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.ComIdntfBas; + +@Repository +public interface ComIdntBasRepository extends JpaRepository{ + + @Modifying + @Query(value = "DELETE FROM COM_IDNTF_BAS WHERE ARCRFT_SNO = :arcrftSno", nativeQuery = true) + int deleteByArcrftSno(@Param("arcrftSno") int arcrftSno); + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java new file mode 100644 index 0000000..c267aad --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java @@ -0,0 +1,11 @@ +package com.palnet.biz.jpa.repository.ctr; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; + +@Repository +public interface CtrCntrlBasRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryAreaRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryAreaRepository.java new file mode 100644 index 0000000..5cb47e2 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryAreaRepository.java @@ -0,0 +1,11 @@ +package com.palnet.biz.jpa.repository.ctr; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; + +@Repository +public interface CtrCntrlHstryAreaRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryRepository.java new file mode 100644 index 0000000..01c5a9c --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlHstryRepository.java @@ -0,0 +1,11 @@ +package com.palnet.biz.jpa.repository.ctr; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlHstry; + +@Repository +public interface CtrCntrlHstryRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java new file mode 100644 index 0000000..fa51d49 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -0,0 +1,485 @@ +package com.palnet.biz.jpa.repository.ctr; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltDetailModel; +import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel; +import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel; +import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlEndModel; +import com.palnet.biz.api.main.dash.model.MainDashStcsModel; +import com.palnet.biz.jpa.entity.ComArcrftBas; +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; +import com.palnet.biz.jpa.entity.QComArcrftBas; +import com.palnet.biz.jpa.entity.QComArcrftOwner; +import com.palnet.biz.jpa.entity.QCtrCntrlBas; +import com.palnet.biz.jpa.entity.QCtrCntrlHstry; +import com.palnet.biz.jpa.entity.QCtrCntrlHstryArea; +import com.palnet.comn.utils.DateUtils; +import com.palnet.comn.utils.EncryptUtils; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.ConstantImpl; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.Expressions; +import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.jpa.JPAExpressions; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@Repository +@RequiredArgsConstructor +public class CtrCntrlQueryRepository{ + + + private final JPAQueryFactory query; + + /** + * 비행 현황 데이터 조회 + * @param rq + * @return + */ + public List listCntrlBas(AnlsHstryRqModel rq){ + + QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; + QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; + + BooleanBuilder builder = new BooleanBuilder(); + + builder.and(qCntrlBasEntity.statusCd.eq("99")); + log.debug("Params ===> " +rq.toString()); + + + builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); + builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); + + if(!StringUtils.isEmpty(rq.getSearch1())) { + builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); + } + + ArrayList result = new ArrayList(); + + List queryList = query.select(Projections.bean(AnlsHstryModel.class , + qCntrlBasEntity.cntrlId, + qCntrlBasEntity.idntfNum, + qCntrlBasEntity.statusCd, + qCntrlBasEntity.objectTypeCd, + qCntrlBasEntity.flghtStDt, + qCntrlBasEntity.flghtEndDt, + qCntrlBasEntity.cntrlStDt, + qCntrlBasEntity.cntrlEndDt, + qCntrlBasEntity.ttlTime, + qCntrlBasEntity.ttlTimeType, + qCntrlBasEntity.ttlDstnc, + qCntrlBasEntity.ttlDstncType, + qCntrlBasEntity.avrgSpeed, + qCntrlBasEntity.avrgSpeedType, + qCntrlBasEntity.bttrCnsmptn, + qCntrlBasEntity.endTypeCd, + qCntrlBasEntity.createDt , + qCntrlBasEntity.updateDt, + qCntrlHstryAreaEntity.actnType, + qCntrlHstryAreaEntity.area1, + qCntrlHstryAreaEntity.area2, + qCntrlHstryAreaEntity.area3, + qCntrlHstryAreaEntity.areaNm, + qCntrlHstryAreaEntity.areaType, + qCntrlHstryAreaEntity.landNm, + qCntrlHstryAreaEntity.landNum, + qCntrlHstryAreaEntity.zipCd + )) + .from(qCntrlBasEntity) + .leftJoin(qCntrlHstryAreaEntity) + .on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) + .on(qCntrlHstryAreaEntity.actnType.eq("01")) + .where(builder) + .orderBy(qCntrlBasEntity.cntrlStDt.desc()) + .fetch(); + + for(AnlsHstryModel model: queryList) { + String addr = ""; + + if(!StringUtils.isEmpty(model.getArea1())) { + addr = addr + " " + model.getArea1(); + } + + if(!StringUtils.isEmpty(model.getArea2())) { + addr = addr + " " + model.getArea2(); + } + + if(!StringUtils.isEmpty(model.getArea3())) { + addr = addr + " " + model.getArea3(); + } + + if(!StringUtils.isEmpty(model.getLandNm())) { + addr = addr + " " + model.getLandNm(); + } + + if(!StringUtils.isEmpty(model.getLandNum())) { + addr = addr + " " + model.getLandNum(); + } + model.setStArea(addr); + + result.add(model); + } + + + + return result; + } + + /** + * 비행 이력 데이터 조회 + * @param id + * @return + */ + public List listCntrlHstry(String id){ + + QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; + QCtrCntrlHstry qCtrCntrHstry = QCtrCntrlHstry.ctrCntrlHstry; + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(qCtrCntrHstry.cntrlId.eq(id)); + + List resultList = query.select(Projections.bean(AnlsHstryDetailModel.class , + qCtrCntrHstry.cntrlId , + qCtrCntrHstry.hstrySno , + qCtrCntrHstry.trmnlId , + qCtrCntrHstry.mssgTypeCd , + qCtrCntrHstry.statusCd , + qCtrCntrHstry.lat, + qCtrCntrHstry.lon , + qCtrCntrHstry.speed , + qCtrCntrHstry.speedType , + qCtrCntrHstry.heading , + qCtrCntrHstry.elev , + qCtrCntrHstry.elevType , + qCtrCntrHstry.mvDstnc , + qCtrCntrHstry.mvDstncType , + qCtrCntrHstry.bttrLvl, + qCtrCntrHstry.bttrVltg, + qCtrCntrHstry.trmnlRcvDt , + qCtrCntrHstry.srvrRcvDt, + qCntrlBasEntity.idntfNum + )) + .from(qCntrlBasEntity) + .leftJoin(qCtrCntrHstry) + .on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId)) + .where(builder) + .orderBy(qCtrCntrHstry.trmnlRcvDt.desc()) + .fetch(); + + return resultList; + } + + + + public List listCntrlHstryArea() { + QCtrCntrlHstryArea qCtrCntrHstryArea = QCtrCntrlHstryArea.ctrCntrlHstryArea; + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(qCtrCntrHstryArea.prcsYn.eq("N")); + + List list = + query.select(qCtrCntrHstryArea) + .from(qCtrCntrHstryArea) + .where(builder) + .orderBy(qCtrCntrHstryArea.createDt.desc()) + .fetch(); + + return list; + + } + + /** + * 상세보기 조회 + * 관제마스터 , 드론 , 드론운영자 정보 조회 + */ + public CtrCntrlDtlModel detailCntrl(String controlId) { + QCtrCntrlBas ctr = QCtrCntrlBas.ctrCntrlBas; + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + QComArcrftOwner own = QComArcrftOwner.comArcrftOwner; + + CtrCntrlDtlModel result = query.select(Projections.bean(CtrCntrlDtlModel.class , + ctr.cntrlId , + ctr.cntrlStDt , + ctr.cntrlEndDt , + bas.arcrftSno , + bas.prdctNum , + bas.arcrftTypeCd, + bas.arcrftModelNm , + bas.prdctCmpnNm , + bas.wghtTypeCd , + bas.imageUrl , + bas.cameraYn , + bas.insrncYn , + own.ownerNm , + own.hpno + )) + .from(ctr) + .leftJoin(bas) + .on(ctr.objectId.eq(bas.prdctNum)) + .leftJoin(own) + .on(bas.arcrftSno.eq(own.arcrftSno)) + .where(ctr.cntrlId.eq(controlId)) + + .where(bas.useYn.eq("Y")) + .where(ctr.objectId.ne("none")) + .fetchFirst(); + + + if(result == null) return new CtrCntrlDtlModel(); + + if(!StringUtils.isEmpty(result.getOwnerNm())) { + result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm())); + } + if(!StringUtils.isEmpty(result.getHpno())) { + result.setHpno(EncryptUtils.decrypt(result.getHpno())); + } + if(!StringUtils.isEmpty(result.getTelno())) { + result.setTelno(EncryptUtils.decrypt(result.getTelno())); + } + return result; + + } + + /** + * 상세보기 조회 + * 지역정보 조회 + */ + public List detailArea(String controlId) { + QCtrCntrlHstryArea area = QCtrCntrlHstryArea.ctrCntrlHstryArea; + + List result = query.select(area) + .from(area) + .where(area.cntrlId.eq(controlId)) + + .fetch(); + + return result; + + } + + + /** + * 드론 정보 조회 + * + */ + public ComArcrftBas findComArcrftBasByPrdtNum(String prdtNum) { + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + ComArcrftBas result = query.select(bas).from(bas).where(bas.prdctNum.eq(prdtNum)).where(bas.useYn.eq("Y")).fetchFirst(); + + return result; + + } + + /** + * 종료 처리 되지 않은 데이터 종료처리 대상 조회 + * 기준 - STAUS = 01 , 최종 수신 시간이 30분 초과 한 경우 + */ + + public List endList(){ + QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; + QCtrCntrlHstry hst = QCtrCntrlHstry.ctrCntrlHstry; + + List result = query.select(Projections.bean(CtrCntrlEndModel.class , + hst.cntrlId, + hst.srvrRcvDt.max().as("srvrRcvDt") + )) + .from(hst) + .where(hst.cntrlId.in( + JPAExpressions + .select(bas.cntrlId) + .from(bas) + .where(bas.statusCd.eq("01")) + )) + .groupBy(hst.cntrlId) + .fetch(); + + return result; + + } + + + + + /** + * 후처리 대상자 선정을 위한 조회 쿼리 + */ + public List endProcessList(){ + QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; + List result = query.select(Projections.bean(CtrCntrlEndModel.class , + bas.cntrlId + )) + .from(bas) + .where(bas.procStatusYn.eq("N")) + .orderBy(bas.cntrlStDt.asc()) + .limit(100) // 100건만 추출 + .fetch(); + return result; + + } + + + /*** + * 시뮬레이션 상세정보 조회 쿼리 + * + */ + + public AnlsSmltDetailModel anlsSmltDetail(String cntrlId){ + QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; + QComArcrftBas air = QComArcrftBas.comArcrftBas; + + AnlsSmltDetailModel result = query.select(Projections.bean(AnlsSmltDetailModel.class , + bas.cntrlId , + bas.idntfNum , + bas.flghtStDt , + bas.flghtEndDt , + bas.cntrlStDt , + bas.cntrlEndDt , + bas.ttlTime , + bas.ttlTimeType , + bas.ttlDstnc , + bas.ttlDstncType , + bas.avrgSpeed , + bas.avrgSpeedType , + bas.bttrCnsmptn , + air.arcrftTypeCd , + air.prdctNum , + air.arcrftModelNm , + air.imageUrl + )) + .from(bas) + .leftJoin(air) + .on(bas.objectId.eq(air.prdctNum)) + .on(air.useYn.eq("Y")) + .where(bas.cntrlId.eq(cntrlId)) + .fetchFirst(); + + return result; + + + } + + + /*** + * 시뮬레이션 통계 + */ + + public List anlsSmltStcs(String cntrlId){ + + QCtrCntrlHstry hstry = QCtrCntrlHstry.ctrCntrlHstry; + + StringTemplate formattedDate = Expressions.stringTemplate( + "DATE_FORMAT({0}, {1})" + , hstry.srvrRcvDt + , ConstantImpl.create("%Y-%m-%d")); + + + StringTemplate formattedTime = Expressions.stringTemplate( + "DATE_FORMAT({0}, {1})" + , hstry.srvrRcvDt + , ConstantImpl.create("%H:%i")); + + + List result = query.select(Projections.bean(AnlsSmltStcsModel.class , + formattedTime.as("timeCd"), + formattedDate.as("dateCd"), + + hstry.speed.avg().as("avrgSpeed"), + hstry.speedType.max().as("speedType"), + hstry.elev.avg().as("avrgElev"), + hstry.elevType.max().as("elevType"), + hstry.mvDstnc.avg().as("avrgMvDstnc"), + hstry.mvDstncType.max().as("mvDstncType"), + hstry.bttrLvl.max().as("maxBttrLvl"), + hstry.bttrLvl.min().as("minBttrLvl") + + )) + .from(hstry) + .where(hstry.cntrlId.eq(cntrlId)) + .groupBy(formattedDate , formattedTime) + .fetch(); + + return result; + } + + /*** + * 대시보드 통계(지역별) + */ + + public List mainDashStcsArea(String yyyymm){ + QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; + QCtrCntrlHstryArea area = QCtrCntrlHstryArea.ctrCntrlHstryArea; + + StringTemplate formattedDate = Expressions.stringTemplate( + "DATE_FORMAT({0}, {1})" + , bas.cntrlStDt + , ConstantImpl.create("%Y-%m")); + + + List result = query.select(Projections.bean(MainDashStcsModel.class , + area.area1.as("typeCd"), + area.count().as("count") + )) + .from(bas) + .leftJoin(area) + .on(bas.cntrlId.eq(area.cntrlId)) + .on(area.actnType.eq("01")) + .where(area.area1.isNotNull()) + .where(formattedDate.eq(yyyymm)) + .groupBy(area.area1) + .orderBy(area.count().desc()) + .limit(5) + .fetch(); + + return result; + + + } + + /*** + * 대시보드 통계(일자별) + */ + + public List mainDashStcsDay(String yyyymm){ + QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; + + StringTemplate formattedDate = Expressions.stringTemplate( + "DATE_FORMAT({0}, {1})" + , bas.cntrlStDt + , ConstantImpl.create("%Y-%m")); + + StringTemplate formattedDate2 = Expressions.stringTemplate( + "DATE_FORMAT({0}, {1})" + , bas.cntrlStDt + , ConstantImpl.create("%d")); + + + List result = query.select(Projections.bean(MainDashStcsModel.class , + formattedDate2.as("typeCd"), + bas.count().as("count") + )) + .from(bas) + .where(bas.statusCd.eq("99")) + .where(formattedDate.eq(yyyymm)) + .groupBy(formattedDate2) + .fetch(); + return result; + } + + + + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java new file mode 100644 index 0000000..efa47fb --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasQueryRepository.java @@ -0,0 +1,40 @@ +package com.palnet.biz.jpa.repository.pty; + + +import com.palnet.biz.jpa.entity.PtyCrtfyhpBas; +import com.palnet.biz.jpa.entity.QPtyCrtfyhpBas; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; +import java.util.List; + +@Log4j2 +@Repository +@RequiredArgsConstructor +public class PtyCrtfyhpBasQueryRepository{ + private final JPAQueryFactory query; + + public List confirmSms(String hpno , String crtfyNo){ + QPtyCrtfyhpBas qEntity = QPtyCrtfyhpBas.ptyCrtfyhpBas; + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(qEntity.crtfyhpNo.eq(crtfyNo)); + + builder.and(qEntity.crtfyhpYn.eq("N")); + builder.and(qEntity.createDt.between(LocalDateTime.now().minusMinutes(5), LocalDateTime.now())); + + List entity = + query.select(qEntity).from(qEntity) + .where(builder) + .orderBy(qEntity.createDt.desc()) + .fetch(); + + return entity; + + } + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasRepository.java new file mode 100644 index 0000000..3247c45 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCrtfyhpBasRepository.java @@ -0,0 +1,23 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import com.palnet.biz.jpa.entity.PtyCrtfyhpBas; + +@Repository +public interface PtyCrtfyhpBasRepository extends JpaRepository{ + @Transactional + @Modifying + @Query(value = "UPDATE PTY_CRTFYHP_BAS " + + "SET CRTFYHP_YN = 'Y' " + + "WHERE CRTFYHP_YN = 'N' " + + "AND HPNO = :hpno " + ,nativeQuery = true) + void prevCrtfyhpYnBlock(@Param("hpno") String hpno); + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrBasRepository.java new file mode 100644 index 0000000..a365223 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrBasRepository.java @@ -0,0 +1,15 @@ +package com.palnet.biz.jpa.repository.pty; + +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; +import com.palnet.biz.jpa.entity.PtyCstmrBas; + +@Repository +public interface PtyCstmrBasRepository extends JpaRepository{ + Optional findByUserId(String userId); + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrConectHistRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrConectHistRepository.java new file mode 100644 index 0000000..9db4a14 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrConectHistRepository.java @@ -0,0 +1,12 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.PtyCstmrConectHist; + +@Repository +public interface PtyCstmrConectHistRepository extends JpaRepository{ + + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrDtlRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrDtlRepository.java new file mode 100644 index 0000000..cb75fb1 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrDtlRepository.java @@ -0,0 +1,13 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrDtl; +import com.palnet.biz.jpa.entity.PtyTermsBas; + +@Repository +public interface PtyCstmrDtlRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java new file mode 100644 index 0000000..2a54188 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java @@ -0,0 +1,13 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; +import com.palnet.biz.jpa.entity.PtyTermsBas; + +@Repository +public interface PtyCstmrGroupRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java new file mode 100644 index 0000000..79a4ec2 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java @@ -0,0 +1,154 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.stereotype.Repository; + +import com.palnet.biz.api.acnt.jwt.model.JwtProfileRsModel; +import com.palnet.biz.api.acnt.jwt.model.JwtUserModel; +import com.palnet.biz.jpa.entity.PtyCstmrBas; +import com.palnet.biz.jpa.entity.QPtyCstmrBas; +import com.palnet.biz.jpa.entity.QPtyCstmrDtl; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@Repository +@RequiredArgsConstructor +public class PtyCstmrQueryRepository{ + + + private final JPAQueryFactory query; + + public boolean findCstmrByUserId(String userId){ + + boolean result = false; + + QPtyCstmrBas basEntity = QPtyCstmrBas.ptyCstmrBas; + + + BooleanBuilder builder = new BooleanBuilder(); + + builder.and(basEntity.cstmrStatusCd.eq("A")); //활성화 상태 + builder.and(basEntity.userId.eq(userId)); + + PtyCstmrBas entity = query.select(basEntity) + .from(basEntity) + .where(builder) + .fetchFirst(); + if(entity != null) { + result = true; + } + + return result; + } + + + + public boolean findCstmrByHpno(String hpno) { + boolean result = false; + + QPtyCstmrBas basEntity = QPtyCstmrBas.ptyCstmrBas; + QPtyCstmrDtl dtlEntity = QPtyCstmrDtl.ptyCstmrDtl; + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(basEntity.cstmrStatusCd.eq("A")); //활성화 상태 + builder.and(dtlEntity.hpno.eq(hpno)); + + PtyCstmrBas entity = query.select(basEntity) + .from(basEntity) + .leftJoin(dtlEntity) + .on(basEntity.cstmrSno.eq(dtlEntity.cstmrSno)) + .where(builder) + .fetchFirst(); + if(entity != null) { + result = true; + } + return result; + + } + + public JwtUserModel findUserPassword(String userId) { + QPtyCstmrBas basEntity = QPtyCstmrBas.ptyCstmrBas; + BooleanBuilder builder = new BooleanBuilder(); + builder.and(basEntity.userId.eq(userId)); + + PtyCstmrBas entity = query.select(basEntity) + .from(basEntity) + .where(builder) + .fetchFirst(); + if(entity != null) { + JwtUserModel model = new JwtUserModel(); + model.setAuth(entity.getAuthId()); + model.setUserId(entity.getUserId()); + model.setCstmrSno(entity.getCstmrSno()); + model.setCstmrStatusCd(entity.getCstmrStatusCd()); + model.setUserPswd(entity.getUserPswd()); + + return model; + + }else { + return null; + } + + + } + + public JwtProfileRsModel findUserProfile(int cstmrSno) { + QPtyCstmrBas basEntity = QPtyCstmrBas.ptyCstmrBas; + QPtyCstmrDtl dtlEntity = QPtyCstmrDtl.ptyCstmrDtl; + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(basEntity.cstmrSno.eq(cstmrSno)); + + + JwtProfileRsModel model = query.select(Projections.bean(JwtProfileRsModel.class , + basEntity.cstmrSno, + basEntity.userId, + basEntity.authId, + basEntity.siteCode, + dtlEntity.memberName + )) + .from(basEntity) + .leftJoin(dtlEntity) + .on(basEntity.cstmrSno.eq(dtlEntity.cstmrSno)) + .where(builder) + .fetchFirst(); + + return model; + + } + + public JwtUserModel findRefreshtoken(int cstmrSno , String refreshToken) { + QPtyCstmrBas basEntity = QPtyCstmrBas.ptyCstmrBas; + BooleanBuilder builder = new BooleanBuilder(); + builder.and(basEntity.cstmrSno.eq(cstmrSno)); + builder.and(basEntity.rfrshToken.eq(refreshToken)); + + PtyCstmrBas entity = query.select(basEntity) + .from(basEntity) + .where(builder) + .fetchFirst(); + if(entity != null) { + JwtUserModel model = new JwtUserModel(); + model.setAuth(entity.getAuthId()); + model.setUserId(entity.getUserId()); + model.setCstmrSno(entity.getCstmrSno()); + model.setCstmrStatusCd(entity.getCstmrStatusCd()); + model.setUserPswd(entity.getUserPswd()); + + return model; + + }else { + return null; + } + } + + + + + + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java new file mode 100644 index 0000000..0252cdf --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java @@ -0,0 +1,296 @@ +package com.palnet.biz.jpa.repository.pty; + + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.api.bas.dron.model.BasDronModel; +import com.palnet.biz.api.bas.dron.model.BasDronRqModel; +import com.palnet.biz.api.bas.dron.model.BasIdntfModel; +import com.palnet.biz.api.bas.dron.model.BasOwnerModel; +import com.palnet.biz.api.bas.group.model.BasGroupAprvModel; +import com.palnet.biz.api.main.dash.model.MainDashListModel; +import com.palnet.biz.jpa.entity.QComArcrftBas; +import com.palnet.biz.jpa.entity.QComArcrftOwner; +import com.palnet.biz.jpa.entity.QComIdntfBas; +import com.palnet.biz.jpa.entity.QPtyCstmrGroup; +import com.palnet.biz.jpa.entity.QPtyGroupArcrft; +import com.palnet.comn.utils.EncryptUtils; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.JPAExpressions; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@Repository +@RequiredArgsConstructor +public class PtyDronQueryRepository{ + private final JPAQueryFactory query; + + /** + * 목록 조회 + * @param rq + * @return + */ + public List list(BasDronRqModel rq){ + + QPtyGroupArcrft group = QPtyGroupArcrft.ptyGroupArcrft; + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + QComArcrftOwner owner = QComArcrftOwner.comArcrftOwner; +// QComIdntfBas idnt = QComIdntfBas.comIdntfBas; + + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(group.groupId.eq(rq.getGroupId())); + + if(!StringUtils.isEmpty(rq.getArcrftModelNm())) { + builder.and(bas.arcrftModelNm.like('%' + rq.getArcrftModelNm() + '%')); + } + +// if(!StringUtils.isEmpty(rq.getIdntfNum())) { +// builder.and(idnt.idntfNum.like('%' + rq.getArcrftModelNm() + '%')); +// } + + if(!StringUtils.isEmpty(rq.getArcrftTypeCd())) { + builder.and(bas.arcrftTypeCd.eq(rq.getArcrftTypeCd())); + } + + List queryResult = + query.select(Projections.bean(BasDronModel.class , + group.groupId, + bas.arcrftSno, + bas.arcrftHght, + bas.arcrftLngth, + bas.arcrftModelNm, + bas.arcrftTypeCd, + bas.arcrftWdth, + bas.arcrftWght, + bas.cameraYn, + bas.createDt, + bas.createUserId, + bas.insrncYn, + bas.prdctCmpnNm, + bas.prdctDate, + bas.prdctNum, + bas.takeoffWght, + bas.updateDt, + bas.updateUserId, + bas.wghtTypeCd, + owner.ownerSno, + owner.ownerNm + )).from(bas) + .leftJoin(group) + .on(bas.arcrftSno.eq(group.arcrftSno)) + .on(group.groupId.eq(rq.getGroupId())) + .on(group.useYn.eq("Y")) + .leftJoin(owner) + .on(bas.arcrftSno.eq(owner.arcrftSno)) + .on(owner.useYn.eq("Y")) + + .where(builder) + .orderBy(bas.createDt.desc()) + .fetch(); + + List result = new ArrayList(); + + for(BasDronModel model : queryResult) { + if(!StringUtils.isEmpty(model.getOwnerNm())) { + model.setOwnerNm(EncryptUtils.decrypt(model.getOwnerNm())); + } + + result.add(model); + } + + return result; + } + + /** + * 식별번호 조회 + * @param arcrftSno + * @return + */ + public List idntfList(int arcrftSno){ + + QComIdntfBas idnt = QComIdntfBas.comIdntfBas; + + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(idnt.arcrftSno.eq(arcrftSno)); + + + List result = + query.select(Projections.bean(BasIdntfModel.class , + + idnt.idntfNum, + idnt.idntfTypeCd, + idnt.createDt, + idnt.updateDt + )).from(idnt) + .where(builder) + .orderBy(idnt.createDt.asc()) + .fetch(); + return result; + } + + + + + /** + * 상세 조회 + * @param rq + * @return + */ + public BasDronModel detail(int arcrftSno){ + + QPtyGroupArcrft group = QPtyGroupArcrft.ptyGroupArcrft; + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + QComArcrftOwner owner = QComArcrftOwner.comArcrftOwner; + + BasDronModel result = + query.select(Projections.bean(BasDronModel.class , + group.groupId, + bas.arcrftSno, + bas.arcrftHght, + bas.arcrftLngth, + bas.arcrftModelNm, + bas.arcrftTypeCd, + bas.arcrftWdth, + bas.arcrftWght, + bas.cameraYn, + bas.createDt, + bas.createUserId, + bas.insrncYn, + bas.prdctCmpnNm, + bas.prdctDate, + bas.prdctNum, + bas.takeoffWght, + bas.updateDt, + bas.updateUserId, + bas.wghtTypeCd, + bas.imageUrl, + owner.ownerSno, + owner.ownerNm, + owner.hpno, + owner.telno + )).from(bas) + .leftJoin(group) + .on(bas.arcrftSno.eq(group.arcrftSno)) + .on(group.useYn.eq("Y")) + .leftJoin(owner) + .on(bas.arcrftSno.eq(owner.arcrftSno)) + .on(owner.useYn.eq("Y")) + .where(bas.arcrftSno.eq(arcrftSno)) + .fetchOne(); + + if(!StringUtils.isEmpty(result.getOwnerNm())) { + result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm())); + } + if(!StringUtils.isEmpty(result.getHpno())) { + result.setHpno(EncryptUtils.decrypt(result.getHpno())); + } + if(!StringUtils.isEmpty(result.getTelno())) { + result.setTelno(EncryptUtils.decrypt(result.getTelno())); + } + + return result; + + } + + + + /** + * 식별번호가 존해 하는지 여부체크 + * @param cstmrSno + * @param groupId + * @return + */ + public boolean isNotIdntNum(String idntfNum) { + QComIdntfBas idnt = QComIdntfBas.comIdntfBas; + BooleanBuilder builder = new BooleanBuilder(); + builder.and(idnt.idntfNum.eq(idntfNum)); + + long count = query.select(idnt.idntfNum).from(idnt).where(builder).fetchCount(); + + if(count == 0) { + return true; + }else { + return false; + } + + } + + + public boolean isNotPrdctNum(String prdctNum , int arcrftSno) { + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + + long count = query.select(bas.prdctNum).from(bas).where(bas.useYn.eq("Y")).where(bas.prdctNum.eq(prdctNum).and(bas.arcrftSno.ne(arcrftSno))).fetchCount(); + + if(count == 0) { + return true; + }else { + return false; + } + } + + public String findIdntfNumByProdNumber(String idntfNum) { + QComIdntfBas idnt = QComIdntfBas.comIdntfBas; + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + String prdctNum = ""; + + prdctNum = + query.select(bas.prdctNum) + .from(bas) + .where(bas.useYn.eq("Y")) + .where(bas.arcrftSno.in( + JPAExpressions + .select(idnt.arcrftSno) + .from(idnt) + .where(idnt.idntfNum.eq(idntfNum)) + )) + .fetchOne(); + + return prdctNum; + + } + + /*** + * 메인 대시보드 기체 정보 3건 표출 + */ + public List dronTop3(int cstmrSno){ + QComArcrftBas bas = QComArcrftBas.comArcrftBas; + QPtyGroupArcrft groupArcrft = QPtyGroupArcrft.ptyGroupArcrft; + QPtyCstmrGroup group = QPtyCstmrGroup.ptyCstmrGroup; + + List result = + query.select(Projections.bean(MainDashListModel.class , + bas.arcrftModelNm, + bas.prdctNum, + bas.createDt + )).from(group) + .leftJoin(groupArcrft) + .on(group.groupId.eq(groupArcrft.groupId)) + .on(group.joinYn.eq("Y")) + .on(group.aprvlYn.eq("Y")) + .on(groupArcrft.useYn.eq("Y")) + .leftJoin(bas) + .on(groupArcrft.arcrftSno.eq(bas.arcrftSno)) + .where(bas.useYn.eq("Y")) + .where(group.cstmrSno.eq(cstmrSno)) + .limit(3) + .orderBy(bas.createDt.desc()) + .fetch(); + + + return result; + } + + + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java new file mode 100644 index 0000000..79c3e97 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupArcrftRepository.java @@ -0,0 +1,17 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.PtyGroupArcrft; + +@Repository +public interface PtyGroupArcrftRepository extends JpaRepository{ + + @Modifying + @Query(value = "UPDATE PTY_GROUP_ARCRFT SET USE_YN='N' WHERE ARCRFT_SNO = :arcrftSno", nativeQuery = true) + int deleteByArcrftSno(@Param("arcrftSno") int arcrftSno); +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupBasRepository.java new file mode 100644 index 0000000..3660678 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupBasRepository.java @@ -0,0 +1,13 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyGroupBas; +import com.palnet.biz.jpa.entity.PtyTermsBas; + +@Repository +public interface PtyGroupBasRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java new file mode 100644 index 0000000..96e6700 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -0,0 +1,380 @@ +package com.palnet.biz.jpa.repository.pty; + + +import com.palnet.biz.api.acnt.jwt.model.JwtProfileRsModel; +import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupAprvModel; +import com.palnet.biz.api.bas.group.model.BasGroupAprvRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; +import com.palnet.biz.api.bas.group.model.BasGroupJoinRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupModel; +import com.palnet.biz.api.bas.group.model.BasGroupRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel; +import com.palnet.biz.jpa.entity.PtyCrtfyhpBas; +import com.palnet.biz.jpa.entity.QPtyCrtfyhpBas; +import com.palnet.biz.jpa.entity.QPtyCstmrBas; +import com.palnet.biz.jpa.entity.QPtyCstmrDtl; +import com.palnet.biz.jpa.entity.QPtyCstmrGroup; +import com.palnet.biz.jpa.entity.QPtyGroupBas; +import com.palnet.comn.utils.EncryptUtils; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.JPAExpressions; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Log4j2 +@Repository +@RequiredArgsConstructor +public class PtyGroupQueryRepository{ + private final JPAQueryFactory query; + + /** + * 그룹 전체 목록 + * @param rq + * @return + */ + public List list(BasGroupRqModel rq){ + + QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; + BooleanBuilder builder = new BooleanBuilder(); + builder.and(bas.useYn.eq("Y")); + + if(!StringUtils.isEmpty(rq.getGroupId())) { + builder.and(bas.groupId.eq(rq.getGroupId())); + } + + if(!StringUtils.isEmpty(rq.getGroupNm())) { + builder.and(bas.groupNm.like(rq.getGroupNm())); + } + + List result = + query.select(Projections.bean(BasGroupModel.class , + bas.groupId, + bas.groupNm, + bas.groupTypeCd, + bas.updateDt, + bas.createDt + )).from(bas) + .where(builder) + .orderBy(bas.createDt.desc()) + .fetch(); + + return result; + + } + + /** + * 내가 생성한 그룹 목록 + * @param cstmrSno + * @return + */ + public List mylist(int cstmrSno){ + + QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; + QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; + + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(bas.useYn.eq("Y")); + builder.and(dtl.cstmrSno.eq(cstmrSno)); + builder.and(dtl.groupAuthCd.eq("CREATER")); + + + List result = + query.select(Projections.bean(BasGroupModel.class , + bas.groupId, + bas.groupNm, + bas.groupTypeCd, + bas.updateDt, + bas.createDt + )).from(bas) + .leftJoin(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .where(builder) + .orderBy(bas.createDt.desc()) + .fetch(); + + return result; + + } + + /** + * 참여 중인 그룹 목록 + * @param cstmrSno + * @return + */ + public List joinList(int cstmrSno){ + QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; + QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; + + + BooleanBuilder builder = new BooleanBuilder(); + builder.and(bas.useYn.eq("Y")); + builder.and(dtl.cstmrSno.eq(cstmrSno)); + builder.and(dtl.joinYn.eq("Y")); + + List result = + query.select(Projections.bean(BasGroupJoinModel.class , + bas.groupId, + bas.groupNm, + bas.groupTypeCd, + dtl.cstmrSno, + dtl.cstmrGroupSno, + bas.updateDt, + bas.createDt, + dtl.aprvlYn, + dtl.joinDt, + dtl.aprvlDt, + dtl.groupAuthCd + )).from(bas) + .leftJoin(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .where(builder) + .orderBy(dtl.joinDt.desc()) + .orderBy(bas.createDt.desc()) + .fetch(); + + return result; + + } + /** + * 참여할 그룹 목록 + * @param cstmrSno + * @return + */ + public List joinFullList(BasGroupJoinRqModel rq){ + QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; + QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; + BooleanBuilder builder = new BooleanBuilder(); + builder.and(bas.useYn.eq("Y")); +// builder.and(dtl.cstmrSno.eq(rq.getCstmrSno())); + + if(!StringUtils.isEmpty(rq.getGroupId())) { + builder.and(bas.groupId.like("%" + rq.getGroupId() + "%")); + } + + if(!StringUtils.isEmpty(rq.getGroupNm())) { + builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%")); + } + + + List result = + query.select(Projections.bean(BasGroupJoinModel.class , + bas.groupId, + bas.groupNm, + bas.groupTypeCd, + bas.updateDt, + bas.createDt, + dtl.cstmrSno, + dtl.cstmrGroupSno, + dtl.aprvlYn, + dtl.joinYn, + dtl.joinDt, + dtl.aprvlDt, + dtl.groupAuthCd + )).from(bas) + .leftJoin(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .on(dtl.cstmrSno.eq(rq.getCstmrSno())) + .on(dtl.joinYn.eq("Y")) + .where(builder) + .orderBy(dtl.joinYn.asc()) + .orderBy(dtl.joinDt.desc()) + .orderBy(bas.createDt.desc()) + + .fetch(); + + return result; + + } + + public List aprvList(BasGroupAprvRqModel rq){ + QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; + QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; + QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; + QPtyCstmrDtl cstmrDtl = QPtyCstmrDtl.ptyCstmrDtl; + + BooleanBuilder builder = new BooleanBuilder(); + + if(!StringUtils.isEmpty(rq.getGroupNm())) { + builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%")); + } + + if(!StringUtils.isEmpty(rq.getMemberName())) { + String memberName = EncryptUtils.encrypt(rq.getMemberName()); + builder.and(cstmrDtl.memberName.eq(memberName)); + } + + + if(!StringUtils.isEmpty(rq.getAprvYn())) { + builder.and(dtl.aprvlYn.eq(rq.getAprvYn())); + } + + builder.and(dtl.joinYn.eq("Y")); + + List queryResult = + query.select(Projections.bean(BasGroupAprvModel.class , + bas.groupId, + bas.groupNm, + bas.groupTypeCd, + dtl.cstmrGroupSno, + dtl.cstmrSno, + bas.updateDt, + bas.createDt, + dtl.aprvlYn, + dtl.joinYn, + dtl.joinDt, + dtl.aprvlDt, + dtl.groupAuthCd, + dtl.aprvlUserId, + cstmrDtl.memberName, + cstmr.userId + )).from(bas) + .join(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .join(cstmr) + .on(dtl.cstmrSno.eq(cstmr.cstmrSno)) + .on(cstmr.cstmrStatusCd.eq("A")) + .join(cstmrDtl) + .on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) + .where(builder) + + .where(bas.groupId.in( + JPAExpressions + .select(bas.groupId) + .from(bas) + .leftJoin(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .where(bas.useYn.eq("Y")) + .where(dtl.cstmrSno.eq(rq.getCstmrSno())) + .where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN"))) + + )) + .where(dtl.cstmrSno.ne(rq.getCstmrSno())) + .where(dtl.groupAuthCd.ne("CREATER")) + .orderBy(bas.createDt.desc()) + .fetch(); + + List result = new ArrayList(); + + for(BasGroupAprvModel model : queryResult) { + model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); + result.add(model); + } + + return result; + } + + /** + * 참여 했는지 여부체크 + * @param cstmrSno + * @param groupId + * @return + */ + public boolean isNotJoin(int cstmrSno , String groupId) { + QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; + BooleanBuilder builder = new BooleanBuilder(); + builder.and(dtl.joinYn.eq("Y")); + builder.and(dtl.cstmrSno.eq(cstmrSno)); + builder.and(dtl.groupId.eq(groupId)); + long count = query.select(dtl.cstmrGroupSno).from(dtl).where(builder).fetchCount(); + + if(count == 0) { + return true; + }else { + return false; + } + + + } + + /** + * 그룹 사용자 목록 조회 + * @param rq + * @return + */ + public List userList(BasGroupUserRqModel rq){ + QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; + QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; + QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; + QPtyCstmrDtl cstmrDtl = QPtyCstmrDtl.ptyCstmrDtl; + + BooleanBuilder builder = new BooleanBuilder(); + + builder.and(bas.useYn.eq("Y")); + builder.and(dtl.joinYn.eq("Y")); + + + if(!StringUtils.isEmpty(rq.getGroupNm())) { + builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%")); + } + + if(!StringUtils.isEmpty(rq.getMemberName())) { + String memberName = EncryptUtils.encrypt(rq.getMemberName()); + builder.and(cstmrDtl.memberName.eq(memberName)); + } + + +// if(!StringUtils.isEmpty(rq.getMemberName())) { +// builder.and(dtl.aprvlYn.eq(rq.getAprvYn())); +// } +// + + List queryResult = + query.select(Projections.bean(BasGroupUserModel.class , + bas.groupId, + bas.groupNm, + bas.groupTypeCd, + bas.updateDt, + bas.createDt, + dtl.cstmrGroupSno, + dtl.cstmrSno, + dtl.joinDt, + dtl.joinYn, + dtl.aprvlDt, + dtl.groupAuthCd, + cstmrDtl.memberName, + cstmr.userId + )).from(bas) + .leftJoin(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .leftJoin(cstmr) + .on(dtl.cstmrSno.eq(cstmr.cstmrSno)) + .on(cstmr.cstmrStatusCd.eq("A")) + .leftJoin(cstmrDtl) + .on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) + .where(builder) + .where(bas.groupId.in( + JPAExpressions + .select(bas.groupId) + .from(bas) + .leftJoin(dtl) + .on(bas.groupId.eq(dtl.groupId)) + .where(bas.useYn.eq("Y")) + .where(dtl.cstmrSno.eq(rq.getCstmrSno())) + .where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN"))) + + )) + .where(dtl.cstmrSno.ne(rq.getCstmrSno())) + + .orderBy(bas.createDt.desc()) + .fetch(); + List result = new ArrayList(); + + for(BasGroupUserModel model : queryResult) { + model.setMemberName(EncryptUtils.decrypt(model.getMemberName())); + result.add(model); + } + return result; + } +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtySnsLoginRelRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtySnsLoginRelRepository.java new file mode 100644 index 0000000..3f143d9 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtySnsLoginRelRepository.java @@ -0,0 +1,13 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtySnsLoginRel; +import com.palnet.biz.jpa.entity.PtyTermsBas; + +@Repository +public interface PtySnsLoginRelRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsAgreeTxnRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsAgreeTxnRepository.java new file mode 100644 index 0000000..f04800f --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsAgreeTxnRepository.java @@ -0,0 +1,12 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyTermsAgreeTxn; + +@Repository +public interface PtyTermsAgreeTxnRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsBasRepository.java new file mode 100644 index 0000000..b1f2db1 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsBasRepository.java @@ -0,0 +1,12 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyTermsBas; + +@Repository +public interface PtyTermsBasRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsDtlRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsDtlRepository.java new file mode 100644 index 0000000..d26bf3e --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsDtlRepository.java @@ -0,0 +1,13 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyTermsDtl; +import com.palnet.biz.jpa.entity.PtyTermsDtlPK; + +@Repository +public interface PtyTermsDtlRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsQueryRepository.java new file mode 100644 index 0000000..6114640 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyTermsQueryRepository.java @@ -0,0 +1,61 @@ +package com.palnet.biz.jpa.repository.pty; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.palnet.biz.api.acnt.terms.model.AcntTermsRqModel; +import com.palnet.biz.api.acnt.terms.model.AcntTermsRsModel; +import com.palnet.biz.jpa.entity.QPtyTermsBas; +import com.palnet.biz.jpa.entity.QPtyTermsDtl; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +@Repository +@RequiredArgsConstructor +public class PtyTermsQueryRepository{ + + + private final JPAQueryFactory query; + + public List list(AcntTermsRqModel rq){ + + QPtyTermsBas basEntity = QPtyTermsBas.ptyTermsBas; + QPtyTermsDtl dtlEntity = QPtyTermsDtl.ptyTermsDtl; + + BooleanBuilder builder = new BooleanBuilder(); + + builder.and(basEntity.lastTxnYn.eq("Y")); + builder.and(basEntity.siteCd.eq(rq.getSiteCd())); + + + List queryList = query.select(Projections.bean(AcntTermsRsModel.class , + basEntity.termsSno, + basEntity.siteCd, + basEntity.estbshDate, + basEntity.termsCtgryCd, + dtlEntity.id.langDivCd, + dtlEntity.termsTitleNm, + dtlEntity.termsCn, + dtlEntity.simpleCn + )) + .from(basEntity) + .leftJoin(dtlEntity) + .on(basEntity.termsSno.eq(dtlEntity.id.termsSno).and(dtlEntity.id.langDivCd.eq(rq.getLangDivCd()))) + .where(builder) + .orderBy(basEntity.updateDt.desc()) + .fetch(); + + return queryList; + } + + + + + +} diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/SuredataRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/SuredataRepository.java new file mode 100644 index 0000000..09e1621 --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/SuredataRepository.java @@ -0,0 +1,15 @@ +package com.palnet.biz.jpa.repository.pty; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCrtfyhpBas; +import com.palnet.biz.jpa.entity.PtyCstmrBas; +import com.palnet.biz.jpa.entity.PtyTermsBas; +import com.palnet.biz.jpa.entity.SuredataEntity; + +@Repository +public interface SuredataRepository extends JpaRepository{ + +} diff --git a/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java b/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java new file mode 100644 index 0000000..8c86c8a --- /dev/null +++ b/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java @@ -0,0 +1,182 @@ +package com.palnet.biz.jpa.service.ctr; + +import java.util.Optional; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.CtrCntrlHstry; +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlHstryAreaRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlHstryRepository; +import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.utils.DateUtils; + +@Service +public class CtrCntrlJpaService { + + @Autowired + private CtrCntrlBasRepository ctrCntrlBasRepository; + + @Autowired + private CtrCntrlHstryRepository ctrCntrlHstryRepository; + + @Autowired + private CtrCntrlHstryAreaRepository ctrCntrlHstryAreaRepository; + + private Logger logger = LoggerFactory.getLogger(getClass()); + + public CtrCntrlBas insertCtrCntrlBas(GPDatabaseModel data) { + Optional optional = ctrCntrlBasRepository.findById(data.getControlId()); + if (optional.isPresent()) { + logger.debug(ErrorCode.DATA_DUPLICATE.toString()); + return null; +// throw new CustomException(ErrorCode.DATA_DUPLICATE); + } + + CtrCntrlBas entity = new CtrCntrlBas(); + entity.setCntrlId(data.getControlId()); + entity.setIdntfNum(data.getObjectId()); + if(StringUtils.isEmpty(data.getProdNumber())) { + entity.setObjectId("none"); + }else { + entity.setObjectId(data.getProdNumber()); + } + + + entity.setObjectTypeCd(data.getObjectType()); + entity.setStatusCd(data.getTypeCd()); + entity.setProcStatusYn("N"); +// entity.setFlghtStDt(null); +// entity.setFlghtEndDt(null); + entity.setCntrlStDt(DateUtils.stringToDatetime(data.getControlStartDt())); +// entity.setCntrlEndDt(DateUtils.stringToLocalDateTime(data.getControlEndDt())); +// entity.setTtlTime(null); +// entity.setTtlTimeType(null); +// entity.setTtlDstnc(null); +// entity.setTtlDstncType(null); +// entity.setAvrgSpeed(null); +// entity.setAvrgSpeedType(null); +// entity.setBttrCnsmptn(null); +// entity.setEndTypeCd(null); + entity.setCreateDt(DateUtils.nowDate()); + entity.setUpdateDt(DateUtils.nowDate()); + + return ctrCntrlBasRepository.save(entity); + + + } + + + public CtrCntrlBas updateCtrCntrlBas(GPDatabaseModel data) { + Optional optional = ctrCntrlBasRepository.findById(data.getControlId()); + if (!optional.isPresent()) { + logger.debug(ErrorCode.DATA_NOTFIND.toString()); + return null; + } + + CtrCntrlBas entity = optional.get(); + entity.setStatusCd(data.getTypeCd()); + entity.setFlghtStDt(null); + entity.setFlghtEndDt(null); + entity.setCntrlEndDt(DateUtils.stringToDatetime(data.getControlEndDt())); + entity.setTtlTime(0.0); + entity.setTtlTimeType(null); + entity.setTtlDstnc(0.0); + entity.setTtlDstncType(null); + entity.setAvrgSpeed(0.0); + entity.setAvrgSpeedType(null); + entity.setBttrCnsmptn(0.0); + entity.setEndTypeCd(data.getEndTypeCd()); + entity.setUpdateDt(DateUtils.nowDate()); + + return ctrCntrlBasRepository.save(entity); + + } + + public CtrCntrlHstry insertCtrCntrlHstry(GPDatabaseModel data) { + CtrCntrlHstry entity = new CtrCntrlHstry(); + entity.setCntrlId(data.getControlId()); + //터미널 ID 추가 필요 + entity.setTrmnlId(data.getTerminalId()); + + //이동거리 추가 필요 + entity.setMvDstnc(data.getMoveDistance()); + entity.setMvDstncType(data.getMoveDistanceType()); + + entity.setMssgTypeCd(data.getMessageType()); + entity.setStatusCd(data.getDronStatus()); + entity.setLat(data.getLat()); + entity.setLon(data.getLng()); + entity.setSpeed(data.getSpeed()); + entity.setSpeedType(data.getSpeedType()); + entity.setHeading(data.getHeading()); + entity.setElevType(data.getElevType()); + + entity.setElev(data.getElev()); + + entity.setBttrLvl(data.getBetteryLevel()); + entity.setBttrVltg(data.getBetteryVoltage()); + entity.setTrmnlRcvDt(DateUtils.stringToDatetime(data.getTerminalRcvDt())); + entity.setSrvrRcvDt(DateUtils.stringToDatetime(data.getServerRcvDt())); + + // 환경지표 + entity.setSensorCo(data.getSensorCo()); + entity.setSensorSo2(data.getSensorSo2()); + entity.setSensorNo2(data.getSensorNo2()); + entity.setSensorO3(data.getSensorO3()); + entity.setSensorDust(data.getSensorDust()); + + + return ctrCntrlHstryRepository.save(entity); + } + + public CtrCntrlHstryArea insertCtrCntrlHstryArea(GPDatabaseModel data , int hstrySno) { + CtrCntrlHstryArea entity = new CtrCntrlHstryArea(); + + entity.setCntrlId(data.getControlId()); + entity.setActnType(data.getTypeCd()); + entity.setPrcsYn("N"); + entity.setLat(data.getLat()); + entity.setLon(data.getLng()); + entity.setHstrySno(hstrySno); + entity.setCreateDt(DateUtils.nowDate()); + entity.setUpdateDt(DateUtils.nowDate()); + + return ctrCntrlHstryAreaRepository.save(entity); + + } + + public CtrCntrlHstryArea updateCtrCntrlHstryArea(CtrTrnsLctnModel model) { + + Optional optional = ctrCntrlHstryAreaRepository.findById(model.getHstryAreaSno()); + if (!optional.isPresent()) { + logger.debug(ErrorCode.DATA_NOTFIND.toString()); + return null; + } + + CtrCntrlHstryArea entity = optional.get(); + + entity.setPrcsYn("Y"); + entity.setArea1(model.getArea1()); + entity.setArea2(model.getArea2()); + entity.setArea3(model.getArea3()); + entity.setZipCd(model.getZipCd()); + entity.setLandNm(model.getLandNm()); + entity.setLandNum(model.getLandNum()); + entity.setAreaType(model.getAreaType()); + entity.setAreaNm(model.getAreaNm()); + entity.setUpdateDt(DateUtils.nowDate()); + + return ctrCntrlHstryAreaRepository.save(entity); + } + + +} diff --git a/src/main/java/com/palnet/biz/sample/entity/SampleEntity.java b/src/main/java/com/palnet/biz/sample/entity/SampleEntity.java new file mode 100644 index 0000000..e7ff7c9 --- /dev/null +++ b/src/main/java/com/palnet/biz/sample/entity/SampleEntity.java @@ -0,0 +1,28 @@ +package com.palnet.biz.sample.entity; + +import java.time.LocalDateTime; + +import javax.persistence.*; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@Table(name="SAMPLE") +@Entity +public class SampleEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "SAMPLE_SNO") + private Integer agencySno; + /* 업체명*/ + @Column(name = "SAMPLE1") + private String sample1; + /* 주소*/ + @Column(name = "sample2") + private String sample2; + + + +} diff --git a/src/main/java/com/palnet/biz/sample/repository/SampleRepository.java b/src/main/java/com/palnet/biz/sample/repository/SampleRepository.java new file mode 100644 index 0000000..c49dedd --- /dev/null +++ b/src/main/java/com/palnet/biz/sample/repository/SampleRepository.java @@ -0,0 +1,11 @@ +package com.palnet.biz.sample.repository; + + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.palnet.biz.sample.entity.SampleEntity; + +@Repository +public interface SampleRepository extends JpaRepository { +} diff --git a/src/main/java/com/palnet/biz/sample/service/SampleService.java b/src/main/java/com/palnet/biz/sample/service/SampleService.java new file mode 100644 index 0000000..7d3edeb --- /dev/null +++ b/src/main/java/com/palnet/biz/sample/service/SampleService.java @@ -0,0 +1,22 @@ +package com.palnet.biz.sample.service; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import com.palnet.biz.sample.entity.SampleEntity; +import com.palnet.biz.sample.repository.SampleRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class SampleService { + private final SampleRepository sampleRepository; + + public List find() throws Exception{ + return sampleRepository.findAll(); + } + + +} diff --git a/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java b/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java new file mode 100644 index 0000000..6ca32cc --- /dev/null +++ b/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java @@ -0,0 +1,81 @@ +package com.palnet.biz.scheduler.ctr; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import com.palnet.biz.scheduler.ctr.service.CtrSchedulerService; + +/** + * 데이터 정제 작업을 위한 스케줄러 + * @author kang + * + */ +@Component +public class CtrScheduler { + + @Autowired + private CtrSchedulerService service; + + + + private Logger logger = LoggerFactory.getLogger(getClass()); + + + /** + * 실행 시점 : 10초에 한번 + * 실행 내용 : 특정시간 들어오지 않는 데이터 삭제 처리 + */ + @Scheduled(fixedDelay = 1000 * 10) + public void removeCollection() { + logger.debug("=================== {removeCollection} ===================== "); + service.removeInfo(); + } + + /** + * 실행 시점 : 10초에 한번 + * 실행 내용 : Database GP 데이터 내용 저장 처리 + */ + @Scheduled(fixedDelay = 1000 * 10) + public void gpDataInsert() { + logger.debug("=================== {gpDataInsert} ===================== "); + service.insertGpData(); + } + + /** + * 실행 시점 : 10초에 한번 + * 실행 내용 : 주소 변환 처리 + */ +// @Scheduled(fixedDelay = 1000 * 10) +// public void transferLocation() { +// logger.debug("=================== {transferLocation} ===================== "); +// service.trnsLctnPrcss(); +// } + + + /** + * 실행 시점 : 10분에 한번 + * 실행 내용 : 종료 처리 되지 않은 데이터 종료 처리 + */ + @Scheduled(fixedDelay = 1000 * 60 * 10) + public void endData() { + logger.debug("=================== {endProc} ===================== "); + service.endData(); + } + + + /** + * 실행 시점 : 10분에 한번 + * 실행 내용 : 종료후 평균값 등을 계산 + */ +// @Scheduled(fixedDelay = 1000 * 60 * 10) +// public void endCalProc() { +// logger.debug("=================== {endProc} ===================== "); +// service.endData(); +// +// } + + +} diff --git a/src/main/java/com/palnet/biz/scheduler/ctr/model/CtrTrnsLctnModel.java b/src/main/java/com/palnet/biz/scheduler/ctr/model/CtrTrnsLctnModel.java new file mode 100644 index 0000000..10ca5f3 --- /dev/null +++ b/src/main/java/com/palnet/biz/scheduler/ctr/model/CtrTrnsLctnModel.java @@ -0,0 +1,19 @@ +package com.palnet.biz.scheduler.ctr.model; + +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class CtrTrnsLctnModel { + + private Integer hstryAreaSno; + private String area1; + private String area2; + private String area3; + private String zipCd; + private String landNm; + private String landNum; + private String areaType; + private String areaNm; + +} diff --git a/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java b/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java new file mode 100644 index 0000000..8ba4a62 --- /dev/null +++ b/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java @@ -0,0 +1,211 @@ +package com.palnet.biz.scheduler.ctr.service; + +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentLinkedQueue; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlEndModel; +import com.palnet.biz.jpa.entity.CtrCntrlHstry; +import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyDronQueryRepository; +import com.palnet.biz.jpa.service.ctr.CtrCntrlJpaService; +import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel; +import com.palnet.comn.collection.GPCollection; +import com.palnet.comn.collection.GPDatabaseCollection; +import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.model.GPModel; +import com.palnet.comn.utils.DateUtils; + +@Service +public class CtrSchedulerService { + + + private GPCollection cic = new GPCollection(); + private GPDatabaseCollection gpdc = new GPDatabaseCollection(); + + @Autowired + private CtrCntrlJpaService service; + + @Autowired + private CtrCntrlQueryRepository query; + + @Autowired + private CtrTrnsLctnService trnsService; + + @Autowired + private PtyDronQueryRepository dronQuery; + + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${gp.remove.time}") + private long GP_REMOVE_TIME; + + @Value("${gp.insert.count}") + private long GP_INSERT_COUNT; + + @Value("${gp.end.time}") + private long GP_END_TIME; + + + + /** + * 일정 주기로 위치 데이터가 오지 않는 데이터 중지 처리 + * 기준 + * 1) {param} 분 이상 데이터가 들어오지 않을 경우 + * 2) 마지막 데이터 속도가 0 , 고도가 0 (현재 적용 X) + * @param minute + */ + public void removeInfo() { + Map cicData = cic.getData(); + + GPModel model; + Date nowDate = new Date(); // 현재 시간 구하기 + + + Iterator itKey = cicData.keySet().iterator(); + + while (itKey.hasNext()) { + String index = itKey.next(); + + model = cicData.get(index); + Date lastRevDate = DateUtils.stringToDatetime(model.getServerRcvDt()); + long diffMinute = DateUtils.diffMinute(lastRevDate, nowDate); + + if(diffMinute > GP_REMOVE_TIME) { + model.setControlEndDt(DateUtils.getCurrentTime()); + model.setTypeCd("99"); + model.setAreaTrnsYn("N"); + cic.putDatabase(model); + + itKey.remove(); + } + + } + logger.debug("{removeInfo } collection size :: " + cicData.size() + ""); + + } + + + public void trnsLctnPrcss() { + List list = query.listCntrlHstryArea(); + + for(CtrCntrlHstryArea entity : list) { + + CtrTrnsLctnModel lctnModel = trnsService.convertLatlonToAddress(entity.getLat(), entity.getLon()); + + if(lctnModel == null) { + lctnModel = new CtrTrnsLctnModel(); + } + + lctnModel.setHstryAreaSno(entity.getHstryAreaSno()); + service.updateCtrCntrlHstryArea(lctnModel); + + } + + + } + + public void insertGpData() { + ConcurrentLinkedQueue gpdcList = gpdc.getData(); + int count = 0; + Iterator itKey = gpdcList.iterator(); + logger.debug("SIZE >>>" + gpdcList.size()); + + GPDatabaseModel model; + + while (itKey.hasNext()) { + model = itKey.next(); + if(count == GP_INSERT_COUNT) { + break; + } + + logger.debug("%%%%" + model.getTypeCd()); + if(!model.getMessageType().equals("OPENSKY")) { + if(model.getTypeCd().equals("01")) { + //마스터 정보에저장 + //식별번호로 제작번호 알아오기 + String prodNumber = dronQuery.findIdntfNumByProdNumber(model.getObjectId()); + model.setProdNumber(prodNumber); + service.insertCtrCntrlBas(model); + + }else if(model.getTypeCd().equals("99")) { + //마스터 정보에 종료 처리 저장 + model.setEndTypeCd("01"); + service.updateCtrCntrlBas(model); + } + + CtrCntrlHstry hstryEntity = service.insertCtrCntrlHstry(model); + + if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) { + service.insertCtrCntrlHstryArea(model, hstryEntity.getHstrySno()); + } + + } + itKey.remove(); + count ++; + } + + } + + public void endData() { + List endList = query.endList(); + + Date nowDate = new Date(); // 현재 시간 구하기 + + for(CtrCntrlEndModel data : endList) { + long diffMinute = DateUtils.diffMinute(data.getSrvrRcvDt(), nowDate); + if(diffMinute > GP_END_TIME) { + GPDatabaseModel model = new GPDatabaseModel(); + model.setEndTypeCd("02"); + model.setControlId(data.getCntrlId());; + model.setTypeCd("99"); + model.setControlEndDt(DateUtils.getCurrentTime()); + service.updateCtrCntrlBas(model); + } + + + } + } + +// private static List dataList = Collections.synchronizedList(new ArrayList()); +// public static void main(String [] args) { +// int COUNT = 1000; +// int count =0; +// for(int i=0 ; i< 4000; i++) { +// +// +// GPDatabaseModel model = new GPDatabaseModel(); +// model.setControlId(i + " slfjwelfjklwjflwejflwejflwjfklwjlfwejlf"); +// dataList.add(model); +// } +// +// System.out.println("SIZE ============>" + dataList.size()); +// +// +// Iterator iter = dataList.iterator(); +// +// while (iter.hasNext()) { +// +// if(count == COUNT) { +// +// break; +// } +// count ++; +// GPDatabaseModel model = iter.next(); +// System.out.println("count ====> " + count + "model ============> " + model.getControlId()); +// iter.remove(); +// } +// +// +// } +} diff --git a/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java b/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java new file mode 100644 index 0000000..76d7e3e --- /dev/null +++ b/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrTrnsLctnService.java @@ -0,0 +1,131 @@ +package com.palnet.biz.scheduler.ctr.service; + +import java.util.List; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponents; +import org.springframework.web.util.UriComponentsBuilder; + +import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel; +import com.palnet.comn.code.ErrorCode; +import com.palnet.comn.utils.JsonUtils; + +@Service +public class CtrTrnsLctnService { + + @Value("${naver.api.url}") + private String NAVER_API_URL; + + @Value("${naver.api.id}") + private String NAVER_API_ID; + + @Value("${naver.api.key}") + private String NAVER_API_KEY; + + private Logger logger = LoggerFactory.getLogger(getClass()); + + public CtrTrnsLctnModel convertLatlonToAddress(double lat , double lon) { + HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(); + factory.setConnectTimeout(5000); //타임아웃 설정 5초 + factory.setReadTimeout(5000);//타임아웃 설정 5초 + RestTemplate restTemplate = new RestTemplate(factory); + + HttpHeaders header = new HttpHeaders(); + header.add("X-NCP-APIGW-API-KEY-ID", NAVER_API_ID); + header.add("X-NCP-APIGW-API-KEY", NAVER_API_KEY); + HttpEntity entity = new HttpEntity<>(header); + + UriComponents uri = UriComponentsBuilder.fromHttpUrl(NAVER_API_URL) + .queryParam("request", "coordsToaddr") + .queryParam("coords", lon + "," + lat) + .queryParam("sourcecrs", "epsg:4326") + .queryParam("output", "json") +// .queryParam("orders", "roadaddr") + .queryParam("orders", "addr,roadaddr") + .build(); + + ResponseEntity resultMap = restTemplate.exchange(uri.toString(), HttpMethod.GET, entity, Map.class); + + HttpStatus rsStatus = resultMap.getStatusCode(); + if(rsStatus != HttpStatus.OK){ + logger.debug("response error occurs."); + return null; + } + + Map body = resultMap.getBody(); + Map apiStatus = (Map)body.get("status"); + + logger.debug(JsonUtils.toJson(body)); + + String name = (String)apiStatus.get("name"); + if(!"ok".equals(name)){ + if(apiStatus != null){ + logger.debug("get aera api response error occurs. : {}/{}", name, apiStatus.get("message")); + }else{ + logger.debug("get aera api response error occurs."); + } +// logger.debug("{}\t/{}\t/{}\t/{}\t/{}", dto.getUserSno(), dto.getLctSno(), dto.getLat(), dto.getLon(), dto.getCreatDt()); + logger.debug(ErrorCode.FAIL.message()); + return null; +// throw new CustomException(ErrorCode.FAIL); + } + + CtrTrnsLctnModel model = new CtrTrnsLctnModel(); + + List results = (List)body.get("results"); + + // 리스트에서 도로명 타입의 검색결과가 있는지 확인 + // 있을 경우 해당 인덱스로 area 주소 반환 + int typeIndex = -1; + for(Object result : results){ + typeIndex++; + if("roadaddr".equals(((Map) result).get("name"))) break; + } + if(typeIndex < 0) { + logger.debug(ErrorCode.DATA_NO.message()); + return null; + } + Map result = (Map)results.get(typeIndex); + result.forEach((resultKey, resultValue) -> { +// log.debug(">>> resultKey / resultValue : {} / {}",resultKey, resultValue); + if("region".equals(resultKey)){ + model.setArea1(((Map)((Map)resultValue).get("area1")).get("name").toString()); + model.setArea2(((Map)((Map)resultValue).get("area2")).get("name").toString()); + model.setArea3(((Map)((Map)resultValue).get("area3")).get("name").toString()); + } + if("land".equals(resultKey)){ + String landNum = ((Map)resultValue).get("number1").toString(); + if(!"".equals(((Map)resultValue).get("number2").toString())){ + landNum += "-" + ((Map)resultValue).get("number2").toString(); + } + model.setLandNum(landNum); + if(((Map)resultValue).containsKey("name")){ + model.setLandNm(((Map)resultValue).get("name").toString()); + }else{ + model.setLandNm(""); + } + model.setZipCd(((Map)((Map)resultValue).get("addition1")).get("value").toString()); + model.setAreaType(((Map)((Map)resultValue).get("addition0")).get("type").toString()); + model.setAreaNm(((Map)((Map)resultValue).get("addition0")).get("value").toString()); + } + }); + + return model; + + } + + + + +} diff --git a/src/main/java/com/palnet/comn/code/ErrorCode.java b/src/main/java/com/palnet/comn/code/ErrorCode.java new file mode 100644 index 0000000..fde8b66 --- /dev/null +++ b/src/main/java/com/palnet/comn/code/ErrorCode.java @@ -0,0 +1,31 @@ +package com.palnet.comn.code; + +public enum ErrorCode { + SUCCESS("1", "성공"), + FAIL("-1" , "실패"), + INTERNAL_SERVER_ERROR("ER500", "내부 시스템 오류"), + NOT_REGIST_ERROR_CODE("ER501", "등록되지 않은 오류 코드"), + DATA_NOTFIND("DT001","데이터 를 찾을수 없습니다."), + DATA_DUPLICATE("DT002","중복 데이터가 존재합니다."), + DATA_NO("DT003", "데이터 미존재"), + DB_ERROR("DB001" , "디비 처리중 오류"); + + + + private final String code; + + private final String message; + + private ErrorCode(String code, String message) { + this.code = code; + this.message = message; + } + + public String code() { + return code; + } + + public String message() { + return message; + } +} diff --git a/src/main/java/com/palnet/comn/code/Level.java b/src/main/java/com/palnet/comn/code/Level.java new file mode 100644 index 0000000..7a9f429 --- /dev/null +++ b/src/main/java/com/palnet/comn/code/Level.java @@ -0,0 +1,24 @@ +package com.palnet.comn.code; + +public enum Level { + INFO(0), + WARN(1), + RETRY(2), + DROP(3), + RECYCLE(4), + CRITICAL(5); + + private int code; + + Level(int code) { + setLevel(code); + } + + public int getLevel() { + return code; + } + + public void setLevel(int code) { + this.code = code; + } +} diff --git a/src/main/java/com/palnet/comn/code/MessageType.java b/src/main/java/com/palnet/comn/code/MessageType.java new file mode 100644 index 0000000..c845f4c --- /dev/null +++ b/src/main/java/com/palnet/comn/code/MessageType.java @@ -0,0 +1,8 @@ +package com.palnet.comn.code; + +public enum MessageType { + OPENSKY, + ADSB, + LTEM, + ETC, +} diff --git a/src/main/java/com/palnet/comn/code/ObjectType.java b/src/main/java/com/palnet/comn/code/ObjectType.java new file mode 100644 index 0000000..f350743 --- /dev/null +++ b/src/main/java/com/palnet/comn/code/ObjectType.java @@ -0,0 +1,9 @@ +package com.palnet.comn.code; + +public enum ObjectType { + DRON, + AIRPLANE, + CAR, + BUS, + PERSON +} diff --git a/src/main/java/com/palnet/comn/code/RSErrorCode.java b/src/main/java/com/palnet/comn/code/RSErrorCode.java new file mode 100644 index 0000000..2ef4d83 --- /dev/null +++ b/src/main/java/com/palnet/comn/code/RSErrorCode.java @@ -0,0 +1,31 @@ +package com.palnet.comn.code; + +public enum RSErrorCode { + SUCCESS("1", "Success"), + FAIL("-1" , "Fail"), + ER_PARAM("-100" , "Please parameter Check"), + DATA_NOTFOUNT("-101" , "Data not found"), + PSWD_NOTMATCH("-102" , "Password does not match"), + ACNT_UNAVAIL("-103","Account is unavailable"), + + INTERNAL_SERVER_ERROR("-500", "Internal system error"), + DATA_DUPLICATE("-104","Duplicate data exists"); + + + private final String code; + + private final String message; + + private RSErrorCode(String code, String message) { + this.code = code; + this.message = message; + } + + public String code() { + return code; + } + + public String message() { + return message; + } +} diff --git a/src/main/java/com/palnet/comn/code/Source.java b/src/main/java/com/palnet/comn/code/Source.java new file mode 100644 index 0000000..7a0c51b --- /dev/null +++ b/src/main/java/com/palnet/comn/code/Source.java @@ -0,0 +1,6 @@ +package com.palnet.comn.code; + +public enum Source { + SERVER, + INTERNAL +} diff --git a/src/main/java/com/palnet/comn/collection/AuthCollection.java b/src/main/java/com/palnet/comn/collection/AuthCollection.java new file mode 100644 index 0000000..0fd34da --- /dev/null +++ b/src/main/java/com/palnet/comn/collection/AuthCollection.java @@ -0,0 +1,45 @@ +package com.palnet.comn.collection; + +import java.util.ArrayList; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AuthCollection { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private static List authkeyList = new ArrayList(); + + public void reloadAuthkey() { + // 인증키 하드코딩 처리 + authkeyList.add("1cc2e08e-0c5c-43b2-8d4d-cddd3de558e3");// 지텔인증키 + authkeyList.add("35ea4080-a3f2-4e34-8361-78db06bac6fc");// PAL 인증키 + +// authkeyList.add(null) + } + + public boolean checkAuthkey(String authKey) { + boolean result = false; +// logger.debug("authKey ::: " + authKey); + + for(String key : authkeyList) { +// logger.debug("key ::: " + key); + if(authKey.equals(key)) { + result = true; + } + } + + return result; + } + + + public static void main(String [] agrs) { + AuthCollection auth = new AuthCollection(); + auth.reloadAuthkey(); + + System.out.println("1>>>>> " + auth.checkAuthkey("!234")); + System.out.println("2>>>>> " + auth.checkAuthkey("1cc2e08e-0c5c-43b2-8d4d-cddd3de558e3")); + } +} diff --git a/src/main/java/com/palnet/comn/collection/GPCollection.java b/src/main/java/com/palnet/comn/collection/GPCollection.java new file mode 100644 index 0000000..95c4988 --- /dev/null +++ b/src/main/java/com/palnet/comn/collection/GPCollection.java @@ -0,0 +1,138 @@ +package com.palnet.comn.collection; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; + +import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.model.GPHistoryModel; +import com.palnet.comn.model.GPModel; +import com.palnet.comn.utils.DateUtils; + +/** + * 현재 움직이는 물체/비행체에 대한 정보를 전송하기 위해 저장하는 Collection + * @author kang + * + */ +public class GPCollection { + private Logger logger = LoggerFactory.getLogger(getClass()); + + private static Map nowControl = Collections.synchronizedMap(new HashMap()); //현재 움직이는 비행체 + + + private GPDatabaseCollection gpdc = new GPDatabaseCollection(); + + + // 받은 데이터 정보를 데이터구조에 맞게 저장 한다. + // 최초에 데이터를 수신한 경우 관제 ID , 관제시작 시간을 셋팅한다. + public void putData(List paramData) { + + List historyList = null; + GPModel model = null; + for(GPModel data : paramData) { + if(!nowControl.containsKey(data.getObjectId())) { + model = new GPModel(); + model.setControlId(UUID.randomUUID().toString()); + model.setTypeCd("01"); + model.setAreaTrnsYn("N"); + model.setControlStartDt(DateUtils.getCurrentTime()); + }else { + + model = nowControl.get(data.getObjectId()); + model.setTypeCd("02"); + model.setAreaTrnsYn("E"); + } + model.setObjectId(data.getObjectId()); + model.setObjectType(data.getObjectType()); + model.setMessageType(data.getMessageType()); + model.setLat(data.getLat()); + model.setLng(data.getLng()); + model.setElevType(data.getElevType()); + model.setElev(data.getElev()); + model.setSpeedType(data.getSpeedType()); + model.setSpeed(data.getSpeed()); + model.setBetteryLevel(data.getBetteryLevel()); + model.setBetteryVoltage(data.getBetteryVoltage()); + model.setDronStatus(data.getDronStatus()); + model.setHeading(data.getHeading()); + model.setTerminalRcvDt(data.getTerminalRcvDt()); + model.setServerRcvDt(data.getServerRcvDt()); + model.setServerRcvDt(DateUtils.getCurrentTime()); //서버에서 받은 시간 넣기 + model.setTerminalId(data.getTerminalId()); + model.setMoveDistance(data.getMoveDistance()); + model.setMoveDistanceType(data.getMoveDistanceType()); + + // 환경 데이터 필드 추가 + model.setSensorCo(data.getSensorCo()); + model.setSensorSo2(data.getSensorSo2()); + model.setSensorNo2(data.getSensorNo2()); + model.setSensorO3(data.getSensorO3()); + model.setSensorDust(data.getSensorDust()); + + // history 좌표 넣기 start + GPHistoryModel historyModel = new GPHistoryModel(); + historyModel.setObjectId(data.getObjectId()); + historyModel.setLat(data.getLat()); + historyModel.setLng(data.getLng()); + if(model.getPostionHistory() != null) { + historyList = model.getPostionHistory() ; + }else { + historyList = new ArrayList(); + + } + historyList.add(historyModel); + model.setPostionHistory(historyList); + // history 좌표 넣기 end + + + nowControl.put(data.getObjectId(), model); + + //Database 저장을 위해 Collection 저장을 위함 + putDatabase(model); + +// logger.debug(">>>" + model.toString()); + } + } + + //데이터를 저장하기 위한 Collection 에 저장 + public void putDatabase(GPModel model) { + GPDatabaseModel gpData = new GPDatabaseModel(); + + BeanUtils.copyProperties(model, gpData); + + gpdc.putData(gpData); + + } + + + // 현재 데이터 정보를 리턴 함 + public Map getData(){ + return nowControl; + } + + // 이력 좌표데이터 정보를 리턴함 + public List getHistoryData(String objectId){ + List result = new ArrayList(); + + if(nowControl.containsKey(objectId)) { + result= nowControl.get(objectId).getPostionHistory(); + } + return result; + + } + + + // 위치 히스토리 정보 전달 + public List getHistoryList(String objectId){ + return nowControl.get(objectId).getPostionHistory(); + + } + +} diff --git a/src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java b/src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java new file mode 100644 index 0000000..cef1270 --- /dev/null +++ b/src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java @@ -0,0 +1,49 @@ +package com.palnet.comn.collection; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.model.GPModel; + +/** + * 전송된 원시데이터를 Database 에 넣기 위해 임시 저장해두는 Collection + * @author kang + * + */ +public class GPDatabaseCollection { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private static ConcurrentLinkedQueue dataList = new ConcurrentLinkedQueue(); + + + public void putData(GPDatabaseModel paramData) { + dataList.add(paramData); + + } + +// public void putListData(List paramDataList) { +// dataList.addAll(paramDataList); +// } + + public ConcurrentLinkedQueue getData(){ + + return dataList; + } + +// public static void main(String[] args) { +// ConcurrentLinkedQueue qe = new ConcurrentLinkedQueue(); +// +// } +// +} diff --git a/src/main/java/com/palnet/comn/encrptn/kisa/KISA_SEED_CBC.java b/src/main/java/com/palnet/comn/encrptn/kisa/KISA_SEED_CBC.java new file mode 100644 index 0000000..3c7325f --- /dev/null +++ b/src/main/java/com/palnet/comn/encrptn/kisa/KISA_SEED_CBC.java @@ -0,0 +1,1923 @@ +package com.palnet.comn.encrptn.kisa; + +public class KISA_SEED_CBC { + + + // DEFAULT : JAVA = BIG_ENDIAN + private static int ENDIAN = Common.BIG_ENDIAN; + + // S-BOX + private static final int SS0[] = + { + 0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0, 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124, + 0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c, 0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360, + 0x28082028, 0x04444044, 0x20002020, 0x1d8d919c, 0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314, + 0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378, 0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec, + 0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8, 0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074, + 0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354, 0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100, + 0x24042024, 0x1c0c101c, 0x33437370, 0x18889098, 0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8, + 0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380, 0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8, + 0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8, 0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c, + 0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078, 0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4, + 0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140, 0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008, + 0x1f0f131c, 0x19899198, 0x00000000, 0x19091118, 0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0, + 0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324, 0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8, + 0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c, 0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208, + 0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4, 0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064, + 0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218, 0x06060204, 0x21012120, 0x2b4b6368, 0x26466264, + 0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288, 0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0, + 0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4, 0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc, + 0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac, 0x36063234, 0x15051114, 0x22022220, 0x38083038, + 0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c, 0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394, + 0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c, 0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188, + 0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8, 0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4, + 0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364, 0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8, + 0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320, 0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4, + 0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0, 0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040, + 0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0, 0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154, + 0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c, 0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254, + 0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244, 0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8, + 0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c, 0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0, + 0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c, 0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088, + 0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4, 0x22426260, 0x29092128, 0x07070304, 0x33033330, + 0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178, 0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298 + }; + + private static final int SS1[] = + { + 0x38380830, 0xe828c8e0, 0x2c2d0d21, 0xa42686a2, 0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0, + 0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3, 0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53, + 0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1, 0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3, + 0xd013c3d3, 0x90118191, 0x10110111, 0x04060602, 0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43, + 0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0, 0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0, + 0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2, 0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890, + 0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32, 0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3, + 0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72, 0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272, + 0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0, 0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83, + 0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13, 0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430, + 0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1, 0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0, + 0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1, 0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1, + 0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131, 0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1, + 0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202, 0x20220222, 0x04040400, 0x68284860, 0x70314171, + 0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991, 0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951, + 0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0, 0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0, + 0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12, 0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3, + 0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2, 0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41, + 0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32, 0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62, + 0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292, 0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0, + 0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571, 0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303, + 0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470, 0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901, + 0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040, 0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501, + 0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22, 0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343, + 0x84058581, 0x14140410, 0x88098981, 0x981b8b93, 0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971, + 0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282, 0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53, + 0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11, 0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642, + 0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3, 0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1, + 0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30, 0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70, + 0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622, 0x30320232, 0x84048480, 0x68294961, 0x90138393, + 0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0, 0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783, + 0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83, 0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3 + }; + + private static final int SS2[] = + { + 0xa1a82989, 0x81840585, 0xd2d416c6, 0xd3d013c3, 0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505, + 0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e, 0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343, + 0x20282808, 0x40440444, 0x20202000, 0x919c1d8d, 0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707, + 0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b, 0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece, + 0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888, 0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444, + 0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747, 0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101, + 0x20242404, 0x101c1c0c, 0x73703343, 0x90981888, 0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9, + 0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383, 0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9, + 0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb, 0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f, + 0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848, 0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5, + 0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141, 0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808, + 0x131c1f0f, 0x91981989, 0x00000000, 0x11181909, 0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1, + 0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707, 0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b, + 0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d, 0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a, + 0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5, 0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444, + 0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a, 0x02040606, 0x21202101, 0x63682b4b, 0x62642646, + 0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a, 0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0, + 0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5, 0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf, + 0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e, 0x32343606, 0x11141505, 0x22202202, 0x30383808, + 0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c, 0x81800181, 0xe1e829c9, 0x80840484, 0x93941787, + 0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c, 0x71703141, 0x11101101, 0xc3c407c7, 0x81880989, + 0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8, 0x90941484, 0x51581949, 0x82800282, 0xc0c404c4, + 0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747, 0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888, + 0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303, 0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484, + 0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2, 0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040, + 0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1, 0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545, + 0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f, 0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646, + 0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646, 0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca, + 0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f, 0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282, + 0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f, 0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888, + 0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4, 0x62602242, 0x21282909, 0x03040707, 0x33303303, + 0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949, 0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a + }; + + private static final int SS3[] = + { + 0x08303838, 0xc8e0e828, 0x0d212c2d, 0x86a2a426, 0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838, + 0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407, 0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b, + 0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435, 0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427, + 0xc3d3d013, 0x81919011, 0x01111011, 0x06020406, 0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b, + 0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828, 0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434, + 0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416, 0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818, + 0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e, 0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f, + 0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a, 0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032, + 0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000, 0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b, + 0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f, 0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434, + 0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829, 0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838, + 0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405, 0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839, + 0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031, 0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031, + 0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002, 0x02222022, 0x04000404, 0x48606828, 0x41717031, + 0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819, 0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819, + 0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c, 0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010, + 0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a, 0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f, + 0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022, 0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d, + 0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a, 0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e, + 0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012, 0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c, + 0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435, 0x4f737c3f, 0x05313435, 0x00101010, 0x03030003, + 0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434, 0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809, + 0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000, 0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405, + 0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a, 0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003, + 0x85818405, 0x04101414, 0x89818809, 0x8b93981b, 0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839, + 0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002, 0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f, + 0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d, 0x05212425, 0x4f434c0f, 0x00000000, 0x46424406, + 0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b, 0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d, + 0x00303030, 0x85919415, 0x45616425, 0x0c303c3c, 0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c, + 0x0e020c0e, 0x40505010, 0x09313839, 0x06222426, 0x02323032, 0x84808404, 0x49616829, 0x83939013, + 0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424, 0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407, + 0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f, 0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437 + }; + + private static final int BLOCK_SIZE_SEED = 16; + private static final int BLOCK_SIZE_SEED_INT = 4; + + private static final byte GetB0(int A) { return (byte)(A & 0x0ff); } + private static final byte GetB1(int A) { return (byte)((A>>8) & 0x0ff); } + private static final byte GetB2(int A) { return (byte)((A>>16) & 0x0ff); } + private static final byte GetB3(int A) { return (byte)((A>>24) & 0x0ff); } + + // Round function F and adding output of F to L. + // L0, L1 : left input values at each round + // R0, R1 : right input values at each round + // K : round keys at each round + private static final void SeedRound(int[] T, int LR[], int L0, int L1, int R0, int R1, int[] K, int K_offset) { + T[0] = LR[R0] ^ K[K_offset+0]; + T[1] = LR[R1] ^ K[K_offset+1]; + T[1] ^= T[0]; + T[1] = SS0[GetB0(T[1])&0x0ff] ^ SS1[GetB1(T[1])&0x0ff] ^ + SS2[GetB2(T[1])&0x0ff] ^ SS3[GetB3(T[1])&0x0ff]; + T[0] += T[1]; + T[0] = SS0[GetB0(T[0])&0x0ff] ^ SS1[GetB1(T[0])&0x0ff] ^ + SS2[GetB2(T[0])&0x0ff] ^ SS3[GetB3(T[0])&0x0ff]; + T[1] += T[0]; + T[1] = SS0[GetB0(T[1])&0x0ff] ^ SS1[GetB1(T[1])&0x0ff] ^ + SS2[GetB2(T[1])&0x0ff] ^ SS3[GetB3(T[1])&0x0ff]; + T[0] += T[1]; + LR[L0] ^= T[0]; LR[L1] ^= T[1]; + } + + + + private static final int EndianChange(int dwS) { return ( (/*ROTL(dwS,8)*/(((dwS) << (8)) | (((dwS) >> (32-(8)))&0x000000ff)) & 0x00ff00ff) | (/*ROTL(dwS,24)*/(((dwS) << (24)) | (((dwS) >> (32-(24)))&0x00ffffff)) & 0xff00ff00) ); } + + /************************ Constants for Key schedule **************************/ + private static final int KC0 = 0x9e3779b9; + private static final int KC1 = 0x3c6ef373; + private static final int KC2 = 0x78dde6e6; + private static final int KC3 = 0xf1bbcdcc; + private static final int KC4 = 0xe3779b99; + private static final int KC5 = 0xc6ef3733; + private static final int KC6 = 0x8dde6e67; + private static final int KC7 = 0x1bbcdccf; + private static final int KC8 = 0x3779b99e; + private static final int KC9 = 0x6ef3733c; + private static final int KC10 = 0xdde6e678; + private static final int KC11 = 0xbbcdccf1; + private static final int KC12 = 0x779b99e3; + private static final int KC13 = 0xef3733c6; + private static final int KC14 = 0xde6e678d; + private static final int KC15 = 0xbcdccf1b; + + + + + private static final int ABCD_A = 0; + private static final int ABCD_B = 1; + private static final int ABCD_C = 2; + private static final int ABCD_D = 3; + + private static final void RoundKeyUpdate0(int T[], int[] K, int K_offset, int ABCD[], int KC) { + T[0] = ABCD[ABCD_A] + ABCD[ABCD_C] - KC; + T[1] = ABCD[ABCD_B] + KC - ABCD[ABCD_D]; + K[K_offset+0] = SS0[GetB0(T[0])&0x0ff] ^ SS1[GetB1(T[0])&0x0ff] ^ SS2[GetB2(T[0])&0x0ff] ^ SS3[GetB3(T[0])&0x0ff]; + K[K_offset+1] = SS0[GetB0(T[1])&0x0ff] ^ SS1[GetB1(T[1])&0x0ff] ^ SS2[GetB2(T[1])&0x0ff] ^ SS3[GetB3(T[1])&0x0ff]; + T[0] = ABCD[ABCD_A]; + ABCD[ABCD_A] = ((ABCD[ABCD_A]>>8)&0x00ffffff) ^ (ABCD[ABCD_B]<<24); + ABCD[ABCD_B] = ((ABCD[ABCD_B]>>8)&0x00ffffff) ^ (T[0]<<24); + } + + private static final void RoundKeyUpdate1(int T[], int []K, int K_offset, int ABCD[], int KC) { + T[0] = ABCD[ABCD_A] + ABCD[ABCD_C] - KC; + T[1] = ABCD[ABCD_B] + KC - ABCD[ABCD_D]; + K[K_offset+0] = SS0[GetB0(T[0])&0x0ff] ^ SS1[GetB1(T[0])&0x0ff] ^ SS2[GetB2(T[0])&0x0ff] ^ SS3[GetB3(T[0])&0x0ff]; + K[K_offset+1] = SS0[GetB0(T[1])&0x0ff] ^ SS1[GetB1(T[1])&0x0ff] ^ SS2[GetB2(T[1])&0x0ff] ^ SS3[GetB3(T[1])&0x0ff]; + T[0] = ABCD[ABCD_C]; + ABCD[ABCD_C] = (ABCD[ABCD_C]<<8) ^ ((ABCD[ABCD_D]>>24)&0x000000ff); + ABCD[ABCD_D] = (ABCD[ABCD_D]<<8) ^ ((T[0]>>24)&0x000000ff); + } + + private static void BLOCK_XOR_CBC(int[] OUT_VALUE, int out_value_offset, int[] IN_VALUE1, int in_value1_offset, int[] IN_VALUE2, int in_value2_offset) { + OUT_VALUE[out_value_offset+0] = (in_value1_offset 0) + len = (inLen/4)+1; + else + len = (inLen/4); + + data = new int[len]; + + for(i=0;i> ((i%4)*8)); + } + } else { + for(i=0;i> ((3-(i%4))*8)); + } + } + + return data; + } + + + public static int SEED_CBC_init( KISA_SEED_INFO pInfo, KISA_ENC_DEC enc, byte[] pbszUserKey, byte[] pbszIV ) { + int ABCD[] = new int[4]; // Iuput/output values at each rounds(�� ���� ��/���) + int T[] = new int[2]; // Temporary variable + int K[]; + + if( null == pInfo || + null == pbszUserKey || + null == pbszIV ) + return 0; + + K = pInfo.seed_key.key_data; // Pointer of round keys + pInfo.encrypt = enc.value; // + Common.memcpy(pInfo.ivec, pbszIV, 16, ENDIAN); + pInfo.last_block_flag = pInfo.buffer_length = 0; + + // Set up input values for Key Schedule + ABCD[ABCD_A] = Common.byte_to_int(pbszUserKey, 0*4, ENDIAN); + ABCD[ABCD_B] = Common.byte_to_int(pbszUserKey, 1*4, ENDIAN); + ABCD[ABCD_C] = Common.byte_to_int(pbszUserKey, 2*4, ENDIAN); + ABCD[ABCD_D] = Common.byte_to_int(pbszUserKey, 3*4, ENDIAN); + + // Reorder for big endian + if(Common.BIG_ENDIAN != ENDIAN) { + ABCD[ABCD_A] = EndianChange(ABCD[ABCD_A]); + ABCD[ABCD_B] = EndianChange(ABCD[ABCD_B]); + ABCD[ABCD_C] = EndianChange(ABCD[ABCD_C]); + ABCD[ABCD_D] = EndianChange(ABCD[ABCD_D]); + } + + // i-th round keys( K_i,0 and K_i,1 ) are denoted as K[2*(i-1)] and K[2*i-1], respectively + RoundKeyUpdate0(T, K, 0, ABCD, KC0 ); // K_1,0 and K_1,1 + RoundKeyUpdate1(T, K, 2, ABCD, KC1 ); // K_2,0 and K_2,1 + RoundKeyUpdate0(T, K, 4, ABCD, KC2 ); // K_3,0 and K_3,1 + RoundKeyUpdate1(T, K, 6, ABCD, KC3 ); // K_4,0 and K_4,1 + RoundKeyUpdate0(T, K, 8, ABCD, KC4 ); // K_5,0 and K_5,1 + RoundKeyUpdate1(T, K, 10, ABCD, KC5 ); // K_6,0 and K_6,1 + RoundKeyUpdate0(T, K, 12, ABCD, KC6 ); // K_7,0 and K_7,1 + RoundKeyUpdate1(T, K, 14, ABCD, KC7 ); // K_8,0 and K_8,1 + RoundKeyUpdate0(T, K, 16, ABCD, KC8 ); // K_9,0 and K_9,1 + RoundKeyUpdate1(T, K, 18, ABCD, KC9 ); // K_10,0 and K_10,1 + RoundKeyUpdate0(T, K, 20, ABCD, KC10); // K_11,0 and K_11,1 + RoundKeyUpdate1(T, K, 22, ABCD, KC11); // K_12,0 and K_12,1 + RoundKeyUpdate0(T, K, 24, ABCD, KC12); // K_13,0 and K_13,1 + RoundKeyUpdate1(T, K, 26, ABCD, KC13); // K_14,0 and K_14,1 + RoundKeyUpdate0(T, K, 28, ABCD, KC14); // K_15,0 and K_15,1 + + T[0] = ABCD[ABCD_A] + ABCD[ABCD_C] - KC15; + T[1] = ABCD[ABCD_B] - ABCD[ABCD_D] + KC15; + + K[30] = SS0[GetB0(T[0])&0x0ff] ^ SS1[GetB1(T[0])&0x0ff] ^ // K_16,0 + SS2[GetB2(T[0])&0x0ff] ^ SS3[GetB3(T[0])&0x0ff]; + K[31] = SS0[GetB0(T[1])&0x0ff] ^ SS1[GetB1(T[1])&0x0ff] ^ // K_16,1 + SS2[GetB2(T[1])&0x0ff] ^ SS3[GetB3(T[1])&0x0ff]; + + return 1; + + + } + + + public static int SEED_CBC_Process( KISA_SEED_INFO pInfo, int[] in, int inLen, int[] out, int[] outLen ) { + int nCurrentCount = BLOCK_SIZE_SEED; + int[] pdwXOR = null; + int in_offset = 0; + int out_offset = 0; + int pdwXOR_offset = 0; + + if( null == pInfo || + null == in || + null == out || + 0 > inLen ) + return 0; + + + if( KISA_ENC_DEC._KISA_ENCRYPT == pInfo.encrypt ) { + pdwXOR = pInfo.ivec; + in_offset = 0; + out_offset = 0; + pdwXOR_offset = 0; + + + while( nCurrentCount <= inLen ) + { + BLOCK_XOR_CBC( out, out_offset, in, in_offset, pdwXOR, pdwXOR_offset ); + + KISA_SEED_Encrypt_Block_forCBC( out, out_offset, out, out_offset, pInfo.seed_key ); + + pdwXOR = out; + pdwXOR_offset = out_offset; + + nCurrentCount += BLOCK_SIZE_SEED; + in_offset += BLOCK_SIZE_SEED_INT; + out_offset += BLOCK_SIZE_SEED_INT; + } + + outLen[0] = nCurrentCount - BLOCK_SIZE_SEED; + pInfo.buffer_length = (inLen - outLen[0]); + + Common.memcpy( pInfo.ivec, pdwXOR, pdwXOR_offset, BLOCK_SIZE_SEED ); + Common.memcpy( pInfo.cbc_buffer, in, in_offset, pInfo.buffer_length ); + } + else { + pdwXOR = pInfo.ivec; + in_offset = 0; + out_offset = 0; + pdwXOR_offset = 0; + + while( nCurrentCount <= inLen ) + { + KISA_SEED_Decrypt_Block_forCBC( in, in_offset, out, out_offset, pInfo.seed_key ); + + BLOCK_XOR_CBC( out, out_offset, out, out_offset, pdwXOR, pdwXOR_offset ); + + pdwXOR = in; + pdwXOR_offset = in_offset; + + nCurrentCount += BLOCK_SIZE_SEED; + in_offset += BLOCK_SIZE_SEED_INT; + out_offset += BLOCK_SIZE_SEED_INT; + } + + outLen[0] = nCurrentCount - BLOCK_SIZE_SEED; + + + + Common.memcpy( pInfo.ivec, pdwXOR, pdwXOR_offset, BLOCK_SIZE_SEED ); + Common.memcpy( pInfo.cbc_last_block, out, out_offset-BLOCK_SIZE_SEED_INT, BLOCK_SIZE_SEED ); + + + } + + return 1; + + } + + + public static int SEED_CBC_Close( KISA_SEED_INFO pInfo, int[] out, int out_offset, int[] outLen ) { + int nPaddngLeng; + int i; + + outLen[0] = 0; + + if( null == out ) + return 0; + + if( KISA_ENC_DEC._KISA_ENCRYPT == pInfo.encrypt ) { + nPaddngLeng = BLOCK_SIZE_SEED - pInfo.buffer_length; + + for( i = pInfo.buffer_length; i 0 && nPaddngLeng <= BLOCK_SIZE_SEED ) + { + for(i=nPaddngLeng; i>0; i--) + { + Common.set_byte_for_int(out, out_offset-i, (byte)0x00, ENDIAN); + } + + outLen[0] = nPaddngLeng; + } + else + return 0; + + + } + return 1; + + + } + + + + + + + + public static byte[] SEED_CBC_Encrypt( byte[] pbszUserKey, byte[] pbszIV, byte[] message, int message_offset, int message_length ) { + KISA_SEED_INFO info = new KISA_SEED_INFO(); + int[] outbuf; + int[] data; + byte[] cdata; + int outlen; + int nRetOutLeng[] = new int[] { 0 }; + int nPaddingLeng[] = new int[] { 0 }; + + byte[] pbszPlainText = new byte[message_length]; + System.arraycopy(message, message_offset, pbszPlainText, 0, message_length); + int nPlainTextLen = pbszPlainText.length; + + + int nPlainTextPadding = BLOCK_SIZE_SEED - (nPlainTextLen % BLOCK_SIZE_SEED); + byte []newpbszPlainText = new byte[nPlainTextLen+nPlainTextPadding]; + Common.arraycopy(newpbszPlainText, pbszPlainText, nPlainTextLen); + + byte[] pbszCipherText = new byte[newpbszPlainText.length]; + + + SEED_CBC_init( info, KISA_ENC_DEC.KISA_ENCRYPT, pbszUserKey, pbszIV ); + + outlen = ((newpbszPlainText.length/BLOCK_SIZE_SEED) ) * BLOCK_SIZE_SEED_INT ; + outbuf = new int[outlen]; + data = chartoint32_for_SEED_CBC(newpbszPlainText, nPlainTextLen); + + SEED_CBC_Process( info, data, nPlainTextLen, outbuf, nRetOutLeng ); + SEED_CBC_Close( info, outbuf, (nRetOutLeng[0]/4), nPaddingLeng ); + + cdata = int32tochar_for_SEED_CBC(outbuf, nRetOutLeng[0]+nPaddingLeng[0]); + Common.arraycopy(pbszCipherText, cdata, nRetOutLeng[0]+nPaddingLeng[0]); + + data = null; + cdata = null; + outbuf = null; + + return pbszCipherText; + } + + + + + + + + + + + + public static byte[] SEED_CBC_Decrypt( byte[] pbszUserKey, byte[] pbszIV, byte[] message, int message_offset, int message_length ) { + KISA_SEED_INFO info = new KISA_SEED_INFO(); + int[] outbuf; + int[] data; + byte[] cdata; + int outlen; + int nRetOutLeng[] = new int[] { 0 }; + int nPaddingLeng[] = new int[] { 0 }; + + + + byte[] pbszCipherText = new byte[message_length]; + System.arraycopy(message, message_offset, pbszCipherText, 0, message_length); + int nCipherTextLen = pbszCipherText.length; + + if( (nCipherTextLen%BLOCK_SIZE_SEED) != 0 ) + { + byte result[] = null; + return result; + } + + + byte []newpbszCipherText = new byte[nCipherTextLen]; + Common.arraycopy(newpbszCipherText, pbszCipherText, nCipherTextLen); + + nCipherTextLen = newpbszCipherText.length; + + + SEED_CBC_init( info, KISA_ENC_DEC.KISA_DECRYPT, pbszUserKey, pbszIV ); + + outlen = ((nCipherTextLen/16)) *4 ; + outbuf = new int[outlen]; + data = chartoint32_for_SEED_CBC(newpbszCipherText, nCipherTextLen); + + SEED_CBC_Process( info, data, nCipherTextLen, outbuf, nRetOutLeng ); + + + if( SEED_CBC_Close( info, outbuf, (nRetOutLeng[0]), nPaddingLeng ) == 1 ) + { + cdata = int32tochar_for_SEED_CBC( outbuf, nRetOutLeng[0]-nPaddingLeng[0] ); + + byte[] pbszPlainText = new byte[nRetOutLeng[0]-nPaddingLeng[0]]; + + Common.arraycopy(pbszPlainText, cdata, nRetOutLeng[0]-nPaddingLeng[0]); + + int pdmessage_length = nRetOutLeng[0]-nPaddingLeng[0]; + byte[] result = new byte[pdmessage_length]; + System.arraycopy(pbszPlainText, 0, result, 0, pdmessage_length); + + data = null; + cdata = null; + outbuf = null; + + return result; + + } + else + { + byte result[] = null; + return result; + } + + + } + + + + + + + + + + + + public static final class KISA_ENC_DEC { + public static final int _KISA_DECRYPT = 0; + public static final int _KISA_ENCRYPT = 1; + + public int value; + + public KISA_ENC_DEC(int value ) { + this.value = value; + } + + public static final KISA_ENC_DEC KISA_ENCRYPT = new KISA_ENC_DEC(_KISA_ENCRYPT); + public static final KISA_ENC_DEC KISA_DECRYPT = new KISA_ENC_DEC(_KISA_DECRYPT); + + } + + public static final class KISA_SEED_KEY { + public int[] key_data = new int[32]; + + public void init() { + for(int i=0; i> shift_value; + return (byte)value; + } else { + int shift_value = (b_offset%4)*8; + int mask_value = 0x0ff << shift_value; + int value = (src[b_offset/4] & mask_value) >> shift_value; + return (byte)value; + } + + } + + public static byte[] get_bytes_for_ints(int[] src, int offset, int ENDIAN) { + int iLen = src.length-offset; + byte[] result = new byte[(iLen)*4]; + for(int i=0; i> 24) & 0x0ff); + dst[dst_offset+1] = (byte)((src >> 16) & 0x0ff); + dst[dst_offset+2] = (byte)((src >> 8) & 0x0ff); + dst[dst_offset+3] = (byte)((src) & 0x0ff); + } else { + dst[dst_offset] = (byte)((src) & 0x0ff); + dst[dst_offset+1] = (byte)((src >> 8) & 0x0ff); + dst[dst_offset+2] = (byte)((src >> 16) & 0x0ff); + dst[dst_offset+3] = (byte)((src >> 24) & 0x0ff); + } + + } + + public static void int_to_byte_unit_big_endian(byte[] dst, int dst_offset, int src) { + dst[dst_offset] = (byte)((src>> 24) & 0x0ff); + dst[dst_offset+1] = (byte)((src >> 16) & 0x0ff); + dst[dst_offset+2] = (byte)((src >> 8) & 0x0ff); + dst[dst_offset+3] = (byte)((src) & 0x0ff); + } + + public static int URShift(int x, int n) { + if(n == 0) + return x; + if(n >= 32) + return 0; + int v = x >> n; + int v_mask = ~(0x80000000 >> (n-1)); + return v & v_mask; + } + + public static final long INT_RANGE_MAX = (long)Math.pow(2, 32); + + public static long intToUnsigned(int x) { + if(x >= 0) + return x; + return x + INT_RANGE_MAX; + } + + //Padding : PKSC #7 + //��� : PADDING �� ����(����Ʈ����) + public static int Padding(byte[] pbData, byte[] padData, int length) { + int i; + int padvalue = 16 - (length%16); + Common.arraycopy(padData, pbData, length); + i = length; + do { + padData[i] = (byte)(padvalue); + i++; + }while((i%16) != 0); + return i; + } + + + //1��(128��Ʈ XOR) + public static void BLOCK_XOR_PROPOSAL(int[] OUT_VALUE, int out_value_offset, int[] IN_VALUE1, int in_value1_offset, int[] IN_VALUE2, int in_value2_offset) { + OUT_VALUE[out_value_offset+0] = (in_value1_offset= SHA256_DIGEST_BLOCKLEN) { + Common.arraycopy_offset(Info.szBuffer, 0, pszMessage, pszMessage_offset, SHA256_DIGEST_BLOCKLEN); + SHA256_Transform(Info.szBuffer, Info.uChainVar); + pszMessage_offset += SHA256_DIGEST_BLOCKLEN; + uDataLen -= SHA256_DIGEST_BLOCKLEN; + } + + Common.arraycopy_offset(Info.szBuffer, 0, pszMessage, pszMessage_offset, uDataLen); + } + + /** + @brief �޽��� �����̱�� ���� �����̱⸦ ������ �� ������ �޽��� ����� ������ �����Լ��� ȣ���ϴ� �Լ� + @param Info : SHA256_Init ȣ���Ͽ� �ʱ�ȭ�� ����ü(���������� ���ȴ�.) + @param pszDigest : ��ȣ�� + */ + public static void SHA256_Close( SHA256_INFO Info, byte[] pszDigest ) { + int i, Index; + + Index = Common.URShift(Info.uLowLength, 3) % SHA256_DIGEST_BLOCKLEN; + Info.szBuffer[Index++] = (byte)0x80; + + if (Index > SHA256_DIGEST_BLOCKLEN - 8) { + Common.arrayinit_offset(Info.szBuffer, Index, (byte)0, SHA256_DIGEST_BLOCKLEN - Index); + SHA256_Transform(Info.szBuffer, Info.uChainVar); + Common.arrayinit(Info.szBuffer, (byte)0, SHA256_DIGEST_BLOCKLEN - 8); + } + else { + Common.arrayinit_offset(Info.szBuffer, Index, (byte)0, SHA256_DIGEST_BLOCKLEN - Index - 8); + } + + if(ENDIAN == Common.LITTLE_ENDIAN) { + Info.uLowLength = ENDIAN_REVERSE_ULONG(Info.uLowLength); + Info.uHighLength = ENDIAN_REVERSE_ULONG(Info.uHighLength); + } + + Common.int_to_byte_unit(Info.szBuffer, ((int)(SHA256_DIGEST_BLOCKLEN / 4 - 2))*4, Info.uHighLength, ENDIAN); + Common.int_to_byte_unit(Info.szBuffer, ((int)(SHA256_DIGEST_BLOCKLEN / 4 - 1))*4, Info.uLowLength, ENDIAN); + + SHA256_Transform(Info.szBuffer, Info.uChainVar); + + for (i = 0; i < SHA256_DIGEST_VALUELEN; i += 4) + BIG_D2B((Info.uChainVar)[i / 4], pszDigest, i); + } + + /** + @brief ����� �Է� ���� �ѹ��� ó�� + @param pszMessage : ����� �Է� �� + @param pszDigest : ��ȣ�� + @remarks ���������� SHA256_Init, SHA256_Process, SHA256_Close�� ȣ���Ѵ�. + */ + public static void SHA256_Encrpyt( byte[] pszMessage, int uPlainTextLen, byte[] pszDigest ) { + SHA256_INFO info = new SHA256_INFO(); + SHA256_Init( info ); + SHA256_Process( info, pszMessage, uPlainTextLen ); + SHA256_Close( info, pszDigest ); + } + + + public static class SHA256_INFO { + public int uChainVar[] = new int[SHA256_DIGEST_VALUELEN / 4]; + public int uHighLength; + public int uLowLength; + public byte szBuffer[] = new byte[SHA256_DIGEST_BLOCKLEN]; + } + + public static class Common { + + public static final int BIG_ENDIAN = 0; + public static final int LITTLE_ENDIAN = 1; + + public static void arraycopy(byte[] dst, byte[] src, int length) { + for(int i=0; i> shift_value; + return (byte)value; + } else { + int shift_value = (b_offset%4)*8; + int mask_value = 0x0ff << shift_value; + int value = (src[b_offset/4] & mask_value) >> shift_value; + return (byte)value; + } + + } + + public static byte[] get_bytes_for_ints(int[] src, int offset, int ENDIAN) { + int iLen = src.length-offset; + byte[] result = new byte[(iLen)*4]; + for(int i=0; i> 24) & 0x0ff); + dst[dst_offset+1] = (byte)((src >> 16) & 0x0ff); + dst[dst_offset+2] = (byte)((src >> 8) & 0x0ff); + dst[dst_offset+3] = (byte)((src) & 0x0ff); + } else { + dst[dst_offset] = (byte)((src) & 0x0ff); + dst[dst_offset+1] = (byte)((src >> 8) & 0x0ff); + dst[dst_offset+2] = (byte)((src >> 16) & 0x0ff); + dst[dst_offset+3] = (byte)((src >> 24) & 0x0ff); + } + + } + + public static void int_to_byte_unit_big_endian(byte[] dst, int dst_offset, int src) { + dst[dst_offset] = (byte)((src>> 24) & 0x0ff); + dst[dst_offset+1] = (byte)((src >> 16) & 0x0ff); + dst[dst_offset+2] = (byte)((src >> 8) & 0x0ff); + dst[dst_offset+3] = (byte)((src) & 0x0ff); + } + + public static int URShift(int x, int n) { + if(n == 0) + return x; + if(n >= 32) + return 0; + int v = x >> n; + int v_mask = ~(0x80000000 >> (n-1)); + return v & v_mask; + } + + public static final long INT_RANGE_MAX = (long)Math.pow(2, 32); + + public static long intToUnsigned(int x) { + if(x >= 0) + return x; + return x + INT_RANGE_MAX; + } + } + + public static void main(String[] args) + { + byte pbData[] = {(byte)0x00, (byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05, (byte)0x06, (byte)0x07, + (byte)0x08, (byte)0x09, (byte)0x0A, (byte)0x0B, (byte)0x0C, (byte)0x0D, (byte)0x0E, (byte)0x0F, + (byte)0x08, (byte)0x09, (byte)0x0A, (byte)0x0B, (byte)0x0C, (byte)0x0D, (byte)0x0E, (byte)0x0F, + (byte)0x00, (byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05, (byte)0x06, (byte)0x07, + (byte)0x08, (byte)0x09, (byte)0x0A, (byte)0x0B, (byte)0x0C, (byte)0x0D, (byte)0x0E, (byte)0x0F, + (byte)0x08, (byte)0x09, (byte)0x0A, (byte)0x0B, (byte)0x0C, (byte)0x0D, (byte)0x0E, (byte)0x0F}; + byte pbData1[] = {(byte)0x61}; + + byte pbCipher[] = new byte[32]; + byte pbPlain[] = new byte[16]; + + System.out.print("[ Test SHA256 reference code ]"+"\n"); + System.out.print("\n\n"); + System.out.print("[ Test HASH mode ]"+"\n"); + System.out.print("\n"); + + int Plaintext_length = 1; + + for(int k=0; k<30; k++) + { + + System.out.print("Plaintext\t: "); + for (int i=0; i recentPositionHistory; + + // 전체 히스토리 저장 + private List postionHistory; + + +} diff --git a/src/main/java/com/palnet/comn/storage/config/StorageConfig.java b/src/main/java/com/palnet/comn/storage/config/StorageConfig.java new file mode 100644 index 0000000..71ee696 --- /dev/null +++ b/src/main/java/com/palnet/comn/storage/config/StorageConfig.java @@ -0,0 +1,31 @@ +package com.palnet.comn.storage.config; + +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class StorageConfig { + + @Value("${cloud.aws.credentials.accessKey}") + private String accessKey; + + @Value("${cloud.aws.credentials.secretKey}") + private String accessSecret; + @Value("${cloud.aws.region.static}") + private String region; + + @Bean + public AmazonS3 s3Client() { + AWSCredentials credentials = new BasicAWSCredentials(accessKey, accessSecret); + return AmazonS3ClientBuilder.standard() + .withCredentials(new AWSStaticCredentialsProvider(credentials)) + .withRegion(region).build(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/palnet/comn/storage/controller/StorageController.java b/src/main/java/com/palnet/comn/storage/controller/StorageController.java new file mode 100644 index 0000000..23934d5 --- /dev/null +++ b/src/main/java/com/palnet/comn/storage/controller/StorageController.java @@ -0,0 +1,46 @@ +package com.palnet.comn.storage.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ByteArrayResource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import com.palnet.comn.storage.service.StorageService; + +@RestController +@RequestMapping("/api/file") +public class StorageController { + + @Autowired + private StorageService service; + + @PostMapping("/upload") + public ResponseEntity uploadFile(@RequestParam(value = "file") MultipartFile file) { + return new ResponseEntity<>(service.uploadFile(file), HttpStatus.OK); + } + + @GetMapping("/download/{fileName}") + public ResponseEntity downloadFile(@PathVariable String fileName) { + byte[] data = service.downloadFile(fileName); + ByteArrayResource resource = new ByteArrayResource(data); + return ResponseEntity + .ok() + .contentLength(data.length) + .header("Content-type", "application/octet-stream") + .header("Content-disposition", "attachment; filename=\"" + fileName + "\"") + .body(resource); + } + + @DeleteMapping("/delete/{fileName}") + public ResponseEntity deleteFile(@PathVariable String fileName) { + return new ResponseEntity<>(service.deleteFile(fileName), HttpStatus.OK); + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/comn/storage/service/StorageService.java b/src/main/java/com/palnet/comn/storage/service/StorageService.java new file mode 100644 index 0000000..a364365 --- /dev/null +++ b/src/main/java/com/palnet/comn/storage/service/StorageService.java @@ -0,0 +1,65 @@ +package com.palnet.comn.storage.service; + +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.model.PutObjectRequest; +import com.amazonaws.services.s3.model.S3Object; +import com.amazonaws.services.s3.model.S3ObjectInputStream; +import com.amazonaws.util.IOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + +@Service +@Slf4j +public class StorageService { + + @Value("${cloud.aws.s3.bucket}") + private String bucketName; + + @Autowired + private AmazonS3 s3Client; + + public String uploadFile(MultipartFile file) { + File fileObj = convertMultiPartFileToFile(file); + String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename(); + s3Client.putObject(new PutObjectRequest(bucketName, fileName, fileObj)); + fileObj.delete(); + return fileName; + } + + + public byte[] downloadFile(String fileName) { + S3Object s3Object = s3Client.getObject(bucketName, fileName); + S3ObjectInputStream inputStream = s3Object.getObjectContent(); + try { + byte[] content = IOUtils.toByteArray(inputStream); + return content; + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + + public String deleteFile(String fileName) { + s3Client.deleteObject(bucketName, fileName); + return fileName + " removed ..."; + } + + + private File convertMultiPartFileToFile(MultipartFile file) { + File convertedFile = new File(file.getOriginalFilename()); + try (FileOutputStream fos = new FileOutputStream(convertedFile)) { + fos.write(file.getBytes()); + } catch (IOException e) { + log.error("Error converting multipartFile to file", e); + } + return convertedFile; + } +} \ No newline at end of file diff --git a/src/main/java/com/palnet/comn/utils/DateUtils.java b/src/main/java/com/palnet/comn/utils/DateUtils.java new file mode 100644 index 0000000..4eaa660 --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/DateUtils.java @@ -0,0 +1,159 @@ +package com.palnet.comn.utils; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.temporal.ChronoField; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DateUtils { + + public static String getCurrentTime(){ + return new SimpleDateFormat("yyyyMMddHHmmss").format(System.currentTimeMillis()); + } + + public static String stringToFormat(String str) { + Date date = stringToDatetime(str); + + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date); + } + + + public static Date stringToDatetime(String date) { + + SimpleDateFormat transFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + Date result = null; + try { + if(date.length() == 14) { + result = transFormat.parse(date); + } + }catch(Exception e) { + e.printStackTrace(); + } + + return result; + } + + public static Date stringToDate(String date) { + SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat transFormat2 = new SimpleDateFormat("yyyyMMdd"); + Date result = null; + try { + if(date.length() == 10) { + result = transFormat.parse(date); + }else if(date.length() == 8) { + result = transFormat2.parse(date); + } + }catch(Exception e) { + e.printStackTrace(); + } + + return result; + } + + public static LocalDateTime stringToLocalDateTime(String date) { + + DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + LocalDateTime localDateTime = LocalDateTime.parse(date , transFormat); + + return localDateTime; + + } + + + + public static LocalDateTime stringToLocalDate(String date) { + DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + DateTimeFormatter DATEFORMATTER = new DateTimeFormatterBuilder().append(transFormat) + .parseDefaulting(ChronoField.HOUR_OF_DAY, 0) + .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0) + .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0) + .toFormatter(); + + + LocalDateTime localDateTime = LocalDateTime.parse(date , DATEFORMATTER); + + return localDateTime; + } + + + public static Date nowDate() { + return new Date(System.currentTimeMillis()); + } + + public static long diffSecond(Date firstDate , Date secondDate) { + + long diffDate = secondDate.getTime() - firstDate.getTime(); + long diffTime = diffDate / (1000); + + return diffTime; + + } + + public static long diffMinute(Date firstDate , Date secondDate) { + + long diffDate = secondDate.getTime() - firstDate.getTime(); + long diffTime = diffDate / (1000 * 60); + + return diffTime; + + } + + + +// public static void main(String[] args) { +// +// Date firstDate = stringToDate("20210630142014"); +// +// Date secondDate = stringToDate("20210630142914"); +// +// LocalDateTime dateTime = stringToLocalDate("2021-07-20"); +// +// System.out.println(">>>>" + dateTime); +// +// +// System.out.println("두 날짜의 차이 분: "+diffMinute(firstDate , secondDate)); +// +// System.out.println(">>>" + stringToFormat("20210630142014")); +// +// +// +// +// +//// List> list = new ArrayList>(); +//// +//// +//// for( double i= 0 ; i < 1000 ; i ++) { +//// Map position = new HashMap(); +//// position.put("lat", 11111.0); +//// position.put("lng", 11111.0); +//// position.put("date", i); +//// list.add(position); +//// } +//// +//// int limitSize = 1000; +//// if(list.size() < 1000) { +//// limitSize = list.size(); +//// } +//// +//// List> lastThreeThings = list.subList(list.size() - limitSize, list.size()); +//// +//// //뒤집기 +//// Collections.reverse(lastThreeThings); +//// +//// for(Map data : lastThreeThings) { +//// +//// +//// System.out.println(data); +//// } +// +// } +} diff --git a/src/main/java/com/palnet/comn/utils/EncryptUtils.java b/src/main/java/com/palnet/comn/utils/EncryptUtils.java new file mode 100644 index 0000000..5259f22 --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/EncryptUtils.java @@ -0,0 +1,151 @@ +package com.palnet.comn.utils; + +import java.io.UnsupportedEncodingException; +import java.util.Base64; +import java.util.Base64.Decoder; +import java.util.Base64.Encoder; + +import com.palnet.comn.encrptn.kisa.KISA_SEED_CBC; +import com.palnet.comn.encrptn.kisa.KISA_SHA256; + +public class EncryptUtils { + private static String CHARSET = "utf-8"; + private static final String PBUserKey = "palnet!01234567890"; //16Byte로 설정 + private static final String DEFAULT_IV = "1234567890123456"; //16Byte로 설정 + + /* + public static byte pbUserKey[] = { (byte) 0x2c, (byte) 0x11, (byte) 0x19, (byte) 0x1d, (byte) 0x1f, (byte) 0x16, (byte) 0x12, + (byte) 0x12, (byte) 0x11, (byte) 0x19, (byte) 0x1d, (byte) 0x1f, (byte) 0x10, (byte) 0x14, (byte) 0x1b, + (byte) 0x16 }; + */ + private static byte pbUserKey[] = PBUserKey.getBytes(); + + /* + public static byte bszIV[] = { (byte) 0x27, (byte) 0x28, (byte) 0x27, (byte) 0x6d, (byte) 0x2d, (byte) 0xd5, (byte) 0x4e, + (byte) 0x29, (byte) 0x2c, (byte) 0x56, (byte) 0xf4, (byte) 0x2a, (byte) 0x65, (byte) 0x2a, (byte) 0xae, + (byte) 0x08 }; + */ + private static byte bszIV[] = DEFAULT_IV.getBytes(); + + + /*************************************** + * Main 함수 + * @param args + **************************************/ + public static void main(String[] args) { + + try { + + String plainText = "강찬구님 안녕하세요!!!!@#!@"; + + /* (1) 시작 시간 측정 */ + long startTimeLong = getCurrentTimeLong(); + /*test*/System.out.println( "startTimeLong : " + startTimeLong ); + + /************************************* + * 암호화 + *************************************/ + String encryptData = encrypt(plainText); + System.out.println("encrypt:" + encryptData); + + /************************************* + * 복호화 + *************************************/ + plainText = decrypt(encryptData); + System.out.println("decrypt:" + plainText); + + + String sha256 = sha256Encrypt(plainText); + + System.out.println("sha256:" + sha256); + + + + /* (2)종료 시간 측정 */ + long endTimeLong = getCurrentTimeLong(); + /*test*/System.out.println( "endTimeLong : " + endTimeLong ); + + /* (3)시스템 사용기간 계산 + * - 시간 차이는 초(sec)단위로 계산되며 long 타입 변수에 저장된다. + */ + //long useTime = Math.abs( endTimeLong - startTimeLong )/1000; //절대값을 반환 - sec + //*test*/System.out.println( " useTime : " + useTime + "(Sec)"); + long useTime = Math.abs( endTimeLong - startTimeLong ); //절대값을 반환 - 밀리세컨 + /*test*/System.out.println( " useTime : " + useTime + "(MM)"); + + } catch (Exception e) { + e.printStackTrace(); + } + + } + + public static String sha256Encrypt(String str) { + + byte[] bytes = str.getBytes(); + byte[] pszDigest = new byte[32]; + KISA_SHA256.SHA256_Encrpyt(bytes, bytes.length, pszDigest); + StringBuffer encrypted = new StringBuffer(); + for (int i = 0; i < 32; i++) { + encrypted.append(String.format("%02x", pszDigest[i])); + } + return encrypted.toString(); + } + + public static String encrypt(String str) { + + byte[] enc = null; + String result = ""; + try { + + //암호화 함수 호출 + enc = KISA_SEED_CBC.SEED_CBC_Encrypt(pbUserKey, bszIV, str.getBytes(CHARSET), 0, str.getBytes(CHARSET).length); + //enc = KISA_SEED_ECB.SEED_ECB_Encrypt(pbUserKey, str.getBytes(CHARSET), 0, str.getBytes(CHARSET).length); + Encoder encoder = Base64.getEncoder(); + byte[] encArray = encoder.encode(enc); + + result = new String(encArray, "utf-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + return result; + + } + + public static String decrypt(String param) { + byte[] str = param.getBytes(); + + Decoder decoder = Base64.getDecoder(); + byte[] enc = decoder.decode(str); + +// byte[] enc = Base64.decode(str); + + String result = ""; + byte[] dec = null; + + try { + //복호화 함수 호출 + dec = KISA_SEED_CBC.SEED_CBC_Decrypt(pbUserKey, bszIV, enc, 0, enc.length); + //dec = KISA_SEED_ECB.SEED_ECB_Decrypt(pbUserKey, enc, 0, enc.length); + result = new String(dec, CHARSET); + + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + return result; + } + + + /** + * - 용도 : 현재 시간을 long 타입으로 변환하며 시간 차를 구하는 함수로 사용 + * - Return Type: long + * - Argument Type : none + */ + public static long getCurrentTimeLong() { + long time; + java.util.Calendar cal = java.util.Calendar.getInstance(); + time = cal.getTimeInMillis(); + return time; + } +} diff --git a/src/main/java/com/palnet/comn/utils/HttpUtils.java b/src/main/java/com/palnet/comn/utils/HttpUtils.java new file mode 100644 index 0000000..e7e1a45 --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/HttpUtils.java @@ -0,0 +1,271 @@ +package com.palnet.comn.utils; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.net.UnknownHostException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpMethod; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.RequestEntity; +import org.apache.commons.httpclient.methods.StringRequestEntity; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import lombok.extern.log4j.Log4j2; + +@Log4j2 +public class HttpUtils { + + public static String getAthnNo(int i) { + String athnNo = RandomStringUtils.randomNumeric(i); + return athnNo; + } + + + public static void clientFileDownload(String filePath, HttpServletResponse response) { + File file = new File(filePath); + + if (file.exists()) { + + OutputStream outStream = null; + InputStream inputStream = null; + + try { + inputStream = new FileInputStream(file); + response.reset() ; + response.setContentType("image/jpeg"); + response.setHeader ("Content-Disposition", "attachment; filename=\"" + + new String(file.getName().getBytes(),"ISO8859_1")+"\"" ); + response.setHeader ("Content-Length", ""+file.length() ); + outStream = response.getOutputStream(); + byte b[] = new byte[(int)file.length()]; + int leng = 0; + + while( (leng = inputStream.read(b)) > 0 ){ + outStream.write(b,0,leng); + } + + } catch (Exception e) { + log.error("IGNORE : {}", e); + } finally { + try { + inputStream.close(); + outStream.flush(); + outStream.close(); + } catch (IOException e) { + log.error("IGNORE : {}", e); + } + } + } + } + + public static boolean checkServerAlive(String url,String port) { + boolean isAlive = false; + HttpURLConnection httpConn = null; + try { + URL hostUrl = new URL("http://"+url+":"+port+"/"); + httpConn = (HttpURLConnection) hostUrl.openConnection(); + + if (httpConn != null) { + httpConn.setInstanceFollowRedirects(false); + httpConn.setRequestMethod("HEAD"); + httpConn.connect(); + isAlive = true; + } + + } catch (java.net.ConnectException e) { + log.error("IGNORE : {}", e); + } catch (MalformedURLException e) { + log.error("IGNORE : {}", e); + } catch (IOException e) { + log.error("IGNORE : {}", e); + } finally { + if (httpConn != null) { + httpConn.disconnect(); + } + } + return isAlive; + } + + public static boolean checkPingAlive(String ip) { + boolean isAlive = false; + try { + InetAddress inet = InetAddress.getByName(ip); + + if (inet.isReachable(2000)) { + isAlive = true; + } + + } catch (UnknownHostException e) { + log.error("IGNORE : {}", e); + } catch (IOException e) { + log.error("IGNORE : {}", e); + } + return isAlive; + } + + public static boolean checkUrlAlive(String url,String port, String fullPath) { + boolean isAlive = false; + URLConnection urlConn = null; + URL hostUrl; + String fullUrl = ""; + + if (StringUtils.isEmpty(fullPath)) { + StringBuffer sb = new StringBuffer("http://"); + + if (StringUtils.isEmpty(port)) { + sb = sb.append(url); + fullUrl = sb.toString(); + } else { + sb = sb.append(url).append(":").append(port); + fullUrl = sb.toString(); + } + } else { + fullUrl = fullPath; + } + + try { + hostUrl = new URL(fullUrl); + urlConn = hostUrl.openConnection(); + urlConn.setConnectTimeout(5000); + urlConn.connect(); + isAlive = true; + } catch (MalformedURLException e) { + log.error("IGNORE : {}", e); + } catch (IOException e) { + log.error("IGNORE : {}", e); + } + + return isAlive; + } + + public static void httpPost(String url, String contentType, String body) { + PostMethod methodPost = new PostMethod(url); + RequestEntity entity = null; + + try { + entity = new StringRequestEntity(body, contentType, "UTF-8"); + } catch (UnsupportedEncodingException e) { + log.error("", e); + } + + methodPost.setRequestEntity(entity); + + executeMethod(methodPost); + } + + private static void executeMethod(HttpMethod method) { + HttpClient client = new HttpClient(); + + BufferedReader br = null; + + try { + int respCd = client.executeMethod(method); + + if (respCd == HttpStatus.SC_OK) { + br = new BufferedReader(new InputStreamReader(method.getResponseBodyAsStream())); + String readLine; + while (((readLine = br.readLine()) != null)) { + log.info(readLine); + } + } else { + log.error("respCd: {}", respCd); + } + } catch (Exception e) { + log.error("", e); + } finally { + method.releaseConnection(); + + if (br != null) { + try { + br.close(); + } catch (Exception e) { + log.error("IGNORE : {}", e); + } + } + } + } + + public static String getClientIpAddr(HttpServletRequest request) { + String ip = request.getHeader("X-Forwarded-For"); + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + + return ip; + } + + + public static HttpServletRequest getCurrentRequest() { + ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + return sra.getRequest(); + } + + /** + * 클라이언트 IP 를 가져온다 + * @return 클라이언트 IP + */ + public static String getRequestIp() { + HttpServletRequest req = getCurrentRequest(); + + String[] HEADER_CLIENT_IP = { "NS-CLIENT-IP", "X-Forwarded-For", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR"}; + for (String name : HEADER_CLIENT_IP) { + String clientIp = req.getHeader(name); + if(!StringUtils.isEmpty(clientIp) && !"unknown".equalsIgnoreCase(clientIp)) { + log.debug("{}={}", name, clientIp); + return clientIp; + } + } + + return req.getRemoteAddr(); + } + + public static String getIpFirst(String ips) { + ips = ips.replaceAll(" ", ""); + String[] ipArr = ips.split(","); + if(ipArr.length == 0) { + return null; + } + return ipArr[0]; + } + + public static String getRequestIpFirst() { + String ip = getRequestIp(); + return getIpFirst(ip); + } +} diff --git a/src/main/java/com/palnet/comn/utils/JsonUtils.java b/src/main/java/com/palnet/comn/utils/JsonUtils.java new file mode 100644 index 0000000..a7097e4 --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/JsonUtils.java @@ -0,0 +1,81 @@ +package com.palnet.comn.utils; + +import java.io.IOException; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class JsonUtils { + + private static ObjectMapper getObjectMapper() { + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + return mapper; + } + + public static String toJson(Object object) { + String json = null; + + try { + json = getObjectMapper().writeValueAsString(object); + } catch (JsonProcessingException e) { + log.error("", e); + } + + return json; + } + + public static T fromJson(String val, Class clazz){ + T object = null; + + try { + object = getObjectMapper().readValue(val, clazz); + } catch (IOException e) { + log.error("", e); + } + + return object; + } + + public static T fromJson(byte[] bytes, Class clazz){ + T object = null; + + try { + object = getObjectMapper().readValue(bytes, clazz); + } catch (IOException e) { + log.error("", e); + } + + return object; + } + + public static T fromJson(String val, TypeReference type){ + T object = null; + + try { + object = getObjectMapper().readValue(val, type); + } catch (IOException e) { + log.error("", e); + } + + return object; + } + + public static T bytesToJson(byte[] bytes, TypeReference type){ + T object = null; + + try { + object = getObjectMapper().readValue(bytes, type); + } catch (IOException e) { + log.error("", e); + } + + return object; + } + +} diff --git a/src/main/java/com/palnet/comn/utils/LocationUtils.java b/src/main/java/com/palnet/comn/utils/LocationUtils.java new file mode 100644 index 0000000..ba8e355 --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/LocationUtils.java @@ -0,0 +1,68 @@ +package com.palnet.comn.utils; + +public class LocationUtils { + + + + /** + * 두 지점간의 거리 계산 + * + * @param lat1 지점 1 위도 + * @param lon1 지점 1 경도 + * @param lat2 지점 2 위도 + * @param lon2 지점 2 경도 + * @param unit 거리 표출단위 + * @return + */ + private static double distance(double lat1, double lon1, double lat2, double lon2, String unit) { + + double theta = lon1 - lon2; + double dist = Math.sin(deg2rad(lat1)) * Math.sin(deg2rad(lat2)) + Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * Math.cos(deg2rad(theta)); + + dist = Math.acos(dist); + dist = rad2deg(dist); + dist = dist * 60 * 1.1515; + + if (unit == "kilometer") { + dist = dist * 1.609344; + } else if(unit == "meter"){ + dist = dist * 1609.344; + } + + return (dist); + } + + + // This function converts decimal degrees to radians + private static double deg2rad(double deg) { + return (deg * Math.PI / 180.0); + } + + // This function converts radians to decimal degrees + private static double rad2deg(double rad) { + return (rad * 180 / Math.PI); + } + + + public static void main(String[] args) { + + // 마일(Mile) 단위 + double distanceMile = + distance(37.504198, 127.047967, 37.501025, 127.037701, ""); + + // 미터(Meter) 단위 + double distanceMeter = + distance(37.504198, 127.047967, 37.501025, 127.037701, "meter"); + + // 킬로미터(Kilo Meter) 단위 + double distanceKiloMeter = + distance(37.504198, 127.047967, 37.501025, 127.037701, "kilometer"); + + System.out.println(distanceMile) ; + System.out.println(distanceMeter) ; + System.out.println(distanceKiloMeter) ; + + + } + +} diff --git a/src/main/java/com/palnet/comn/utils/NumberUtils.java b/src/main/java/com/palnet/comn/utils/NumberUtils.java new file mode 100644 index 0000000..3c35d9c --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/NumberUtils.java @@ -0,0 +1,16 @@ +package com.palnet.comn.utils; + + +public class NumberUtils { + public static Double formatZero2(Double object) { + + Double result = 0.0; + if(object != null) { + result = Double.parseDouble(String.format("%.2f", object)); + + } + + return result; + + } +} diff --git a/src/main/java/com/palnet/comn/utils/StringUtils.java b/src/main/java/com/palnet/comn/utils/StringUtils.java new file mode 100644 index 0000000..4020b72 --- /dev/null +++ b/src/main/java/com/palnet/comn/utils/StringUtils.java @@ -0,0 +1,10 @@ +package com.palnet.comn.utils; + + +public class StringUtils { + public static String toStirng(Object object) { + + return object.toString().trim(); + + } +} diff --git a/src/main/java/com/palnet/server/SocketServer.java b/src/main/java/com/palnet/server/SocketServer.java new file mode 100644 index 0000000..93cc68a --- /dev/null +++ b/src/main/java/com/palnet/server/SocketServer.java @@ -0,0 +1,117 @@ +package com.palnet.server; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import com.palnet.server.initializer.SocketInitializer; + +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.AdaptiveRecvByteBufAllocator; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import io.netty.handler.logging.LogLevel; +import io.netty.handler.logging.LoggingHandler; + +@Component +public class SocketServer { + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${netty.socket.port}") + private int port; + + @Value("${netty.socket.thread.boss}") + private int threadBoss; + + @Value("${netty.socket.thread.worker}") + private int threadWorker; + + + private Channel ch; + + private EventLoopGroup bossGroup ; + private EventLoopGroup workerGroup ; + private ServerBootstrap b = new ServerBootstrap(); + +// @Autowired +// private AdsbClient client; +// + + @PostConstruct + public void postConstruct(){ + start(); + } + + + @PreDestroy + public void preDestroy(){ + + stop(); + } + + public void start(){ + try { + bossGroup = new NioEventLoopGroup(10); + workerGroup =new NioEventLoopGroup(); + + b.group(bossGroup , workerGroup) // bossGroup과 workerGroup은 NioEventLoopGroup의 인스턴스입니다.이 때 스레드 개수를 설정할 수 있음 각각 1, Runtime.getRuntime().availableProcessors() * 2로 설정했습니다. + .channel(NioServerSocketChannel.class) +// .handler(new LoggingHandler(LogLevel.valueOf(logBootstrap))) +// .handler(bootstrapHandler) // 채널이 활성화되면 소켓 서버와 소켓 클라이언트를 구동하게 되는 핸들러를 등록합니다. + .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000) + .option(ChannelOption.SO_BACKLOG, 1000) // 동시에 수용할 수 있는 소켓 연결 요청 수입니다. + +// .option(ChannelOption.RCVBUF_ALLOCATOR, new AdaptiveRecvByteBufAllocator(1024 , 1024 * 16 , 1024 * 1024)) + .childOption(ChannelOption.TCP_NODELAY, false) // 반응속도를 높이기 위해 Nagle 알고리즘을 비활성화 합니다 + + .childOption(ChannelOption.SO_LINGER, 0) // 소켓이 close될 때 신뢰성있는 종료를 위해 4way-handshake가 발생하고 이때 TIME_WAIT로 리소스가 낭비됩니다. 이를 방지하기 위해 0으로 설정합니다. + .childOption(ChannelOption.SO_KEEPALIVE, false) // Keep-alive를 켭니다. + .childOption(ChannelOption.SO_REUSEADDR, false) // SO_LINGER설정이 있으면 안해도 되나 혹시나병(!)으로 TIME_WAIT걸린 포트를 재사용할 수 있도록 설정합니다. + .childHandler(new SocketInitializer()); + + connection(); +// taskProcess(); +// client.start(); + + logger.warn("====== [SOCKET SERVER] Start ====== "); + }catch (Exception e) { + logger.warn("====== [SOCKET SERVER] Fail ====== "); + logger.error(e.getMessage()); + } + + } + + private void connection() { + //서버는 Listen상태로 기다려야하는데, 톰캣이 Timeout이 발생함 + //이를 방지하기 위해 Thread로 처리한다. + new Thread(new Runnable() { + @Override + public void run() { + try { + ChannelFuture future = b.bind(port).sync(); + future.channel().closeFuture().sync(); + + } catch (InterruptedException e) { + logger.error("InterruptedException", e); + } + } + }).start(); + } + + + public void stop(){ + bossGroup.shutdownGracefully(); + workerGroup.shutdownGracefully(); + logger.warn("====== [SOCKET SERVER] STOP ====== "); + + } + +} diff --git a/src/main/java/com/palnet/server/WebServer.java b/src/main/java/com/palnet/server/WebServer.java new file mode 100644 index 0000000..fa7380e --- /dev/null +++ b/src/main/java/com/palnet/server/WebServer.java @@ -0,0 +1,124 @@ +package com.palnet.server; + +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import com.palnet.server.initializer.WebInitializer; +import com.palnet.server.task.ctr.CtrCntrlTask; + +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import io.netty.handler.logging.LogLevel; +import io.netty.handler.logging.LoggingHandler; + +@Component +public class WebServer { + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${netty.websocket.port}") + private int port; + + @Value("${netty.websocket.thread.boss}") + private int threadBoss; + + @Value("${netty.websocket.thread.worker}") + private int threadWorker; + + @Value("${netty.task.controlinfoTime}") + private int controlinfoTime; + + + private Channel ch; + + private EventLoopGroup bossGroup ; + private EventLoopGroup workerGroup ; + private ServerBootstrap b = new ServerBootstrap(); + + @PostConstruct + public void postConstruct(){ + start(); + } + + + @PreDestroy + public void preDestroy(){ + + stop(); + } + + public void start(){ + try { + bossGroup = new NioEventLoopGroup(); + workerGroup =new NioEventLoopGroup(); + + b.group(bossGroup , workerGroup) // bossGroup과 workerGroup은 NioEventLoopGroup의 인스턴스입니다.이 때 스레드 개수를 설정할 수 있음 각각 1, Runtime.getRuntime().availableProcessors() * 2로 설정했습니다. + .channel(NioServerSocketChannel.class) +// .handler(new LoggingHandler(LogLevel.valueOf(logBootstrap))) +// .handler(bootstrapHandler) // 채널이 활성화되면 소켓 서버와 소켓 클라이언트를 구동하게 되는 핸들러를 등록합니다. + .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000) + .option(ChannelOption.SO_BACKLOG, 1000) // 동시에 수용할 수 있는 소켓 연결 요청 수입니다. + .childOption(ChannelOption.TCP_NODELAY, true) // 반응속도를 높이기 위해 Nagle 알고리즘을 비활성화 합니다 + .childOption(ChannelOption.SO_LINGER, 0) // 소켓이 close될 때 신뢰성있는 종료를 위해 4way-handshake가 발생하고 이때 TIME_WAIT로 리소스가 낭비됩니다. 이를 방지하기 위해 0으로 설정합니다. + .childOption(ChannelOption.SO_KEEPALIVE, true) // Keep-alive를 켭니다. + .childOption(ChannelOption.SO_REUSEADDR, true) // SO_LINGER설정이 있으면 안해도 되나 혹시나병(!)으로 TIME_WAIT걸린 포트를 재사용할 수 있도록 설정합니다. + .childHandler(new WebInitializer()); + + connection(); + taskProcess(); + + logger.warn("====== [WEBSOCKET SERVER] Start ====== "); + }catch (Exception e) { + logger.warn("====== [WEBSOCKET SERVER] Fail ====== "); + logger.error(e.getMessage()); + } + + } + + private void connection() { + //서버는 Listen상태로 기다려야하는데, 톰캣이 Timeout이 발생함 + //이를 방지하기 위해 Thread로 처리한다. + new Thread(new Runnable() { + @Override + public void run() { + try { + ChannelFuture future = b.bind(port).sync(); + future.channel().closeFuture().sync(); + + } catch (InterruptedException e) { + logger.error("InterruptedException", e); + } + } + }).start(); + } + + private void taskProcess() { + ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(); + service.scheduleAtFixedRate(new CtrCntrlTask(),0,controlinfoTime,TimeUnit.MILLISECONDS); + } + + + public void stop(){ + bossGroup.shutdownGracefully(); + workerGroup.shutdownGracefully(); + logger.warn("====== [WEBSOCKET SERVER] STOP ====== "); +// ch.close().addListener(f->{ +// logger.warn("====== [WEBSOCKET SERVER] CLOSE ====== "); +// bossGroup.shutdownGracefully(); +// workerGroup.shutdownGracefully(); +// }); + } +} diff --git a/src/main/java/com/palnet/server/codec/BigIntegerDecoder.java b/src/main/java/com/palnet/server/codec/BigIntegerDecoder.java new file mode 100644 index 0000000..211e369 --- /dev/null +++ b/src/main/java/com/palnet/server/codec/BigIntegerDecoder.java @@ -0,0 +1,53 @@ +/* + * Copyright 2012 The Netty Project + * + * The Netty Project licenses this file to you under the Apache License, + * version 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at: + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ +package com.palnet.server.codec; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.codec.CorruptedFrameException; + +import java.math.BigInteger; +import java.util.List; + +/** + * Decodes the binary representation of a {@link BigInteger} prepended + * with a magic number ('F' or 0x46) and a 32-bit integer length prefix into a + * {@link BigInteger} instance. For example, { 'F', 0, 0, 0, 1, 42 } will be + * decoded into new BigInteger("42"). + */ +public class BigIntegerDecoder extends ByteToMessageDecoder { + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { + + + + System.out.println(">>>>>>>>>>>>>>>>>>>>>" + in.readableBytes()); + + if (in.isReadable()) { + byte[] bytes = new byte[in.readableBytes()]; + + int readerIndex = in.readerIndex(); + in.getBytes(readerIndex, bytes); + + System.out.println(">>>" + new String(bytes)); + + } + // Wait until the length prefix is available. + + } +} diff --git a/src/main/java/com/palnet/server/codec/SocketPayLoadDecoder.java b/src/main/java/com/palnet/server/codec/SocketPayLoadDecoder.java new file mode 100644 index 0000000..d6936fb --- /dev/null +++ b/src/main/java/com/palnet/server/codec/SocketPayLoadDecoder.java @@ -0,0 +1,43 @@ +package com.palnet.server.codec; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.palnet.comn.utils.JsonUtils; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandler.Sharable; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; +import io.netty.handler.codec.json.JsonObjectDecoder; + +@Sharable +public class SocketPayLoadDecoder extends MessageToMessageDecoder { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + protected void decode(ChannelHandlerContext ctx, Object msg, List out){ +// logger.info("[SocketPayLoadDecoder] Init 2 " ); + SocketPayload payload = null; + + try { + payload = JsonUtils.fromJson((String) msg, SocketPayload.class); + if(payload != null) { + out.add(payload); + + } + }catch(Exception e) { + logger.info("MSG => " + msg ); + logger.error(e.getMessage()); + + } + + + + } + + +} diff --git a/src/main/java/com/palnet/server/codec/SocketPayLoadEncorder.java b/src/main/java/com/palnet/server/codec/SocketPayLoadEncorder.java new file mode 100644 index 0000000..13cce85 --- /dev/null +++ b/src/main/java/com/palnet/server/codec/SocketPayLoadEncorder.java @@ -0,0 +1,38 @@ +package com.palnet.server.codec; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.palnet.comn.utils.JsonUtils; + +import io.netty.channel.ChannelHandler.Sharable; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageEncoder; + +@Sharable +public class SocketPayLoadEncorder extends MessageToMessageEncoder { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + + @Override + protected void encode(ChannelHandlerContext ctx, SocketPayloadResponse msg, List out){ + try { + out.add(JsonUtils.toJson(msg)); +// logger.debug("[SocketPayLoadEncorder] Init 11111" ); + logger.info("=== >>>>>>>>>>>>>>" , JsonUtils.toJson(msg)); + }catch(Exception e) { + logger.info("MSG => " + msg ); + logger.error(e.getMessage()); + } + + + + } + + + + +} diff --git a/src/main/java/com/palnet/server/codec/SocketPayload.java b/src/main/java/com/palnet/server/codec/SocketPayload.java new file mode 100644 index 0000000..207ce0d --- /dev/null +++ b/src/main/java/com/palnet/server/codec/SocketPayload.java @@ -0,0 +1,23 @@ +package com.palnet.server.codec; + +import java.io.Serializable; +import java.util.List; + +import lombok.Data; + +@Data +public class SocketPayload implements Serializable{ + + private static final long serialVersionUID = 1L; + + private String authKey; + + private String terminalId; + + private String command; + + private Object body; + + + +} diff --git a/src/main/java/com/palnet/server/codec/SocketPayloadResponse.java b/src/main/java/com/palnet/server/codec/SocketPayloadResponse.java new file mode 100644 index 0000000..26a8145 --- /dev/null +++ b/src/main/java/com/palnet/server/codec/SocketPayloadResponse.java @@ -0,0 +1,19 @@ +package com.palnet.server.codec; + +import java.io.Serializable; +import java.util.List; + +import lombok.Data; + +@Data +public class SocketPayloadResponse implements Serializable{ + + private static final long serialVersionUID = 1L; + + private String rspCode; + + private String rspMessage; + + + +} diff --git a/src/main/java/com/palnet/server/codec/WebPayLoadDecoder.java b/src/main/java/com/palnet/server/codec/WebPayLoadDecoder.java new file mode 100644 index 0000000..80d1c4f --- /dev/null +++ b/src/main/java/com/palnet/server/codec/WebPayLoadDecoder.java @@ -0,0 +1,23 @@ +package com.palnet.server.codec; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelHandler.Sharable; +import io.netty.handler.codec.MessageToMessageDecoder; + +@Sharable +public class WebPayLoadDecoder extends MessageToMessageDecoder { + + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override + protected void decode(ChannelHandlerContext ctx, String msg, List out) throws Exception { + logger.info("MSG ::" + msg); + + } + + +} diff --git a/src/main/java/com/palnet/server/codec/WebPayLoadEncorder.java b/src/main/java/com/palnet/server/codec/WebPayLoadEncorder.java new file mode 100644 index 0000000..fc20949 --- /dev/null +++ b/src/main/java/com/palnet/server/codec/WebPayLoadEncorder.java @@ -0,0 +1,27 @@ +package com.palnet.server.codec; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.netty.channel.ChannelHandler.Sharable; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageEncoder; + +@Sharable +public class WebPayLoadEncorder extends MessageToMessageEncoder { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + + @Override + protected void encode(ChannelHandlerContext ctx, String msg, List out) throws Exception { + logger.info("MSG ::" + msg); + + } + + + + +} diff --git a/src/main/java/com/palnet/server/collection/ChannelCollection.java b/src/main/java/com/palnet/server/collection/ChannelCollection.java new file mode 100644 index 0000000..5e7f318 --- /dev/null +++ b/src/main/java/com/palnet/server/collection/ChannelCollection.java @@ -0,0 +1,28 @@ +package com.palnet.server.collection; + +import java.io.Serializable; + +import io.netty.channel.Channel; +import io.netty.channel.group.ChannelGroup; +import io.netty.channel.group.DefaultChannelGroup; +import io.netty.util.concurrent.GlobalEventExecutor; + + +public class ChannelCollection{ + + private static final long serialVersionUID = 1L; + + //접속 되어있는 모든 Channel + private static final ChannelGroup allChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); + + + public void setAllChannels(Channel ch) { + allChannels.add(ch); + } + + public ChannelGroup getAllChannels() { + return allChannels; + } + + +} diff --git a/src/main/java/com/palnet/server/command/SocketCommand.java b/src/main/java/com/palnet/server/command/SocketCommand.java new file mode 100644 index 0000000..3296e6d --- /dev/null +++ b/src/main/java/com/palnet/server/command/SocketCommand.java @@ -0,0 +1,143 @@ +package com.palnet.server.command; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.palnet.comn.collection.GPCollection; +import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.model.GPModel; +import com.palnet.comn.utils.JsonUtils; +import com.palnet.comn.utils.StringUtils; +import com.palnet.server.codec.SocketPayload; + +public class SocketCommand { + + private Logger logger = LoggerFactory.getLogger(getClass()); + GPCollection collection = new GPCollection(); + + + public void openSkyCollectionPut(SocketPayload payload) { + + /** 전문 설정 ***/ + String messageType = "OPENSKY"; + String objectType = "FLIGHT"; + + List> resultList = new ArrayList>(); + + List dataList = new ArrayList(); + + logger.debug("BODY TYPE :: " + payload.getBody().getClass()); + + resultList = (ArrayList)payload.getBody(); + + GPModel model; + + for(LinkedHashMap obj : resultList) { + model = new GPModel(); + + model.setObjectType(objectType); + model.setMessageType(messageType); + model.setObjectId(obj.get("objectId").toString().trim()); + model.setTerminalId(obj.get("terminalId").toString().trim()); + model.setLat((Double)obj.get("lat")); + model.setLng((Double)obj.get("lng")); + model.setElev((Double)obj.get("elev")); + model.setTerminalRcvDt(obj.get("terminalRcvDt").toString().trim()); + model.setSpeed((Double)obj.get("speed")); + model.setHeading((Double)obj.get("heading")); + model.setSpeedType((String)obj.get("speedType")); + model.setElevType((String)obj.get("elevType")); + model.setMoveDistanceType((String)obj.get("moveDistanceType")); + model.setMoveDistance((Double)obj.get("moveDistance")); + + model.setBetteryLevel((Double)obj.get("betteryLevel")); + model.setBetteryVoltage((Double)obj.get("betteryVoltage")); + model.setDronStatus((String)obj.get("dronStatus")); + + dataList.add(model); + } + + collection.putData(dataList); + logger.debug("SIZE :: " +collection.getData().size() ); + + + } + + + /** + * 들어온 데이터를 collection넣는 작업을 한다. + * @param payload + */ + public void sandboxCollectionPut(SocketPayload payload) { + + /** 전문 설정 ***/ + String messageType = "LTEM"; + String objectType = "DRON"; + + List> resultList = new ArrayList>(); + + List dataList = new ArrayList(); + + logger.debug("BODY TYPE :: " + payload.getBody().getClass()); + + resultList = (ArrayList)payload.getBody(); + + GPModel model; + + for(LinkedHashMap obj : resultList) { + + //위,경도 좌표가 0으로 들어오는 것은 무시 처리 + if((Double)obj.get("lat") > 0 && (Double)obj.get("lon") > 0) { + model = new GPModel(); +// logger.debug(">>>>" + obj.toString()); + model.setObjectType(objectType); + model.setMessageType(messageType); + model.setObjectId(obj.get("objectId").toString().trim()); + model.setTerminalId(payload.getTerminalId()); + if(obj.get("lat") != null) model.setLat(Double.valueOf(obj.get("lat").toString())); + if(obj.get("lon") != null) model.setLng(Double.valueOf(obj.get("lon").toString())); + if(obj.get("elev") != null) model.setElev(Double.valueOf(obj.get("elev").toString())); + model.setTerminalRcvDt(obj.get("terminalRcvDt").toString().trim()); + if(obj.get("speed") != null) model.setSpeed(Double.valueOf(obj.get("speed").toString())); + if(obj.get("heading") != null) model.setHeading(Double.valueOf(obj.get("heading").toString())); + model.setSpeedType((String)obj.get("speedType")); + model.setElevType((String)obj.get("elevType")); + model.setMoveDistanceType((String)obj.get("moveDistanceType")); + if(obj.get("moveDistance") != null) model.setMoveDistance(Double.valueOf(obj.get("moveDistance").toString())); + + if(obj.get("betteryLevel") != null) model.setBetteryLevel(Double.valueOf(obj.get("betteryLevel").toString())); + if(obj.get("betteryVoltage") != null) model.setBetteryVoltage(Double.valueOf(obj.get("betteryVoltage").toString())); + model.setDronStatus((String)obj.get("dronStatus")); + + // 환경 데이터 필드 추가 + if(obj.get("sensorCo") != null) model.setSensorCo(Double.valueOf(obj.get("sensorCo").toString())); + if(obj.get("sensorSo2") != null) model.setSensorSo2(Double.valueOf(obj.get("sensorSo2").toString())); + if(obj.get("sensorNo2") != null) model.setSensorNo2(Double.valueOf(obj.get("sensorNo2").toString())); + if(obj.get("sensorO3") != null) model.setSensorO3(Double.valueOf(obj.get("sensorO3").toString())); + if(obj.get("sensorDust") != null) model.setSensorDust(Double.valueOf(obj.get("sensorDust").toString())); + + // TODO 환경 데이터 임의의 데이터로 수정 - 추후 제거(임시코드) +// if(model.getSensorCo() != null){ +// model.setSensorCo(TempUtils.gradualData("co")); +// model.setSensorSo2(TempUtils.gradualData("so2")); +// model.setSensorNo2(TempUtils.gradualData("no2")); +// model.setSensorO3(TempUtils.gradualData("o3")); +// model.setSensorDust(TempUtils.gradualData("dust")); +// } + dataList.add(model); + }else { + logger.info("lat , lon No data "); + } + } + + collection.putData(dataList); + logger.debug("SIZE :: " +collection.getData().size() ); + + } + + +} diff --git a/src/main/java/com/palnet/server/command/TempUtils.java b/src/main/java/com/palnet/server/command/TempUtils.java new file mode 100644 index 0000000..c96f3a1 --- /dev/null +++ b/src/main/java/com/palnet/server/command/TempUtils.java @@ -0,0 +1,81 @@ +package com.palnet.server.command; + +import lombok.Data; +import org.springframework.stereotype.Component; + +import java.util.Random; + +class SensorModel{ + static Double co = 0.0; + static Double preCo = 0.0; + static Double so2 = 0.0; + static Double preSo2 = 0.0; + static Double no2 = 0.0; + static Double preNo2 = 0.0; + static Double o3 = 0.0; + static Double preO3 = 0.0; + static Double dust = 0.0; + static Double preDust = 0.0; +} + +public class TempUtils{ + + + public static Double gradualData(String type){ + Double prev = 0.0; + Double result = 0.0; + switch(type){ + case "co": + // 일산화탄소 + prev = SensorModel.preCo; + SensorModel.preCo = SensorModel.co; + result = SensorModel.co = gradualDoubleData(SensorModel.co, prev, 0.1, 0.0, 20.0); + break; + case "so2": + // 아황산가스 + prev = SensorModel.preSo2; + SensorModel.preSo2 = SensorModel.so2; + result = SensorModel.so2 = gradualDoubleData(SensorModel.so2, prev, 0.005, 0.0, 0.2); + break; + case "no2": + // 이산화질소 + prev = SensorModel.preNo2; + SensorModel.preNo2 = SensorModel.no2; + result = SensorModel.no2 = gradualDoubleData(SensorModel.no2, prev, 0.003, 0.0, 0.3); + break; + case "o3": + // 오존 + prev = SensorModel.preO3; + SensorModel.preO3 = SensorModel.o3; + result = SensorModel.o3 = gradualDoubleData(SensorModel.o3, prev, 1.0, 0.0, 175.0); + break; + case "dust": + // 미세먼지 + prev = SensorModel.preDust; + SensorModel.preDust = SensorModel.dust; + result = SensorModel.dust = gradualDoubleData(SensorModel.dust, prev, 1.1, 0.0, 175.0); + break; + default: + result = (Math.round((new Random()).nextDouble() * 100000)) / 100.0; + break; + } + return result; + } + + public static Double gradualDoubleData(Double current, Double prev, Double diff, Double min, Double max){ + boolean isPrevAdd = current >= prev; + boolean isCurAdd = true; + if(isPrevAdd){ + isCurAdd = current + diff <= max; + }else { + isCurAdd = current - diff < min; + } + Double r = 0.0; + if(isCurAdd){ + r = current + diff; + } else { + r = current - diff; + } + return r; + } +} diff --git a/src/main/java/com/palnet/server/handler/SocketHandler.java b/src/main/java/com/palnet/server/handler/SocketHandler.java new file mode 100644 index 0000000..9400855 --- /dev/null +++ b/src/main/java/com/palnet/server/handler/SocketHandler.java @@ -0,0 +1,101 @@ +package com.palnet.server.handler; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; + +import com.palnet.comn.collection.AuthCollection; +import com.palnet.comn.utils.JsonUtils; +import com.palnet.server.codec.SocketPayload; +import com.palnet.server.codec.SocketPayloadResponse; +import com.palnet.server.command.SocketCommand; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class SocketHandler extends SimpleChannelInboundHandler { + + private Logger logger = LoggerFactory.getLogger(getClass()); + private SocketCommand command = new SocketCommand(); + + private AuthCollection auth = new AuthCollection(); + private SocketPayloadResponse res = new SocketPayloadResponse(); + + + @Override + public void channelActive(ChannelHandlerContext ctx) { + auth.reloadAuthkey(); // 채널 활성화 되면 인증키 정보를 다시 불러옴 + + logger.debug("==================== [SocketHandler channelActive ] ==================== "); + ctx.writeAndFlush("Server Connection"); + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, SocketPayload payload){ + + try { + + logger.debug("==================== [SocketHandler channelRead0 ] ==================== "); + logger.debug("AUTH KEY :: ==== > " +payload.getAuthKey()); +// logger.info(auth.checkAuthkey(payload.getAuthKey().toString().trim())); + + if(StringUtils.isEmpty(payload.getAuthKey())) { + // 인증키가 없을 경우 + logger.debug("AUTH : no key " ); + res.setRspCode("-2000"); + res.setRspMessage("inValidate AuthKey"); + }else if(!auth.checkAuthkey(payload.getAuthKey().toString().trim())) { + // 인증키가 틀린 경우 + logger.debug("AUTH : error key " ); + logger.debug(payload.getAuthKey() ); +// logger.info(auth.checkAuthkey(payload.getAuthKey().toString().trim())); + res.setRspCode("-2000"); + res.setRspMessage("inValidate AuthKey"); + }else{ + logger.warn("MSG :: ==== > " + JsonUtils.toJson(payload)); + + switch(payload.getCommand().trim()) { + case "OPENSKY" : + command.openSkyCollectionPut(payload); + break; + case "SANDBOX": + command.sandboxCollectionPut(payload); + break; + default: + break; + } + + res.setRspCode("0"); + res.setRspMessage("SUCCESS"); + + } + + + }catch(Exception e) { + res.setRspCode("-9999"); + res.setRspMessage("Etc error"); + + e.printStackTrace(); + }finally { + logger.debug("res >>>" + JsonUtils.toJson(res)); + ctx.writeAndFlush(res); + } + + + } + + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + logger.info("=========== [exceptionCaught ] ===================="); + res.setRspCode("-9999"); + res.setRspMessage("Etc error"); + ctx.writeAndFlush(res); + + cause.printStackTrace(); + ctx.close(); + } + + + +} diff --git a/src/main/java/com/palnet/server/handler/WebCommandHandler.java b/src/main/java/com/palnet/server/handler/WebCommandHandler.java new file mode 100644 index 0000000..7d6c217 --- /dev/null +++ b/src/main/java/com/palnet/server/handler/WebCommandHandler.java @@ -0,0 +1,21 @@ +package com.palnet.server.handler; + +import com.palnet.server.codec.SocketPayload; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class WebCommandHandler extends SimpleChannelInboundHandler{ + + @Override + protected void channelRead0(ChannelHandlerContext ctx, SocketPayload payload) throws Exception { + switch (payload.getCommand()) { + case "OPENSKY" : + + default: + } + + } + + +} diff --git a/src/main/java/com/palnet/server/handler/WebHandler.java b/src/main/java/com/palnet/server/handler/WebHandler.java new file mode 100644 index 0000000..9ebac6f --- /dev/null +++ b/src/main/java/com/palnet/server/handler/WebHandler.java @@ -0,0 +1,91 @@ +package com.palnet.server.handler; + +import java.net.SocketAddress; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.palnet.server.codec.SocketPayload; +import com.palnet.server.collection.ChannelCollection; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.channel.group.ChannelGroup; +import io.netty.channel.group.DefaultChannelGroup; +import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; +import io.netty.handler.codec.http.websocketx.WebSocketFrame; +import io.netty.util.concurrent.GlobalEventExecutor; + +public class WebHandler extends SimpleChannelInboundHandler{ + + private Logger logger = LoggerFactory.getLogger(getClass()); + + ChannelCollection cc = new ChannelCollection(); + + + @Override + protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) throws Exception { + + logger.info("==================== [ channelRead0 ] ==================== "); + + logger.info("Channel Size [" + cc.getAllChannels().size() + "]"); + + cc.getAllChannels().stream().forEach(c -> { + logger.info(":" + c); + c.writeAndFlush(new TextWebSocketFrame("test")); +// command.execute(c, data, result); + }); + + + + +// ctx.writeAndFlush(new TextWebSocketFrame("Test")); + + } + +// private class HeartBeatTask implements Runnable{ +// +// private final ChannelHandlerContext ctx; +// +// public HeartBeatTask(final ChannelHandlerContext ctx){ +// this.ctx = ctx; +// } +// +// public void run() { +// ctx.writeAndFlush(new TextWebSocketFrame("test")); +// +// System.out.println("Client send heart beat message to server : ---> "); +// } +// +// } + + @Override + public void channelActive(ChannelHandlerContext ctx) throws Exception { +// SocketAddress remoteAddress = ctx.channel().remoteAddress(); + cc.setAllChannels(ctx.channel()); +// ctx.executor().scheduleAtFixedRate(new HeartBeatTask(ctx),0,500, +// TimeUnit.MILLISECONDS); + logger.info("==================== [ channelActive ] ==================== "); + + + + } + + @Override + public void channelInactive(ChannelHandlerContext ctx) throws Exception { + logger.info("==================== [ channelInactive ] ==================== "); + } + + + + @Override + public void channelRegistered(ChannelHandlerContext ctx) throws Exception { + //2 Triggered when a connection is established with the selector of a thread in the worker thread group (channel is registered to EventLoop) + logger.info("==================== [ channelRegistered ] ==================== "); + } + + +} diff --git a/src/main/java/com/palnet/server/initializer/SocketInitializer.java b/src/main/java/com/palnet/server/initializer/SocketInitializer.java new file mode 100644 index 0000000..1869c46 --- /dev/null +++ b/src/main/java/com/palnet/server/initializer/SocketInitializer.java @@ -0,0 +1,70 @@ +package com.palnet.server.initializer; + +import java.util.List; + +import com.palnet.server.codec.BigIntegerDecoder; +import com.palnet.server.codec.SocketPayLoadDecoder; +import com.palnet.server.codec.SocketPayLoadEncorder; +import com.palnet.server.codec.WebPayLoadDecoder; +import com.palnet.server.codec.WebPayLoadEncorder; +import com.palnet.server.handler.WebHandler; +import com.palnet.server.handler.SocketHandler; +import com.palnet.server.handler.WebCommandHandler; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.socket.SocketChannel; +import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.codec.DelimiterBasedFrameDecoder; +import io.netty.handler.codec.Delimiters; +import io.netty.handler.codec.http.HttpObjectAggregator; +import io.netty.handler.codec.http.HttpServerCodec; +import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; +import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler; +import io.netty.handler.codec.json.JsonObjectDecoder; +import io.netty.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; +import io.netty.handler.timeout.IdleStateHandler; +import io.netty.util.CharsetUtil; + +public class SocketInitializer extends ChannelInitializer{ + + @Override + protected void initChannel(SocketChannel ch) throws Exception { + ChannelPipeline pipeline = ch.pipeline(); + +// pipeline.addLast(new BigIntegerDecoder()) +// pipeline.addLast(new ByteToMessageDecoder() { +// +// @Override +// protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception { +// out.add(in.readBytes(in.readableBytes())); +// out.add(in.readBytes(in.readableBytes())); +// +// } +// }) + + +// pipeline.addLast(new StringDecoder(CharsetUtil.UTF_8), new StringEncoder(CharsetUtil.UTF_8)) + pipeline.addLast(new JsonObjectDecoder(655360)) +// .addLast(new DelimiterBasedFrameDecoder(1024 * 1024 , )) +// .addLast(new DelimiterBasedFrameDecoder(1024 * 1024 * 100 , Delimiters.nulDelimiter())) + .addLast(new StringDecoder(CharsetUtil.UTF_8), new StringEncoder(CharsetUtil.UTF_8)) +// .addLast(new HttpServerCodec()) +// .addLast(new HttpObjectAggregator(104857600)) +// .addLast(new DelimiterBasedFrameDecoder(Integer.MAX_VALUE, Unpooled.wrappedBuffer(new byte[]{'E', 'O', 'F', '\n'}))) + .addLast(new SocketPayLoadDecoder() , new SocketPayLoadEncorder()) + .addLast(new SocketHandler()); +// pipeline.addLast(new HttpServerCodec()) + +// pipeline.addLast(new HttpObjectAggregator(65536)) +// pipeline.addLast(new IdleStateHandler(0, 0, 180)); // [5] +// .addLast(new WebPayLoadDecoder() , new WebPayLoadEncorder()) +// .addLast(new DemoHandler()); + + } + +} diff --git a/src/main/java/com/palnet/server/initializer/WebInitializer.java b/src/main/java/com/palnet/server/initializer/WebInitializer.java new file mode 100644 index 0000000..3e9127f --- /dev/null +++ b/src/main/java/com/palnet/server/initializer/WebInitializer.java @@ -0,0 +1,38 @@ +package com.palnet.server.initializer; + +import com.palnet.server.codec.WebPayLoadDecoder; +import com.palnet.server.codec.WebPayLoadEncorder; +import com.palnet.server.handler.WebHandler; +import com.palnet.server.handler.WebCommandHandler; + +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.socket.SocketChannel; +import io.netty.handler.codec.http.HttpObjectAggregator; +import io.netty.handler.codec.http.HttpServerCodec; +import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; +import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler; +import io.netty.handler.timeout.IdleStateHandler; + +public class WebInitializer extends ChannelInitializer{ + + @Override + protected void initChannel(SocketChannel ch) throws Exception { + ChannelPipeline pipeline = ch.pipeline(); + pipeline.addLast(new HttpServerCodec()) + .addLast(new HttpObjectAggregator(65536)) + .addLast(new WebSocketServerCompressionHandler()) + .addLast(new WebSocketServerProtocolHandler("/ws", null, true)) + .addLast(new IdleStateHandler(0, 0, 180)) // [5] +// .addLast(idleHandler) // [6] +// .addLast(healthEndpointHandler) // [7] + .addLast(new WebPayLoadDecoder() , new WebPayLoadEncorder()) +// .addLast(new WebCommandHandler()) + .addLast(new WebHandler()); + +// .addLast(authHandler) // [9] +// .addLast(commandHandler); // [10] + + } + +} diff --git a/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java b/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java new file mode 100644 index 0000000..9295997 --- /dev/null +++ b/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java @@ -0,0 +1,38 @@ +package com.palnet.server.task.ctr; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.palnet.biz.api.ctr.cntrl.service.CtrCntrlService; +import com.palnet.comn.utils.JsonUtils; +import com.palnet.server.collection.ChannelCollection; +import com.palnet.server.task.ctr.service.CtrCntrlTaskService; + +import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; + +public class CtrCntrlTask implements Runnable{ + + private ChannelCollection cc = new ChannelCollection(); + + private Logger logger = LoggerFactory.getLogger(getClass()); + + + private CtrCntrlTaskService service = new CtrCntrlTaskService(); + + + @Override + public void run() { + try { +// logger.info("=========== [Channel Size : " + cc.getAllChannels().size() + "]"); + + cc.getAllChannels().stream().forEach(c -> { // 접속되어 있는 모든 사용자에게 전달 처리 + c.writeAndFlush(new TextWebSocketFrame(JsonUtils.toJson(service.getList()))); + }); + }catch(Exception e) { + e.printStackTrace(); + } + + } + + +} diff --git a/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java b/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java new file mode 100644 index 0000000..e21510b --- /dev/null +++ b/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java @@ -0,0 +1,117 @@ +package com.palnet.server.task.ctr.service; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlModel; +import com.palnet.comn.collection.GPCollection; +import com.palnet.comn.collection.GPDatabaseCollection; +import com.palnet.comn.model.GPHistoryModel; +import com.palnet.comn.model.GPModel; + +@Service +public class CtrCntrlTaskService { + + GPCollection cic = new GPCollection(); + GPDatabaseCollection gpdc = new GPDatabaseCollection(); + + + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${gp.remove.time}") + private long GP_REMOVE_TIME; + + @Value("${gp.insert.count}") + private long GP_INSERT_COUNT; + + /** + * Websocket 을 통해 전달될 위치 정보를 관리 + * @return + */ + public ArrayList getList(){ + + Map cicData = cic.getData(); + + ArrayList list = new ArrayList(); + CtrCntrlModel model; + GPModel dataInfo; + + for(Entry data : cicData.entrySet()) { +// List> historyList = new ArrayList>(); + model = new CtrCntrlModel(); +// dataInfo = new GroundPositionInfoModel(); + dataInfo = data.getValue(); + + model.setObjectId(dataInfo.getObjectId()); + model.setControlId(dataInfo.getControlId()); + model.setControlStartDt(dataInfo.getControlStartDt()); + model.setObjectTypeCd(dataInfo.getObjectType()); + model.setLat(dataInfo.getLat()); + model.setLng(dataInfo.getLng()); + model.setElevType(dataInfo.getElevType()); + model.setElev(dataInfo.getElev()); + model.setSpeedType(dataInfo.getSpeedType()); + model.setSpeed(dataInfo.getSpeed()); + model.setBetteryLevel(dataInfo.getBetteryLevel()); + model.setBetteryVoltage(dataInfo.getBetteryVoltage()); + model.setDronStatus(dataInfo.getDronStatus()); + model.setHeading(dataInfo.getHeading()); + model.setMoveDistance(dataInfo.getMoveDistance()); + model.setMoveDistanceType(dataInfo.getMoveDistanceType()); + + model.setServerRcvDt(dataInfo.getServerRcvDt()); + + // 환경 데이터 필드 추가 + model.setSensorCo(dataInfo.getSensorCo()); + model.setSensorSo2(dataInfo.getSensorSo2()); + model.setSensorNo2(dataInfo.getSensorNo2()); + model.setSensorO3(dataInfo.getSensorO3()); + model.setSensorDust(dataInfo.getSensorDust()); + + //마지막 5개 좌표를 넣기 +// if(dataInfo.getPostionHistory() != null) { +// int listSize = dataInfo.getPostionHistory().size(); +// int limitSize = 10; +// +// if(limitSize >= listSize) { +// limitSize = listSize; +// } +// List tempHistoryList = new ArrayList(); +// +// tempHistoryList = dataInfo.getPostionHistory().subList(listSize - limitSize , listSize); +// +// +// //뒤집기 +// Collections.reverse(tempHistoryList); +// +// for(GroundPositionHistoryModel historyData : tempHistoryList) { +// Map addDate = new HashMap(); +// addDate.put("lat", historyData.getLat()); +// addDate.put("lng", historyData.getLng()); +// +// historyList.add(addDate); +// } +// } +// model.setLastHistory(historyList); + list.add(model); + } + + //=== 정렬 처리 == + //기준 : 관제 시작일이 가장 느린순으로 상단에 올린다. + list.sort(Comparator.reverseOrder()); + + return list; + } + + + +} diff --git a/src/main/resources/application-database.yml b/src/main/resources/application-database.yml new file mode 100644 index 0000000..cea9338 --- /dev/null +++ b/src/main/resources/application-database.yml @@ -0,0 +1,60 @@ +spring: + profiles: local + datasource: + control: + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbc-url: jdbc:log4jdbc:mysql://13.125.97.21:3306/CM_CONTROL?characterEncoding=UTF-8&autoReconnect=true&useSSL=false + username: cm_control + password: palnet!234 +# minimumidle: 5 + maximumpoolsize: 1 + idletimeout: 60000 + maxlifetime: 300000 + connectiontimeout: 30000 + validationtimeout: 5000 +--- +spring: + profiles: dev + datasource: + control: + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbc-url: jdbc:log4jdbc:mysql://13.125.97.21:3306/CM_CONTROL?characterEncoding=UTF-8&autoReconnect=true&useSSL=false + username: cm_control + password: palnet!234 + minimumidle: 5 + maximumpoolsize: 5 + idletimeout: 60000 + maxlifetime: 300000 + connectiontimeout: 30000 + validationtimeout: 5000 +--- +spring: + profiles: prod + datasource: + control: + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbc-url: jdbc:log4jdbc:mysql://palnet.cexpliz30rwl.ap-northeast-2.rds.amazonaws.com:3306/CM_CONTROL?characterEncoding=UTF-8&autoReconnect=true&useSSL=false + username: cm_control + password: palnet!234 + minimumidle: 10 + maximumpoolsize: 20 + idletimeout: 60000 + maxlifetime: 300000 + connectiontimeout: 30000 + validationtimeout: 5000 + +--- +spring: + profiles: prod2 + datasource: + control: + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbc-url: jdbc:log4jdbc:mysql://palnet.cexpliz30rwl.ap-northeast-2.rds.amazonaws.com:3306/CM_CONTROL?characterEncoding=UTF-8&autoReconnect=true&useSSL=false + username: cm_control + password: palnet!234 + minimumidle: 10 + maximumpoolsize: 20 + idletimeout: 60000 + maxlifetime: 300000 + connectiontimeout: 30000 + validationtimeout: 5000 diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..be911f1 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,13 @@ +## file save +file.path.save=/download/save + +################# SMS ###################### +sms.usercode = palnet +sms.deptcode = C2-2C0-0H +sms.reqname = KATA +sms.reqphone = 02-6200-3912 +sms.result = 0 +sms.reqtime = 00000000000000 +sms.kind = S +sms.subject.certify = KATA +sms.callname.certify = KATA \ No newline at end of file diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties new file mode 100644 index 0000000..995624b --- /dev/null +++ b/src/main/resources/application-local.properties @@ -0,0 +1,14 @@ + +file.path.save=/files + + +################# SMS ###################### +sms.usercode = palnet +sms.deptcode = C2-2C0-0H +sms.reqname = KATA +sms.reqphone = 02-6200-3912 +sms.result = 0 +sms.reqtime = 00000000000000 +sms.kind = S +sms.subject.certify = KATA +sms.callname.certify = KATA \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..bdd2c6c --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,14 @@ +## file save +file.path.save=/download/save + + +################# SMS ###################### +sms.usercode = palnet +sms.deptcode = C2-2C0-0H +sms.reqname = KATA +sms.reqphone = 02-6200-3912 +sms.result = 0 +sms.reqtime = 00000000000000 +sms.kind = S +sms.subject.certify = KATA +sms.callname.certify = KATA \ No newline at end of file diff --git a/src/main/resources/application-prod2.properties b/src/main/resources/application-prod2.properties new file mode 100644 index 0000000..bdd2c6c --- /dev/null +++ b/src/main/resources/application-prod2.properties @@ -0,0 +1,14 @@ +## file save +file.path.save=/download/save + + +################# SMS ###################### +sms.usercode = palnet +sms.deptcode = C2-2C0-0H +sms.reqname = KATA +sms.reqphone = 02-6200-3912 +sms.result = 0 +sms.reqtime = 00000000000000 +sms.kind = S +sms.subject.certify = KATA +sms.callname.certify = KATA \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..1f94f9f --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,27 @@ + + +###### GP 데이터 데이터 저장 설정 ####### +gp.remove.time = 5 +gp.insert.count = 1000 +gp.end.time=10 + +####### Naver 주소변화 API 값 ############# +naver.api.id=5md90yszqj +naver.api.key=uCJci6Ixm4DN7hUGtSrjKh6NU6z0SOKq9idpkLat +naver.api.url=https://naveropenapi.apigw.ntruss.com/map-reversegeocode/v2/gc + +### Token key ###### +spring.jwt.secret=jwtsecretkey +spring.jwt.prefix=palnet + + +### AWS S3 #### +#cloud.aws.credentials.accessKey=AKIAW75VMZKFTMBRXK4I +cloud.aws.credentials.accessKey=AKIAW75VMZKFTMBRXK4I +cloud.aws.credentials.secretKey=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 +cloud.aws.stack.auto=false + +cloud.aws.s3.bucket=palnet-file +cloud.aws.region.static=ap-northeast-2 + +cloud.aws.s3.bucket.url=https://s3.ap-northeast-2.amazonaws.com/palnet-file \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..4ae64d7 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,194 @@ +spring: + profiles: + include: + - database + jackson: + time-zone: Asia/Seoul + +# mvc: +# view: +# prefix: /WEB-INF/jsp/ +# suffix: .jsp + +logging: + config: classpath:config/log/logback-spring.xml + +--- + +spring: + profiles: local + devtools: + livereload: + enabled: true +# redis: +# host: ec2-54-180-88-137.ap-northeast-2.compute.amazonaws.com +# port: 6379 +# database: 3 + servlet: + multipart: + enabled: true + file-size-threshold: 2KB + max-file-size: 100MB + max-request-size: 100MB + jpa: + hibernate: + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + ddl-auto: none + properties: + hibernate: +# use_sql_comments: true + use_sql_comments: false +# show_sql: true + show_sql: false +# format_sql: true + format_sql: false +server: + port: 8080 + servlet: + context-path: / + +netty: + task : + controlinfoTime: 2000 + + websocket: + port: 8081 + thread: + boss: 1 + worker: 1 + socket: + port: 8082 + thread: + boss: 1 + worker: 1 +--- + +spring: + profiles: dev + devtools: + livereload: + enabled: true +# redis: +# host: ec2-54-180-88-137.ap-northeast-2.compute.amazonaws.com +# port: 6379 +# database: 3 + jpa: + hibernate: + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + ddl-auto: none + properties: + hibernate: + use_sql_comments: false + show_sql: false + format_sql: false +server: + port: 8080 + servlet: + context-path: / + +netty: + task : + controlinfoTime: 1000 + + websocket: + port: 8081 + thread: + boss: 1 + worker: 1 + socket: + port: 8082 + thread: + boss: 1 + worker: 1 + +--- + +spring: + profiles: prod + devtools: + livereload: + enabled: true +# redis: +# host: qrcode-redis-common.lh9tsq.ng.0001.apn2.cache.amazonaws.com +# port: 6379 +# database: 1 + jpa: + hibernate: + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + ddl-auto: none + properties: + hibernate: + use_sql_comments: false + show_sql: false + format_sql: false +server: + port: 8080 + servlet: + context-path: / + tomcat: + max-connections: 5000 + max-threads: 200 + use-relative-redirects: true + +netty: + task : + controlinfoTime: 10000 + + websocket: + port: 8081 + thread: + boss: 1 + worker: 1 + socket: + port: 8082 + thread: + boss: 1 + worker: 1 + +--- + +spring: + profiles: prod2 + devtools: + livereload: + enabled: true +# redis: +# host: qrcode-redis-common.lh9tsq.ng.0001.apn2.cache.amazonaws.com +# port: 6379 +# database: 1 + jpa: + hibernate: + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + ddl-auto: none + properties: + hibernate: + use_sql_comments: false + show_sql: false + format_sql: false +server: + port: 8181 + servlet: + context-path: / + tomcat: + max-connections: 10000 + max-threads: 200 + use-relative-redirects: true + +netty: + task : + controlinfoTime: 1000 + + websocket: + port: 8081 + thread: + boss: 1 + worker: 1 + socket: + port: 8082 + thread: + boss: 1 + worker: 1 diff --git a/src/main/resources/config/log/logback-spring.xml b/src/main/resources/config/log/logback-spring.xml new file mode 100644 index 0000000..7749f7a --- /dev/null +++ b/src/main/resources/config/log/logback-spring.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + ${LOG_PATH_NAME} + + + ${LOG_PATH_NAME}.%d{yyyyMMdd} + 60 + + + %d{yyyy-MM-dd HH:mm:ss} [%-5p] [%F]%M\(%L\) : %m%n + + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%-5p][$thread] %logger{40} [%F]%M\(%L\) : %m%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/com/palnet/ControlServerApplicationTests.java b/src/test/java/com/palnet/ControlServerApplicationTests.java new file mode 100644 index 0000000..b2d00d3 --- /dev/null +++ b/src/test/java/com/palnet/ControlServerApplicationTests.java @@ -0,0 +1,13 @@ +package com.palnet; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ControlServerApplicationTests { + +// @Test +// void contextLoads() { +// } + +}