feature/main/plan-allow-statistics #2

Merged
dhji merged 5 commits from feature/main/plan-allow-statistics into develop 1 year ago
  1. 14
      pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
  2. 4
      pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
  3. 3
      pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java
  4. 2
      pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java
  5. 8
      pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

14
pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java

@ -161,7 +161,7 @@ public class MainDashController {
@GetMapping(value = "/stcs/flight/date/{type}")
@ApiOperation(value = "김포공항, 날짜 통계")
@ApiOperation(value = "김포공항, 비행실적 통계")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> kacDateStatistics(String date, @PathVariable String type){
@ -190,17 +190,17 @@ public class MainDashController {
return ResponseEntity.ok().body(new SuccessResponse<List<MainDashStcsModel>>(result));
}
@GetMapping("/kac/plan-allow/stcs/date/{type}")
@GetMapping("/stcs/plan-allow/date/{type}")
@ApiOperation(value = "김포공항, 비행승인 통계")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> kacPlanAllowStatistics(String yyyymm ,@PathVariable String type){
@ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> kacPlanAllowStatistics(String date ,@PathVariable String type){
String[] formatParam = null;
try {
if(yyyymm == null) yyyymm = "";
formatParam = service.paramCheck(yyyymm,type);
if(date == null) date = "";
formatParam = service.paramCheck(date,type);
} catch (NumberFormatException e) {
return ResponseEntity.status(HttpStatus.OK)
.body(new ErrorResponse(RSErrorCode.ER_PARAM));
@ -209,7 +209,7 @@ public class MainDashController {
List<MainDashStcsModel> result = null;
try {
result = service.mainKacStcsPlanAllow(yyyymm,formatParam);
result = service.mainKacStcsPlanAllow(date,formatParam);
} catch (Exception e) {
log.error("IGNORE : {}", e);

4
pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java

@ -114,9 +114,9 @@ public class MainDashService {
* @param yyyymm
* @return
*/
public List<MainDashStcsModel> mainKacStcsPlanAllow(String yyyymm, String[] formatParam){
public List<MainDashStcsModel> mainKacStcsPlanAllow(String date, String[] formatParam){
List<MainDashStcsModel> resultList = fltPlanQueryRepository.mainKacStcsPlanAllow(yyyymm, formatParam);
List<MainDashStcsModel> resultList = fltPlanQueryRepository.mainKacStcsPlanAllow(date, formatParam);
return resultList;
}

3
pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java

@ -56,6 +56,9 @@ public class FltPlanBas {
@Column(name = "APRVL_YN")
private String aprvlYn;
@Column(name = "APRVL_DT")
private String aprvlDt;
@Column(name = "DEL_YN")
private String delYn;

2
pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java

@ -33,7 +33,7 @@ public interface FltPlanBasRepository extends JpaRepository<FltPlanBas, Integer>
@Transactional
@Modifying
@Query("update FltPlanBas f set f.aprvlYn = :aprvlYn where f.planSno in :planSno")
@Query("update FltPlanBas f set f.aprvlYn = :aprvlYn, f.aprvlDt = now() where f.planSno in :planSno")
int updateAprvlYnByPlanSnoIn(@Param("planSno") List<Integer> planSnos, @Param("aprvlYn") String aprvlYn);
Optional<FltPlanBas> findByPlanSnoAndDelYnNot(Integer planSno, String delYn);

8
pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@ -672,23 +672,23 @@ public class FltPlanQueryRepository {
* @param yyyymm
* @return
*/
public List<MainDashStcsModel> mainKacStcsPlanAllow(String yyyymm, String[] formatParam){
public List<MainDashStcsModel> mainKacStcsPlanAllow(String date, String[] formatParam){
QFltPlanBas bas = QFltPlanBas.fltPlanBas;
StringTemplate formattedDate = Expressions.stringTemplate(
"DATE_FORMAT({0}, {1})"
, bas.schFltStDt
, bas.aprvlDt
, ConstantImpl.create(formatParam[0]));
StringTemplate formattedDate2 = Expressions.stringTemplate(
"DATE_FORMAT({0}, {1})"
, bas.schFltStDt
, bas.aprvlDt
, ConstantImpl.create(formatParam[1]));
BooleanBuilder builder = new BooleanBuilder();
builder.and(bas.aprvlYn.eq("Y"));
if(yyyymm != null && yyyymm.length() > 0) builder.and(formattedDate.eq(yyyymm));
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date));
List<MainDashStcsModel> result = query
.select(

Loading…
Cancel
Save