修复 海康问题

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

@@ -78,7 +78,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
         person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
         person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
         person.setPersonId(taUserHk.getHkUserId());
-        person.setPersonNo(Long.valueOf(taUserHk.getHkCardNo()));
+        person.setPersonNo(Long.valueOf(taUserHk.getHkPersonNo()));
         person.setPersonName(user.getUserName());
         person.setCardNo(taUserHk.getHkCardNo());
 

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

@@ -200,7 +200,7 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
         String secret = (String) personMap.get("secret");
         String opUserUuid = (String) personMap.get("opUserUuid");
 
-        Long card = System.currentTimeMillis();
+        Long card = (Long) personMap.get("card");
 
         // 添加卡片
         addCards(appkey, secret, openapi_ip_port_http, opUserUuid, card, card);
@@ -240,16 +240,13 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
 
         ResponseBean response = new ResponseBean();
 
-        // 开卡 卡号
-        long cardNo = System.currentTimeMillis();
-
         // 添加卡片
         Map<String,Object> addCardsMap = new HashMap<>();
         addCardsMap.put("secret", secret);
         addCardsMap.put("appkey", appkey);
         addCardsMap.put("openapi_ip_port_http", openapiIpPortHttp);
-        addCardsMap.put("startCardNo", cardNo);
-        addCardsMap.put("endCardNo", cardNo);
+        addCardsMap.put("startCardNo", startCardNo);
+        addCardsMap.put("endCardNo", endCardNo);
         addCardsMap.put("opUserUuid", opUserUuid);
         String addCardsJSON = com.community.commom.hk.HKOpenApi.addCards(addCardsMap);
         checkResult(addCardsJSON);