Browse Source

파라미터명 변경

[기존] yyyymm
[변경] date
pull/1/head
lkd9125 1 year ago
parent
commit
ce24478c6a
  1. 12
      pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
  2. 16
      pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
  3. 4
      pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

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

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

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

@ -102,9 +102,9 @@ public class MainDashService {
* @param yyyymm * @param yyyymm
* @return * @return
*/ */
public List<MainDashStcsModel> mainKacDashStcsDay(String yyyymm, String[] formatParam){ public List<MainDashStcsModel> mainKacDashStcsDay(String date, String[] formatParam){
List<MainDashStcsModel> resultList = query.mainKacDashStcsDay(yyyymm, formatParam); List<MainDashStcsModel> resultList = query.mainKacDashStcsDay(date, formatParam);
return resultList; return resultList;
} }
@ -128,22 +128,20 @@ public class MainDashService {
* 3. 일단위 검색 -> Parameter 2023-09 월까지 있는경우 * 3. 일단위 검색 -> Parameter 2023-09 월까지 있는경우
* 4. 일일단위 검색 -> Parameter 2023-09-01 날짜에 대한 검색 * 4. 일일단위 검색 -> Parameter 2023-09-01 날짜에 대한 검색
* 이하 모든 데이터는 Exception 발생 * 이하 모든 데이터는 Exception 발생
* @param yyyyMM * @param date
* @throws NumberFormatException * @throws NumberFormatException
*/ */
public String[] paramCheck(String yyyymm, String type) throws NumberFormatException{ public String[] paramCheck(String date, String type) throws NumberFormatException{
String[] result = new String[2]; String[] result = new String[2];
yyyymm = yyyymm.trim(); date = date.trim();
logger.error("yyyymm -> {}", yyyymm.length()); String[] paramStrings = date.split("-");
String[] paramStrings = yyyymm.split("-");
switch (type) { switch (type) {
case "month": // 2. 월단위 검색 -> Parameter 2023등 연도만 있는경우 case "month": // 2. 월단위 검색 -> Parameter 2023등 연도만 있는경우
Integer.parseInt(yyyymm.trim()); Integer.parseInt(date.trim());
result[0] = "%Y"; result[0] = "%Y";
result[1] = "%m"; result[1] = "%m";

4
pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@ -1676,7 +1676,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
* @param yyyymm * @param yyyymm
* @return * @return
*/ */
public List<MainDashStcsModel> mainKacDashStcsDay(String yyyymm, String[] formatParam){ public List<MainDashStcsModel> mainKacDashStcsDay(String date, String[] formatParam){
QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas;
StringTemplate formattedDate = Expressions.stringTemplate( StringTemplate formattedDate = Expressions.stringTemplate(
@ -1691,7 +1691,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
BooleanBuilder builder = new BooleanBuilder(); BooleanBuilder builder = new BooleanBuilder();
builder.and(bas.statusCd.eq("99")); builder.and(bas.statusCd.eq("99"));
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 List<MainDashStcsModel> result = query
.select( .select(

Loading…
Cancel
Save