Merge commit 'c4a9683ee0d84b023e21722962fcdffe224fd926' into feature/current/flight-plan

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

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -31,7 +30,6 @@ import java.util.Map;
 @Tag(name = "회원관리", description = "회원 관련 API")
 public class AcntCstmrController {
 	
-	@Autowired
 	private final AcntCstmrService service;
 	
 	@PostMapping(value = "/register")

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

@@ -28,4 +28,6 @@ public class AnctCstmerRlModel {
 	
 	private String updateuserId;
 
+	private String cptAuthCode;
+	
 }

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/model/JwtUserModel.java

@@ -16,85 +16,88 @@ import java.util.*;
 @AllArgsConstructor
 public class JwtUserModel implements UserDetails {
 
-	  	@Id
+    @Id
-	    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
-	  	@Column(name = "CSTMR_SNO", unique = true)
+    @Column(name = "CSTMR_SNO", unique = true)
-	    private Integer cstmrSno;
+    private Integer cstmrSno;
-
+
-	    @Column(name = "USER_ID", unique = true)
+    @Column(name = "USER_ID", unique = true)
-	    private String userId;
+    private String userId;
-
+
-	    @Column(name = "USER_PSWD")
+    @Column(name = "USER_PSWD")
-	    private String userPswd;
+    private String userPswd;
-	    
+
-	    @Column(name = "SITE_CODE")
+    @Column(name = "SITE_CODE")
-	    private String siteCode;
+    private String siteCode;
-
+
-	    @Column(name = "AUTH_ID")
+    @Column(name = "AUTH_ID")
-	    private String auth;
+    private String auth;
-	    
+
-	    @Column(name = "CSTMR_STATUS_CD")
+    @Column(name = "CSTMR_STATUS_CD")
-	    private String cstmrStatusCd;
+    private String cstmrStatusCd;
-
+
-		@Transient
+    @Column(name = "CPT_AUTH_CODE")
-		private String userNm;
+    private String cptAuthCode;
-		@Transient
+
-		private List<JwtGroupModel> group;
+    @Transient
-
+    private String userNm;
-	  
+    @Transient
-	    // 사용자의 권한을 콜렉션 형태로 반환
+    private List<JwtGroupModel> group;
-	    // 단, 클래스 자료형은 GrantedAuthority를 구현해야함
+
-	    @Override
+
-	    public Collection<? extends GrantedAuthority> getAuthorities() {
+    // 사용자의 권한을 콜렉션 형태로 반환
-	        Set<GrantedAuthority> roles = new HashSet<>();
+    // 단, 클래스 자료형은 GrantedAuthority를 구현해야함
-	        for (String role : auth.split(",")) {
+    @Override
-	            roles.add(new SimpleGrantedAuthority(role));
+    public Collection<? extends GrantedAuthority> getAuthorities() {
-	        }
+        Set<GrantedAuthority> roles = new HashSet<>();
-	        return roles;
+        for (String role : auth.split(",")) {
-	    }
+            roles.add(new SimpleGrantedAuthority(role));
-
+        }
-	    // 사용자의 id를 반환 (unique한 값)
+        return roles;
-	    @Override
+    }
-	    public String getUsername() {
+
-	        return userId;
+    // 사용자의 id를 반환 (unique한 값)
-	    }
+    @Override
-
+    public String getUsername() {
-	    // 사용자의 password를 반환
+        return userId;
-	    @Override
+    }
-	    public String getPassword() {
+
-	        return userPswd;
+    // 사용자의 password를 반환
-	    }
+    @Override
-
+    public String getPassword() {
-	    // 계정 만료 여부 반환
+        return userPswd;
-	    @Override
+    }
-	    public boolean isAccountNonExpired() {
+
-	        // 만료되었는지 확인하는 로직
+    // 계정 만료 여부 반환
-	        return true; // true -> 만료되지 않았음
+    @Override
-	    }
+    public boolean isAccountNonExpired() {
-
+        // 만료되었는지 확인하는 로직
-	    // 계정 잠금 여부 반환
+        return true; // true -> 만료되지 않았음
-	    @Override
+    }
-	    public boolean isAccountNonLocked() {
+
-	        // 계정 잠금되었는지 확인하는 로직
+    // 계정 잠금 여부 반환
-	    	if(cstmrStatusCd.equals("A"))
+    @Override
-	    		return true;
+    public boolean isAccountNonLocked() {
-	    	else 
+        // 계정 잠금되었는지 확인하는 로직
-	    		return false;
+        if ("A".equals(cstmrStatusCd))
+            return true;
+        else
+            return false;
 //	        return true; // true -> 잠금되지 않았음
-	    }
+    }
-
+
-	    // 패스워드의 만료 여부 반환
+    // 패스워드의 만료 여부 반환
-	    @Override
+    @Override
-	    public boolean isCredentialsNonExpired() {
+    public boolean isCredentialsNonExpired() {
-	        // 패스워드가 만료되었는지 확인하는 로직
+        // 패스워드가 만료되었는지 확인하는 로직
-	        return true; // true -> 만료되지 않았음
+        return true; // true -> 만료되지 않았음
-	    }
+    }
-
+
-	    // 계정 사용 가능 여부 반환
+    // 계정 사용 가능 여부 반환
-	    @Override
+    @Override
-	    public boolean isEnabled() {
+    public boolean isEnabled() {
-	        // 계정이 사용 가능한지 확인하는 로직
+        // 계정이 사용 가능한지 확인하는 로직
-	    	return true; // true -> 사용 가능
+        return true; // true -> 사용 가능
-	    }
+    }
 
 }

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java

@@ -73,6 +73,7 @@ public class JwtTokenUtil implements Serializable {
         claims.put("auth", userDetails.getAuth());
         claims.put("group", userDetails.getGroup());
         claims.put("userNm", userDetails.getUserNm());
+        claims.put("cptAuthCode", userDetails.getCptAuthCode());
         return doGenerateToken(claims, userDetails.getUsername());
     }
 
@@ -178,4 +179,17 @@ public class JwtTokenUtil implements Serializable {
 
         return payload.get("auth", String.class);
     }
+
+
+    public String getCptAuthCodeByToken() {
+        HttpServletRequest rq = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = rq.getHeader("Authorization");
+
+        if (token == null || "".equals(token)) return null;
+
+        token = token.substring(JWT_PREFIX.length()).trim();
+        Claims payload = getAllClaimsFromToken(token);
+
+        return payload.get("cptAuthCode", String.class);
+    }
 }

pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@@ -391,10 +391,10 @@ public class BasFlightController {
         return ResponseEntity.ok().body(new SuccessResponse<List>(response));
     }
 
-    @PostMapping("/coord")
+//    @PostMapping("/coord")
-    public JSONObject coordTest(@RequestBody Coordinate coordinate) throws IOException, ParseException {
+//    public JSONObject coordTest(@RequestBody Coordinate coordinate) throws IOException, ParseException {
-    	
+//
-    	return FlightUtils.getCoordinateGis(coordinate);
+//    	return FlightUtils.getCoordinateGis(coordinate);
-    	
+//
-    }
+//    }
 }

pav-server/src/main/java/com/palnet/biz/api/comn/elev/controller/ComnElevController.java

@@ -8,13 +8,10 @@ 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.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java

@@ -87,7 +87,7 @@ public class MainStatisticsService {
 					}
 
 					result[0] = "%Y-%m-%d";
-					result[1] = "%Y-%m-%d";
+					result[1] = "%H:00:00";
 				} else {
 					throw new NumberFormatException();
 				}

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

@@ -34,11 +34,12 @@ public class PtyCstmrBas implements Serializable {
 	@Column(name="CSTMR_STATUS_CD")
 	private String cstmrStatusCd;
 
-//	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CSTMR_STATUS_CNG_DT", columnDefinition = "TIMESTAMP")
 	private Instant cstmrStatusCngDt;
 
-//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CPT_AUTH_CODE")
+	private String cptAuthCode;
+
 	@Column(name="JOIN_DT", columnDefinition = "TIMESTAMP")
 	private Instant joinDt;
 

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

@@ -1742,6 +1742,7 @@ public class FltPlanQueryRepository {
                 .leftJoin(qFltPlanBas)
                         .on(qFltPlanBas.planSno.eq(qFltPlanCtrCntrlRel.planSno))
                 .where(builder)
+                .groupBy(qFltPlanCtrCntrlRel.idntfNum)
                 .orderBy(qFltPlanCtrCntrlRel.planSno.countDistinct().desc())
                 .limit(5)
                 .fetch();

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

@@ -164,6 +164,7 @@ public class PtyCstmrQueryRepository {
             model.setUserId(entity.getUserId());
             model.setCstmrSno(entity.getCstmrSno());
             model.setCstmrStatusCd(entity.getCstmrStatusCd());
+            model.setCptAuthCode(entity.getCptAuthCode());
             model.setUserPswd(entity.getUserPswd());
             if (pcgEntityList != null && !pcgEntityList.isEmpty()) {
                 List<JwtGroupModel> groupModelList = new ArrayList<>();
@@ -277,7 +278,8 @@ public class PtyCstmrQueryRepository {
                         dtl.email,
                         dtl.hpno,
                         dtl.updateDt,
-                        bas.userId
+                        bas.userId,
+                        bas.cptAuthCode
                 ))
                 .from(bas)
                 .leftJoin(dtl)