From 97c6e5bc7421f4f7ff78ca00ac9503e7ea90314d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Tue, 26 Jul 2022 04:57:48 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EC=84=9C?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/flight/service/BasFlightService.java | 21 +++++++++++++++++++ .../palnet/biz/jpa/entity/FltPlanArcrft.java | 6 ++++++ .../palnet/biz/jpa/entity/FltPlanArea.java | 6 ++++++ .../biz/jpa/entity/FltPlanAreaCoord.java | 3 +++ .../com/palnet/biz/jpa/entity/FltPlanBas.java | 6 ++++++ .../palnet/biz/jpa/entity/FltPlanPilot.java | 6 ++++++ 6 files changed, 48 insertions(+) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index 63434f4..cea231a 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -74,7 +74,12 @@ public class BasFlightService { // 비행계획서 등록 public boolean createPlan(BasFlightPlanModel rq) { // 비행계획서 + String userId = jwtTokenUtil.getCstmrSnoByToken().toString(); FltPlanBas basEntity = BasFlightMapper.mapper.modelToEntity(rq); + basEntity.setDelYn("N"); + basEntity.setAprvlYn("N"); + basEntity.setCreateUserId(userId); + basEntity.setUpdateUserId(userId); FltPlanBas rBasEntity = fltPlanBasRepository.save(basEntity); Integer planSno = rBasEntity.getPlanSno(); // 비행구역 @@ -83,6 +88,8 @@ public class BasFlightService { for (BasFlightPlanAreaModel areaModel : areaModelList) { FltPlanArea areaEntity = BasFlightMapper.mapper.modelToEntity(areaModel); areaEntity.setPlanSno(planSno); + areaEntity.setCreateUserId(userId); + areaEntity.setUpdateUserId(userId); FltPlanArea rAreaEntity = fltPlanAreaRepository.save(areaEntity); Integer planAreaSno = rAreaEntity.getPlanAreaSno(); List coordModelList = areaModel.getCoordList(); @@ -90,6 +97,7 @@ public class BasFlightService { for (BasFlightPlanAreaCoordModel coordModel : coordModelList) { FltPlanAreaCoord coordEntity = BasFlightMapper.mapper.modelToEntity(coordModel); coordEntity.setPlanAreaSno(planAreaSno); + coordEntity.setCreateUserId(userId); fltPlanAreaCoordRepository.save(coordEntity); } } @@ -102,6 +110,8 @@ public class BasFlightService { for (BasFlightPlanPilotModel pilotModel : pilotModelList) { FltPlanPilot pilotEntity = BasFlightMapper.mapper.modelToEntity(pilotModel); pilotEntity.setPlanSno(planSno); + pilotEntity.setCreateUserId(userId); + pilotEntity.setUpdateUserId(userId); fltPlanPilotRepository.save(pilotEntity); } } @@ -113,6 +123,9 @@ public class BasFlightService { for (BasFlightPlanArcrftModel arcrftModel : arcrftModelList) { FltPlanArcrft arcrftEntity = BasFlightMapper.mapper.modelToEntity(arcrftModel); arcrftEntity.setPlanSno(planSno); + arcrftEntity.setCreateUserId(userId); + arcrftEntity.setUpdateUserId(userId); + fltPlanArcrftRepository.save(arcrftEntity); } } @@ -122,10 +135,12 @@ public class BasFlightService { // 비행계획서 수정 public boolean updatePlan(BasFlightPlanModel rq) { if (rq != null && rq.getPlanSno() != null) { + String userId = jwtTokenUtil.getCstmrSnoByToken().toString(); Integer planSno = rq.getPlanSno(); // 비행계획서 FltPlanBas planEntity = fltPlanBasRepository.findById(planSno).orElseThrow(); BasFlightMapper.mapper.updateEntityByModel(planEntity, rq); + planEntity.setUpdateUserId(userId); fltPlanBasRepository.save(planEntity); // 비행구역 @@ -137,9 +152,11 @@ public class BasFlightService { FltPlanArea areaEntity = areaEntityList.stream().filter(fltPlanArea -> fltPlanArea.getPlanAreaSno() == areaModel.getPlanAreaSno()).findFirst().orElse(null); if (areaEntity == null) { areaEntity = BasFlightMapper.mapper.modelToEntity(areaModel); + areaEntity.setCreateUserId(userId); } else { BasFlightMapper.mapper.updateEntityByModel(areaEntity, areaModel); } + areaEntity.setUpdateUserId(userId); fltPlanAreaRepository.save(areaEntity); @@ -151,6 +168,7 @@ public class BasFlightService { FltPlanAreaCoord coordEntity = coordEntityList.stream().filter(fltPlanAreaCoord -> fltPlanAreaCoord.getPlanAreaCoordSno() == coordModel.getPlanAreaCoordSno()).findFirst().orElse(null); if (coordEntity == null) { coordEntity = BasFlightMapper.mapper.modelToEntity(coordModel); + coordEntity.setCreateUserId(userId); } else { BasFlightMapper.mapper.updateEntityByModel(coordEntity, coordModel); } @@ -189,6 +207,8 @@ public class BasFlightService { FltPlanPilot pilotEntity = pilotEntityList.stream().filter(fltPlanPilot -> fltPlanPilot.getPlanPilotSno() == pilotModel.getPlanPilotSno()).findFirst().orElse(null); if(pilotEntity != null){ BasFlightMapper.mapper.updateEntityByModel(pilotEntity, pilotModel); + pilotEntity.setUpdateUserId(userId); +// pilotEntity.setCreateUserId(userId); fltPlanPilotRepository.save(pilotEntity); } } @@ -210,6 +230,7 @@ public class BasFlightService { FltPlanArcrft arcrftEntity = arcrftEntityList.stream().filter(fltPlanArcrft -> fltPlanArcrft.getPlanArcrftSno() == arcrftModel.getPlanArcrftSno()).findFirst().orElse(null); if(arcrftEntity != null){ BasFlightMapper.mapper.updateEntityByModel(arcrftEntity, arcrftModel); + arcrftEntity.setUpdateUserId(userId); fltPlanArcrftRepository.save(arcrftEntity); } } diff --git a/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java b/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java index 3539d4a..ecfb7ce 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java +++ b/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java @@ -2,6 +2,8 @@ package com.palnet.biz.jpa.entity; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; import javax.persistence.*; import java.util.Date; @@ -80,12 +82,16 @@ public class FltPlanArcrft { @Column(name="CREATE_USER_ID") private String createUserId; + @CreationTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name="CREATE_DT") private Date createDt; @Column(name="UPDATE_USER_ID") private String updateUserId; + @UpdateTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name="update_DT") private Date updateDt; diff --git a/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java b/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java index 5c02fa6..1894391 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java +++ b/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java @@ -2,6 +2,8 @@ package com.palnet.biz.jpa.entity; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; import javax.persistence.*; import java.util.Date; @@ -35,12 +37,16 @@ public class FltPlanArea { @Column(name = "CREATE_USER_ID") private String createUserId; + @CreationTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "CREATE_DT") private Date createDt; @Column(name = "UPDATE_USER_ID") private String updateUserId; + @UpdateTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "UPDATE_DT") private Date updateDt; diff --git a/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java b/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java index 5457e3b..836c249 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java +++ b/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java @@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; import javax.persistence.*; import java.time.LocalDateTime; @@ -31,6 +32,8 @@ public class FltPlanAreaCoord { @Column(name = "CREATE_USER_ID") private String createUserId; + @CreationTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "CREATE_DT") private Date createDt; } diff --git a/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java b/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java index 1e58ea2..d317b4e 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java +++ b/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java @@ -2,6 +2,8 @@ package com.palnet.biz.jpa.entity; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; import javax.persistence.*; import java.time.LocalDateTime; @@ -63,12 +65,16 @@ public class FltPlanBas { @Column(name = "CREATE_USER_ID") private String createUserId; + @CreationTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "CREATE_DT") private Date createDt; @Column(name = "UPDATE_USER_ID") private String updateUserId; + @UpdateTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "UPDATE_DT") private Date updateDt; diff --git a/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java b/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java index 90bf628..be9d013 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java +++ b/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java @@ -2,6 +2,8 @@ package com.palnet.biz.jpa.entity; import lombok.Getter; import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; import javax.persistence.*; import java.util.Date; @@ -56,12 +58,16 @@ public class FltPlanPilot { @Column(name = "CREATE_USER_ID") private String createUserId; + @CreationTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "CREATE_DT") private Date createDt; @Column(name = "UPDATE_USER_ID") private String updateUserId; + @UpdateTimestamp + @Temporal(TemporalType.TIMESTAMP) @Column(name = "UPDATE_DT") private Date updateDt;