refactor: 불필요한 static 제거

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/ComFileBasDTO.java

@@ -25,20 +25,20 @@ public class ComFileBasDTO {
     private String createUserId; // 생성사용자ID
     private LocalDateTime createDt; // 생성일시
 
-    public static ComFileBas toEntity(ComFileBasDTO dto){
+    public ComFileBas toEntity(){
         return ComFileBas.builder()
-                .fileSno(dto.getFileSno())
-                .fileGroupNo(dto.getFileGroupNo())
-                .fileSaveNm(dto.getFileSaveNm())
-                .fileOriNm(dto.getFileOriNm())
-                .filePath(dto.getFilePath())
-                .fileExt(dto.getFileExt())
-                .fileSize(dto.getFileSize())
-                .delYn(dto.getDelYn())
-                .delUserId(dto.getDelUserId())
-                .delDt(dto.getDelDt())
-                .createUserId(dto.getCreateUserId())
-                .createDt(dto.getCreateDt())
+                .fileSno(this.getFileSno())
+                .fileGroupNo(this.getFileGroupNo())
+                .fileSaveNm(this.getFileSaveNm())
+                .fileOriNm(this.getFileOriNm())
+                .filePath(this.getFilePath())
+                .fileExt(this.getFileExt())
+                .fileSize(this.getFileSize())
+                .delYn(this.getDelYn())
+                .delUserId(this.getDelUserId())
+                .delDt(this.getDelDt())
+                .createUserId(this.getCreateUserId())
+                .createDt(this.getCreateDt())
                 .build();
     }
 

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java

@@ -76,37 +76,37 @@ public class FltPlanArcrftDTO {
         return dto;
     }
 
-    public static FltPlanArcrft toEntity(FltPlanArcrftDTO dto){
+    public FltPlanArcrft toEntity(){
         return FltPlanArcrft.builder()
-                .planArcrftSno(dto.getPlanArcrftSno())
-                .planSno(dto.getPlanSno())
-                .arcrftSno(dto.getArcrftSno())
-                .idntfNum(dto.getIdntfNum())
-                .groupNm(dto.getGroupNm())
-                .prdctNum(dto.getPrdctNum())
-                .arcrftTypeCd(dto.getArcrftTypeCd())
-                .arcrftModelNm(dto.getArcrftModelNm())
-                .prdctCmpnNm(dto.getPrdctCmpnNm())
-                .prdctDate(dto.getPrdctDate())
-                .arcrftLngth(dto.getArcrftLngth())
-                .arcrftWdth(dto.getArcrftWdth())
-                .arcrftHght(dto.getArcrftHght())
-                .arcrftWght(dto.getArcrftWght())
-                .arcrftWghtCd(dto.getArcrftWghtCd())
-                .wghtTypeCd(dto.getWghtTypeCd())
-                .imageUrl(dto.getImageUrl())
-                .takeoffWght(dto.getTakeoffWght())
-                .useYn(dto.getUseYn())
-                .cameraYn(dto.getCameraYn())
-                .insrncYn(dto.getInsrncYn())
-                .acrftInsuranceYn(dto.getAcrftInsuranceYn())
-                .insuranceExperiod(dto.getInsuranceExperiod())
-                .corporationNm(dto.getCorporationNm())
-                .ownerNm(dto.getOwnerNm())
-                .createUserId(dto.getCreateUserId())
-                .createDt(dto.getCreateDt())
-                .updateUserId(dto.getUpdateUserId())
-                .updateDt(dto.getUpdateDt())
+                .planArcrftSno(this.getPlanArcrftSno())
+                .planSno(this.getPlanSno())
+                .arcrftSno(this.getArcrftSno())
+                .idntfNum(this.getIdntfNum())
+                .groupNm(this.getGroupNm())
+                .prdctNum(this.getPrdctNum())
+                .arcrftTypeCd(this.getArcrftTypeCd())
+                .arcrftModelNm(this.getArcrftModelNm())
+                .prdctCmpnNm(this.getPrdctCmpnNm())
+                .prdctDate(this.getPrdctDate())
+                .arcrftLngth(this.getArcrftLngth())
+                .arcrftWdth(this.getArcrftWdth())
+                .arcrftHght(this.getArcrftHght())
+                .arcrftWght(this.getArcrftWght())
+                .arcrftWghtCd(this.getArcrftWghtCd())
+                .wghtTypeCd(this.getWghtTypeCd())
+                .imageUrl(this.getImageUrl())
+                .takeoffWght(this.getTakeoffWght())
+                .useYn(this.getUseYn())
+                .cameraYn(this.getCameraYn())
+                .insrncYn(this.getInsrncYn())
+                .acrftInsuranceYn(this.getAcrftInsuranceYn())
+                .insuranceExperiod(this.getInsuranceExperiod())
+                .corporationNm(this.getCorporationNm())
+                .ownerNm(this.getOwnerNm())
+                .createUserId(this.getCreateUserId())
+                .createDt(this.getCreateDt())
+                .updateUserId(this.getUpdateUserId())
+                .updateDt(this.getUpdateDt())
                 .build();
 
     }

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaCoordDTO.java

@@ -28,15 +28,15 @@ public class FltPlanAreaCoordDTO {
         return dto;
     }
 
-    public static FltPlanAreaCoord toEntity(FltPlanAreaCoordDTO dto){
+    public FltPlanAreaCoord toEntity(){
 
         return FltPlanAreaCoord.builder()
-                .planAreaCoordSno(dto.getPlanAreaCoordSno())
-                .planAreaSno(dto.getPlanAreaSno())
-                .lon(dto.getLon())
-                .lat(dto.getLat())
-                .createUserId(dto.getCreateUserId())
-                .createDt(dto.getCreateDt())
+                .planAreaCoordSno(this.getPlanAreaCoordSno())
+                .planAreaSno(this.getPlanAreaSno())
+                .lon(this.getLon())
+                .lat(this.getLat())
+                .createUserId(this.getCreateUserId())
+                .createDt(this.getCreateDt())
                 .build();
     }
     

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java

@@ -41,20 +41,20 @@ public class FltPlanAreaDTO {
         return dto;
     }
 
-    public static FltPlanArea toEntity(FltPlanAreaDTO dto){
+    public FltPlanArea toEntity(){
         return FltPlanArea.builder()
-                .planAreaSno(dto.getPlanAreaSno())
-                .planSno(dto.getPlanSno())
-                .areaType(dto.getAreaType())
-                .fltMethod(dto.getFltMethod().getCode())
-                .fltMothoeRm(dto.getFltMothoeRm())
-                .fltAreaAddr(dto.getFltAreaAddr())
-                .bufferZone(dto.getBufferZone())
-                .fltElev(dto.getFltElev())
-                .createUserId(dto.getCreateUserId())
-                .createDt(dto.getCreateDt())
-                .updateUserId(dto.getUpdateUserId())
-                .updateDt(dto.getUpdateDt())
+                .planAreaSno(this.getPlanAreaSno())
+                .planSno(this.getPlanSno())
+                .areaType(this.getAreaType())
+                .fltMethod(this.getFltMethod().getCode())
+                .fltMothoeRm(this.getFltMothoeRm())
+                .fltAreaAddr(this.getFltAreaAddr())
+                .bufferZone(this.getBufferZone())
+                .fltElev(this.getFltElev())
+                .createUserId(this.getCreateUserId())
+                .createDt(this.getCreateDt())
+                .updateUserId(this.getUpdateUserId())
+                .updateDt(this.getUpdateDt())
                 .build();
     }
 }

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanBasDTO.java

@@ -86,32 +86,32 @@ public class FltPlanBasDTO {
         return dto;
     }
 
-    public static FltPlanBas toFltPlanEntity(FltPlanBasDTO dto){
+    public FltPlanBas toFltPlanEntity(){
         return FltPlanBas.builder()
-                .planSno(dto.getPlanSno())
-                .groupId(dto.getGroupId())
-                .cstmrSno(dto.getCstmrSno())
-                .serviceType(dto.getServiceType())
-                .memberName(dto.getMemberName())
-                .email(dto.getEmail())
-                .hpno(dto.getHpno())
-                .clncd(dto.getClncd())
-                .addr(dto.getAddr())
-                .addrDtlCn(dto.getAddrDtlCn())
-                .zip(dto.getZip())
-                .schFltStDt(dto.getSchFltStDt())
-                .schFltEndDt(dto.getSchFltEndDt())
-                .fltPurpose(dto.getFltPurpose().getCode())
-                .fltType(dto.getFltType().getCode())
-                .corpRegYn(dto.getCorpRegYn())
-                .aprvlYn(dto.getAprvlYn())
-                .aprvlDt(dto.getAprvlDt())
-                .delYn(dto.getDelYn())
-                .fileGroupNo(dto.getFileGroupNo())
-                .createUserId(dto.getCreateUserId())
-                .createDt(dto.getCreateDt())
-                .updateUserId(dto.getUpdateUserId())
-                .updateDt(dto.getUpdateDt())
+                .planSno(this.getPlanSno())
+                .groupId(this.getGroupId())
+                .cstmrSno(this.getCstmrSno())
+                .serviceType(this.getServiceType())
+                .memberName(this.getMemberName())
+                .email(this.getEmail())
+                .hpno(this.getHpno())
+                .clncd(this.getClncd())
+                .addr(this.getAddr())
+                .addrDtlCn(this.getAddrDtlCn())
+                .zip(this.getZip())
+                .schFltStDt(this.getSchFltStDt())
+                .schFltEndDt(this.getSchFltEndDt())
+                .fltPurpose(this.getFltPurpose().getCode())
+                .fltType(this.getFltType().getCode())
+                .corpRegYn(this.getCorpRegYn())
+                .aprvlYn(this.getAprvlYn())
+                .aprvlDt(this.getAprvlDt())
+                .delYn(this.getDelYn())
+                .fileGroupNo(this.getFileGroupNo())
+                .createUserId(this.getCreateUserId())
+                .createDt(this.getCreateDt())
+                .updateUserId(this.getUpdateUserId())
+                .updateDt(this.getUpdateDt())
                 .build();
     }
 

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanPilotDTO.java

@@ -62,25 +62,25 @@ public class FltPlanPilotDTO {
         return dto;
     }
 
-    public static FltPlanPilot toEntity(FltPlanPilotDTO dto){
+    public FltPlanPilot toEntity(){
         return FltPlanPilot.builder()
-                .planPilotSno(dto.getPlanPilotSno())
-                .planSno(dto.getPlanSno())
-                .cstmrSno(dto.getCstmrSno())
-                .groupNm(dto.getGroupNm())
-                .memberName(dto.getMemberName())
-                .email(dto.getEmail())
-                .hpno(dto.getHpno())
-                .clncd(dto.getClncd())
-                .addr(dto.getAddr())
-                .addrDtlCn(dto.getAddrDtlCn())
-                .zip(dto.getZip())
-                .qlfcNo(dto.getQlfcNo())
-                .carrer(dto.getCarrer())
-                .createUserId(dto.getCreateUserId())
-                .createDt(dto.getCreateDt())
-                .updateUserId(dto.getUpdateUserId())
-                .updateDt(dto.getUpdateDt())
+                .planPilotSno(this.getPlanPilotSno())
+                .planSno(this.getPlanSno())
+                .cstmrSno(this.getCstmrSno())
+                .groupNm(this.getGroupNm())
+                .memberName(this.getMemberName())
+                .email(this.getEmail())
+                .hpno(this.getHpno())
+                .clncd(this.getClncd())
+                .addr(this.getAddr())
+                .addrDtlCn(this.getAddrDtlCn())
+                .zip(this.getZip())
+                .qlfcNo(this.getQlfcNo())
+                .carrer(this.getCarrer())
+                .createUserId(this.getCreateUserId())
+                .createDt(this.getCreateDt())
+                .updateUserId(this.getUpdateUserId())
+                .updateDt(this.getUpdateDt())
                 .build();
     }
 

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/PtyTermsAgreeTxnDTO.java

@@ -22,16 +22,16 @@ public class PtyTermsAgreeTxnDTO {
     private LocalDateTime updateDt; // 수정일시
     private String updateUserId; // 수정사용자ID
 
-    public static PtyTermsAgreeTxn toEntity(PtyTermsAgreeTxnDTO dto){
+    public PtyTermsAgreeTxn toEntity(){
         return PtyTermsAgreeTxn.builder()
-                .agreeSno(dto.getAgreeSno())
-                .termsSno(dto.getTermsSno())
-                .cstmrSno(dto.getCstmrSno())
-                .agreeYn(dto.getAgreeYn())
-                .agreeDt(dto.getAgreeDt())
-                .procIp(dto.getProcIp())
-                .updateDt(dto.getUpdateDt())
-                .updateUserId(dto.getUpdateUserId())
+                .agreeSno(this.getAgreeSno())
+                .termsSno(this.getTermsSno())
+                .cstmrSno(this.getCstmrSno())
+                .agreeYn(this.getAgreeYn())
+                .agreeDt(this.getAgreeDt())
+                .procIp(this.getProcIp())
+                .updateDt(this.getUpdateDt())
+                .updateUserId(this.getUpdateUserId())
                 .build();
     }
 

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/SuredataEntityDTO.java

@@ -64,63 +64,63 @@ public class SuredataEntityDTO {
     private String etc4;
     private String etc5;
 
-    public static SuredataEntity toEntity(SuredataEntityDTO dto){
+    public SuredataEntity toEntity(){
         return SuredataEntity.builder()
-                .seqno(dto.getSeqno())
-                .intime(dto.getIntime())
-                .usercode(dto.getUsercode())
-                .deptcode(dto.getDeptcode())
-                .biztype(dto.getBiztype())
-                .yellowidKey(dto.getYellowidKey())
-                .reqname(dto.getReqname())
-                .reqphone(dto.getReqphone())
-                .callname(dto.getCallname())
-                .country(dto.getCountry())
-                .callphone(dto.getCallphone())
-                .subject(dto.getSubject())
-                .msg(dto.getMsg())
-                .reqtime(dto.getReqtime())
-                .senttime(dto.getSenttime())
-                .recvtime(dto.getRecvtime())
-                .result(dto.getResult())
-                .errcode(dto.getErrcode())
-                .kind(dto.getKind())
-                .fkcontent(dto.getFkcontent())
-                .imageUrl(dto.getImageUrl())
-                .batchflag(dto.getBatchflag())
-                .retry(dto.getRetry())
-                .resend(dto.getResend())
-                .templatecode(dto.getTemplatecode())
-                .retext(dto.getRetext())
-                .resentflag(dto.getResentflag())
-                .sentmedia(dto.getSentmedia())
-                .mediatype(dto.getMediatype())
-                .btnType01(dto.getBtnType01())
-                .btnNm01(dto.getBtnNm01())
-                .btn02Url01(dto.getBtn02Url01())
-                .btn02Url02(dto.getBtn02Url02())
-                .btnType02(dto.getBtnType02())
-                .btnNm02(dto.getBtnNm02())
-                .btn02Url01(dto.getBtn01Url01())
-                .btn02Url02(dto.getBtn01Url02())
-                .btnType03(dto.getBtnType03())
-                .btnNm03(dto.getBtnNm03())
-                .btn03Url01(dto.getBtn03Url01())
-                .btn03Url02(dto.getBtn03Url02())
-                .btnType04(dto.getBtnType04())
-                .btnNm04(dto.getBtnNm04())
-                .btn04Url01(dto.getBtn04Url01())
-                .btn04Url02(dto.getBtn04Url02())
-                .btnType05(dto.getBtnType05())
-                .btnNm05(dto.getBtnNm05())
-                .btn05Url01(dto.getBtn05Url01())
-                .btn05Url02(dto.getBtn05Url02())
-                .kakaoerrcode(dto.getKakaoerrcode())
-                .etc1(dto.getEtc1())
-                .etc2(dto.getEtc2())
-                .etc3(dto.getEtc3())
-                .etc4(dto.getEtc4())
-                .etc5(dto.getEtc5())
+                .seqno(this.getSeqno())
+                .intime(this.getIntime())
+                .usercode(this.getUsercode())
+                .deptcode(this.getDeptcode())
+                .biztype(this.getBiztype())
+                .yellowidKey(this.getYellowidKey())
+                .reqname(this.getReqname())
+                .reqphone(this.getReqphone())
+                .callname(this.getCallname())
+                .country(this.getCountry())
+                .callphone(this.getCallphone())
+                .subject(this.getSubject())
+                .msg(this.getMsg())
+                .reqtime(this.getReqtime())
+                .senttime(this.getSenttime())
+                .recvtime(this.getRecvtime())
+                .result(this.getResult())
+                .errcode(this.getErrcode())
+                .kind(this.getKind())
+                .fkcontent(this.getFkcontent())
+                .imageUrl(this.getImageUrl())
+                .batchflag(this.getBatchflag())
+                .retry(this.getRetry())
+                .resend(this.getResend())
+                .templatecode(this.getTemplatecode())
+                .retext(this.getRetext())
+                .resentflag(this.getResentflag())
+                .sentmedia(this.getSentmedia())
+                .mediatype(this.getMediatype())
+                .btnType01(this.getBtnType01())
+                .btnNm01(this.getBtnNm01())
+                .btn02Url01(this.getBtn02Url01())
+                .btn02Url02(this.getBtn02Url02())
+                .btnType02(this.getBtnType02())
+                .btnNm02(this.getBtnNm02())
+                .btn02Url01(this.getBtn01Url01())
+                .btn02Url02(this.getBtn01Url02())
+                .btnType03(this.getBtnType03())
+                .btnNm03(this.getBtnNm03())
+                .btn03Url01(this.getBtn03Url01())
+                .btn03Url02(this.getBtn03Url02())
+                .btnType04(this.getBtnType04())
+                .btnNm04(this.getBtnNm04())
+                .btn04Url01(this.getBtn04Url01())
+                .btn04Url02(this.getBtn04Url02())
+                .btnType05(this.getBtnType05())
+                .btnNm05(this.getBtnNm05())
+                .btn05Url01(this.getBtn05Url01())
+                .btn05Url02(this.getBtn05Url02())
+                .kakaoerrcode(this.getKakaoerrcode())
+                .etc1(this.getEtc1())
+                .etc2(this.getEtc2())
+                .etc3(this.getEtc3())
+                .etc4(this.getEtc4())
+                .etc5(this.getEtc5())
                 .build();
     }
 

web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java

@@ -137,7 +137,7 @@ public class FlightLaancService {
         fltPlanBasDto.setCorpRegYn(corpRegYn); // 사업자유무
         fltPlanBasDto.setServiceType("F0002");
 
-        FltPlanBas fltPlanBas = fltPlanDomainService.saveFltPlanBas(FltPlanBasDTO.toFltPlanEntity(fltPlanBasDto));
+        FltPlanBas fltPlanBas = fltPlanDomainService.saveFltPlanBas(fltPlanBasDto.toFltPlanEntity());
         Long planSno = fltPlanBas.getPlanSno();
 
         // 비행구역 INSERT
@@ -167,7 +167,7 @@ public class FlightLaancService {
                 fltPlanAreaDto.setCreateUserId(userId);
                 fltPlanAreaDto.setUpdateUserId(userId);
 
-                FltPlanArea fltPlanArea = fltPlanDomainService.saveFltPlanArea(FltPlanAreaDTO.toEntity(fltPlanAreaDto));
+                FltPlanArea fltPlanArea = fltPlanDomainService.saveFltPlanArea(fltPlanAreaDto.toEntity());
 
                 Long planAreaSno = fltPlanArea.getPlanAreaSno();
                 List<BasLaancAreaCoordModel> laancAreaModelCoordList = laancAreaModel.getCoordList();
@@ -183,7 +183,7 @@ public class FlightLaancService {
                         coordEntityDto.setPlanAreaSno(planAreaSno);
                         coordEntityDto.setCreateUserId(userId);
 
-                        FltPlanAreaCoord fltPlanAreaCoord = FltPlanAreaCoordDTO.toEntity(coordEntityDto);
+                        FltPlanAreaCoord fltPlanAreaCoord = coordEntityDto.toEntity();
                         fltPlanAreaCoordList.add(fltPlanAreaCoord);
                     }
 
@@ -207,7 +207,7 @@ public class FlightLaancService {
         planPilotDto.setUpdateUserId(userId);
         planPilotDto.setUpdateDt(LocalDateTime.now());
 
-        fltPlanBas.setFltPlanPilotList(Arrays.asList(FltPlanPilotDTO.toEntity(planPilotDto)));
+        fltPlanBas.setFltPlanPilotList(Arrays.asList(planPilotDto.toEntity()));
 
         // 기체정보 INSERT
         List<BasLaancArcrftModel> basLaancArcrftModelList = rq.getArcrftList();
@@ -235,7 +235,7 @@ public class FlightLaancService {
 //                arcrftEntity.setInsuranceExperiod(null); // 보헌 유효기간
 //                arcrftEntity.setCorporationNm(null); // 법인명
 
-                fltPlanArcrftList.add(FltPlanArcrftDTO.toEntity(arcrftEntityDto));
+                fltPlanArcrftList.add(arcrftEntityDto.toEntity());
             }
         }
 
@@ -254,7 +254,7 @@ public class FlightLaancService {
                     agreeEntityDto.setAgreeDt(LocalDateTime.now());
                 }
                 try{
-                    ptyTermsDomainService.savePtyTermsAgreeTxn(PtyTermsAgreeTxnDTO.toEntity(agreeEntityDto));
+                    ptyTermsDomainService.savePtyTermsAgreeTxn(agreeEntityDto.toEntity());
                 }catch (Exception e){
                     // TODO :: 임시로 코드 변경, 추후 약관 있을시 본래 코드인 else문으로 Exception던질것임
                     throw new BaseException(BaseErrorCode.FAILED, "약관등록 실패");
@@ -294,7 +294,7 @@ public class FlightLaancService {
             comFileBasDto.setFileGroupNo(fileGroupNo);
         }
 
-        comFileDomainService.saveComFileBas(ComFileBasDTO.toEntity(comFileBasDto));
+        comFileDomainService.saveComFileBas(comFileBasDto.toEntity());
 
         fltPlanBas.setFileGroupNo(comFileBasDto.getFileGroupNo());
 //        fltPlanDomainService.saveFltPlanBas(fltPlanBas);
@@ -317,7 +317,7 @@ public class FlightLaancService {
             }
 
             SuredataEntityDTO sureDateEntityDto = comnSmsService.sendLaancAprovSms(comnSmsLaancAprovModel);
-            otherDomainService.saveSuredate(SuredataEntityDTO.toEntity(sureDateEntityDto));
+            otherDomainService.saveSuredate(sureDateEntityDto.toEntity());
         } catch (Exception e) {
             log.error("ERROR: ", e);
         }