修复 海康推送

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

@@ -407,6 +407,13 @@ public class FaceServicelimpl implements FaceServiceI {
 
         // 海康数据
         TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
+        if (null == taUserHk) {
+            /**
+             * 如果没有海康数据，就进行推送
+             */
+            ihkService.pushPerson(taUser.getId() + "", userVerify.getId());
+            taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
+        }
 
         // 海康权限信息
         TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());

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

@@ -142,18 +142,26 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
             downloadEntranceGuardPermissions(entranceGuardPermissions.toJSONString());
         }
 
-        // 下发门禁人脸权限
-        JSONObject entranceGuardFace = jsonObject.getJSONObject("entranceGuardFace");
-        if (null != entranceGuardFace) {
-            downloadEntranceGuardFace(entranceGuardFace.toJSONString());
-        }
-
         // 下发门口机(可视对讲)卡权限
         JSONObject doorPermissions = jsonObject.getJSONObject("doorPermissions");
         if (null != doorPermissions) {
             downloadDoorPermissions(doorPermissions.toJSONString());
         }
 
+
+        try {
+            // 睡眠 3 秒
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        // 下发门禁人脸权限
+        JSONObject entranceGuardFace = jsonObject.getJSONObject("entranceGuardFace");
+        if (null != entranceGuardFace) {
+            downloadEntranceGuardFace(entranceGuardFace.toJSONString());
+        }
+
         // 下发门口机(可视对讲)人脸权限
         JSONObject doorFace = jsonObject.getJSONObject("doorFace");
         if (null != doorFace) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/PropertyApplication.java

@@ -3,6 +3,7 @@ package com.community.huiju;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import feign.Logger;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -45,4 +46,10 @@ public class PropertyApplication {
 		factory.setLocation("/tmp/smart-community");
 		return factory.createMultipartConfig();
 	}
+
+	@Bean
+	public Logger.Level feignLoggerLevel() {
+		//这里记录所有，根据实际情况选择合适的日志level
+		return Logger.Level.FULL;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/TaUserFeignService.java

@@ -17,7 +17,7 @@ public interface TaUserFeignService {
      * @return
      */
     @RequestMapping(value = "/user/register",method = RequestMethod.POST)
-    ResponseBean register(@RequestBody String parameter);
+    String register(@RequestBody String parameter);
 
     /**
      * 推送海康人员添加
@@ -25,14 +25,14 @@ public interface TaUserFeignService {
      * @return
      */
     @RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
-    ResponseBean pushHKPerson(@PathVariable("appUserId") Integer appUserId, @RequestParam("userVerifyId") Integer userVerifyId);
+    String pushHKPerson(@PathVariable("appUserId") Integer appUserId, @RequestParam("userVerifyId") Integer userVerifyId);
 
     /**
      * 异动下载门禁权限
      * @return
      */
     @RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
-    ResponseBean downloadAuthorityByDeviceUuids();
+    String downloadAuthorityByDeviceUuids();
 
 
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/impl/TaUserFeignFallBack.java

@@ -1,5 +1,6 @@
 package com.community.huiju.feign.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.feign.TaUserFeignService;
 import lombok.extern.slf4j.Slf4j;
@@ -8,24 +9,24 @@ import lombok.extern.slf4j.Slf4j;
 public class TaUserFeignFallBack implements TaUserFeignService {
 
     @Override
-    public ResponseBean register(String parameter) {
+    public String register(String parameter) {
         return back();
     }
 
     @Override
-    public ResponseBean pushHKPerson(Integer appUserId,Integer userVerifyId) {
+    public String pushHKPerson(Integer appUserId,Integer userVerifyId) {
         return back();
     }
 
     @Override
-    public ResponseBean downloadAuthorityByDeviceUuids() {
+    public String downloadAuthorityByDeviceUuids() {
         return back();
     }
 
-    private ResponseBean back() {
+    private String back() {
         log.error("app-api 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();
         responseBean.addError("app-api 远端服务请求失败！");
-        return responseBean;
+        return JSONObject.toJSONString(responseBean);
     }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -192,11 +192,23 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
             tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
 
-            // 推送海康
-            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId(), userVerifyId);
-            if (!"0".equals(pushHKPerson.getCode())) {
+            /**
+             * 这里有特殊情况需要外面包裹一层异常捕获
+             */
+            try {
+
+                // 推送海康
+                String pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId(), userVerifyId);
+                JSONObject pushHKPersonJsonObject = JSONObject.parseObject(pushHKPerson);
+                if (!"0".equals(pushHKPersonJsonObject.getString("code"))) {
+                    throw new WisdomException("设备推送失败！");
+                }
+
+            }catch (Exception e) {
+                log.info("设备推送失败！，人员id：{}", userVerify.getUserId());
                 throw new WisdomException("设备推送失败！");
             }
+
         }
 
 
@@ -205,7 +217,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    //@Transactional(rollbackFor = Exception.class)
     public ResponseBean add(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -333,13 +345,22 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             messageMapper.insert(message);
         }
 
-
+        /**
+         * 这里有特殊情况需要外面包裹一层异常捕获
+         */
+        try {
             // 推送海康
-            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(appUser.getId(), taUserVerify.getId());
-            if (!"0".equals(pushHKPerson.getCode())) {
+            String pushHKPerson = taUserFeignService.pushHKPerson(appUser.getId(), taUserVerify.getId());
+            JSONObject pushHKPersonJsonObject = JSONObject.parseObject(pushHKPerson);
+            if (!"0".equals(pushHKPersonJsonObject.getString("code"))) {
                 log.info("设备推送失败！，人员id：{}", userVerify.getUserId());
                 throw new WisdomException("设备推送失败！");
             }
+        } catch (Exception e) {
+            log.info("设备推送失败！，人员id：{}", userVerify.getUserId());
+            throw new WisdomException("设备推送失败！");
+        }
+
 
 
         if (row <= 0) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -124,8 +125,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
         try {
             // 推送海康
-            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId(), userVerifyId);
-            if (!"0".equals(pushHKPerson.getCode())) {
+            String pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId(), userVerifyId);
+            JSONObject pushHKPersonJsonObject = JSONObject.parseObject(pushHKPerson);
+            if (!"0".equals(pushHKPersonJsonObject.getString("code"))) {
                 throw new WisdomException("设备推送失败！");
             }
         } catch (Exception e) {
@@ -269,8 +271,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
             try {
                 // 推送海康
-                ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId(), userVerifyId);
-                if (!"0".equals(pushHKPerson.getCode())) {
+                String pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId(), userVerifyId);
+                JSONObject pushHKPersonJsonObject = JSONObject.parseObject(pushHKPerson);
+                if (!"0".equals(pushHKPersonJsonObject.getString("code"))) {
                     throw new WisdomException("设备推送失败！");
                 }
             } catch (Exception e) {

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -11,3 +11,9 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
   mapper-locations: classpath:mapper/*.xml
+
+
+logging:
+  level:
+    com.community.huiju.dao: debug
+    com.community.huiju.feign: DEBUG