海康设备

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

@@ -57,7 +57,7 @@ public class AddFace {
             private String appkey;
             private String openapi_ip_port_http;
             private String opUserUuid;
-            private String longNums;
+            private List<String> longNums;
             private List<Integer> personIds;
 
 
@@ -82,8 +82,8 @@ public class AddFace {
             private String openapi_ip_port_http;
             private String opUserUuid;
             private Integer opType;
-            private String personIds;
-            private String longNums;
+            private List<Integer> personIds;
+            private List<String> longNums;
 
         }
 
@@ -153,9 +153,10 @@ public class AddFace {
             private String appkey;
             private String openapi_ip_port_http;
             private String opUserUuid;
-            private String personId;
-            private String personNo;
+            private Integer personId;
+            private Long personNo;
             private String personName;
+            // 因为直接传输了图片流，就可以不用设置这个字段值
             private String facePhoto;
             private String cardNo;
         }

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

@@ -0,0 +1,113 @@
+package com.community.huiju.feign.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateFace {
+
+
+    /**
+     * 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 {
+        /**
+         * doorFace : {"secret":"服务器secret","appkey":"服务器appkey","openapi_ip_port_http":"服务器地址","opUserUuid":"服务器操作人员UUID","opType":"执行操作","personIds":"人员海康ID","longNums":"门口机(可视对讲)编号"}
+         * 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 DoorFaceBean doorFace;
+        private EntranceGuardFaceBean entranceGuardFace;
+        private PersonBean person;
+
+        @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 List<Integer> personIds;
+            private List<String> longNums;
+
+        }
+
+        @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 Integer personId;
+            private Long personNo;
+            private String personName;
+            // 因为直接传输了图片流，就可以不用设置这个字段值
+            private String facePhoto;
+            private String cardNo;
+        }
+    }
+}

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

@@ -87,6 +87,11 @@ public class TpEquipment {
      */
     private String image;
 
+    /**
+     * 厂家
+     */
+    private String factory;
+
     public Integer getId() {
         return id;
     }
@@ -270,4 +275,12 @@ public class TpEquipment {
     public void setImage(String image) {
         this.image = image;
     }
+
+    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

@@ -1,10 +1,10 @@
 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;
+import com.community.huiju.model.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 公共设备方法
@@ -21,6 +21,37 @@ public interface IEquipmentService {
      */
     String pushPerson(TpEquipmentTree tpEquipmentTree, TpUnitHkSetting unitHkSetting, TaUser user, TaUserHk taUserHk, Integer expirationTime);
 
-    String addFace();
+    /**
+     *
+     * @param faceImg 文件流
+     * @param unitHkSetting
+     * @param tpEquipmentTree
+     * @param taUserHk
+     * @param userVerify
+     * @param user
+     * @param visualList
+     * @param doorUuids 门禁点UUID
+     * @param deviceUuids 门禁设备UUID
+     * @return
+     */
+    String addFace(MultipartFile faceImg, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree,
+                   TaUserHk taUserHk, TaUserVerify userVerify, TaUser user, List<String> visualList,
+                   String doorUuids, String deviceUuids);
+
 
+    /**
+     *
+     * @param faceImg 文件流
+     * @param unitHkSetting
+     * @param tpEquipmentTree
+     * @param taUserHk
+     * @param userVerify
+     * @param user
+     * @param visualList
+     * @param deviceUuids 门禁设备UUID
+     * @return
+     */
+    String updateFace(MultipartFile faceImg, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree,
+                      TaUserHk taUserHk, TaUserVerify userVerify, TaUser user, List<String> visualList,
+                      String deviceUuids);
 }

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

@@ -4,15 +4,19 @@ 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.model.TaUser;
-import com.community.huiju.model.TaUserHk;
-import com.community.huiju.model.TpEquipmentTree;
-import com.community.huiju.model.TpUnitHkSetting;
+import com.community.huiju.feign.entity.UpdateFace;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IEquipmentService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -49,7 +53,149 @@ public class EquipmentServiceImpl implements IEquipmentService {
     }
 
     @Override
-    public String addFace() {
-        return null;
+    public String addFace(MultipartFile faceImg, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree,
+                          TaUserHk taUserHk, TaUserVerify userVerify, TaUser user, List<String> visualList,
+                          String doorUuids, String deviceUuids) {
+
+
+        AddFace addFace = new AddFace();
+        AddFace.FaceBean faceBean = new AddFace.FaceBean();
+
+        // 人脸图片
+        AddFace.FaceBean.PersonBean person = new AddFace.FaceBean.PersonBean();
+        person.setAppkey(tpEquipmentTree.getSecret());
+        person.setSecret(tpEquipmentTree.getAppkey());
+        person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+        person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+        person.setPersonId(taUserHk.getHkUserId());
+        person.setPersonNo(Long.valueOf(taUserHk.getHkCardNo()));
+        person.setPersonName(user.getUserName());
+        person.setCardNo(taUserHk.getHkCardNo());
+
+        faceBean.setPerson(person);
+
+
+        if (CollectionUtils.isNotEmpty(visualList)) {
+            // 门口机卡权限(可是对讲)
+            AddFace.FaceBean.DoorPermissionsBean doorPermissionsBean = new AddFace.FaceBean.DoorPermissionsBean();
+            doorPermissionsBean.setAppkey(tpEquipmentTree.getSecret());
+            doorPermissionsBean.setSecret(tpEquipmentTree.getAppkey());
+            doorPermissionsBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+            doorPermissionsBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+            doorPermissionsBean.setAuthName(user.getUserName()+userVerify.getId());
+            doorPermissionsBean.setPersonIds(Arrays.asList(taUserHk.getHkUserId()));
+            doorPermissionsBean.setLongNums(visualList);
+
+            // 门口机人脸权限(可视对讲)
+            AddFace.FaceBean.DoorFaceBean doorFaceBean = new AddFace.FaceBean.DoorFaceBean();
+            doorFaceBean.setAppkey(tpEquipmentTree.getSecret());
+            doorFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            doorFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+            doorFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+            doorFaceBean.setOpType(1);
+            doorFaceBean.setLongNums(visualList);
+            doorFaceBean.setPersonIds(Arrays.asList(taUserHk.getHkUserId()));
+
+            faceBean.setDoorPermissions(doorPermissionsBean);
+            faceBean.setDoorFace(doorFaceBean);
+        }
+
+
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
+            // 门禁卡权限下发
+            AddFace.FaceBean.EntranceGuardPermissionsBean entranceGuardPermissionsBean = new AddFace.FaceBean.EntranceGuardPermissionsBean();
+            entranceGuardPermissionsBean.setAppkey(tpEquipmentTree.getSecret());
+            entranceGuardPermissionsBean.setSecret(tpEquipmentTree.getAppkey());
+            entranceGuardPermissionsBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+            entranceGuardPermissionsBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+            entranceGuardPermissionsBean.setPersonIds(String.valueOf(taUserHk.getHkUserId()));
+            entranceGuardPermissionsBean.setDoorUuids(doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+
+            faceBean.setEntranceGuardPermissions(entranceGuardPermissionsBean);
+        }
+
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(deviceUuids)) {
+
+            // 门禁人脸权限下发
+            AddFace.FaceBean.EntranceGuardFaceBean entranceGuardFaceBean = new AddFace.FaceBean.EntranceGuardFaceBean();
+            entranceGuardFaceBean.setAppkey(tpEquipmentTree.getSecret());
+            entranceGuardFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            entranceGuardFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+            entranceGuardFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+            entranceGuardFaceBean.setDeviceUuids(deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+            entranceGuardFaceBean.setType(1);
+            entranceGuardFaceBean.setPersonIds(String.valueOf(taUserHk.getHkUserId()));
+
+            faceBean.setEntranceGuardFace(entranceGuardFaceBean);
+        }
+
+        addFace.setType(tpEquipmentTree.getFactory());
+        addFace.setFace(faceBean);
+        // 添加人脸
+        ResponseBean responseBean = ihkServer.addFace(faceImg, JSONObject.toJSONString(addFace));
+        if ("1".equals(responseBean.getCode())) {
+            throw new WisdomException(responseBean.getMessage());
+        }
+        return JSONObject.toJSONString(responseBean.getData());
+    }
+
+    @Override
+    public String updateFace(MultipartFile faceImg, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user, List<String> visualList, String deviceUuids) {
+
+        UpdateFace addFace = new UpdateFace();
+        UpdateFace.FaceBean faceBean = new UpdateFace.FaceBean();
+
+        // 人脸图片
+        UpdateFace.FaceBean.PersonBean person = new UpdateFace.FaceBean.PersonBean();
+        person.setAppkey(tpEquipmentTree.getSecret());
+        person.setSecret(tpEquipmentTree.getAppkey());
+        person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+        person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+        person.setPersonId(taUserHk.getHkUserId());
+        person.setPersonNo(Long.valueOf(taUserHk.getHkCardNo()));
+        person.setPersonName(user.getUserName());
+        person.setCardNo(taUserHk.getHkCardNo());
+
+        faceBean.setPerson(person);
+
+
+        if (CollectionUtils.isNotEmpty(visualList)) {
+
+            // 门口机人脸权限(可视对讲)
+            UpdateFace.FaceBean.DoorFaceBean doorFaceBean = new UpdateFace.FaceBean.DoorFaceBean();
+            doorFaceBean.setAppkey(tpEquipmentTree.getSecret());
+            doorFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            doorFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+            doorFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+            doorFaceBean.setOpType(1);
+            doorFaceBean.setLongNums(visualList);
+            doorFaceBean.setPersonIds(Arrays.asList(taUserHk.getHkUserId()));
+
+            faceBean.setDoorFace(doorFaceBean);
+        }
+
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(deviceUuids)) {
+
+            // 门禁人脸权限下发
+            UpdateFace.FaceBean.EntranceGuardFaceBean entranceGuardFaceBean = new UpdateFace.FaceBean.EntranceGuardFaceBean();
+            entranceGuardFaceBean.setAppkey(tpEquipmentTree.getSecret());
+            entranceGuardFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            entranceGuardFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
+            entranceGuardFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
+            entranceGuardFaceBean.setDeviceUuids(deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+            entranceGuardFaceBean.setType(1);
+            entranceGuardFaceBean.setPersonIds(String.valueOf(taUserHk.getHkUserId()));
+
+            faceBean.setEntranceGuardFace(entranceGuardFaceBean);
+        }
+
+        addFace.setType(tpEquipmentTree.getFactory());
+        addFace.setFace(faceBean);
+        // 添加人脸
+        ResponseBean responseBean = ihkServer.updateFace(faceImg, JSONObject.toJSONString(addFace));
+        if ("1".equals(responseBean.getCode())) {
+            throw new WisdomException(responseBean.getMessage());
+        }
+        return JSONObject.toJSONString(responseBean.getData());
     }
 }

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

@@ -9,8 +9,10 @@ import com.community.commom.session.UserElement;
 import com.community.huiju.common.welcome.WelcomeProperties;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.feign.IHKServer;
 import com.community.huiju.model.*;
 import com.community.huiju.service.FaceServiceI;
+import com.community.huiju.service.IEquipmentService;
 import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ImageServiceI;
 import com.google.common.collect.Maps;
@@ -82,6 +84,9 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private TpUnitHkSettingMapper tpUnitHkSettingMapper;
 
+    @Autowired
+    private IEquipmentService iEquipmentService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
@@ -232,42 +237,45 @@ 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());
-
             // 等待 1s
             Thread.sleep(1000);
 
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
 
+                // 给用户添加 海康门禁权限
+                List<TpEquipment> doorEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
+                List<Map<String, Object>> equipmentUUID = getEquipmentUUID(doorEquipments);
+                StringBuilder doorUuids = new StringBuilder();
+                StringBuilder deviceUuids = new StringBuilder();
+                equipmentUUID.forEach(e-> {
+                    doorUuids.append(e.get("doorUuid"));
+                    doorUuids.append(",");
+                    deviceUuids.append(e.get("deviceUuid"));
+                    deviceUuids.append(",");
+                });
+
+                // 单元门口机
+                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+                List<String> visualList = visualEquipments.stream()
+                        .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                        .collect(Collectors.toList());
+
+                // true 添加人脸， false 修改人脸
                 if (isA) {
                     /**
                      * 添加人脸的时候下发可视对讲卡权限，修改人脸的时候不下发卡权限
                      */
-                    // 下发可是对讲卡权限
-                    ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user);
-
-                    // 下发门禁权限
-                    ihkService.addAuthoritiesAnddownloadAuthorityByPersonIds(userVerify, taUserHk, tpEquipmentTree);
+                    iEquipmentService.addFace(uploadFile, unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user,visualList,doorUuids.toString(), deviceUuids.toString());
 
                     taFaceMapper.insertSelective(taFace);
                 } else {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
+                    iEquipmentService.updateFace(uploadFile, unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user,visualList, deviceUuids.toString());
                 }
 
-                // 等待 1s
-                Thread.sleep(3000);
-
                 responseBean.addSuccess(taFace);
 
-                // 下发门禁人脸权限
-                ihkService.downloadFaceAndFingerInfos(tpEquipmentTree, userVerify, taUserHk);
-
-
-                //可视对讲时 指定人员人脸权限下载
-                ihkService.visualIntercom(tpEquipmentTree, taUserHk, userVerify);
-
             } else {
                 responseBean.addError("请录入正确图片");
             }

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

@@ -20,15 +20,13 @@
     <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="monitoringUrl" property="monitoringUrl" />
-    <result column="securityGuardTel" property="securityGuardTel" />
-    <result column="securityRoomTel" property="securityRoomTel" />
-    <result column="monitoringAddress" property="monitoringAddress" />
+    <result column="factory" property="factory" jdbcType="VARCHAR" />
+    <result column="device" property="device" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, url_id, community_id, security_guard_tel_id, security_room_tel_id, address_id,
     create_time, create_user, update_time, update_user, uuid_id, equipment_type, equipment_tree_id,
-    appkey, secret, op_user_uuid, http_server, unit_uuids
+    appkey, secret, op_user_uuid, http_server, unit_uuids, factory, device
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -47,14 +45,16 @@
       update_time, update_user, uuid_id,
       equipment_type, equipment_tree_id, appkey,
       secret, op_user_uuid, http_server,
-      unit_uuids)
+      unit_uuids, factory, device
+      )
     values (#{id,jdbcType=INTEGER}, #{urlId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},
       #{securityGuardTelId,jdbcType=INTEGER}, #{securityRoomTelId,jdbcType=INTEGER},
       #{addressId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{uuidId,jdbcType=INTEGER},
       #{equipmentType,jdbcType=VARCHAR}, #{equipmentTreeId,jdbcType=INTEGER}, #{appkey,jdbcType=VARCHAR},
       #{secret,jdbcType=VARCHAR}, #{opUserUuid,jdbcType=VARCHAR}, #{httpServer,jdbcType=VARCHAR},
-      #{unitUuids,jdbcType=VARCHAR})
+      #{unitUuids,jdbcType=VARCHAR}, #{factory,jdbcType=VARCHAR}, #{device,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpEquipment" >
     insert into tp_equipment
@@ -113,6 +113,12 @@
       <if test="unitUuids != null" >
         unit_uuids,
       </if>
+      <if test="factory != null" >
+        factory,
+      </if>
+      <if test="device != null" >
+        device,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -169,6 +175,12 @@
       <if test="unitUuids != null" >
         #{unitUuids,jdbcType=VARCHAR},
       </if>
+      <if test="factory != null" >
+        #{factory,jdbcType=VARCHAR},
+      </if>
+      <if test="device != null" >
+        #{device,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpEquipment" >
@@ -225,6 +237,12 @@
       <if test="unitUuids != null" >
         unit_uuids = #{unitUuids,jdbcType=VARCHAR},
       </if>
+      <if test="factory != null" >
+        factory = #{factory,jdbcType=VARCHAR},
+      </if>
+      <if test="device != null" >
+        device = #{device,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -246,7 +264,9 @@
       secret = #{secret,jdbcType=VARCHAR},
       op_user_uuid = #{opUserUuid,jdbcType=VARCHAR},
       http_server = #{httpServer,jdbcType=VARCHAR},
-      unit_uuids = #{unitUuids,jdbcType=VARCHAR}
+      unit_uuids = #{unitUuids,jdbcType=VARCHAR},
+      factory = #{factory,jdbcType=VARCHAR},
+      device = #{device,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -16,7 +16,7 @@
     <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" />
+    <result column="factory" property="factory" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, equipment_name, pid, sort, create_time, create_user, update_time,
@@ -37,12 +37,14 @@
       pid, sort, create_time,
       create_user, update_time, update_user,
       appkey, secret, op_user_uuid,
-      http_server, unit_uuids)
+      http_server, unit_uuids, factory
+      )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{equipmentName,jdbcType=VARCHAR},
       #{pid,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{createUser,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER},
       #{appkey,jdbcType=VARCHAR}, #{secret,jdbcType=VARCHAR}, #{opUserUuid,jdbcType=VARCHAR},
-      #{httpServer,jdbcType=VARCHAR}, #{unitUuids,jdbcType=VARCHAR})
+      #{httpServer,jdbcType=VARCHAR}, #{unitUuids,jdbcType=VARCHAR}, #{factory,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpEquipmentTree" >
     insert into tp_equipment_tree
@@ -89,6 +91,9 @@
       <if test="unitUuids != null" >
         unit_uuids,
       </if>
+      <if test="factory != null" >
+        factory,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -133,6 +138,9 @@
       <if test="unitUuids != null" >
         #{unitUuids,jdbcType=VARCHAR},
       </if>
+      <if test="factory != null" >
+        #{factory,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpEquipmentTree" >
@@ -177,6 +185,9 @@
       <if test="unitUuids != null" >
         unit_uuids = #{unitUuids,jdbcType=VARCHAR},
       </if>
+      <if test="factory != null" >
+        factory = #{factory,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -194,7 +205,8 @@
       secret = #{secret,jdbcType=VARCHAR},
       op_user_uuid = #{opUserUuid,jdbcType=VARCHAR},
       http_server = #{httpServer,jdbcType=VARCHAR},
-      unit_uuids = #{unitUuids,jdbcType=VARCHAR}
+      unit_uuids = #{unitUuids,jdbcType=VARCHAR},
+      factory = #{factory,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>