合并

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

@@ -175,5 +175,45 @@ public interface IHKServer {
     @PostMapping(value = "/updateFace", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     String updateFace(@RequestPart MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
 
+    /**
+     * 访客邀请
+     *
+     *{
+     * 	"type":"厂家",
+     * 	"temporaryRegister": {
+     *          "visitorName": "访客人姓名",
+     *           "visitorName": 访客姓名
+     *            "phoneNo": 联系电话
+     *            "personNum": 来访人数
+     *           "startTime": 来访时间
+     *           "endTime": 离开时间
+     *            "personId": 被访人ID
+     *       }
+     * }
+     *
+     * @param jsonString
+     * @return
+     */
+    @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/entity/TemporaryRegister.java

@@ -0,0 +1,38 @@
+package com.community.huiju.feign.entity;
+
+import lombok.Data;
+
+@Data
+public class TemporaryRegister {
+
+
+    /**
+     * type : 厂家
+     * temporaryRegister : {"visitorName":"访客姓名","phoneNo":"联系电话","personNum":"来访人数","startTime":"来访时间","endTime":"离开时间","personId":"被访人ID"}
+     */
+
+    private String type;
+    private TemporaryRegisterBean temporaryRegister;
+
+    @Data
+    public static class TemporaryRegisterBean {
+        /**
+         * visitorName : 访客姓名
+         * phoneNo : 联系电话
+         * personNum : 来访人数
+         * startTime : 来访时间
+         * endTime : 离开时间
+         * personId : 被访人ID
+         */
+
+        private String visitorName;
+        private String phoneNo;
+        private Integer personNum;
+        private Long startTime;
+        private Long endTime;
+        private Integer personId;
+        private String secret;
+        private String appkey;
+        private String openapi_ip_port_http;
+    }
+}

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

@@ -30,6 +30,16 @@ public class HKServerFallbackImpl implements IHKServer {
         return back();
     }
 
+    @Override
+    public String temporaryRegister(String jsonString) {
+        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

@@ -54,4 +54,26 @@ public interface IEquipmentService {
     String updateFace(MultipartFile faceImg, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree,
                       TaUserHk taUserHk, TaUserVerify userVerify, TaUser user, List<String> visualList,
                       String deviceUuids);
+
+    /**
+     * 访客邀请
+     * @param visitorName 姓名
+     * @param phoneNo 手机号
+     * @param personNum  人员数量
+     * @param startTime 访问开始时间
+     * @param endTime 访问结束时间
+     * @param personId 人员海康ID
+     * @param tpEquipmentTree
+     * @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,11 +4,10 @@ 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.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;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -204,4 +204,46 @@ public class EquipmentServiceImpl implements IEquipmentService {
         ResponseBean responseBean = getResponseBean(result);
         return JSONObject.toJSONString(responseBean.getData());
     }
+
+    @Override
+    public String temporaryRegister(String visitorName, String phoneNo, Integer personNum, Long startTime, Long endTime, Integer personId, TpEquipmentTree tpEquipmentTree) {
+
+        TemporaryRegister temporaryRegister = new TemporaryRegister();
+        temporaryRegister.setType(tpEquipmentTree.getFactory());
+        TemporaryRegister.TemporaryRegisterBean temporaryRegisterBean = new TemporaryRegister.TemporaryRegisterBean();
+        temporaryRegisterBean.setVisitorName(visitorName);
+        temporaryRegisterBean.setPhoneNo(phoneNo);
+        temporaryRegisterBean.setPersonNum(personNum);
+        temporaryRegisterBean.setStartTime(startTime);
+        temporaryRegisterBean.setEndTime(endTime);
+        temporaryRegisterBean.setPersonId(personId);
+        temporaryRegisterBean.setAppkey(tpEquipmentTree.getAppkey());
+        temporaryRegisterBean.setSecret(tpEquipmentTree.getSecret());
+        temporaryRegisterBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+
+        temporaryRegister.setTemporaryRegister(temporaryRegisterBean);
+
+
+        String result = ihkServer.temporaryRegister(JSONObject.toJSONString(temporaryRegister));
+        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/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java

@@ -7,6 +7,7 @@ import com.community.commom.session.UserElement;
 import com.community.commom.hk.HKOpenApi;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
+import com.community.huiju.service.IEquipmentService;
 import com.community.huiju.service.IHKService;
 import com.community.huiju.service.TaVistorServiceI;
 import com.google.common.collect.Maps;
@@ -57,6 +58,8 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private IHKService ihkService;
 
+    @Autowired
+    private IEquipmentService iEquipmentService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -156,9 +159,9 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
 
         TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userElement.getUserVerifyId(), communityId);
 
-        String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
+        String result = iEquipmentService.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
                 Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),
-                visitor.getVisitorEndTime().getTime(),taUserHk.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                visitor.getVisitorEndTime().getTime(),taUserHk.getHkUserId(), tpEquipmentTree);
 
         JSONObject resultJSON = JSONObject.parseObject(result);
         int errorCode = resultJSON.getInteger("errorCode");

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

@@ -241,4 +241,65 @@ public class HardwareController {
         return responseBean;
     }
 
+    @ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "jsonString", value =
+					"{\n" +
+							"\t\"type\":\"厂家\",\n" +
+							"\t\"temporaryRegister\": {\n" +
+							"         \"visitorName\": \"访客人姓名\",\n" +
+							"          \"visitorName\": 访客姓名\n" +
+							"           \"phoneNo\": 联系电话\n" +
+							"           \"personNum\": 来访人数\n" +
+							"          \"startTime\": 来访时间\n" +
+							"          \"endTime\": 离开时间\n" +
+							"           \"personId\": 被访人ID\n" +
+							"      }\n" +
+							"}"
+			)
+	})
+    @ApiOperation(value = "访客邀请", notes = "访客邀请")
+	@PostMapping(value = "/temporaryRegister")
+    public ResponseBean temporaryRegister(@RequestBody String jsonString) {
+		ResponseBean responseBean = new ResponseBean();
+
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		String type = jsonObject.getString("type");
+		if ("hk".equals(type)) {
+			responseBean = hkHardwareService.temporaryRegister(jsonObject.getString("temporaryRegister"));
+		} else {
+			responseBean.addError("未找到服务商: " + type);
+		}
+
+		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;
     }
 

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/HkHardwareServiceI.java

@@ -280,4 +280,21 @@ public interface HkHardwareServiceI {
     ResponseBean deletePerson(String jsonString);
 
 
+    /**
+     *
+     * {
+     *     "visitorName": "访客人姓名",
+     *     "visitorName": 访客姓名
+     *      "phoneNo": 联系电话
+     *      "personNum": 来访人数
+     *      "startTime": 来访时间
+     *      "endTime": 离开时间
+     *      "personId": 被访人ID
+     * }
+     *
+     * 访客邀请
+     * @param jsonString
+     * @return
+     */
+    ResponseBean temporaryRegister(String jsonString);
 }

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/impl/HkHardwareServiceImpl.java

@@ -294,4 +294,20 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
         return result;
     }
 
+    @Override
+    public ResponseBean temporaryRegister(String jsonString) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+
+        String result = HKOpenApi.temporaryRegister(jsonObject.getString("visitorName"),jsonObject.getString("phoneNo"),
+                jsonObject.getInteger("personNum"),jsonObject.getLong("startTime"),
+                jsonObject.getLong("endTime"),jsonObject.getInteger("personId"), jsonObject.getString("opUserUuid"),
+                jsonObject.getString("appkey"), jsonObject.getString("secret"), jsonObject.getString("openapi_ip_port_http"));
+
+        checkResult(result);
+
+        responseBean.addSuccess(JSONObject.parseObject(result).getInnerMap());
+        return responseBean;
+    }
 }