pangs 1 rok pred
rodič
commit
462db95e07

BIN
.DS_Store


BIN
src/.DS_Store


BIN
src/main/.DS_Store


BIN
src/main/java/.DS_Store


BIN
src/main/java/com/.DS_Store


BIN
src/main/java/com/icontrols/.DS_Store


BIN
src/main/java/com/icontrols/kakao/.DS_Store


+ 2 - 2
src/main/java/com/icontrols/kakao/common/THINGS_INFO.java

@@ -289,8 +289,8 @@ public final class THINGS_INFO {
 	}
 	
 	public static boolean isAvailableThings(String modelId) {
-//		return Arrays.asList("aircon", "airsensor", "electric", "gas", "light", "livinglight", "temper", "ventil").contains(modelId);
-		return Arrays.asList("electric", "gas", "light", "livinglight", "temper", "ventil").contains(modelId);
+		return Arrays.asList("aircon", "airsensor", "electric", "gas", "light", "livinglight", "temper", "ventil").contains(modelId);
+		
 	}
 	
 }

BIN
src/main/java/com/icontrols/kakao/socket/.DS_Store


BIN
src/main/java/com/icontrols/kakao/socket/wallpad/.DS_Store


+ 34 - 34
src/main/java/com/icontrols/kakao/socket/wallpad/KakaoMsgHandler.java

@@ -325,14 +325,14 @@ public class KakaoMsgHandler {
 					});
 			//aircon의 capa를 다시 조회한다.
 			// aircon은 세대별로 지원하는 모드가 다를 수 있어서 월패드의 해당 세대의 에어컨 속성을 다시 조회해서 전달해줘야 한다.
-//			Map<String, Object> airconCapaMap = getAirconCapability(dong, ho);
-//			for(int i=1; i <=10; i++) {
-//				String _tmpEndpoint = "aircon_" + i;
-//				if(body.containsKey(_tmpEndpoint)) {
-//					Map<String, Object> _tmpDeviceMap = (HashMap)body.get(_tmpEndpoint);
-//					_tmpDeviceMap.put("capabilities", airconCapaMap.get("capabilities"));
-//				}
-//			}
+			Map<String, Object> airconCapaMap = getAirconCapability(dong, ho);
+			for(int i=1; i <=10; i++) {
+				String _tmpEndpoint = "aircon_" + i;
+				if(body.containsKey(_tmpEndpoint)) {
+					Map<String, Object> _tmpDeviceMap = (HashMap)body.get(_tmpEndpoint);
+					_tmpDeviceMap.put("capabilities", airconCapaMap.get("capabilities"));
+				}
+			}
 			
 			// elevator는 하드코딩.
 			// elevator가 존재해야 카카오홈 앱에서 엘리베이터를 제어할 수 있다.
@@ -347,35 +347,35 @@ public class KakaoMsgHandler {
 			body.put("elevator", eleMap);
 			
 			// 주차위치도 직접 입력해줘야 함. 
-//			Map<String, Object> parkingMap = new HashMap<String, Object>();
-//			parkingMap.put(KEY_INFO.BODY_KEY_DISPLAY_TYPE, THINGS_INFO.THINGS.PARKING.getKakaoDisplayName());
-//			parkingMap.putAll(getDeviceCapabilities(THINGS_INFO.THINGS.PARKING.getThingsName(), null));
-//			parkingMap.put(KEY_INFO.BODY_KEY_ENDPOINT_ID, THINGS_INFO.DEVICE_DETAIL.PARKING.getModelId());
-//			parkingMap.put(KEY_INFO.BODY_KEY_NAME, THINGS_INFO.THINGS.PARKING.getDesc());
-//
-//			// 주차위치를 월패드에 물어봐서 입력해주어야함.
-//			parkingMap.put(KEY_INFO.BODY_KEY_STATE, getParkingList(dong, ho));
-//			parkingMap.put(KEY_INFO.BODY_KEY_ADDITIONALPROP, getAdditionalProp(KEY_INFO.BODY_KEY_ROOMPRESETNAME, THINGS_INFO.DEVICE_DETAIL.PARKING.getRoomName()));
-//			body.put("parking", parkingMap);
+			Map<String, Object> parkingMap = new HashMap<String, Object>();
+			parkingMap.put(KEY_INFO.BODY_KEY_DISPLAY_TYPE, THINGS_INFO.THINGS.PARKING.getKakaoDisplayName());
+			parkingMap.putAll(getDeviceCapabilities(THINGS_INFO.THINGS.PARKING.getThingsName(), null));
+			parkingMap.put(KEY_INFO.BODY_KEY_ENDPOINT_ID, THINGS_INFO.DEVICE_DETAIL.PARKING.getModelId());
+			parkingMap.put(KEY_INFO.BODY_KEY_NAME, THINGS_INFO.THINGS.PARKING.getDesc());
+
+			// 주차위치를 월패드에 물어봐서 입력해주어야함.
+			parkingMap.put(KEY_INFO.BODY_KEY_STATE, getParkingList(dong, ho));
+			parkingMap.put(KEY_INFO.BODY_KEY_ADDITIONALPROP, getAdditionalProp(KEY_INFO.BODY_KEY_ROOMPRESETNAME, THINGS_INFO.DEVICE_DETAIL.PARKING.getRoomName()));
+			body.put("parking", parkingMap);
 			
 			// 택배 정보를 조회해서 알려주어야 함.
-//			Map<String, Object> parcelMap = getParcelList(dong, ho);
-//			
-//			if(parcelMap != null)
-//				body.put("parcel", parcelMap);
+			Map<String, Object> parcelMap = getParcelList(dong, ho);
 			
-//			if(SERVERINFO.KAKAO_I_WALLPAD_APPLY) {
-//				Map<String, Object> wpMap = new HashMap<String, Object>();
-//				String wpEndpointId = "WALLPAD_"+SERVERINFO.danzi_code+"_"+dong+"_"+ho;
-//				wpMap.put("endpointId", wpEndpointId);
-//				wpMap.put("name", "월패드");
-//				wpMap.put("displayType", "DummyWallPad");
-//				wpMap.put("capabilities", new ArrayList<>());
-//				wpMap.put("state", "{}");
-//				wpMap.put("additionalProperties", null);
-//				
-//				body.put(wpEndpointId, wpMap);
-//			}
+			if(parcelMap != null)
+				body.put("parcel", parcelMap);
+			
+			if(SERVERINFO.KAKAO_I_WALLPAD_APPLY) {
+				Map<String, Object> wpMap = new HashMap<String, Object>();
+				String wpEndpointId = "WALLPAD_"+SERVERINFO.danzi_code+"_"+dong+"_"+ho;
+				wpMap.put("endpointId", wpEndpointId);
+				wpMap.put("name", "월패드");
+				wpMap.put("displayType", "DummyWallPad");
+				wpMap.put("capabilities", new ArrayList<>());
+				wpMap.put("state", "{}");
+				wpMap.put("additionalProperties", null);
+				
+				body.put(wpEndpointId, wpMap);
+			}
 			
 		}catch(Exception e) {
 			retMap.put(KEY_INFO.HTTP_KEY_ERROR, KAKAO_RESULT.getErrorInfo(KAKAO_RESULT.FAIL_INTERNAL));

+ 1 - 1
src/main/resources/application.properties

@@ -9,7 +9,7 @@ logging.config=classpath:logback-spring.xml
 #spring.datasource.url=jdbc:mariadb://61.33.215.54:8005/platform_kakao?useUnicode=true&charaterEncoding=utf-8
 
 ## local (배포용)
-spring.datasource.url=jdbc:mariadb://221.163.243.3:8005/platform_kakao?useUnicode=true&charaterEncoding=utf-8
+spring.datasource.url=jdbc:mariadb://localhost:8005/platform_kakao?useUnicode=true&charaterEncoding=utf-8
 
 spring.datasource.username=valley
 spring.datasource.password=valley123