Selaa lähdekoodia

구독신청과 전체기기상태 조회하기 순서 변경

pangs 5 vuotta sitten
vanhempi
commit
1899e68234

+ 14 - 15
src/main/java/com/icontrols/kakao/service/impl/KakaoExtensionServiceImpl.java

@@ -89,6 +89,20 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
 				return param;
 			}
 			
+			Map<String, Object> subsMap = new HashMap<String, Object>();
+			
+			subsMap.put("type", "subs");
+			subsMap.put("dong", dong_ho.split("/")[0]);
+			subsMap.put("ho", dong_ho.split("/")[1]);
+			subsMap.put("devNum", "1");
+			subsMap.put("company", "kakao");
+			
+			// 구독 신청
+			authService.subscriptionProcess(subsMap);
+			
+			// 모바일 기기 등록
+			authService.remoteRegisterNewDevice(subsMap);
+			
 			// 기기목록 조회 및 저장
 			List<ThingsInfo> databaseThingsList = thingsInfoRepository.findByDongAndHo(dong_ho.split("/")[0], dong_ho.split("/")[1]);
 			
@@ -115,21 +129,6 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
 			
 			logger.debug("userInfo saved complete " );
 			
-			Map<String, Object> subsMap = new HashMap<String, Object>();
-			
-			subsMap.put("type", "subs");
-			subsMap.put("dong", dong_ho.split("/")[0]);
-			subsMap.put("ho", dong_ho.split("/")[1]);
-			subsMap.put("devNum", "1");
-			subsMap.put("company", "kakao");
-			
-			// 구독 신청
-			authService.subscriptionProcess(subsMap);
-			
-			// 모바일 기기 등록
-			authService.remoteRegisterNewDevice(subsMap);
-			
-			
 		}catch(Exception e) {
 			logger.error("[Auth Database Insert Error]");
 			param.put(KEY_INFO.HTTP_KEY_ERROR, KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_INTERNAL));