비행계획서 관련 내용 수정

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<BasFlightPlanAreaCoordModel> 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);
                     }
                 }

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;
 

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;
 

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;
 }

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;
 

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;