From 4db93360932dcee2efddae48152a4ba1f9d7f28b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 12:02:20 +0800
Subject: [PATCH] 优化业主查询报错问题
---
service-job/src/main/java/com/java110/job/adapt/hcIot/IotConstant.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/IotConstant.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/IotConstant.java
index 43997c1..dbf7eb5 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/IotConstant.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/IotConstant.java
@@ -15,6 +15,9 @@
*/
package com.java110.job.adapt.hcIot;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.util.StringUtil;
+
/**
* HC 鐗╄仈缃戝父閲忕被
* 鎺ュ彛鍗忚鍦板潃锛� https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
@@ -23,30 +26,63 @@
*/
public class IotConstant {
- public static final String IOT_URL = "https://things.homecommunity.cn:9999/";
+ public static final String IOT_DOMAIN = "IOT"; // 鐗╄仈缃戝煙
+ public static final String IOT_URL = "IOT_URL"; // 鐗╄仈缃戝煙
+ public static final String IOT_APP_ID = "APP_ID"; // 鐗╄仈缃戝煙
+ public static final String IOT_APP_SECRET = "APP_SECRET"; // 鐗╄仈缃戝煙
- public static final String APP_ID = "e86a6a373c354927bea5fd21a0bec617";
- public static final String APP_SECRET = "ead9a2f67f96e2b8ed2fe38cc9709463";
+ private static final String DEFAULT_IOT_URL = "https://things.homecommunity.cn";
- public static final String GET_TOKEN_URL = IOT_URL + " /extApi/auth/getAccessToken?appId=" + APP_ID + "&appSecret=" + APP_SECRET;
+ private static final String DEFAULT_APP_ID = "e86a6a373c354927bea5fd21a0bec617";
+ private static final String DEFAULT_APP_SECRET = "ead9a2f67f96e2b8ed2fe38cc9709463";
+
+ public static final String GET_TOKEN_URL = "/extApi/auth/getAccessToken?appId=APP_ID&appSecret=APP_SECRET";
//娣诲姞灏忓尯
- public static final String ADD_COMMUNITY_URL = IOT_URL + "/extApi/community/addCommunity";
+ public static final String ADD_COMMUNITY_URL = "/extApi/community/addCommunity";
//淇敼灏忓尯
- public static final String UPDATE_COMMUNITY_URL = IOT_URL + "/extApi/community/updateCommunity";
+ public static final String UPDATE_COMMUNITY_URL = "/extApi/community/updateCommunity";
//鍒犻櫎灏忓尯
- public static final String DELETE_COMMUNITY_URL = IOT_URL + "/extApi/community/deleteCommunity";
+ public static final String DELETE_COMMUNITY_URL = "/extApi/community/deleteCommunity";
//娣诲姞璁惧
- public static final String ADD_MACHINE_URL = IOT_URL + "/extApi/machine/addMachine";
+ public static final String ADD_MACHINE_URL = "/extApi/machine/addMachine";
//淇敼璁惧
- public static final String UPDATE_MACHINE_URL = IOT_URL + "/extApi/machine/updateMachine";
+ public static final String UPDATE_MACHINE_URL = "/extApi/machine/updateMachine";
//鍒犻櫎璁惧
- public static final String DELETE_MACHINE_URL = IOT_URL + "/extApi/machine/deleteMachine";
+ public static final String DELETE_MACHINE_URL = "/extApi/machine/deleteMachine";
+
+ //娣诲姞鍋滆溅鍦�
+ public static final String ADD_PARKING_AREA_URL = "/extApi/parkingArea/addParkingArea";
+ //淇敼鍋滆溅鍦�
+ public static final String UPDATE_PARKING_AREA_URL = "/extApi/parkingArea/updateParkingArea";
+ //鍒犻櫎鍋滆溅鍦�
+ public static final String DELETE_PARKING_AREA_URL = "/extApi/parkingArea/deleteParkingArea";
+
+ //娣诲姞杞﹁締
+ public static final String ADD_OWNER_CAR_URL = "/extApi/car/addCar";
+ //淇敼杞﹁締
+ public static final String UPDATE_OWNER_CAR_URL = "/extApi/car/updateCar";
+ //鍒犻櫎杞﹁締
+ public static final String DELETE_OWNER_CAR_URL = "/extApi/car/deleteCar";
+
+ //娣诲姞杞﹁締
+ public static final String ADD_CAR_BLACK_WHITE_URL = "/extApi/car/addBlackWhite";
+
+ //鍒犻櫎杞﹁締
+ public static final String DELETE_CAR_BLACK_WHITE_URL = "/extApi/car/deleteBlackWhite";
+
//寮�闂ㄦ帴鍙�
- public static final String OPEN_DOOR = IOT_URL + "/extApi/machine/openDoor";
+ public static final String OPEN_DOOR = "/extApi/machine/openDoor";
//閲嶅惎鎺ュ彛
- public static final String RESTART_MACHINE = IOT_URL + "/extApi/machine/restartMachine";
+ public static final String RESTART_MACHINE = "/extApi/machine/restartMachine";
+
+ //娣诲姞杞﹁締
+ public static final String ADD_TEAM_CAR_FEE_CONFIG = "/extApi/fee/addTempCarFee";
+ //淇敼杞﹁締
+ public static final String UPDATE_TEAM_CAR_FEE_CONFIG = "/extApi/fee/updateTempCarFee";
+ //鍒犻櫎杞﹁締
+ public static final String DELETE_TEAM_CAR_FEE_CONFIG = "/extApi/fee/deleteTempCarFee";
public static final String HC_TOKEN = "HC_ACCESS_TOKEN";
@@ -57,4 +93,35 @@
public static final String ADD_OWNER = "/extApi/user/addUser";
public static final String EDIT_OWNER = "/extApi/user/updateUser";
public static final String DELETE_OWNER = "/extApi/user/deleteUser";
+
+
+ public static String getUrl(String param) {
+ String url = MappingCache.getValue(IOT_DOMAIN, IotConstant.IOT_URL);
+
+ if (StringUtil.isEmpty(url)) {
+ return DEFAULT_IOT_URL + param;
+ }
+
+ return url + param;
+ }
+
+ public static String getAppId() {
+ String appId = MappingCache.getValue(IOT_DOMAIN, IotConstant.IOT_APP_ID);
+
+ if (StringUtil.isEmpty(appId)) {
+ return DEFAULT_APP_ID;
+ }
+
+ return appId;
+ }
+
+ public static String getAppSecret() {
+ String appSecret = MappingCache.getValue(IOT_DOMAIN, IotConstant.IOT_APP_SECRET);
+
+ if (StringUtil.isEmpty(appSecret)) {
+ return DEFAULT_APP_SECRET;
+ }
+
+ return appSecret;
+ }
}
--
Gitblit v1.8.0