From 1140f80aefef30b543c99aaed47bcbca731b24e2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 08 十二月 2023 18:21:40 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 832bc36..285c101 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl.hksync;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
@@ -57,13 +59,13 @@
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
param = new AcsDeviceListRequest();
param.setPageNo(curPage);
- param.setPageSize(10000);
+ param.setPageSize(100);
BaseResponse<AcsDeviceListResponse> response = HKService.acsDeviceList(param);
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
}
AcsDeviceListResponse r = response.getData();
- curTotal += 10000;
+ curTotal += 100;
if(curTotal >= r.getTotal()){
hasNext = false;
}
@@ -126,17 +128,21 @@
model.setIsdeleted(Constants.ZERO);
model.setIp(device.getIp());
model.setHkDate(date);
- model.setCreateDate(DateUtil.StringToDate2(device.getCreateTime()));
- model.setEditDate(DateUtil.StringToDate2(device.getUpdateTime()));
- model.setNo(device.getDeviceCode());
+ model.setCreateDate(DateUtil.getISO8601DateByStr(device.getCreateTime()));
+ model.setEditDate(DateUtil.getISO8601DateByStr(device.getUpdateTime()));
+ model.setNo(device.getDevSerialNum());
model.setHkId(device.getIndexCode());
model.setName(device.getName());
model.setHkStatus(Constants.ONE);
+ model.setManufature(device.getManufacturer());
model.setType(Constants.ZERO);
+// model.setNo(device.getDevSerialNum());
+// model.setChannelNo(device);
model.setResourceType(device.getResourceType());
model.setDevTypeCode(device.getDevTypeCode());
model.setManufature(device.getManufacturer());
model.setPort(device.getPort());
+ model.setRemark(JSONObject.toJSONString(device));
return model;
}
--
Gitblit v1.9.3