pav
/
pav-server
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://gitea.palntour.com/pav/pav-server

feature/auth
노승철 2 years ago
parent
40eeacb167 8dd90b9240
commit
13d176a0d4
6 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java
  2. 3
      src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java
  3. 2
      src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java
  4. 6
      src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanModel.java
  5. 25
      src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
  6. 11
      src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

5
src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java
Unescape View File

@ -58,8 +58,9 @@ public class BasFlightController {
@GetMapping(value = "/plan/list")
public ResponseEntity<? extends BasicResponse> listPlan(BasFlightPlanListRq rq) {
Map<String, Object> resultMap = new HashMap<String, Object>();
List<BasFlightPlanModel> result = null;
try {
List<BasFlightPlanModel> result = basFlightService.listPlan(rq);
result = basFlightService.listPlan(rq);
resultMap.put("result", result);
} catch (CustomException e) {
@ -73,7 +74,7 @@ public class BasFlightController {
.body(new ErrorResponse("Server Error", "-1"));
}
return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
return ResponseEntity.ok().body(new SuccessResponse<List<BasFlightPlanModel>>(result));
}
// 비행계획서 상세 조회

3
src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java
Unescape View File

@ -2,7 +2,6 @@ package com.palnet.biz.api.bas.flight.model;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -19,5 +18,5 @@ public class BasFlightPlanAreaModel {
private String updateUserId;
private Date updateDt;
private String docState = "R";
private List<BasFlightPlanAreaCoordModel> coords;
private List<BasFlightPlanAreaCoordModel> coordList;
}

2
src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java
Unescape View File

@ -2,13 +2,11 @@ package com.palnet.biz.api.bas.flight.model;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class BasFlightPlanListRq {
private Date schFltStDt;
private Date schFltEndDt;
private LocalDateTime datetime;
private String aprvlYn;
}

6
src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanModel.java
Unescape View File

@ -27,7 +27,7 @@ public class BasFlightPlanModel {
private String updateUserId;
private Date updateDt;
private String docState = "R";
private List<BasFlightPlanAreaModel> area;
private List<BasFlightPlanPilotModel> pilot;
private List<BasFlightPlanArcrftModel> arcrft;
private List<BasFlightPlanAreaModel> areaList;
private List<BasFlightPlanPilotModel> pilotList;
private List<BasFlightPlanArcrftModel> arcrftList;
}

25
src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
Unescape View File

@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@ -52,21 +51,21 @@ public class BasFlightService {
BasFlightPlanAreaModel areaModel = BasFlightMapper.mapper.entityToModel(areaEntity);
List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno());
if (coordEntityList != null && !coordEntityList.isEmpty()) {
areaModel.setCoords(BasFlightMapper.mapper.entityToModelCoordList(coordEntityList));
areaModel.setCoordList(BasFlightMapper.mapper.entityToModelCoordList(coordEntityList));
}
area.add(areaModel);
}
rs.setArea(area);
rs.setAreaList(area);
}
// 조종사
List<FltPlanPilot> pilotList = fltPlanPilotRepository.findByPlanSnoOrderByPlanPilotSnoAsc(planSno);
if (pilotList != null && !pilotList.isEmpty()) {
rs.setPilot(BasFlightMapper.mapper.entityToModelPilotList(pilotList));
rs.setPilotList(BasFlightMapper.mapper.entityToModelPilotList(pilotList));
}
// 기체
List<FltPlanArcrft> arcrft = fltPlanArcrftRepository.findByPlanSnoOrderByPlanArcrftSnoAsc(planSno);
if (arcrft != null && !arcrft.isEmpty()) {
rs.setArcrft(BasFlightMapper.mapper.entityToModelArcrftList(arcrft));
rs.setArcrftList(BasFlightMapper.mapper.entityToModelArcrftList(arcrft));
}
}
return rs;
@ -79,14 +78,14 @@ public class BasFlightService {
FltPlanBas rBasEntity = fltPlanBasRepository.save(basEntity);
Integer planSno = rBasEntity.getPlanSno();
// 비행구역
List<BasFlightPlanAreaModel> areaModelList = rq.getArea();
List<BasFlightPlanAreaModel> areaModelList = rq.getAreaList();
if (areaModelList != null && !areaModelList.isEmpty()) {
for (BasFlightPlanAreaModel areaModel : areaModelList) {
FltPlanArea areaEntity = BasFlightMapper.mapper.modelToEntity(areaModel);
areaEntity.setPlanSno(planSno);
FltPlanArea rAreaEntity = fltPlanAreaRepository.save(areaEntity);
Integer planAreaSno = rAreaEntity.getPlanAreaSno();
List<BasFlightPlanAreaCoordModel> coordModelList = areaModel.getCoords();
List<BasFlightPlanAreaCoordModel> coordModelList = areaModel.getCoordList();
if (coordModelList != null && !coordModelList.isEmpty()) {
for (BasFlightPlanAreaCoordModel coordModel : coordModelList) {
FltPlanAreaCoord coordEntity = BasFlightMapper.mapper.modelToEntity(coordModel);
@ -98,7 +97,7 @@ public class BasFlightService {
}
// 조종사
List<BasFlightPlanPilotModel> pilotModelList = rq.getPilot();
List<BasFlightPlanPilotModel> pilotModelList = rq.getPilotList();
if (pilotModelList != null && !pilotModelList.isEmpty()) {
for (BasFlightPlanPilotModel pilotModel : pilotModelList) {
FltPlanPilot pilotEntity = BasFlightMapper.mapper.modelToEntity(pilotModel);
@ -109,7 +108,7 @@ public class BasFlightService {
// 기체
List<BasFlightPlanArcrftModel> arcrftModelList = rq.getArcrft();
List<BasFlightPlanArcrftModel> arcrftModelList = rq.getArcrftList();
if (arcrftModelList != null && !arcrftModelList.isEmpty()) {
for (BasFlightPlanArcrftModel arcrftModel : arcrftModelList) {
FltPlanArcrft arcrftEntity = BasFlightMapper.mapper.modelToEntity(arcrftModel);
@ -130,7 +129,7 @@ public class BasFlightService {
fltPlanBasRepository.save(planEntity);
// 비행구역
List<BasFlightPlanAreaModel> areaModelList = rq.getArea();
List<BasFlightPlanAreaModel> areaModelList = rq.getAreaList();
if (areaModelList != null && !areaModelList.isEmpty()) {
List<FltPlanArea> areaEntityList = fltPlanAreaRepository.findByPlanSnoOrderByPlanAreaSnoAsc(planSno);
for (BasFlightPlanAreaModel areaModel : areaModelList) {
@ -144,7 +143,7 @@ public class BasFlightService {
fltPlanAreaRepository.save(areaEntity);
List<BasFlightPlanAreaCoordModel> coordsModelList = areaModel.getCoords();
List<BasFlightPlanAreaCoordModel> coordsModelList = areaModel.getCoordList();
if (coordsModelList != null && !coordsModelList.isEmpty()) {
Integer areaSno = areaModel.getPlanAreaSno();
List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno);
@ -183,7 +182,7 @@ public class BasFlightService {
}
// 조종사
List<BasFlightPlanPilotModel> pilotModelList = rq.getPilot();
List<BasFlightPlanPilotModel> pilotModelList = rq.getPilotList();
if(pilotModelList != null && !pilotModelList.isEmpty()){
List<FltPlanPilot> pilotEntityList = fltPlanPilotRepository.findByPlanSnoOrderByPlanPilotSnoAsc(planSno);
for(BasFlightPlanPilotModel pilotModel : pilotModelList){
@ -204,7 +203,7 @@ public class BasFlightService {
}
// 기체
List<BasFlightPlanArcrftModel> arcrftModelList = rq.getArcrft();
List<BasFlightPlanArcrftModel> arcrftModelList = rq.getArcrftList();
if(arcrftModelList != null && !arcrftModelList.isEmpty()){
List<FltPlanArcrft> arcrftEntityList = fltPlanArcrftRepository.findByPlanSnoOrderByPlanArcrftSnoAsc(planSno);
for(BasFlightPlanArcrftModel arcrftModel : arcrftModelList){

11
src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
Unescape View File

@ -32,12 +32,15 @@ public class FltPlanQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
if (rq.getSchFltEndDt() != null) {
builder.and(bas.schFltStDt.goe(rq.getSchFltEndDt()));
builder.and(bas.schFltStDt.loe(rq.getSchFltEndDt()));
}
if (rq.getSchFltStDt() != null) {
builder.and(bas.schFltEndDt.loe(rq.getSchFltStDt()));
builder.and(bas.schFltEndDt.goe(rq.getSchFltStDt()));
}
if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
// if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
// builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
// }
if (!"A".equals(rq.getAprvlYn())) {
builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
}
builder.and(bas.delYn.ne("Y"));
@ -82,7 +85,7 @@ public class FltPlanQueryRepository {
area.createDt,
area.updateUserId,
area.updateDt
).skipNulls()).as("area")
).skipNulls()).as("areaList")
))
);

Write Preview
Loading…
Cancel
Save