海康推送完成

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java

@@ -43,8 +43,8 @@ public class HkController {
 		return hkResponseBean;
 	}
 
-	@RequestMapping(value = "推送HK人员", method = RequestMethod.POST)
-	public ResponseBean pushHKPerson(@RequestParam("appUserId") String appUserId) {
+	@RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson(@PathVariable("appUserId") String appUserId) {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = ihkService.pushPerson(appUserId);
 		return responseBean;

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

@@ -70,7 +70,6 @@ public class HKServiceImpl implements IHKService {
             return responseBean;
         }
         responseBean.addError("操作失败!");
-        responseBean.addError("操作失败!");
         return responseBean;
     }
 

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

@@ -3,6 +3,7 @@ package com.community.huiju.feign;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.feign.impl.TaUserFeignFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,4 +22,12 @@ public interface TaUserFeignService {
     @RequestMapping(value = "/user/register",method = RequestMethod.POST)
     ResponseBean register(@RequestBody String parameter);
 
+    /**
+     * 推送海康人员添加
+     * @param appUserId
+     * @return
+     */
+    @RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
+    ResponseBean pushHKPerson(@PathVariable("appUserId") Integer appUserId);
+
 }

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

@@ -9,6 +9,15 @@ public class TaUserFeignFallBack implements TaUserFeignService {
 
     @Override
     public ResponseBean register(String parameter) {
+        return back();
+    }
+
+    @Override
+    public ResponseBean pushHKPerson(Integer appUserId) {
+        return back();
+    }
+
+    private ResponseBean back() {
         log.error("app-api 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();
         responseBean.addError("app-api 远端服务请求失败！");

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

@@ -107,6 +107,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     @Qualifier("phoneCodeImpl")
     private ICode iCode;
+
+    @Autowired
+    private TaUserFeignService taUserFeignService;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -184,6 +187,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
                     userVerify.getGender(), user.getUserName(), user.getLoginName());
+            // 推送海康
+            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+            if (!"0".equals(pushHKPerson.getCode())) {
+                throw new WisdomException("设备推送失败！");
+            }
         }
 
 

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

@@ -8,6 +8,8 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.feign.TaUserFeignService;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserVerifyService;
 import org.apache.commons.lang.StringUtils;
@@ -54,6 +56,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private TpRoomNoMapper tpRoomNoMapper;
 
+    @Autowired
+    private TaUserFeignService taUserFeignService;
+
     @Override
     public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -173,6 +178,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                 // 添加楼栋数据
                 insertBuildingOwnerInfo(userVerify, user);
             }
+            // 推送海康
+            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+            if (!"0".equals(pushHKPerson.getCode())) {
+                throw new WisdomException("设备推送失败！");
+            }
         }
         taUserVerifyMapper.updateById(userVerify);