魏熙美 6 gadus atpakaļ
vecāks
revīzija
38bdbeecfd

+ 10
- 0
CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/HkHardwareServiceI.java Parādīt failu

@@ -1,6 +1,8 @@
1 1
 package com.community.huiju.service;
2 2
 
3
+import com.alibaba.fastjson.JSONObject;
3 4
 import com.community.commom.mode.ResponseBean;
5
+import com.community.huiju.exception.WisdomException;
4 6
 import org.springframework.web.multipart.MultipartFile;
5 7
 
6 8
 import java.util.Map;
@@ -10,6 +12,14 @@ import java.util.Map;
10 12
  */
11 13
 public interface HkHardwareServiceI {
12 14
 
15
+    default void checkResult(String json) {
16
+        JSONObject jsonObject = JSONObject.parseObject(json);
17
+        Integer errorCode = jsonObject.getInteger("errorCode");
18
+        if (errorCode != 0) {
19
+            throw new WisdomException(jsonObject.getString("errorMessage"));
20
+        }
21
+    }
22
+
13 23
     /**
14 24
      * 下发门口机权限
15 25
      *

+ 13
- 0
CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/impl/HkHardwareServiceImpl.java Parādīt failu

@@ -30,10 +30,13 @@ import java.util.Map;
30 30
 @Slf4j
31 31
 public class HkHardwareServiceImpl implements HkHardwareServiceI {
32 32
 
33
+
34
+
33 35
     @Override
34 36
     public ResponseBean downloadDoorPermissions(String jsonString) {
35 37
         Map<String, Object> innerMap = JSONObject.parseObject(jsonString).getInnerMap();
36 38
         String result = HKOpenApi.addOutDoorAuth(innerMap);
39
+        checkResult(result);
37 40
         ResponseBean responseBean = new ResponseBean();
38 41
         responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
39 42
         return responseBean;
@@ -52,6 +55,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
52 55
         List<String> longNums = (List<String>) innerMap.get("longNums");
53 56
 
54 57
         String result = HKOpenApi.visualIntercom(opUserUuid, opType, personIds, longNums, appkey, secret,openapi_ip_port_http);
58
+        checkResult(result);
55 59
         ResponseBean responseBean = new ResponseBean();
56 60
         responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
57 61
         return responseBean;
@@ -64,6 +68,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
64 68
 
65 69
         ResponseBean responseBean = new ResponseBean();
66 70
         String result = HKOpenApi.syncControl(innerMap);
71
+        checkResult(result);
67 72
         responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
68 73
         return responseBean;
69 74
     }
@@ -78,12 +83,14 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
78 83
         Map<String,Object> map = JSONObject.parseObject(jsonString, HashMap.class);
79 84
         // 添加门禁权限
80 85
         String result = HKOpenApi.addAuthoritiesByPersonIds(map);
86
+        checkResult(result);
81 87
 
82 88
         // 下发门禁权限,还需要这两个参数
83 89
         map.put("operateType",1);
84 90
         map.put("includeFinger",1);
85 91
 
86 92
         result = HKOpenApi.downloadAuthorityByPersonIds(map);
93
+        checkResult(result);
87 94
         ResponseBean responseBean = new ResponseBean();
88 95
         responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
89 96
         return responseBean;
@@ -93,6 +100,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
93 100
     public ResponseBean downloadEntranceGuardFace(String jsonString) {
94 101
         Map<String, Object> innerMap = JSONObject.parseObject(jsonString).getInnerMap();
95 102
         String result = HKOpenApi.downloadFaceAndFingerInfos(innerMap);
103
+        checkResult(result);
96 104
         ResponseBean responseBean = new ResponseBean();
97 105
         responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
98 106
         return responseBean;
@@ -126,6 +134,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
126 134
 
127 135
         // 修改人脸
128 136
         String result = HKOpenApi.HKpersonGroupId(faceImg, personId, personNo, personName, cardNo, appkey, secret, openapi_ip_port_http, opUserUuid);
137
+        checkResult(result);
129 138
 
130 139
         // 下发门禁卡权限
131 140
         JSONObject entranceGuardPermissions = jsonObject.getJSONObject("entranceGuardPermissions");
@@ -157,6 +166,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
157 166
     @Override
158 167
     public ResponseBean updateFace(MultipartFile faceImg, String jsonString) {
159 168
         String result = updateFaceImage(faceImg, jsonString);
169
+        checkResult(result);
160 170
         ResponseBean responseBean = new ResponseBean();
161 171
         responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
162 172
         return responseBean;
@@ -203,6 +213,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
203 213
         JSONObject jsonObject = JSONObject.parseObject(jsonString);
204 214
         Map<String, Object> personMap = jsonObject.getInnerMap();
205 215
         String result = HKOpenApi.updateUser(personMap);
216
+        checkResult(result);
206 217
         ResponseBean responseBean = new ResponseBean();
207 218
         responseBean.addSuccess(JSONObject.parseObject(result, HashMap.class));
208 219
         return responseBean;
@@ -233,6 +244,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
233 244
         addCardsMap.put("endCardNo", cardNo);
234 245
         addCardsMap.put("opUserUuid", opUserUuid);
235 246
         String addCardsJSON = com.community.commom.hk.HKOpenApi.addCards(addCardsMap);
247
+        checkResult(addCardsJSON);
236 248
         return addCardsJSON;
237 249
     }
238 250
 
@@ -278,6 +290,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
278 290
         parOpenCard.put("openapi_ip_port_http", openapiIpPortHttp);
279 291
         parOpenCard.put("opUserUuid", opUserUuid);
280 292
         String result = HKOpenApi.openCard(parOpenCard);
293
+        checkResult(result);
281 294
         return result;
282 295
     }
283 296