add: 임시커밋

회원가입시 cptAutoCode(권한코드)를 못받아와서 생기는 현상
해당 코드로 어떤 기관청인지 확인하는 부분에서 값이 없어 버그가 발생함
기본값으로 KAC(한국공항공사) 권한을 주었음.

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.palnet.biz.api.acnt.cstmr.model.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -16,11 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel;
-import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel;
 import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService;
 import com.palnet.biz.api.comn.response.BasicResponse;
 import com.palnet.biz.api.comn.response.ErrorResponse;
@@ -159,15 +155,15 @@ public class AcntCstmrController {
 	/**
 	 * 회원 기존 패스워드 확인,
 	 * userPswd 값에 있는 회원 암호가 맞는지 확인합니다.
-	 * @param userPswdMap
+	 * @param rq
 	 * @return
 	 */
 	@PostMapping(value = "/profile/pwcheck")
 	@Operation(summary = "기존 회원의 패스워드 확인", description = " jwt토큰에 등록된 유저정보와 패스워드가 일치하는지 확인합니다. 입력 예시 -> userPswd : test1234 ")
-	public ResponseEntity<? extends BasicResponse> extendpsw(@Parameter(name="userPswd", description = "유저 비밀번호", in = ParameterIn.QUERY, example = "test1234") String userPswd){
+	public ResponseEntity<? extends BasicResponse> extendpsw(@RequestBody  AcntCstmrPswdCheckRQ rq){
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
-			boolean result = service.extendpsw(userPswd); // 기존 암호가 맞는지 확인하는 기능.
+			boolean result = service.extendpsw(rq); // 기존 암호가 맞는지 확인하는 기능.
 			resultMap.put("result", result);
 
 		} catch (CustomException e) {

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrPswdCheckRQ.java

@@ -0,0 +1,11 @@
+package com.palnet.biz.api.acnt.cstmr.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class AcntCstmrPswdCheckRQ {
+
+    @Schema(description = "유저의 비밀번호", example = "test1234")
+    private String userPswd;
+}

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrRqModel.java

@@ -71,6 +71,9 @@ public class AcntCstmrRqModel{
 	@Schema(hidden = true)
 	private String trmnlId;
 
+	@Schema(description = "권한코드(부서)" , example = "KAC")
+	private String cptAuthCode;
+	
 	
 	
 }

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java

@@ -5,18 +5,13 @@ import java.util.List;
 
 import javax.persistence.EntityManagerFactory;
 
+import com.palnet.biz.api.acnt.cstmr.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel;
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel;
-import com.palnet.biz.api.acnt.cstmr.model.AnctCstmerRlModel;
-import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel;
 import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel;
 import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
 import com.palnet.biz.jpa.entity.PtyCstmrBas;
@@ -152,6 +147,7 @@ public class AcntCstmrService {
 		basEntity.setJoinDt(Instant.now() );
 		basEntity.setJoinIp(HttpUtils.getRequestIp());
 		basEntity.setTrmnlId(rq.getTrmnlId());
+		basEntity.setCptAuthCode(rq.getCptAuthCode() == null ? "KAC": rq.getCptAuthCode());
 
 		return ptyCstmrBasRepository.save(basEntity);
 		
@@ -259,8 +255,10 @@ public class AcntCstmrService {
 	 * @param userPswd
 	 * @return
 	 */
-	public boolean extendpsw(String userPswd){
+	public boolean extendpsw(AcntCstmrPswdCheckRQ rq){
 		boolean result = false;
+		String userPswd = rq.getUserPswd();
+
 		// 	1. 토큰 유저 정보 불러오기
 		Integer userId = jwtTokenUtil.getCstmrSnoByToken();
 

pav-server/src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java

@@ -133,7 +133,7 @@ public class AnlsSmltService {
 		List<AnlsHstryDetailModel> resultList = query.listCntrlHstry(id);
 		
 		//정렬 순서 뒤집기 처리
-		Collections.reverse(resultList);
+		//		Collections.reverse(resultList);
 		
 		return resultList;
 	}

pav-server/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java

@@ -84,8 +84,8 @@ public class BasDronController {
 	 */
 	@GetMapping(value = "/idntf/list/{id}")
 	@Operation(summary = "드론정보 조회", description = "드론[기체]일련번호로 식별장치를 조회합니다.")
-	public ResponseEntity<? extends BasicResponse> mylist(@Parameter(name="id", description = "기체일련번호", in = ParameterIn.PATH, example = "6") @PathVariable Integer id) {
-		List<BasIdntfModel> result = null;
+	public ResponseEntity<? extends BasicResponse> mylist(@Parameter(name="id", description = "기체일련번호", in = ParameterIn.PATH, example = "1") @PathVariable Integer id) {
+		BasIdntfModel result = null;
 		
 		// 기체일련번호확인[id] 입력값 검증처리
 		if(StringUtils.isEmpty(id)) {
@@ -111,7 +111,7 @@ public class BasDronController {
 					.body(new ErrorResponse("Server Error", "-1"));
 
 		}
-		return ResponseEntity.ok().body(new SuccessResponse<List>(result));
+		return ResponseEntity.ok().body(new SuccessResponse<>(result));
 
 	}
 	
@@ -335,6 +335,44 @@ public class BasDronController {
 		}
 		return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
 
+	}
+	/**
+	 * 식별장치 수정
+	 * @param id
+	 * @return
+	 */
+	@PutMapping(value = "/idntf/update/{id}")
+	@Operation(summary = "드론식별장치 정보 수정", description = "드론[기체]식별장치 정보를 수정합니다. 실제로 존재하는 기체번호(idntfNum)의 소유자명과 핸드폰 번호를 수정합니다.")
+	public ResponseEntity<? extends BasicResponse> updateIdntf(@RequestBody BasIdntfUpdateModel rq) {
+		Map<String , Object> resultMap = new HashMap<String,Object>();
+		
+        try {
+        	// 기체일련번호확인[id] 입력값 검증처리
+    		if(StringUtils.isEmpty(rq.getIdntfNum())) {
+				// 검증통과하지 못할 시 서버에서 "의도적인" 에러 반환
+				return ResponseEntity.status(HttpStatus.OK) // "의도적인" 에러 반환코드
+						.body(new ErrorResponse(RSErrorCode.ER_PARAM));
+			}
+
+        	boolean result = service.updateIdntf(rq); // 드론정보 수정하는 기능.
+        	
+        	resultMap.put("result", result);
+			
+        } catch (Exception e) {
+			/**
+			 * try{
+				...
+			}
+			 * try 영역 안 코드들중 문제가 생기면 오는 곳.
+			 * log.error 로그로 원인 파악과 함께 API를 호출한 곳에 서버에러 내려줌
+			 */
+			log.error("IGNORE : {}", e);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(new ErrorResponse("Server Error", "-1"));
+
+		}
+		return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
+
 	}
 	
 	/**

pav-server/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfUpdateModel.java

@@ -0,0 +1,17 @@
+package com.palnet.biz.api.bas.dron.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BasIdntfUpdateModel {
+	
+	@Schema(description = "기체 식별번호", example = "PA0001")
+	private String idntfNum;
+	
+	@Schema(description = "변경할 소유자명", example = "수정소유자명")
+	private String ownerNm;
+	
+	@Schema(description = "변경할 핸드폰 번호", example = "01036907198")
+	private String hpno;
+}

pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java

@@ -1,6 +1,8 @@
 package com.palnet.biz.api.bas.dron.service;
 
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -18,6 +20,7 @@ import com.palnet.biz.api.bas.dron.model.BasDronModel;
 import com.palnet.biz.api.bas.dron.model.BasDronRqModel;
 import com.palnet.biz.api.bas.dron.model.BasIdntfModel;
 import com.palnet.biz.api.bas.dron.model.BasIdntfRqModel;
+import com.palnet.biz.api.bas.dron.model.BasIdntfUpdateModel;
 import com.palnet.biz.api.comn.model.ComnPagingRs;
 import com.palnet.biz.jpa.entity.ComArcrftBas;
 import com.palnet.biz.jpa.entity.ComIdntfBas;
@@ -81,17 +84,17 @@ public class BasDronService {
 	 * @param arcrftSno
 	 * @return
 	 */
-	public List<BasIdntfModel> listIdntf(int arcrftSno){
+	public BasIdntfModel listIdntf(int arcrftSno){
 
-		List<BasIdntfModel> resultList = query.idntfList(arcrftSno);
+		BasIdntfModel result = query.idntfList(arcrftSno);
 
-		for(BasIdntfModel model : resultList){
-			if(model.getHpno() != null && !model.getHpno().isEmpty()){
-				model.setHpno(EncryptUtils.decrypt(model.getHpno()));
+		if(result != null) {
+			if(result.getHpno() != null && !result.getHpno().isEmpty()){
+				result.setHpno(EncryptUtils.decrypt(result.getHpno()));
 			}
 		}
 
-		return resultList;
+		return result;
 	}
 	
 	/**
@@ -209,6 +212,42 @@ public class BasDronService {
 		
 	}
 	
+	/**
+	 * 드론정보 수정하는 기능.
+	 * @param idntfNum
+	 * @return
+	 */
+	public boolean updateIdntf(BasIdntfUpdateModel rq) {
+		
+		Optional<ComIdntfBas> optional =  comIdntBasRepository.findById(rq.getIdntfNum());
+		
+		if (!optional.isPresent()) {
+			throw new CustomException(ErrorCode.DATA_NOTFIND);
+		}
+		String hpno = "";
+		ComIdntfBas entity = optional.get();
+		
+		if(rq.getHpno() != null && rq.getHpno() != "") {
+			hpno = EncryptUtils.encrypt(rq.getHpno());
+			entity.setHpno(hpno);
+		}
+		
+		if(rq.getOwnerNm() != null && rq.getOwnerNm() != "") {
+			entity.setOwnerNm(rq.getOwnerNm());
+		}
+		
+		ZoneId koreaZoneId = ZoneId.of("Asia/Seoul");
+
+		ZonedDateTime koreaTime = ZonedDateTime.ofInstant(Instant.now(), koreaZoneId);
+
+		entity.setUpdateDt(koreaTime.toInstant());
+		
+		comIdntBasRepository.save(entity);
+		
+		return true;
+		
+	}
+	
 	/**
 	 * 드론정보 삭제하는 기능.
 	 * @param idntfNum

pav-server/src/main/java/com/palnet/biz/api/comn/coordinate/controller/ComnCoordinateController.java

@@ -1,14 +1,5 @@
 package com.palnet.biz.api.comn.coordinate.controller;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.palnet.biz.api.comn.coordinate.model.CompotentAuthorityRQ;
 import com.palnet.biz.api.comn.coordinate.model.CompotentAuthorityRS;
 import com.palnet.biz.api.comn.coordinate.service.ComnCoordinateService;
@@ -16,11 +7,18 @@ import com.palnet.biz.api.comn.response.BasicResponse;
 import com.palnet.biz.api.comn.response.ErrorResponse;
 import com.palnet.biz.api.comn.response.SuccessResponse;
 import com.palnet.comn.exception.CustomException;
-
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @RequiredArgsConstructor
@@ -36,9 +34,8 @@ public class ComnCoordinateController {
      * @param rq
      * @return
      */
+    @Operation(summary = "좌표로 관할 기관청 가져오기", description = "좌표로 관할 기관청 가져오기")
     @GetMapping("/comptent-authority")
-    @ApiOperation(value = "좌표로 관할 기관청 가져오기")
-    @Tag(name = "공통 API", description = "공통 API")
     public ResponseEntity<? extends BasicResponse> getCompetentAuthority(CompotentAuthorityRQ rq){
 
         CompotentAuthorityRS result = new CompotentAuthorityRS();

pav-server/src/main/java/com/palnet/biz/api/comn/sunriseset/service/ComnSunrisesetService.java

@@ -3,6 +3,8 @@ package com.palnet.biz.api.comn.sunriseset.service;
 import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetCoordRq;
 import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetRq;
 import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetRs;
+import com.palnet.biz.jpa.entity.ComRiseSetBas;
+import com.palnet.biz.jpa.repository.com.ComRiseSetBasRepository;
 import com.palnet.biz.jpa.repository.com.ComRiseSetQueryRepository;
 import com.palnet.comn.code.ErrorCode;
 import com.palnet.comn.exception.CustomException;
@@ -10,6 +12,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -28,6 +32,7 @@ import java.util.List;
 @Service
 public class ComnSunrisesetService {
 
+    private final ComRiseSetBasRepository comRiseSetBasRepository;
 
     private final ComRiseSetQueryRepository comRiseSetQueryRepository;
 
@@ -37,8 +42,9 @@ public class ComnSunrisesetService {
      * @return
      */
     public List<ComnSunrisesetRs> getSunRiseSetList(ComnSunrisesetRq rq) {
-        return comRiseSetQueryRepository.findAllBySearchTransform(rq);
+        List<ComRiseSetBas> list = comRiseSetBasRepository.findByLocStDateAndLocEndDateNearLocation(rq.getLocStDate(), rq.getLocEndDate(), rq.getLocation());
 
+        return ComnSunrisesetMapper.MAPPER.toRs(list);
     }
 
     /**
@@ -58,6 +64,18 @@ public class ComnSunrisesetService {
      */
     public List<ComnSunrisesetRs> getSunRiseSetByCoord(ComnSunrisesetCoordRq rq) {
         if(rq == null || !rq.hasCoord()) throw new CustomException(ErrorCode.NON_VALID_PARAMETER);
-        return comRiseSetQueryRepository.findAllBySearchCoordTransform(rq);
+
+        LocalDate stDate = LocalDate.now();
+        LocalDate endDate = stDate.plusMonths(6);
+
+        String location = comRiseSetQueryRepository.findLocationByGeo(rq);
+        String stDateStr = stDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+        List<ComRiseSetBas> list = comRiseSetBasRepository.findByLocStDateAndLocEndDateNearLocation(stDateStr, endDateStr, location);
+
+        return ComnSunrisesetMapper.MAPPER.toRs(list);
     }
+
+
 }

pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java

@@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComRiseSetBasRepository.java

@@ -26,4 +26,34 @@ public interface ComRiseSetBasRepository extends JpaRepository<ComRiseSetBas, Co
     @Query(value = "SELECT R FROM COM_RISE_SET_BAS R WHERE LOC_DATE >= :locStDate AND LOC_DATE <= :locEndDate", nativeQuery = true)
     List<ComRiseSetBas> findByLocStDateAndLocEndDate(@Param("locStDate") String locStDate, @Param("locEndDate") String locEndDate);
 
+    /**
+     * RQ로 받은 location[지역]과 RQ로 받은 일자별로 가장 가까운 도시 SELECT함
+     * SELECT
+     * 	NEAR.*
+     * FROM
+     * 	(
+     * 		SELECT
+     * 			*,
+     * 			CAST(
+     * 				ST_DISTANCE_SPHERE(
+     * 					POINT(LON, LAT),
+     * 					POINT(
+     * 						(SELECT DISTINCT LON FROM COM_RISE_SET_BAS WHERE LOCATION = :location),
+     * 						(SELECT DISTINCT LAT FROM COM_RISE_SET_BAS WHERE LOCATION = :location)
+     * 					)
+     * 				) AS SIGNED
+     * 			) AS DIST
+     * 		FROM COM_RISE_SET_BAS
+     * 		WHERE LOC_DATE BETWEEN :locStDate AND :locEndDate
+     * 		ORDER BY LOC_DATE ASC , DIST ASC )
+     * 	AS NEAR
+     * GROUP BY NEAR.LOC_DATE
+     * @param locStDate
+     * @param locEndDate
+     * @param location
+     * @return
+     */
+    @Query(value = "SELECT NEAR.* FROM ( SELECT *, CAST( ST_DISTANCE_SPHERE( POINT(LON, LAT), POINT( (SELECT DISTINCT LON FROM COM_RISE_SET_BAS WHERE LOCATION = :location), (SELECT DISTINCT LAT FROM COM_RISE_SET_BAS WHERE LOCATION = :location) ) ) AS SIGNED ) AS DIST FROM COM_RISE_SET_BAS WHERE LOC_DATE BETWEEN :locStDate AND :locEndDate ORDER BY LOC_DATE ASC , DIST ASC ) AS NEAR GROUP BY NEAR.LOC_DATE", nativeQuery = true)
+    List<ComRiseSetBas> findByLocStDateAndLocEndDateNearLocation(@Param("locStDate") String locStDate, @Param("locEndDate") String locEndDate, @Param("location") String location);
+
 }

pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComRiseSetQueryRepository.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,6 +35,19 @@ import java.util.List;
 public class ComRiseSetQueryRepository {
     private final JPAQueryFactory query;
 
+    public List<String> findUnDuplicatoinLocationByLocDate(String locDate){
+        QComRiseSetBas bas = QComRiseSetBas.comRiseSetBas;
+
+        List<String> result = query
+            .selectDistinct(bas.id.location)
+            .from(bas)
+            .where(bas.id.location.eq(locDate))
+            .fetch();
+
+        return result;
+    }
+
+
     public List<ComRiseSetBas> findAllBySearch(ComnSunrisesetRq rq) {
         QComRiseSetBas bas = QComRiseSetBas.comRiseSetBas;
 
@@ -249,4 +263,32 @@ public class ComRiseSetQueryRepository {
                 .fetch();
         return rs;
     }
+
+    public String findLocationByGeo(ComnSunrisesetCoordRq rq){
+        QComRiseSetBas bas = QComRiseSetBas.comRiseSetBas;
+
+        BooleanBuilder builder = new BooleanBuilder();
+        LocalDate stDate = LocalDate.now();
+        LocalDate endDate = stDate.plusMonths(6);
+        String stDateStr = stDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String endDateStr = endDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        builder.and(bas.id.locDate.goe(stDateStr));
+        builder.and(bas.id.locDate.loe(endDateStr));
+
+        return query.select(bas.id.location)
+                .from(bas)
+                .where(builder)
+                .groupBy(bas.id.location)
+                .orderBy(Expressions.stringTemplate("ST_Distance_Sphere({0}, {1})",
+                        Expressions.stringTemplate("POINT({0}, {1})",
+                                rq.getLon(),
+                                rq.getLat()
+                        ),
+                        Expressions.stringTemplate("POINT({0}, {1})",
+                                bas.lon,
+                                bas.lat
+                        )
+                ).asc())
+                .fetchFirst();
+    }
 }

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

@@ -1361,8 +1361,7 @@ public class CtrCntrlQueryRepository{
 				.from(qCntrlBasEntity)
 				.leftJoin(qCtrCntrHstry)
 				.on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId))
-				.where(builder)
-				.orderBy(qCtrCntrHstry.srvrRcvDt.asc())
+				.where(builder)
				.orderBy(qCtrCntrHstry.hstrySno.asc())
 				.fetch();
 
 		return result;

pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java

@@ -1,6 +1,7 @@
 package com.palnet.biz.jpa.repository.pty;
 
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -215,7 +216,7 @@ public class PtyDronQueryRepository{
      * @param arcrftSno
      * @return
      */
-	public List<BasIdntfModel> idntfList(int arcrftSno){
+	public BasIdntfModel idntfList(int arcrftSno){
     	
     	QComIdntfBas idnt = QComIdntfBas.comIdntfBas;
     	QComArcrftBas arcrft = QComArcrftBas.comArcrftBas;
@@ -243,7 +244,8 @@ public class PtyDronQueryRepository{
 		 * WHERE CIB.ARCRFT_SNO = #{arcrftSno}
 		 * ORDER BY CIB.CREATE_DT ASC
 		 */
-        List<BasIdntfModel> result = 
+        
+        BasIdntfModel result = 
                 query.select(Projections.bean(BasIdntfModel.class , 
                 		
                 		idnt.arcrftSno,
@@ -260,7 +262,9 @@ public class PtyDronQueryRepository{
                 		.on(idnt.arcrftSno.eq(arcrft.arcrftSno))
                 		.where(builder)
                         .orderBy(idnt.createDt.asc())
-                        .fetch();
+                        .fetchFirst();
+        
+        
         return result;
     }
 	

pav-server/src/main/java/com/palnet/biz/scheduler/external/SunRiseSetScheduler.java

@@ -0,0 +1,21 @@
+package com.palnet.biz.scheduler.external;
+
+import com.palnet.biz.scheduler.external.service.SunRiseSchedulerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Profile({"dev", "prod"})
+public class SunRiseSetScheduler {
+
+    private final SunRiseSchedulerService sunRiseSchedulerService;
+
+    @Scheduled(cron = "0 0 2 * * *") // 매일 새벽 2시
+    public void run(){
+        sunRiseSchedulerService.sunsetSchedule();
+    }
+
+}

pav-server/src/main/java/com/palnet/biz/scheduler/external/service/SunRiseSchedulerService.java

@@ -0,0 +1,225 @@
+package com.palnet.biz.scheduler.external.service;
+
+import com.palnet.biz.api.external.model.SunRiseSetRs;
+import com.palnet.biz.api.external.model.SunRiseSetXmlRs;
+import com.palnet.biz.api.external.service.SunRiseSetMapper;
+import com.palnet.biz.jpa.entity.ComRiseSetBas;
+import com.palnet.biz.jpa.entity.ComRiseSetBasPK;
+import com.palnet.biz.jpa.repository.com.ComRiseSetBasRepository;
+import com.palnet.biz.jpa.repository.com.ComRiseSetQueryRepository;
+import com.palnet.comn.code.ErrorCode;
+import com.palnet.comn.exception.CustomException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.lang.reflect.Field;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class SunRiseSchedulerService {
+
+    private final ComRiseSetQueryRepository comRiseSetQueryRepository;
+
+    private final ComRiseSetBasRepository comRiseSetBasRepository;
+
+    @Value("${external.sunriseset.url}")
+    private String SUN_HOST;
+
+    @Value("${external.sunriseset.key}")
+    private String SUN_KEY;
+
+    private final String AREA_RISE_SEET_INFO_URL = "/getAreaRiseSetInfo";
+
+    private static final String[][][] location = {
+            {
+                    {"백령도", "연평도", "덕적도", "강화", "격렬비도", "격렬비도", "김포", "인천", "부천", "고양", "시흥", "태안", "광명"},
+                    {"연세KVN", "안산", "서산", "서울", "의정부", "화성", "양주", "군포", "동두천", "안양", "연천", "과천", "당진"},
+                    {"의왕", "구리", "포천", "수원", "성남", "남양주", "하남", "오산", "파주", "철원", "경기광주", "용인", "평택"},
+                    {"가평", "양평", "이천", "화천", "춘천", "홍천", "양구", "인제", "홍천군서석면", "인제군기린면", "강원고성", "속초", "양양"}
+            },
+            {
+                    {"어청도", "보령", "서천", "위도", "군산", "홍성", "청양", "부여", "익산", "예산", "논산", "공주", "계룡"},
+                    {"아산", "세종", "천안", "대덕전파천문대", "대전", "옥천", "청주", "청주공항", "안성", "진천", "증평", "보은", "음성"},
+                    {"괴산", "괴산군연풍면", "여주", "충주", "문경", "원주", "제천", "예천", "단양", "횡성", "소백산천문대", "영주", "영월"},
+                    {"평창", "봉화", "정선", "홍천군내면", "춘양", "태백", "대관령", "평창KVN", "강릉", "주문진", "동해", "삼척"}
+            },
+            {
+                    {"가거도", "흑산도", "신안", "목포", "신안군임자면", "무안", "영암", "함평", "나주", "영광", "광주", "화순", "장성"},
+                    {"고창", "변산", "담양", "정읍", "순창", "부안", "곡성", "김제", "남원", "임실", "전주", "완주", "장수"},
+                    {"진안", "함양", "거창", "금산", "무주", "김천시부항면", "영동", "고령", "성주", "추풍령", "김천", "달성", "칠곡"},
+                    {"구미", "대구", "상주", "군위", "의성", "보현산천문대", "안동", "청송", "영양", "영덕", "울진", "울릉"}
+            },
+            {
+                    {"마라도", "제주레이더", "탐라KVN", "서귀포", "제주", "성산일출", "추자도", "완도", "삼산도", "진도", "해남", "강진", "장흥"},
+                    {"고흥", "보성", "여수", "여수공항", "순천", "승주", "광양", "남해", "하동", "구례", "사천", "통영", "고성"},
+                    {"진주", "거제", "산청", "의령", "함안", "합천", "창원", "김해", "창녕", "부산", "밀양", "양산", "진해"},
+                    {"기장", "청도", "경산", "울주", "울산KVN", "울산", "경주시산내면", "영천", "경주", "경주시감포읍", "포항", "독도"}
+            }
+    };
+
+    public void sunsetSchedule(){
+        List<String> todayLocation = this.todayLocation();
+        LocalDate today = LocalDate.now();
+        List<String> timeColumn = List.of("sunrise", "suntransit", "sunset", "moonrise", "moontransit", "moonset", "civilm", "civile", "nautm", "naute", "astm", "aste");
+
+        List<ComRiseSetBas> sunRiseSet = new ArrayList<>();
+
+        // 내일부터 약180일 데이터 INSERT
+        for(int i = 0; i <= 180; i ++){
+            today = today.plusDays(1);
+            String locdate = today.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+            List<String> rotateLocation = getUnDuplicationLocation(todayLocation,locdate);
+
+            for(int j = 0; j < rotateLocation.size(); j ++){
+                String location = rotateLocation.get(j);
+
+                List<SunRiseSetRs> results = callSunRiseSet(locdate, location);
+
+                // trim 제거 및 6자리로 맞추기
+                results.forEach(result -> {
+                    Class<? extends SunRiseSetRs> aClass = result.getClass();
+                    Field[] declaredFields = aClass.getDeclaredFields();
+                    for (Field field: declaredFields){
+                        if(timeColumn.contains(field.getName())){
+                            field.setAccessible(true);
+                            try {
+                                Object o = field.get(result);
+                                if(o instanceof String){
+                                    String str = (String) o;
+                                    if(!str.isEmpty()) {
+                                        String trim = str.trim();
+                                        if(trim.length() <= 6 && trim.length() >= 4 && trim.matches("-?\\d+(\\.\\d+)?")) {
+                                            field.set(result, String.format("%-6s", trim).replace(' ', '0'));
+                                        } else {
+                                            field.set(result, null);
+                                        }
+                                    }
+                                }
+
+                            } catch (IllegalAccessException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }
+
+                    ComRiseSetBasPK pk = SunRiseSetMapper.MAPPER.toEntityPk(result);
+                    ComRiseSetBas entity = SunRiseSetMapper.MAPPER.toEntity(result);
+                    entity.setId(pk);
+
+                    sunRiseSet.add(entity);
+                });
+            }
+
+            if(i%30 == 0){
+                comRiseSetBasRepository.saveAll(sunRiseSet);
+
+                sunRiseSet.clear();
+            }
+        }
+    }
+
+    private List<String> getUnDuplicationLocation(List<String> todayLocation, String location){
+
+        List<String> dateLocation = comRiseSetQueryRepository.findUnDuplicatoinLocationByLocDate(location);
+
+        HashSet<String> set = new HashSet<>(todayLocation);
+        set.removeAll(dateLocation);
+
+        return new ArrayList<>(set);
+    }
+
+    private List<SunRiseSetRs> callSunRiseSet(String locdate, String location) {
+
+        String uriStr = UriComponentsBuilder.fromUriString(AREA_RISE_SEET_INFO_URL)
+                .queryParam("serviceKey", SUN_KEY)
+                .queryParam("locdate", locdate)
+                .queryParam("location", location)
+                .build().toUriString();
+
+        WebClient client = WebClient.builder()
+                .baseUrl(SUN_HOST)
+                .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE)
+                .build();
+
+        ResponseEntity<SunRiseSetXmlRs> resp = client.get()
+                .uri(uriStr)
+                .retrieve()
+                .toEntity(SunRiseSetXmlRs.class)
+                .block();
+
+        log.debug(">>> resp : {}", resp);
+
+        List<SunRiseSetRs> items = resp.getBody().getBody().getItems();
+
+        return items;
+    }
+
+    private List<String> todayLocation (){
+        int count = this.init();
+        int changeCount = this.arraySelect(count);
+
+        List<String> todayLocation = new ArrayList<>();
+
+        for(int i = 0; i < 4; i ++){
+            if(changeCount == 4) changeCount = 0;
+            String[] arr = this.location[i][changeCount];
+
+            todayLocation.addAll(Arrays.asList(arr));
+            changeCount ++;
+        }
+
+        // 중복제거
+        HashSet<String> set = new HashSet<>(todayLocation);
+
+        return new ArrayList<>(set);
+    }
+
+    private int arraySelect(int count){
+        int result;
+
+        switch (count){
+            case 1 :
+                result = 0;
+                break;
+            case 2 :
+                result = 1;
+                break;
+            case 3 :
+                result= 2;
+                break;
+            case 4 :
+                result = 3;
+                break;
+            default:
+                throw new CustomException(ErrorCode.NON_VALID_PARAMETER);
+        }
+
+        return result;
+    }
+
+
+    private int init(){
+
+        int day = LocalDate.now().getDayOfMonth();
+
+        return (day % 4) + 1;
+    }
+
+
+}

pav-server/src/main/java/com/palnet/comn/utils/DmsUtils.java

@@ -100,18 +100,17 @@ public class DmsUtils {
 	}
 	
 	public static String convertDDtoDMS(Coordinate DD) {
+        double latitude = DD.x;
+        double longitude = DD.y;
 
-		double latitude = DD.x;
-    	double longitude = DD.y;
-    	
-    	char latitudeDirection = (latitude >= 0) ? 'N' : 'S';
+        char latitudeDirection = (latitude >= 0) ? 'N' : 'S';
         char longitudeDirection = (longitude >= 0) ? 'E' : 'W';
 
         latitude = Math.abs(latitude);
         longitude = Math.abs(longitude);
 
-        int latitudeDegrees = (int) Math.round(latitude);
-        int longitudeDegrees = (int) Math.round(longitude);
+        int latitudeDegrees = (int) Math.floor(latitude);
+        int longitudeDegrees = (int) Math.floor(longitude);
 
         double latitudeMinutes = (latitude - latitudeDegrees) * 60;
         double longitudeMinutes = (longitude - longitudeDegrees) * 60;
@@ -119,10 +118,12 @@ public class DmsUtils {
         int latitudeSeconds = (int) ((latitudeMinutes - (int) latitudeMinutes) * 60);
         int longitudeSeconds = (int) ((longitudeMinutes - (int) longitudeMinutes) * 60);
 
-        String result = String.format("%d° %02d′ %02d″ %c %d° %02d′ %02d″ %c\n", latitudeDegrees, (int) latitudeMinutes, latitudeSeconds, latitudeDirection, longitudeDegrees, (int) longitudeMinutes, longitudeSeconds, longitudeDirection);
+        String result = String.format("%d° %02d′ %02d″ %c, %d° %02d′ %02d″ %c",
+                latitudeDegrees, (int) latitudeMinutes, latitudeSeconds, latitudeDirection,
+                longitudeDegrees, (int) longitudeMinutes, longitudeSeconds, longitudeDirection);
 
-		return result;
-	}
+        return result;
+    }
 	
 	public static String convertDMMtoDD(String DMM) {
 		

pav-server/src/main/java/com/palnet/comn/utils/SunRiseUtils.java

@@ -0,0 +1,130 @@
+package com.palnet.comn.utils;
+
+public class SunRiseUtils {
+
+    public static String calculateSunriseSunset(int year, int month, int day, double longitude, double lati) {
+        int sunriseH, sunrisem, sunsetH, sunsetm;
+
+        double latitude = deg2rad(lati);
+        double zenith = deg2rad(90.8333);  // 일출일몰 계산, 시민박명:96.0, 항해박명:102.0, 천문박명:108.0
+        double timezone = 9.0;  // KST +9H
+
+        // 1. first calculate the day of the year
+        int N = (int) (floor(275 * month / 9) - (floor((month + 9) / 12) * (1 + floor((year - 4 * floor(year / 4) + 2) / 3))) + day - 30);
+
+        // 2. convert the longitude to hour value and calculate an approximate time
+        double lhour = longitude / 15;
+        double tr = N + ((6 - lhour) / 24.0); // sunrise
+        double ts = N + ((18 - lhour) / 24.0); // sunrise
+
+        // 3. calculate the Sun's mean anomaly
+        double Mr = (0.9856 * tr) - 3.289;
+        double Ms = (0.9856 * ts) - 3.289;
+
+        // 4. calculate the Sun's true longitude
+        double Lr = Mr + (1.916 * sin(deg2rad(Mr))) + (0.020 * sin(deg2rad(2 * Mr))) + 282.634;
+        double Ls = Ms + (1.916 * sin(deg2rad(Ms))) + (0.020 * sin(deg2rad(2 * Ms))) + 282.634;
+        Lr = (Lr >= 0) ? fmod(Lr, 360) : fmod(Lr, 360) + 360.0;
+        Ls = (Ls >= 0) ? fmod(Ls, 360) : fmod(Ls, 360) + 360.0;
+        double lr = deg2rad(Lr);
+        double ls = deg2rad(Ls);
+
+        // 5a. calculate the Sun's right ascension
+        double RAr = rad2deg(atan(0.91764 * tan(lr)));
+        double RAs = rad2deg(atan(0.91764 * tan(ls)));
+        RAr = (RAr >= 0) ? fmod(RAr, 360) : fmod(RAr, 360) + 360.0;
+        RAs = (RAs >= 0) ? fmod(RAs, 360) : fmod(RAs, 360) + 360.0;
+
+        // 5b. right ascension value needs to be in the same quadrant as L
+        RAr += (floor(Lr / 90.0) * 90.0) - (floor(RAr / 90.0) * 90.0);
+        RAs += (floor(Ls / 90.0) * 90.0) - (floor(RAs / 90.0) * 90.0);
+
+        // 5c. right ascension value needs to be converted into hours
+        RAr /= 15;
+        RAs /= 15;
+
+        // 6. calculate the Sun's declination
+        double sindecr = 0.39782 * sin(lr);
+        double sindecs = 0.39782 * sin(ls);
+        double cosdecr = cos(Math.asin(sindecr));
+        double cosdecs = cos(Math.asin(sindecs));
+
+        // 7a. calculate the Sun's local hour angle
+        double cosHr = (cos(zenith) - (sindecr * sin(latitude))) / (cosdecr * cos(latitude));
+        double cosHs = (cos(zenith) - (sindecs * sin(latitude))) / (cosdecs * cos(latitude));
+
+        // 7b. finish calculating H and convert into hours
+        double Hr = 360.0 - rad2deg(acos(cosHr));
+        double Hs = rad2deg(acos(cosHs));
+        Hr /= 15;
+        Hs /= 15;
+
+        // 8. calculate local mean time of rising/setting
+        double Tr = Hr + RAr - (0.06571 * tr) - 6.622;
+        double Ts = Hs + RAs - (0.06571 * ts) - 6.622;
+
+        // 9. adjust back to UTC
+        double UTr = Tr - lhour;
+        double UTs = Ts - lhour;
+        UTr = (UTr >= 0) ? fmod(UTr, 24.0) : fmod(UTr, 24.0) + 24.0;
+        UTs = (UTs >= 0) ? fmod(UTs, 24.0) : fmod(UTs, 24.0) + 24.0;
+
+        // 10. convert UT value to local time zone of latitude/longitude
+        double localTr = fmod(UTr + timezone, 24.0);
+        double localTs = fmod(UTs + timezone, 24.0);
+
+        // last convert localT to human time
+        sunriseH = (int) floor(localTr);
+        sunrisem = (int) ((localTr - sunriseH) * 60);
+        sunsetH = (int) floor(localTs);
+        sunsetm = (int) ((localTs - sunsetH) * 60);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append((sunriseH < 10 ? ("0"+sunriseH) : sunriseH));
+        sb.append((sunrisem < 10 ? ("0"+sunrisem) : sunrisem));
+        sb.append("00");
+        sb.append(" / ");
+        sb.append((sunsetH < 10 ? ("0"+sunsetH) : sunsetH));
+        sb.append((sunsetm < 10 ? ("0"+sunsetm) : sunsetm));
+        sb.append("00");
+
+        return sb.toString();
+    }
+
+    private static double deg2rad(double degree) {
+        return degree * Math.PI / 180;
+    }
+
+    private static double rad2deg(double radian) {
+        return radian * 180 / Math.PI;
+    }
+
+    private static double sin(double value) {
+        return Math.sin(value);
+    }
+
+    private static double cos(double value) {
+        return Math.cos(value);
+    }
+
+    private static double tan(double value) {
+        return Math.tan(value);
+    }
+
+    private static double acos(double value) {
+        return Math.acos(value);
+    }
+
+    private static double atan(double value) {
+        return Math.atan(value);
+    }
+
+    private static double floor(double value) {
+        return Math.floor(value);
+    }
+
+    private static double fmod(double x, double y) {
+        return x % y;
+    }
+
+}

pav-socket/src/main/java/com/palnet/server/command/SocketCommand.java

@@ -164,16 +164,17 @@ public class SocketCommand {
 //                logger.info(">>> during time : {}::{}", model.getObjectId(),end - start);
                 // STEP 2. 이력 생성할 전문 전달 -> DRON의 대한 식별정보만 이력 관리
 
-                if (model.getObjectId().indexOf("PA") > -1) {
+//                if (model.getObjectId().indexOf("PA") > -1) {
 //                    messageProducer.sendControlHistoryMessage(model);
-                    try {
+//                    try {
 //                    	taskServerService.sendData(model);
-                        taskWbService.sendDataWebClient(model);
-                    } catch (Exception e) {
-                        logger.error("ERROR : {}\n{}", e.getMessage(), e.getStackTrace());
-                    }
-                }
+//                        taskWbService.sendDataWebClient(model);
+//                    } catch (Exception e) {
+//                        logger.error("ERROR : {}\n{}", e.getMessage(), e.getStackTrace());
+//                    }
+//                }
 
+                taskWbService.sendDataWebClient(model);
 //                model.setRegDt(Instant.now());
 
                 // STEP 3. 화면에 표출할 정보 WebSocket 전달