|
@@ -2,10 +2,8 @@ package com.icontrols.kakao.service.impl;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
-import java.util.HashSet;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
-import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
@@ -27,6 +25,7 @@ import com.icontrols.kakao.service.KakaoExtensionService;
|
|
import com.icontrols.kakao.socket.wallpad.KakaoMsgHandler;
|
|
import com.icontrols.kakao.socket.wallpad.KakaoMsgHandler;
|
|
import com.icontrols.kakao.socket.wallpad.WallpadMsgSender;
|
|
import com.icontrols.kakao.socket.wallpad.WallpadMsgSender;
|
|
|
|
|
|
|
|
+
|
|
@Service
|
|
@Service
|
|
public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
private final Logger logger = LoggerFactory.getLogger(KakaoExtensionService.class);
|
|
private final Logger logger = LoggerFactory.getLogger(KakaoExtensionService.class);
|
|
@@ -128,10 +127,13 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
logger.debug(allDeviceMap.toString());
|
|
logger.debug(allDeviceMap.toString());
|
|
try {
|
|
try {
|
|
if(endpointIds == null) {
|
|
if(endpointIds == null) {
|
|
- body.clear();
|
|
+ param.remove(KEY_INFO.HTTP_KEY_BODY);
|
|
- body.put(KEY_INFO.HTTP_KEY_ERROR,KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_INVALID_REQ));
|
|
|
|
- param.put(KEY_INFO.HTTP_KEY_BODY, body);
|
|
|
|
|
|
|
|
|
|
+ Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
|
+ errMap.put(KEY_INFO.HTTP_KEY_ERROR,KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_INVALID_REQ));
|
|
|
|
+
|
|
|
|
+ param.putAll(errMap);
|
|
|
|
+ logger.error("[ERROR] - INVALID REQ _01");
|
|
return param;
|
|
return param;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -140,9 +142,12 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
|
|
|
|
List<ThingsInfo> thingsInfoList = thingsInfoRepository.findByDongAndHoAndEndpointId(Integer.toString(dong), Integer.toString(ho), endpointId);
|
|
List<ThingsInfo> thingsInfoList = thingsInfoRepository.findByDongAndHoAndEndpointId(Integer.toString(dong), Integer.toString(ho), endpointId);
|
|
if(thingsInfoList == null || thingsInfoList.size() == 0) {
|
|
if(thingsInfoList == null || thingsInfoList.size() == 0) {
|
|
- body.clear();
|
|
+ param.remove(KEY_INFO.HTTP_KEY_BODY);
|
|
- body.put(KEY_INFO.HTTP_KEY_ERROR,KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_NONEXIST));
|
|
+
|
|
- param.put(KEY_INFO.HTTP_KEY_BODY, body);
|
|
+ Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
|
+ errMap.put(KEY_INFO.HTTP_KEY_ERROR,KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_NONEXIST));
|
|
|
|
+
|
|
|
|
+ param.putAll(errMap);
|
|
|
|
|
|
return param;
|
|
return param;
|
|
}
|
|
}
|
|
@@ -167,9 +172,13 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
body.putAll(retMap);
|
|
body.putAll(retMap);
|
|
param.put(KEY_INFO.HTTP_KEY_UNREACHABLEIDS, unreachableIds);
|
|
param.put(KEY_INFO.HTTP_KEY_UNREACHABLEIDS, unreachableIds);
|
|
}catch(Exception e) {
|
|
}catch(Exception e) {
|
|
- body.clear();
|
|
+ param.remove(KEY_INFO.HTTP_KEY_BODY);
|
|
- body.put(KEY_INFO.HTTP_KEY_ERROR,KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_INTERNAL));
|
|
+
|
|
- param.put(KEY_INFO.HTTP_KEY_BODY, body);
|
|
+ Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
|
+ errMap.put(KEY_INFO.HTTP_KEY_ERROR,KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_INTERNAL));
|
|
|
|
+
|
|
|
|
+ param.putAll(errMap);
|
|
|
|
+
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
return param;
|
|
return param;
|
|
}
|
|
}
|
|
@@ -196,6 +205,8 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
String endpointId = (String)body.get(KEY_INFO.BODY_KEY_ENDPOINT_ID);
|
|
String endpointId = (String)body.get(KEY_INFO.BODY_KEY_ENDPOINT_ID);
|
|
String capabilityName = (String)body.get(KEY_INFO.BODY_KEY_CAPABILITY_NAME);
|
|
String capabilityName = (String)body.get(KEY_INFO.BODY_KEY_CAPABILITY_NAME);
|
|
|
|
|
|
|
|
+ logger.debug("[UPDATE] - " + body.toString());
|
|
|
|
+
|
|
List<ThingsInfo> thingsInfoList = thingsInfoRepository.findByDongAndHoAndEndpointId(Integer.toString(dong), Integer.toString(ho), endpointId);
|
|
List<ThingsInfo> thingsInfoList = thingsInfoRepository.findByDongAndHoAndEndpointId(Integer.toString(dong), Integer.toString(ho), endpointId);
|
|
if(thingsInfoList == null || thingsInfoList.size() == 0) {
|
|
if(thingsInfoList == null || thingsInfoList.size() == 0) {
|
|
retMap = new HashMap<String, Object>();
|
|
retMap = new HashMap<String, Object>();
|
|
@@ -206,10 +217,9 @@ public class KakaoExtensionServiceImpl implements KakaoExtensionService {
|
|
|
|
|
|
if(retMap.containsKey(KEY_INFO.HTTP_KEY_ERROR)) {
|
|
if(retMap.containsKey(KEY_INFO.HTTP_KEY_ERROR)) {
|
|
param.remove(KEY_INFO.HTTP_KEY_BODY);
|
|
param.remove(KEY_INFO.HTTP_KEY_BODY);
|
|
- param.put(KEY_INFO.HTTP_KEY_BODY, retMap);
|
|
+ param.putAll(retMap);
|
|
}
|
|
}
|
|
- else
|
|
+
|
|
- param.put(KEY_INFO.HTTP_KEY_BODY, kMsgHandler.sendDeviceAction(dong, ho, endpointId, capabilityName, desired));
|
|
|
|
return param;
|
|
return param;
|
|
}
|
|
}
|
|
}
|
|
}
|