diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java index 7c40b46a..50a448f9 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtRqModel.java @@ -1,11 +1,10 @@ package com.palnet.biz.api.acnt.jwt.model; -import java.io.Serializable; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; + +import java.io.Serializable; @NoArgsConstructor diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index e47180e4..1440779c 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -6,38 +6,24 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.time.Instant; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.palnet.biz.api.bas.flight.model.*; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.locationtech.jts.geom.Coordinate; -import org.locationtech.proj4j.CRSFactory; -import org.locationtech.proj4j.CoordinateReferenceSystem; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.core.env.Environment; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*; -import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel; -import com.palnet.biz.api.bas.flight.model.BasFlightScheduleRs; -import com.palnet.biz.api.bas.flight.model.BasFlightWeatherModel; import com.palnet.biz.api.bas.flight.service.BasFlightService; import com.palnet.biz.api.comn.model.ComnPagingRs; import com.palnet.biz.api.comn.response.BasicResponse; @@ -100,7 +86,7 @@ public class BasFlightController { @ApiOperation(value = "비행계획서 조회") @Tag(name = "비행계획서", description = "비행계획서 관련 API") public ResponseEntity findPlanList(BasFlightPlanListRq rq) { - ComnPagingRs result = null; + ComnPagingRs result = null; log.debug(">>> rq : {}", rq); try { result = basFlightService.listPlan(rq); @@ -117,7 +103,7 @@ public class BasFlightController { @GetMapping(value = "/plan/detail/{planSno}") @ApiOperation(value = "비행계획서 상세 조회") @Tag(name = "비행계획서", description = "비행계획서 관련 API") - @ApiImplicitParam(name = "planSno",value = "비행계획서일련번호", dataTypeClass = Integer.class) + @ApiImplicitParam(name = "planSno", value = "비행계획서일련번호", dataTypeClass = Integer.class) public ResponseEntity detailPlan(@PathVariable("planSno") Integer planSno) { BasFlightPlanModel result = null; try { @@ -136,14 +122,14 @@ public class BasFlightController { @ApiOperation(value = "비행계획서 등록") @Tag(name = "비행계획서", description = "비행계획서 관련 API") public ResponseEntity createPlan(@RequestBody BasFlightPlanModel rq) { - Map resultMap = new HashMap(); + BasFlightPlanLaancRs rs = null; try { - log.error(">>> rq : {}", rq); - boolean result = basFlightService.createPlan(rq); - resultMap.put("result", result); - log.info(">>> resultMap : " , resultMap); + log.debug(">>> rq : {}", rq); + rs = basFlightService.createPlan(rq); + log.debug(">>> rs : {}", rs); } catch (CustomException e) { + Map resultMap = new HashMap(); log.error("IGNORE : {}", e); resultMap.put("result", false); resultMap.put("errorCode", e.getErrorCode()); @@ -155,7 +141,7 @@ public class BasFlightController { .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(rs)); } // 비행계획서 수정 @@ -163,12 +149,12 @@ public class BasFlightController { @ApiOperation(value = "비행계획서 수정") @Tag(name = "비행계획서", description = "비행계획서 관련 API") public ResponseEntity updatePlan(@RequestBody BasFlightPlanModel rq) { - Map resultMap = new HashMap(); + BasFlightPlanLaancRs rs = null; try { - boolean result = basFlightService.updatePlan(rq); - resultMap.put("result", result); + rs = basFlightService.updatePlan(rq); } catch (CustomException e) { + Map resultMap = new HashMap(); log.error("IGNORE : {}", e); resultMap.put("result", false); resultMap.put("errorCode", e.getErrorCode()); @@ -180,14 +166,14 @@ public class BasFlightController { .body(new ErrorResponse("Server Error", "-1")); } - return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); + return ResponseEntity.ok().body(new SuccessResponse<>(rs)); } // 비행계획서 삭제 @DeleteMapping(value = "/plan/delete/{planSno}") @ApiOperation(value = "비행계획서 삭제") @Tag(name = "비행계획서", description = "비행계획서 관련 API") - @ApiImplicitParam(name = "planSno",value = "비행계획서일련번호", dataTypeClass = Integer.class) + @ApiImplicitParam(name = "planSno", value = "비행계획서일련번호", dataTypeClass = Integer.class) public ResponseEntity deletePlan(@PathVariable("planSno") Integer planSno) { Map resultMap = new HashMap(); try { @@ -212,7 +198,7 @@ public class BasFlightController { @GetMapping(value = "/plan/pilot/{groupId}") @ApiOperation(value = "그룹의 조종사 조회") @Tag(name = "비행계획서", description = "비행계획서 관련 API") - @ApiImplicitParam(name = "groupId",value = "그룹ID", dataTypeClass = String.class) + @ApiImplicitParam(name = "groupId", value = "그룹ID", dataTypeClass = String.class) public ResponseEntity findPilot(@PathVariable("groupId") String groupId) { List result = null; try { @@ -227,11 +213,12 @@ public class BasFlightController { return ResponseEntity.ok().body(new SuccessResponse<>(result)); } + // 그룹 기체 조회 @GetMapping(value = "/plan/arcrft/{groupId}") @ApiOperation(value = "그룹의 기체 조회") @Tag(name = "비행계획서", description = "비행계획서 관련 API") - @ApiImplicitParam(name = "groupId",value = "그룹ID", dataTypeClass = String.class) + @ApiImplicitParam(name = "groupId", value = "그룹ID", dataTypeClass = String.class) public ResponseEntity findArcrft(@PathVariable("groupId") String groupId) { List result = null; try { @@ -266,26 +253,27 @@ public class BasFlightController { @GetMapping("/plan/api/weather") @ApiOperation(value = "비행계획서 날씨") @Tag(name = "비행계획서", description = "비행계획서 관련 API") - public ResponseEntity restApiGetWeather(BasFlightWeatherModel rq){ - JSONObject jsonObject = null; - - try { - jsonObject = basFlightService.getWeather(rq); - } catch (Exception e) { - log.error("IGNORE : {}", e); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(new ErrorResponse("Server Error", "-1")); - } + public ResponseEntity restApiGetWeather(BasFlightWeatherModel rq) { + JSONObject jsonObject = null; + + try { + jsonObject = basFlightService.getWeather(rq); + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + } return ResponseEntity.ok().body(new SuccessResponse<>(jsonObject)); } + // 비행계획서 리스트(승인) @GetMapping(value = "/aprv/list") @ApiOperation(value = "비행계획서 리스트(승인)") @Tag(name = "비행계획서", description = "비행계획서 관련 API") public ResponseEntity findAprvList(BasFlightPlanListRq rq) { - ComnPagingRs result = null; + ComnPagingRs result = null; try { result = basFlightService.aprvList(rq); } catch (Exception e) { @@ -296,6 +284,7 @@ public class BasFlightController { } return ResponseEntity.ok().body(new SuccessResponse<>(result)); } + // 비행계획서 승인/미승인 @PutMapping(value = "/aprv/proc") @ApiOperation(value = "비행 계획서 승인/미승인") @@ -338,30 +327,30 @@ public class BasFlightController { return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); } - + //지역 검색 @GetMapping("/plan/area/search") @ApiOperation(value = "지역 검색") @Tag(name = "비행계획서", description = "비행계획서 관련 API") public ResponseEntity searchArea(String query) throws ParseException { - String text = null; - try { - text = URLEncoder.encode(query, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException("검색어 인코딩 실패", e); - } - - String apiURL = env.getProperty("api.naver.search-url") + "?query=" + text + "&display=5"; - Map requestHeaders = new HashMap<>(); - requestHeaders.put("X-Naver-Client-Id", env.getProperty("api.naver.client-id")); - requestHeaders.put("X-Naver-Client-Secret", env.getProperty("api.naver.client-secret-key")); - String responseBody = basFlightService.searchArea(apiURL, requestHeaders); - - JSONParser parser = new JSONParser(); - Object obj = parser.parse(responseBody); - - return ResponseEntity.ok().body(new SuccessResponse<>(obj)); - } + String text = null; + try { + text = URLEncoder.encode(query, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("검색어 인코딩 실패", e); + } + + String apiURL = env.getProperty("api.naver.search-url") + "?query=" + text + "&display=5"; + Map requestHeaders = new HashMap<>(); + requestHeaders.put("X-Naver-Client-Id", env.getProperty("api.naver.client-id")); + requestHeaders.put("X-Naver-Client-Secret", env.getProperty("api.naver.client-secret-key")); + String responseBody = basFlightService.searchArea(apiURL, requestHeaders); + + JSONParser parser = new JSONParser(); + Object obj = parser.parse(responseBody); + + return ResponseEntity.ok().body(new SuccessResponse<>(obj)); + } @GetMapping("/schedule") @Tag(name = "비행계획서", description = "비행계획서 관련 API") @@ -385,13 +374,13 @@ public class BasFlightController { @GetMapping("/test") public void createCircleTest(@RequestParam double getX, @RequestParam double getY, @RequestParam double buffer) { - - Coordinate circleCoord = new Coordinate(getY, getX); - List coordList = utils.createCircle(circleCoord, buffer); - for(Coordinate a : coordList) { - System.out.println("["+a.getX() + ", " + a.getY()+"],"); - } + Coordinate circleCoord = new Coordinate(getY, getX); + + List coordList = utils.createCircle(circleCoord, buffer); + for (Coordinate a : coordList) { + System.out.println("[" + a.getX() + ", " + a.getY() + "],"); + } } } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordModel.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordModel.java index 9ded3b75..042d7973 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordModel.java @@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.flight.model; import lombok.Data; import java.time.Instant; -import java.util.Date; @Data public class BasFlightPlanAreaCoordModel { diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordQueryList.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordQueryList.java index 1ff24985..0ec4b872 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordQueryList.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordQueryList.java @@ -1,10 +1,9 @@ package com.palnet.biz.api.bas.flight.model; -import java.util.List; - +import lombok.Data; import org.locationtech.jts.geom.Coordinate; -import lombok.Data; +import java.util.List; @Data public class BasFlightPlanAreaCoordQueryList { diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordRq.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordRq.java index fd7b9312..b92ba3dd 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordRq.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordRq.java @@ -1,7 +1,5 @@ package com.palnet.biz.api.bas.flight.model; -import java.util.Date; - import lombok.Data; @Data diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanLaancRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanLaancRs.java new file mode 100644 index 00000000..747205ea --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanLaancRs.java @@ -0,0 +1,37 @@ +package com.palnet.biz.api.bas.flight.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * packageName : com.palnet.biz.api.bas.flight.model + * fileName : BasFlightPlanErrorRS + * author : dhji + * date : 2023-09-19(019) + * description : + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 2023-09-19(019) dhji 최초 생성 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BasFlightPlanLaancRs { + private String pilotQlfcYn; // 자격여부 + private String acrftInsuranceYn; // 항공기보험여부 + private String acrftDuplicatedYn; // 기체 중복여부 + private String planAreaDuplicatdYn; // 비행계획서비행구역 중복여부 + private String airspaceDuplicatedYn; // 공역 중복여부 + + public boolean isValid() { + return "Y".equals(pilotQlfcYn) + && "Y".equals(acrftInsuranceYn) + && "N".equals(acrftDuplicatedYn) + && "N".equals(planAreaDuplicatdYn) + && "N".equals(airspaceDuplicatedYn); + } +} diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java index 2d47f0da..2de595d0 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java @@ -3,7 +3,6 @@ package com.palnet.biz.api.bas.flight.model; import lombok.Data; import java.time.Instant; -import java.util.Date; @Data public class BasFlightScheduleRs { diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index 0b7d980f..ee893631 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.palnet.biz.api.bas.flight.model.*; import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; @@ -27,16 +28,6 @@ import org.springframework.transaction.annotation.Transactional; import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; -import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaCoordModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaCoordRq; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; -import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel; -import com.palnet.biz.api.bas.flight.model.BasFlightScheduleRs; -import com.palnet.biz.api.bas.flight.model.BasFlightWeatherModel; import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; import com.palnet.biz.api.comn.model.ComnPagingRs; import com.palnet.biz.jpa.entity.FltPlanArcrft; @@ -181,7 +172,14 @@ public class BasFlightService { return rs; } - public void planValid(BasFlightPlanModel rq) { + public BasFlightPlanLaancRs planValid(BasFlightPlanModel rq) { + BasFlightPlanLaancRs rs = BasFlightPlanLaancRs.builder() + .pilotQlfcYn("N") + .acrftInsuranceYn("N") + .airspaceDuplicatedYn("N") + .acrftDuplicatedYn("N") + .planAreaDuplicatdYn("N") + .build(); boolean isEqualsFltElev = false; List rqAreaList = rq.getAreaList(); String rqFltElev = rqAreaList.get(0).getFltElev(); @@ -197,10 +195,12 @@ public class BasFlightService { } List effectivePlanCount = fltPlanQueryRepository.CoordCount(rq); for (BasFlightPlanModel i : effectivePlanList) { - if (rq.getPlanSno().equals(i.getPlanSno())) return; + // TODO 의미? + if (rq.getPlanSno().equals(i.getPlanSno())) return rs; + } if (effectivePlanList != null && !effectivePlanList.isEmpty()) { - for (BasFlightPlanModel plan : effectivePlanList) { + plan: for (BasFlightPlanModel plan : effectivePlanList) { // 1. 구역 조회 List areaList = fltPlanAreaRepository.findByPlanSnoOrderByPlanAreaSnoAsc(plan.getPlanSno()); @@ -251,23 +251,29 @@ public class BasFlightService { } else if ("CIRCLE".equals(rqArea.getAreaType())) { rqCoordBufferList = areaUtils.createCircle(rqCoord.get(0), rqArea.getBufferZone()); } - //검증 + //검증 - 비행계획서 비행구역 중복확인 overlapCheck = areaUtils.overlaps(rqCoordBufferList, effectiveCoordBufferList); overlapCheck2 = areaUtils.overlaps(effectiveCoordBufferList, rqCoordBufferList); if ((overlapCheck || overlapCheck2) && isEqualsFltElev) { - throw new CustomException(ErrorCode.PLAN_DATA_DUPLICATE); +// throw new CustomException(ErrorCode.PLAN_DATA_DUPLICATE); + rs.setPlanAreaDuplicatdYn("Y"); + break plan; } for (Coordinate coord : effectiveCoordBufferList) { containCheck = areaUtils.contains(rqCoordBufferList, coord); if (containCheck && isEqualsFltElev) { - throw new CustomException(ErrorCode.PLAN_DATA_DUPLICATE); +// throw new CustomException(ErrorCode.PLAN_DATA_DUPLICATE); + rs.setPlanAreaDuplicatdYn("Y"); + break plan; } } for (Coordinate coord : rqCoordBufferList) { containCheck2 = areaUtils.contains(effectiveCoordBufferList, coord); if (containCheck2 && isEqualsFltElev) { - throw new CustomException(ErrorCode.PLAN_DATA_DUPLICATE); +// throw new CustomException(ErrorCode.PLAN_DATA_DUPLICATE); + rs.setPlanAreaDuplicatdYn("Y"); + break plan; } } } @@ -275,24 +281,34 @@ public class BasFlightService { } // 3. 중복 기체 확인 - for (BasFlightPlanAreaCoordRq idntfNum : effectivePlanCount) { + acrft: for (BasFlightPlanAreaCoordRq idntfNum : effectivePlanCount) { for (BasFlightPlanArcrftModel rqArcrft : rq.getArcrftList()) { if (rqArcrft.getIdntfNum().equals(idntfNum.getIdntfNum())) { - throw new CustomException(ErrorCode.ARCRFT_DATA_DUPLICATE); +// throw new CustomException(ErrorCode.ARCRFT_DATA_DUPLICATE); + rs.setAcrftDuplicatedYn("Y"); + break acrft; } } } } } + return rs; } // 비행계획서 등록 @Transactional - public boolean createPlan(BasFlightPlanModel rq) { + public BasFlightPlanLaancRs createPlan(BasFlightPlanModel rq) { // 비행계획서 유효성 검사. - this.planValid(rq); + BasFlightPlanLaancRs rs = this.planValid(rq); + // TODO 공역 중복 확인 + rs.setAirspaceDuplicatedYn("N"); + // TODO 조종사 자격 및 기체보험 확인 + rs.setPilotQlfcYn("Y"); + rs.setAcrftInsuranceYn("Y"); + + if(!rs.isValid()) return rs; // 비행계획서 String userId = jwtTokenUtil.getUserIdByToken(); @@ -349,15 +365,23 @@ public class BasFlightService { fltPlanArcrftRepository.save(arcrftEntity); } } - return true; + return rs; } // 비행계획서 수정 @Transactional - public boolean updatePlan(BasFlightPlanModel rq) { + public BasFlightPlanLaancRs updatePlan(BasFlightPlanModel rq) { // 비행계획서 유효성 검사. - this.planValid(rq); + // 비행계획서 유효성 검사. + BasFlightPlanLaancRs rs = this.planValid(rq); + // TODO 공역 중복 확인 + rs.setAirspaceDuplicatedYn("N"); + // TODO 조종사 자격 및 기체보험 확인 + rs.setPilotQlfcYn("Y"); + rs.setAcrftInsuranceYn("Y"); + + if(!rs.isValid()) return rs; if (rq != null && rq.getPlanSno() != null) { String userId = jwtTokenUtil.getUserIdByToken(); @@ -475,7 +499,7 @@ public class BasFlightService { fltPlanArcrftRepository.deleteAll(deleteArcrftEntity); } } - return true; + return rs; } // 비행계획서 삭제 diff --git a/pav-socket/build.gradle b/pav-socket/build.gradle index 3b08317d..6ea45562 100644 --- a/pav-socket/build.gradle +++ b/pav-socket/build.gradle @@ -20,7 +20,7 @@ jar { } dependencies { - implementation project(':pav-common') +// implementation project(':pav-common') implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-actuator' diff --git a/pav-websocket/build.gradle b/pav-websocket/build.gradle index 5cd9e046..8783894a 100644 --- a/pav-websocket/build.gradle +++ b/pav-websocket/build.gradle @@ -20,7 +20,7 @@ jar { } dependencies { - implementation project(':pav-common') +// implementation project(':pav-common') implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'io.netty:netty-all:4.1.63.Final' diff --git a/settings.gradle b/settings.gradle index d85a34dc..6a394419 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ rootProject.name = 'pav-be-kac' -include 'pav-common' +//include 'pav-common' include 'pav-socket' include 'pav-websocket' include 'pav-server'