提交

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

@@ -0,0 +1,176 @@
+package com.community.huiju.feign;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.feign.impl.HKServerFallbackImpl;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(value = "hardware-server", fallback = HKServerFallbackImpl.class)
+public interface IHKServer {
+
+    /**
+     * 添加人员
+     *
+     *  {
+     * 	"type": "厂商",
+     * 	"person": {
+     * 		"openapi_ip_port_http": "服务器地址",
+     * 		"appkey": "服务器appkey",
+     * 		"secret": "服务器secret",
+     * 		"opUserUuid": "操作人员UUID",
+     * 		"personNo": "人员编号",
+     * 		"personName": "人员姓名",
+     * 		"remark": "手机号",
+     * 		"deptUuid": "部门uuid"
+     *   }
+     * }
+     *
+     *
+     * @param jsonString
+     * @return
+     */
+    @PostMapping("/pushPerson")
+    ResponseBean pushPerson(@RequestBody String jsonString);
+
+    /**
+     * 修改人员
+     *
+     *{
+     * 	"type": "厂商",
+     * 	"person": {
+     * 		"openapi_ip_port_http": "服务器地址",
+     * 		"appkey": "服务器appkey",
+     * 		"secret": "服务器secret",
+     * 		"opUserUuid": "操作人员UUID",
+     * 		"personNo": "人员编号",
+     * 		"personName": "人员姓名",
+     * 		"remark": "手机号",
+     * 		"deptUuid": "部门uuid",
+     * 		"personId": "人员海康ID"
+     *        }
+     * }
+     *
+     * @param jsonString
+     * @return
+     */
+    @PostMapping("/updatePerson")
+    ResponseBean updatePerson(@RequestBody String jsonString);
+
+    /**
+     * 添加人脸
+     *
+     *      *  json里面的设备下发字段，没有就不写入
+     *      *  比如：不下发门禁人脸权限，就写入 entranceGuardFace 这个字段的json字符串
+     *
+     * {
+     * 	"type": "厂商",
+     * 	"face": {
+     * 		"doorPermissions": { // 下发门口机权限(可视对讲)\n" +
+     * 			"authName": "权限组",
+     * 			"personIds": [人员海康ID...],
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http\": \"服务器地址\",\n" +
+     * 			"opUserUuid\": \"服务器操作人员UUID\",\n" +
+     * 			"longNums\": \"门口机(可视对讲)编号\"\n" +
+     *                },
+     * 		"doorFace": { // 下发门口机人脸权限\n" +
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器地址",
+     * 			"opUserUuid": "服务器操作人员UUID",
+     * 			"opType": 1, // 表示下发"
+     * 			"personIds": "人员海康ID",
+     * 			"longNums": "门口机(可视对讲)编号"
+     *        },
+     * 		"entranceGuardPermissions": { // 下发门禁权限
+     * 			"personIds": "人员海康ID",
+     * 			"doorUuids": "门禁点UUID",
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器操地址",
+     * 			"opUserUuid": "服务器操作人员UUID"
+     *        },
+     * 		"entranceGuardFace": { // 下发门禁人脸权限
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器操地址",
+     * 			"opUserUuid": "服务器操作人员UUID\",\n" +
+     * 				"personIds\": \"人员海康ID\",\n" +
+     * 				"deviceUuids\": \"门禁设备UUID\",\n" +
+     * 				"type": "1"
+     *        },
+     * 		"person": {
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器操地址",
+     * 			"opUserUuid": "服务器操作人员UUID",
+     * 			"personId": "人员海康ID",
+     * 			"personNo": "人员海康编号",
+     * 			"personName": "人员名称",
+     * 			//"facePhoto":"人脸图片",
+     * 			"cardNo": "卡号"
+     *        }
+     *     }
+     * }
+     *
+     * @param faceImg 文件流
+     * @param jsonString json字符串
+     * @return
+     */
+    @PostMapping("/addFace")
+    ResponseBean addFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
+
+
+    /**
+     * 修改人脸
+     *
+     *  json里面的设备下发字段，没有就不写入
+     *  比如：不下发门禁人脸权限，就写入 entranceGuardFace 这个字段的json字符串
+     *
+     *{
+     * 	"type": "厂商",
+     * 	"face": {
+     * 		"doorFace": { // 下发门口机人脸权限\n" +
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器地址",
+     * 			"opUserUuid": "服务器操作人员UUID",
+     * 			"opType": 1, // 表示下发"
+     * 			"personIds": "人员海康ID",
+     * 			"longNums": "门口机(可视对讲)编号"
+     *        },
+     * 		"entranceGuardFace": { // 下发门禁人脸权限
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器操地址",
+     * 			"opUserUuid": "服务器操作人员UUID\",\n"
+     * 			"personIds\": \"人员海康ID\"," +
+     * 			"deviceUuids\": \"门禁设备UUID\",
+     * 			"type": "1"
+     *        },
+     * 		"person": {
+     * 			"secret": "服务器secret",
+     * 			"appkey": "服务器appkey",
+     * 			"openapi_ip_port_http": "服务器操地址",
+     * 			"opUserUuid": "服务器操作人员UUID",
+     * 			"personId": "人员海康ID",
+     * 			"personNo": "人员海康编号",
+     * 			"personName": "人员名称",
+     * 			//"facePhoto":"人脸图片",
+     * 			"cardNo": "卡号"
+     *        }* 	}
+     * }
+     *
+     * @param faceImg 文件流
+     * @param jsonString json字符串
+     * @return
+     */
+    @PostMapping("/updateFace")
+    ResponseBean updateFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
+
+
+}

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

@@ -0,0 +1,163 @@
+package com.community.huiju.feign.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddFace {
+
+
+    /**
+     * type : 厂商
+     * face : {"doorPermissions":{"authName":"权限组","personIds":[],"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器地址","opUserUuid":"服务器操作人员UUID","longNums":"门口机(可视对讲)编号"},"doorFace":{"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器地址","opUserUuid":"服务器操作人员UUID","opType":"执行操作","personIds":"人员海康ID","longNums":"门口机(可视对讲)编号"},"entranceGuardPermissions":{"personIds":"人员海康ID","doorUuids":"门禁点UUID","secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器操地址","opUserUuid":"服务器操作人员UUID"},"entranceGuardFace":{"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器操地址","opUserUuid":"服务器操作人员UUID","personIds":"人员海康ID","deviceUuids":"门禁设备UUID","type":"1"},"person":{"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器操地址","opUserUuid":"服务器操作人员UUID","personId":"人员海康ID","personNo":"人员海康编号","personName":"人员名称","facePhoto":"人脸图片","cardNo":"卡号"}}
+     */
+
+    private String type;
+    private FaceBean face;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class FaceBean {
+        /**
+         * doorPermissions : {"authName":"权限组","personIds":[],"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器地址","opUserUuid":"服务器操作人员UUID","longNums":"门口机(可视对讲)编号"}
+         * doorFace : {"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器地址","opUserUuid":"服务器操作人员UUID","opType":"执行操作","personIds":"人员海康ID","longNums":"门口机(可视对讲)编号"}
+         * entranceGuardPermissions : {"personIds":"人员海康ID","doorUuids":"门禁点UUID","secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器操地址","opUserUuid":"服务器操作人员UUID"}
+         * entranceGuardFace : {"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器操地址","opUserUuid":"服务器操作人员UUID","personIds":"人员海康ID","deviceUuids":"门禁设备UUID","type":"1"}
+         * person : {"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器操地址","opUserUuid":"服务器操作人员UUID","personId":"人员海康ID","personNo":"人员海康编号","personName":"人员名称","facePhoto":"人脸图片","cardNo":"卡号"}
+         */
+
+        private DoorPermissionsBean doorPermissions;
+        private DoorFaceBean doorFace;
+        private EntranceGuardPermissionsBean entranceGuardPermissions;
+        private EntranceGuardFaceBean entranceGuardFace;
+        private PersonBean person;
+
+        @Data
+        @AllArgsConstructor
+        @NoArgsConstructor
+        public static class DoorPermissionsBean {
+            /**
+             * authName : 权限组
+             * personIds : []
+             * secret : 服务器secret
+             * appkey : 服务器appkey
+             * openapi_ip_port_http : 服务器地址
+             * opUserUuid : 服务器操作人员UUID
+             * longNums : 门口机(可视对讲)编号
+             */
+
+            private String authName;
+            private String secret;
+            private String appkey;
+            private String openapi_ip_port_http;
+            private String opUserUuid;
+            private String longNums;
+            private List<Integer> personIds;
+
+
+        }
+
+        @Data
+        @AllArgsConstructor
+        @NoArgsConstructor
+        public static class DoorFaceBean {
+            /**
+             * secret : 服务器secret
+             * appkey : 服务器appkey
+             * openapi_ip_port_http : 服务器地址
+             * opUserUuid : 服务器操作人员UUID
+             * opType : 执行操作
+             * personIds : 人员海康ID
+             * longNums : 门口机(可视对讲)编号
+             */
+
+            private String secret;
+            private String appkey;
+            private String openapi_ip_port_http;
+            private String opUserUuid;
+            private Integer opType;
+            private String personIds;
+            private String longNums;
+
+        }
+
+        @Data
+        @AllArgsConstructor
+        @NoArgsConstructor
+        public static class EntranceGuardPermissionsBean {
+            /**
+             * personIds : 人员海康ID
+             * doorUuids : 门禁点UUID
+             * secret : 服务器secret
+             * appkey : 服务器appkey
+             * openapi_ip_port_http : 服务器操地址
+             * opUserUuid : 服务器操作人员UUID
+             */
+
+            private String personIds;
+            private String doorUuids;
+            private String secret;
+            private String appkey;
+            private String openapi_ip_port_http;
+            private String opUserUuid;
+
+        }
+
+        @Data
+        @AllArgsConstructor
+        @NoArgsConstructor
+        public static class EntranceGuardFaceBean {
+            /**
+             * secret : 服务器secret
+             * appkey : 服务器appkey
+             * openapi_ip_port_http : 服务器操地址
+             * opUserUuid : 服务器操作人员UUID
+             * personIds : 人员海康ID
+             * deviceUuids : 门禁设备UUID
+             * type : 1
+             */
+
+            private String secret;
+            private String appkey;
+            private String openapi_ip_port_http;
+            private String opUserUuid;
+            private String personIds;
+            private String deviceUuids;
+            private Integer type;
+
+        }
+
+        @Data
+        @AllArgsConstructor
+        @NoArgsConstructor
+        public static class PersonBean {
+            /**
+             * secret : 服务器secret
+             * appkey : 服务器appkey
+             * openapi_ip_port_http : 服务器操地址
+             * opUserUuid : 服务器操作人员UUID
+             * personId : 人员海康ID
+             * personNo : 人员海康编号
+             * personName : 人员名称
+             * facePhoto : 人脸图片
+             * cardNo : 卡号
+             */
+
+            private String secret;
+            private String appkey;
+            private String openapi_ip_port_http;
+            private String opUserUuid;
+            private String personId;
+            private String personNo;
+            private String personName;
+            private String facePhoto;
+            private String cardNo;
+        }
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.community.huiju.feign.entity;
+
+/**
+ * 推送海康实体映射类
+ * @author weiximei
+ */
+public class PushPerson {
+
+
+    /**
+     * type : 厂商
+     * person : {"openapi_ip_port_http":"服务器地址","appkey":"服务器appkey","secret":"服务器secret","opUserUuid":"操作人员UUID","personNo":"人员编号","personName":"人员姓名","remark":"手机号","deptUuid":"部门uuid"}
+     */
+
+    private String type;
+    private PersonBean person;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public PersonBean getPerson() {
+        return person;
+    }
+
+    public void setPerson(PersonBean person) {
+        this.person = person;
+    }
+
+    public static class PersonBean {
+        /**
+         * openapi_ip_port_http : 服务器地址
+         * appkey : 服务器appkey
+         * secret : 服务器secret
+         * opUserUuid : 操作人员UUID
+         * personNo : 人员编号
+         * personName : 人员姓名
+         * remark : 手机号
+         * deptUuid : 部门uuid
+         * card : 卡号
+         * expirationTime: 开卡有效期, 值为 0 表示 20 年
+         */
+
+        private String openapi_ip_port_http;
+        private String appkey;
+        private String secret;
+        private String opUserUuid;
+        private Long personNo;
+        private String personName;
+        private String remark;
+        private String deptUuid;
+        private Long card;
+        private Integer expirationTime;
+
+        public String getOpenapi_ip_port_http() {
+            return openapi_ip_port_http;
+        }
+
+        public void setOpenapi_ip_port_http(String openapi_ip_port_http) {
+            this.openapi_ip_port_http = openapi_ip_port_http;
+        }
+
+        public String getAppkey() {
+            return appkey;
+        }
+
+        public void setAppkey(String appkey) {
+            this.appkey = appkey;
+        }
+
+        public String getSecret() {
+            return secret;
+        }
+
+        public void setSecret(String secret) {
+            this.secret = secret;
+        }
+
+        public String getOpUserUuid() {
+            return opUserUuid;
+        }
+
+        public void setOpUserUuid(String opUserUuid) {
+            this.opUserUuid = opUserUuid;
+        }
+
+        public Long getPersonNo() {
+            return personNo;
+        }
+
+        public void setPersonNo(Long personNo) {
+            this.personNo = personNo;
+        }
+
+        public String getPersonName() {
+            return personName;
+        }
+
+        public void setPersonName(String personName) {
+            this.personName = personName;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public String getDeptUuid() {
+            return deptUuid;
+        }
+
+        public void setDeptUuid(String deptUuid) {
+            this.deptUuid = deptUuid;
+        }
+
+        public Long getCard() {
+            return card;
+        }
+
+        public void setCard(Long card) {
+            this.card = card;
+        }
+
+        public Integer getExpirationTime() {
+            return expirationTime;
+        }
+
+        public void setExpirationTime(Integer expirationTime) {
+            this.expirationTime = expirationTime;
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.community.huiju.feign.impl;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.feign.IHKServer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
+
+@Slf4j
+public class HKServerFallbackImpl implements IHKServer {
+
+    @Override
+    public ResponseBean pushPerson(String jsonString) {
+        return back();
+    }
+
+    @Override
+    public ResponseBean updatePerson(String jsonString) {
+        return back();
+    }
+
+    @Override
+    public ResponseBean addFace(MultipartFile faceImg, String jsonString) {
+        return back();
+    }
+
+    @Override
+    public ResponseBean updateFace(MultipartFile faceImg, String jsonString) {
+        return back();
+    }
+
+    private ResponseBean back() {
+        log.error("hardware-server 远端服务请求失败！");
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addError("hardware-server 远端服务请求失败！");
+        return responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpEquipmentTree.java

@@ -31,6 +31,8 @@ public class TpEquipmentTree {
 
     private String unitUuids;
 
+    private String factory;
+
     public Integer getId() {
         return id;
     }
@@ -142,4 +144,12 @@ public class TpEquipmentTree {
     public void setUnitUuids(String unitUuids) {
         this.unitUuids = unitUuids;
     }
+
+    public String getFactory() {
+        return factory;
+    }
+
+    public void setFactory(String factory) {
+        this.factory = factory;
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserHk;
+import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.model.TpUnitHkSetting;
+
+/**
+ * 公共设备方法
+ */
+public interface IEquipmentService {
+
+    /**
+     * 推送人员
+     * @param tpEquipmentTree
+     * @param unitHkSetting
+     * @param user
+     * @param taUserHk
+     * @return
+     */
+    String pushPerson(TpEquipmentTree tpEquipmentTree, TpUnitHkSetting unitHkSetting, TaUser user, TaUserHk taUserHk, Integer expirationTime);
+
+    String addFace();
+
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.service.impl;
+
+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.PushPerson;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserHk;
+import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.model.TpUnitHkSetting;
+import com.community.huiju.service.IEquipmentService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class EquipmentServiceImpl implements IEquipmentService {
+
+    @Autowired
+    private IHKServer ihkServer;
+
+    @Override
+    public String pushPerson(TpEquipmentTree tpEquipmentTree, TpUnitHkSetting unitHkSetting, TaUser user, TaUserHk taUserHk, Integer expirationTime) {
+
+        // 人员信息
+        PushPerson.PersonBean personBean = new PushPerson.PersonBean();
+        personBean.setAppkey(tpEquipmentTree.getAppkey());
+        personBean.setSecret(tpEquipmentTree.getSecret());
+        personBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+        personBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+        personBean.setDeptUuid(unitHkSetting.getDepartmentId());
+        personBean.setPersonName(user.getUserName());
+        personBean.setPersonNo(taUserHk.getHkPersonNo());
+        personBean.setRemark(user.getLoginName());
+        personBean.setCard(Long.valueOf(taUserHk.getHkCardNo()));
+        personBean.setExpirationTime(expirationTime);
+
+        PushPerson pushPerson = new PushPerson();
+        pushPerson.setType(tpEquipmentTree.getFactory());
+        pushPerson.setPerson(personBean);
+
+        ResponseBean responseBean = ihkServer.pushPerson(JSONObject.toJSONString(pushPerson));
+        if ("1".equals(responseBean.getCode())) {
+            throw new WisdomException(responseBean.getMessage());
+        }
+        return JSONObject.toJSONString(responseBean.getData());
+    }
+
+    @Override
+    public String addFace() {
+        return null;
+    }
+}

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

@@ -232,18 +232,14 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer type = (Integer) jsonObject.get("errno");
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
-            // 修改人脸操作
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
+//            // 修改人脸操作
+//            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
 
             // 等待 1s
             Thread.sleep(1000);
 
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
-                if (null == data) {
-                    log.error("海康人脸推送失败！");
-                    throw new RuntimeException("人脸推送失败！");
-                }
 
                 if (isA) {
                     /**

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

@@ -9,7 +9,9 @@ import com.community.commom.uuid.IdGen;
 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.model.*;
+import com.community.huiju.service.IEquipmentService;
 import com.community.huiju.service.IHKService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -60,6 +62,9 @@ public class HKServiceImpl implements IHKService {
     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private IEquipmentService iEquipmentService;
+
     /**
      * 获取设备UUID
      * @param equipmentList
@@ -111,18 +116,9 @@ public class HKServiceImpl implements IHKService {
             addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting, userVerify);
         }
 
-        // 卡片操作
-        // 没有卡片就开卡
-        if (StringUtils.isBlank(taUserHk.getHkCardNo())) {
-
-            // 添加卡片
-            responseBean = addCards(taUserHk, tpEquipmentTree);
-
-            // 开卡
-            responseBean = openCard(taUserHk.getHkUserId(), Long.valueOf(taUserHk.getHkCardNo()), null,tpEquipmentTree);
-
-        }
-
+        /**
+         * 推送人员的时候，携带了卡号
+         */
 
         // 判断是否成功
         if ("0".equals(responseBean.getCode())) {
@@ -227,7 +223,7 @@ public class HKServiceImpl implements IHKService {
 
     /**
      * 公共方法
-     * 添加人员
+     * 添加人员(携带卡号)
      *
      * @param response
      * @param user
@@ -245,17 +241,23 @@ public class HKServiceImpl implements IHKService {
         //String deptUuid = getDeptUUID(parDept);
 
         // 添加人员
-        Map<String, Object> parUser = Maps.newHashMap();
-        parUser.put("personNo", taUserHk.getHkPersonNo());
-        parUser.put("personName", user.getUserName());
-        // parUser.put("phoneNo", user.getLoginName());
-        parUser.put("remark", user.getLoginName());
-        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
-        parUser.put("secret", tpEquipmentTree.getSecret());
-        parUser.put("appkey", tpEquipmentTree.getAppkey());
-        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+//        Map<String, Object> parUser = Maps.newHashMap();
+//        parUser.put("personNo", taUserHk.getHkPersonNo());
+//        parUser.put("personName", user.getUserName());
+//        // parUser.put("phoneNo", user.getLoginName());
+//        parUser.put("remark", user.getLoginName());
+//        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
+//        parUser.put("secret", tpEquipmentTree.getSecret());
+//        parUser.put("appkey", tpEquipmentTree.getAppkey());
+//        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+
+        // 开卡 卡号
+        long cardNo = System.currentTimeMillis();
+
+        String resultString = iEquipmentService.pushPerson(tpEquipmentTree, unitHkSetting, user, taUserHk, 0);
+        Map<String, Object> resultMap = JSONObject.parseObject(resultString, HashMap.class);
         Integer errorCode = (Integer) resultMap.get("errorCode");
         if (errorCode == 0) {
             Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
@@ -272,6 +274,7 @@ public class HKServiceImpl implements IHKService {
                 taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
                 taUserHk.setCreateDate(new Date());
                 taUserHk.setUpdateDate(new Date());
+                taUserHk.setHkCardNo(cardNo + "");
                 // 存储海康人员ID
                 row = taUserHkMapper.insertSelective(taUserHk);
             } else {

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

@@ -5,9 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.messagePush;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.feign.IHKServer;
+import com.community.huiju.feign.entity.PushPerson;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IHKService;
 import com.community.huiju.service.TaUserVerifyServicel;
@@ -84,9 +87,21 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     @Autowired
     private TpRoomNoMapper tpRoomNoMapper;
 
+    /**
+     * 海康设备服务类
+     */
     @Autowired
     private IHKService ihkService;
 
+
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
+    private IdGen idGen = IdGen.get();
+
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     public ResponseBean getToAuditNotApproved(Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
@@ -335,6 +350,18 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         return selectBuild;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     /**
      * 插入 楼栋资料库
      *

CODE/smart-community/app-api/src/main/resources/mapper/TpEquipmentTreeMapper.xml

@@ -16,10 +16,11 @@
     <result column="op_user_uuid" property="opUserUuid" jdbcType="VARCHAR" />
     <result column="http_server" property="httpServer" jdbcType="VARCHAR" />
     <result column="unit_uuids" property="unitUuids" jdbcType="VARCHAR" />
+    <result column="factory" property="factory" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, equipment_name, pid, sort, create_time, create_user, update_time,
-    update_user, appkey, secret, op_user_uuid, http_server, unit_uuids
+    update_user, appkey, secret, op_user_uuid, http_server, unit_uuids, factory
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select

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

@@ -0,0 +1,121 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.base.properties.FuShiProperties;
+import com.community.huiju.service.FSHardwareServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "车辆服务 API", description = "车辆服务 API")
+public class CardController {
+
+    @Autowired
+    private FSHardwareServiceI fsHardwareServiceI;
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+    @RequestMapping(value = "/car/getParkInfoByCarNo", method = RequestMethod.GET)
+    @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean getParkInfoByCarNo(@RequestParam("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = fsHardwareServiceI.getParkInfoByCarNo(carNo, fuShiProperties.getParkingCode());
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetMonthCardInfoByCarNo", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetMonthCardInfoByCarNo(@RequestParam("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = fsHardwareServiceI.parkGetMonthCardInfoByCarNo(carNo, fuShiProperties.getParkingCode());
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetTempCarPaymentInfoByCarNo", method = RequestMethod.GET)
+    @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@RequestParam("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = fsHardwareServiceI.parkGetTempCarPaymentInfoByCarNo(carNo, fuShiProperties.getParkingCode());
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "月卡续费", notes = "月卡续费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
+                    "RenewDay续费日期数目;" +
+                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "RechargeAmt充值续费金额;")
+    })
+    public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = fsHardwareServiceI.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
+                jsonObject.getString("RenewDayType"),
+                jsonObject.getString("RenewDay"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("RechargeAmt"), fuShiProperties.getParkingCode());
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyTemporaryCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "第三方临时卡上发缴费", notes = "第三方临时卡上发缴费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
+                    "ActualAmount实缴金额（单位元）;" +
+                    "DeductionAmount抵扣金额（单位元）;" +
+                    "Reason抵扣原因;" +
+                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "CouponList使用的优惠券列表")
+    })
+    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = fsHardwareServiceI.apiThirdPartyTemporaryCardPay(jsonObject.getString("Amount"),
+                jsonObject.getString("ActualAmount"),
+                jsonObject.getString("DeductionAmount"),
+                jsonObject.getString("Reason"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("CouponList"), fuShiProperties.getParkingCode());
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号")
+    })
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = fsHardwareServiceI.apiGetOfflineFee(carNoOrCardNo, fuShiProperties.getParkingCode());
+        return responseBean;
+    }
+
+}

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

@@ -1,12 +1,17 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.service.FSHardwareServiceI;
 import com.community.huiju.service.HkHardwareServiceI;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.xml.bind.util.JAXBSource;
 
@@ -27,7 +32,7 @@ public class HardwareController {
 	private HkHardwareServiceI hkHardwareService;
 	
 	
-	public String addFace(String jsonString){
+	public String testAddFace(String jsonString){
 		//解析json
 		//厂家信息
 		if ("HK".equals(jsonString)){
@@ -47,4 +52,192 @@ public class HardwareController {
 		}
 		return "";
 	}
+
+	@ApiOperation(value = "添加人员", notes = "添加人员")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "jsonString", value =
+					"{\n" +
+					"\t\"type\": \"厂商\",\n" +
+					"\t\"person\": {\n" +
+                              "\t\"openapi_ip_port_http\":\"服务器地址\"," +
+                              "\t\"appkey\":\"服务器appkey\"," +
+                              "\t\"secret\":\"服务器secret\", " +
+                              "\t\"opUserUuid\":\"操作人员UUID\"," +
+                              "\t\"personNo\":\"人员编号\"," +
+                              "\t\"personName\":\"人员姓名\"," +
+                              "\t\"remark\":\"手机号\", "+
+                              "\t\"deptUuid\",\"部门uuid\", " +
+                              "\t\"card\":\"卡号\"," +
+                              "\t\"expirationTime\": 开卡有效期, 值为 0 表示 20 年" +
+					"\t}\n" +
+					"}")
+	})
+	@PostMapping(value = "/pushPerson")
+	public ResponseBean pushPerson(@RequestBody String jsonString) {
+		ResponseBean responseBean = new ResponseBean();
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		String type = jsonObject.getString("type");
+		if ("hk".equals(type)) {
+			responseBean = hkHardwareService.addPerson(jsonObject.getString("person"));
+		} else {
+			responseBean.addError("未找到服务商：" + type);
+		}
+
+		return responseBean;
+	}
+
+	@ApiOperation(value = "修改人员", notes = "修改人员")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "jsonString", value =
+					"{\n" +
+					"\t\"type\": \"厂商\",\n" +
+					"\t\"person\": {\n" +
+					"\t\t\"openapi_ip_port_http\": \"服务器地址\",\n" +
+					"\t\t\"appkey\": \"服务器appkey\",\n" +
+					"\t\t\"secret\": \"服务器secret\",\n" +
+					"\t\t\"opUserUuid\": \"操作人员UUID\",\n" +
+					"\t\t\"personNo\": \"人员编号\",\n" +
+					"\t\t\"personName\": \"人员姓名\",\n" +
+					"\t\t\"remark\": \"手机号\",\n" +
+					"\t\t\"deptUuid\": \"部门uuid\",\n" +
+					"\t\t\"personId\": \"人员海康ID\"\n" +
+					"\n" +
+					"\t}\n" +
+					"}")
+	})
+	@PostMapping(value = "/updatePerson")
+	public ResponseBean updatePerson(@RequestBody String jsonString) {
+		ResponseBean responseBean = new ResponseBean();
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		String type = jsonObject.getString("type");
+		if ("hk".equals(type)) {
+			responseBean = hkHardwareService.updatePerson(jsonObject.getString("person"));
+		} else {
+			responseBean.addError("未找到服务商：" + type);
+		}
+
+		return responseBean;
+	}
+
+	@ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "jsonString", value =
+                    "{\n" +
+                    "\t\"type\": \"厂商\",\n" +
+                    "\t\"face\": {\n" +
+                    "\t\t\"doorPermissions\": { // 下发门口机权限(可视对讲)\n" +
+                    "\t\t\t\"authName\": \"权限组\",\n" +
+                    "\t\t\t\"personIds\": [人员海康ID...],\n" +
+                    "\t\t\t\"secret\": \"服务器secret\",\n" +
+                    "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                    "\t\t\t\"openapi_ip_port_http\": \"服务器地址\",\n" +
+                    "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                    "\t\t\t\"longNums\": \"门口机(可视对讲)编号\"\n" +
+                    "\t\t},\n" +
+                    "\t\t\"doorFace\": { // 下发门口机人脸权限\n" +
+                    "\t\t\t\"secret\": \"服务器secret\",\n" +
+                    "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                    "\t\t\t\"openapi_ip_port_http\": \"服务器地址\",\n" +
+                    "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                    "\t\t\t\"opType\": 1, // 表示下发\n" +
+                    "\t\t\t\"personIds\": \"人员海康ID\",\n" +
+                    "\t\t\t\"longNums\": \"门口机(可视对讲)编号\"\n" +
+                    "\t\t},\n" +
+                    "\t\t\"entranceGuardPermissions\": { // 下发门禁权限\n" +
+                    "\t\t\t\"personIds\": \"人员海康ID\",\n" +
+                    "\t\t\t\"doorUuids\": \"门禁点UUID\",\n" +
+                    "\t\t\t\"secret\": \"服务器secret\",\n" +
+                    "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                    "\t\t\t\"openapi_ip_port_http\": \"服务器操地址\",\n" +
+                    "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\"\n" +
+                    "\t\t},\n" +
+                    "\t\t\"entranceGuardFace\": { // 下发门禁人脸权限\n" +
+                    "\t\t\t\"secret\": \"服务器secret\",\n" +
+                    "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                    "\t\t\t\"openapi_ip_port_http\": \"服务器操地址\",\n" +
+                    "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                    "\t\t\t\"personIds\": \"人员海康ID\",\n" +
+                    "\t\t\t\"deviceUuids\": \"门禁设备UUID\",\n" +
+                    "\t\t\t\"type\": \"1\"\n" +
+                    "\t\t},\n" +
+                    "\t\t\"person\": {\n" +
+                    "\t\t\t\"secret\": \"服务器secret\",\n" +
+                    "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                    "\t\t\t\"openapi_ip_port_http\": \"服务器操地址\",\n" +
+                    "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                    "\t\t\t\"personId\": \"人员海康ID\",\n" +
+                    "\t\t\t\"personNo\": \"人员海康编号\",\n" +
+                    "\t\t\t\"personName\": \"人员名称\",\n" +
+                    "\t\t\t//\"facePhoto\":\"人脸图片\",\n" +
+                    "\t\t\t\"cardNo\": \"卡号\"\n" +
+                    "\t\t}\n" +
+                    "\t}\n" +
+                    "}")
+    })
+	@ApiOperation(value = "添加人脸", notes = "添加人脸")
+	@PostMapping("/addFace")
+	public ResponseBean addFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString) {
+		ResponseBean responseBean = new ResponseBean();
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		String type = jsonObject.getString("type");
+		if ("hk".equals(type)) {
+			responseBean = hkHardwareService.addFace(faceImg,jsonObject.getJSONObject("face").toJSONString());
+		} else {
+			responseBean.addError("未找到服务商：" + type);
+		}
+
+		return responseBean;
+	}
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "jsonString", value =
+                    "{\n" +
+                            "\t\"type\": \"厂商\",\n" +
+                            "\t\"face\": {\n" +
+                            "\t\t\"doorFace\": { // 下发门口机人脸权限\n" +
+                            "\t\t\t\"secret\": \"服务器secret\",\n" +
+                            "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                            "\t\t\t\"openapi_ip_port_http\": \"服务器地址\",\n" +
+                            "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                            "\t\t\t\"opType\": 1, // 表示下发\n" +
+                            "\t\t\t\"personIds\": \"人员海康ID\",\n" +
+                            "\t\t\t\"longNums\": \"门口机(可视对讲)编号\"\n" +
+                            "\t\t},\n" +
+                            "\t\t\"entranceGuardFace\": { // 下发门禁人脸权限\n" +
+                            "\t\t\t\"secret\": \"服务器secret\",\n" +
+                            "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                            "\t\t\t\"openapi_ip_port_http\": \"服务器操地址\",\n" +
+                            "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                            "\t\t\t\"personIds\": \"人员海康ID\",\n" +
+                            "\t\t\t\"deviceUuids\": \"门禁设备UUID\",\n" +
+                            "\t\t\t\"type\": \"1\"\n" +
+                            "\t\t},\n" +
+                            "\t\t\"person\": {\n" +
+                            "\t\t\t\"secret\": \"服务器secret\",\n" +
+                            "\t\t\t\"appkey\": \"服务器appkey\",\n" +
+                            "\t\t\t\"openapi_ip_port_http\": \"服务器操地址\",\n" +
+                            "\t\t\t\"opUserUuid\": \"服务器操作人员UUID\",\n" +
+                            "\t\t\t\"personId\": \"人员海康ID\",\n" +
+                            "\t\t\t\"personNo\": \"人员海康编号\",\n" +
+                            "\t\t\t\"personName\": \"人员名称\",\n" +
+                            "\t\t\t//\"facePhoto\":\"人脸图片\",\n" +
+                            "\t\t\t\"cardNo\": \"卡号\"\n" +
+                            "\t\t}\n" +
+                            "\t}\n" +
+                            "}")
+    })
+    @ApiOperation(value = "修改人脸", notes = "修改人脸")
+    @PostMapping("/updateFace")
+    public ResponseBean updateFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(jsonString);
+        String type = jsonObject.getString("type");
+        if ("hk".equals(type)) {
+            responseBean = hkHardwareService.updateFace(faceImg,jsonObject.getJSONObject("face").toJSONString());
+        } else {
+            responseBean.addError("未找到服务商：" + type);
+        }
+
+        return responseBean;
+    }
+
 }

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

@@ -176,15 +176,6 @@ public interface HkHardwareServiceI {
      *
      *
      *  {
-     *      "doorPermissions":{ // 下发门口机权限(可视对讲)
-     *          "authName":"权限组",
-     *          "personIds":[人员海康ID...],
-     *          "secret":"服务器secret",
-     *          "appkey":"服务器appkey",
-     *          "openapi_ip_port_http":"服务器地址",
-     *          "opUserUuid":"服务器操作人员UUID",
-     *          "longNums":"门口机(可视对讲)编号"
-     *      },
      *      "doorFace": { // 下发门口机人脸权限
      *          "secret":"服务器secret",
      *          "appkey":"服务器appkey",
@@ -194,14 +185,6 @@ public interface HkHardwareServiceI {
      *          "personIds":"人员海康ID",
      *          "longNums":"门口机(可视对讲)编号"
      *      },
-     *      "entranceGuardPermissions":{ // 下发门禁权限
-     *          "personIds":"人员海康ID",
-     *          "doorUuids":"门禁点UUID",
-     *          "secret":"服务器secret",
-     *          "appkey":"服务器appkey",
-     *          "openapi_ip_port_http":"服务器操地址",
-     *          "opUserUuid":"服务器操作人员UUID"
-     *      },
      *      "entranceGuardFace":{ // 下发门禁人脸权限
      *          "secret":"服务器secret",
      *          "appkey":"服务器appkey",
@@ -249,7 +232,8 @@ public interface HkHardwareServiceI {
      *          "personName":"人员姓名",
      *          "remark":"手机号",
      *          "deptUuid","部门uuid"
-     *
+     *          "card":"卡号",
+     *          "expirationTime": 开卡有效期, 值为 0 表示 20 年
      *  }
      *
      * @param jsonString
@@ -268,7 +252,7 @@ public interface HkHardwareServiceI {
      *          "personNo":"人员编号",
      *          "personName":"人员姓名",
      *          "remark":"手机号",
-     *          "deptUuid","部门uuid",
+     *          "deptUuid":"部门uuid",
      *          "personId":"人员海康ID"
      *
      *  }