修复 远程开门

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/IHKServer.java

@@ -196,4 +196,24 @@ public interface IHKServer {
      */
     @PostMapping(value = "/temporaryRegister", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     String temporaryRegister(@RequestBody String jsonString);
+
+
+    /**
+     * 远程开门
+     * {
+     *             "type:"厂家",
+     *             "sync": {
+     *                     "longNums": "门口机编号",
+     *                     "openapi_ip_port_http": 服务器地址"，
+     *                      "secret": 服务器secret"，
+     *                      "appkey": 服务器appkey",
+     *                    "opUserUuid": 服务器操作人员UUID"
+     *             }
+     *  }
+     *
+     * @param jsonString
+     * @return
+     */
+    @PostMapping(value = "/syncControl", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    String syncControl(@RequestBody String jsonString);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/entity/SyncControl.java

@@ -0,0 +1,34 @@
+package com.community.huiju.feign.entity;
+
+import lombok.Data;
+
+@Data
+public class SyncControl {
+
+
+    /**
+     * type : 厂家
+     * sync : {"longNums":"门口机编号","openapi_ip_port_http":"服务器地址","secret":"服务器secret","appkey":"服务器appkey","opUserUuid":"服务器操作人员UUID"}
+     */
+
+    private String type;
+    private SyncBean sync;
+
+    @Data
+    public static class SyncBean {
+        /**
+         * longNums : 门口机编号
+         * openapi_ip_port_http : 服务器地址
+         * secret : 服务器secret
+         * appkey : 服务器appkey
+         * opUserUuid : 服务器操作人员UUID
+         */
+
+        private String longNums;
+        private String openapi_ip_port_http;
+        private String secret;
+        private String appkey;
+        private String opUserUuid;
+
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/impl/HKServerFallbackImpl.java

@@ -35,6 +35,11 @@ public class HKServerFallbackImpl implements IHKServer {
         return back();
     }
 
+    @Override
+    public String syncControl(String jsonString) {
+        return back();
+    }
+
     private String back() {
         log.error("hardware-server 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/IEquipmentService.java

@@ -67,4 +67,13 @@ public interface IEquipmentService {
      * @return
      */
     String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, TpEquipmentTree tpEquipmentTree);
+
+    /**
+     * 异步反控开门
+     *
+     * @param longNums 设备UUID
+     * @return
+     */
+    String syncControl(String longNums, String factory, TpEquipmentTree tpEquipmentTree);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/EquipmentServiceImpl.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.feign.IHKServer;
-import com.community.huiju.feign.entity.AddFace;
-import com.community.huiju.feign.entity.PushPerson;
-import com.community.huiju.feign.entity.TemporaryRegister;
-import com.community.huiju.feign.entity.UpdateFace;
+import com.community.huiju.feign.entity.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IEquipmentService;
 import com.sun.org.apache.regexp.internal.RE;
@@ -231,4 +228,22 @@ public class EquipmentServiceImpl implements IEquipmentService {
         ResponseBean responseBean = getResponseBean(result);
         return JSONObject.toJSONString(responseBean.getData());
     }
+
+    @Override
+    public String syncControl(String longNums, String factory,TpEquipmentTree tpEquipmentTree) {
+        SyncControl syncControl = new SyncControl();
+        SyncControl.SyncBean syncBean = new SyncControl.SyncBean();
+        syncBean.setLongNums(longNums);
+        syncBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+        syncBean.setSecret(tpEquipmentTree.getSecret());
+        syncBean.setAppkey(tpEquipmentTree.getAppkey());
+        syncBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+
+        syncControl.setSync(syncBean);
+        syncControl.setType(factory);
+
+        String result = ihkServer.syncControl(JSONObject.toJSONString(syncControl));
+        ResponseBean responseBean = getResponseBean(result);
+        return JSONObject.toJSONString(responseBean.getData());
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java

@@ -10,6 +10,7 @@ import com.community.commom.hk.HKOpenApi;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.feign.entity.PushPerson;
+import com.community.huiju.feign.entity.SyncControl;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IEquipmentService;
 import com.community.huiju.service.IHKService;
@@ -487,16 +488,10 @@ public class HKServiceImpl implements IHKService {
          // uuid_id 是可是对讲设备
          TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
 
-        // 查询设备编号
+        // 远程开门
 
-        Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
-        parMap.put("longNums", tpConfiguration.getConfigurationValue());
-        parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        parMap.put("secret", tpEquipmentTree.getSecret());
-        parMap.put("appkey", tpEquipmentTree.getAppkey());
-        parMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-        String data = HKOpenApi.syncControl(parMap);
-        JSONObject jsonObject = JSONObject.parseObject(data);
+        String result = iEquipmentService.syncControl(tpConfiguration.getConfigurationValue(), tpEquipmentTree.getFactory(), tpEquipmentTree);
+        JSONObject jsonObject = JSONObject.parseObject(result);
         int errorCode = jsonObject.getInteger("errorCode");
         if (errorCode == 0) {
 

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/controller/HardwareController.java

@@ -272,4 +272,34 @@ public class HardwareController {
 
 		return responseBean;
 	}
+
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "jsonString", value =
+					"{\n" +
+							"\t\"type\":\"厂家\",\n" +
+							"\t\"sync\": {\n" +
+							"         \"longNums\": \"门口机编号\",\n" +
+							"          \"openapi_ip_port_http\": 服务器地址\n" +
+							"           \"secret\": 服务器secret\n" +
+							"           \"appkey\": 服务器appkey\n" +
+							"          \"opUserUuid\": 服务器操作人员UUID\n" +
+							"      }\n" +
+							"}"
+			)
+	})
+	@ApiOperation(value = "远程开门", notes = "远程开门")
+	@PostMapping(value = "/syncControl")
+	public ResponseBean syncControl(@RequestBody String jsonString) {
+		ResponseBean responseBean = new ResponseBean();
+
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		String type = jsonObject.getString("type");
+		if ("hk".equals(type)) {
+			responseBean = hkHardwareService.syncControl(jsonObject.getString("sync"));
+		} else {
+			responseBean.addError("未找到服务商: " + type);
+		}
+
+		return responseBean;
+	}
 }

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/exception/ExceptionHandleAdice.java

@@ -26,7 +26,7 @@ public class ExceptionHandleAdice {
     public ResponseBean handleException(Exception e){
         log.error(e.getMessage(),e);
         ResponseBean response = new ResponseBean();
-        response.addError(Constant.REQUEST_ERROR,"设备还未联网，系统维护中");
+        response.addError("1","设备还未联网，系统维护中","",null);
         return response;
     }