魏熙美 6 лет назад
Родитель
Сommit
cfa470c986

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/EquipmentServiceImpl.java Просмотреть файл

78
         person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
78
         person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
79
         person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
79
         person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
80
         person.setPersonId(taUserHk.getHkUserId());
80
         person.setPersonId(taUserHk.getHkUserId());
81
-        person.setPersonNo(Long.valueOf(taUserHk.getHkCardNo()));
81
+        person.setPersonNo(Long.valueOf(taUserHk.getHkPersonNo()));
82
         person.setPersonName(user.getUserName());
82
         person.setPersonName(user.getUserName());
83
         person.setCardNo(taUserHk.getHkCardNo());
83
         person.setCardNo(taUserHk.getHkCardNo());
84
 
84
 

+ 3
- 6
CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/impl/HkHardwareServiceImpl.java Просмотреть файл

200
         String secret = (String) personMap.get("secret");
200
         String secret = (String) personMap.get("secret");
201
         String opUserUuid = (String) personMap.get("opUserUuid");
201
         String opUserUuid = (String) personMap.get("opUserUuid");
202
 
202
 
203
-        Long card = System.currentTimeMillis();
203
+        Long card = (Long) personMap.get("card");
204
 
204
 
205
         // 添加卡片
205
         // 添加卡片
206
         addCards(appkey, secret, openapi_ip_port_http, opUserUuid, card, card);
206
         addCards(appkey, secret, openapi_ip_port_http, opUserUuid, card, card);
240
 
240
 
241
         ResponseBean response = new ResponseBean();
241
         ResponseBean response = new ResponseBean();
242
 
242
 
243
-        // 开卡 卡号
244
-        long cardNo = System.currentTimeMillis();
245
-
246
         // 添加卡片
243
         // 添加卡片
247
         Map<String,Object> addCardsMap = new HashMap<>();
244
         Map<String,Object> addCardsMap = new HashMap<>();
248
         addCardsMap.put("secret", secret);
245
         addCardsMap.put("secret", secret);
249
         addCardsMap.put("appkey", appkey);
246
         addCardsMap.put("appkey", appkey);
250
         addCardsMap.put("openapi_ip_port_http", openapiIpPortHttp);
247
         addCardsMap.put("openapi_ip_port_http", openapiIpPortHttp);
251
-        addCardsMap.put("startCardNo", cardNo);
252
-        addCardsMap.put("endCardNo", cardNo);
248
+        addCardsMap.put("startCardNo", startCardNo);
249
+        addCardsMap.put("endCardNo", endCardNo);
253
         addCardsMap.put("opUserUuid", opUserUuid);
250
         addCardsMap.put("opUserUuid", opUserUuid);
254
         String addCardsJSON = com.community.commom.hk.HKOpenApi.addCards(addCardsMap);
251
         String addCardsJSON = com.community.commom.hk.HKOpenApi.addCards(addCardsMap);
255
         checkResult(addCardsJSON);
252
         checkResult(addCardsJSON);