From c45a2129b51276efd8d290c44e2943e5d3a764e7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 十二月 2023 09:20:47 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.java | 10 ++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskProgressRequest.java | 12 +++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 84 +++++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.java | 11 ++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.java | 16 ++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.java | 23 +++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.java | 10 ++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.java | 11 ++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.java | 15 +++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.java | 20 +++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.java | 13 +++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.java | 12 +++
12 files changed, 237 insertions(+), 0 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.java
new file mode 100644
index 0000000..69779e9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TaskAdditionRequest {
+
+ private Integer taskType;//s number True 涓嬭浇浠诲姟绫诲瀷1锛氬崱鐗�4锛氫汉鑴� 鍏朵粬鍙傝�冮檮褰旳.53 浠诲姟涓嬭浇绫诲瀷璇存槑
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.java
new file mode 100644
index 0000000..7d51456
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TaskDataAdditionCardRequest {
+
+ private String card ;// string True 鍗″彿锛屾敮鎸�8-20浣嶆暟瀛�+澶у啓瀛楁瘝鐨勫崱鍙凤紱璇锋牴鎹澶囧疄闄呰兘鍔涘～鍐欏崱鍙�
+ private Integer status ;//number True 鐘舵��0: 鏂板1: 淇敼2:鍒犻櫎
+ private Integer cardType ;//number False 鍗＄被鍨嬶紝涓虹┖鏃堕粯璁ゆ甯告櫘閫氬崱1: 鏅�氬崱2: 娈嬮殰浜哄＋鍗�3: 榛戝悕鍗曞崱4:宸℃煡鍗�5:鑳佽揩鍗�6:瓒呯骇鍗�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.java
new file mode 100644
index 0000000..1cdddc2
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class TaskDataAdditionFaceRequest {
+
+ private String card ;//string False 鏀寔8-20浣嶆暟瀛�+澶у啓瀛楁瘝鐨勫崱鍙凤紱浠ュ崱涓轰腑蹇冭澶囧繀濉紝璇锋牴鎹澶囧疄闄呰兘鍔涘～鍐�
+ private Map<String,String> data ;//object True 浜鸿劯鏁版嵁锛孠ey锛氫负浜鸿劯缂栧彿 Value锛氫负浜鸿劯鍥剧墖https涓嬭浇鐨刄RL锛屽浘鐗囪姹傛祻瑙堝櫒鍙互鐩存帴鎵撳紑锛屼笉鏀寔閲嶅畾鍚�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.java
new file mode 100644
index 0000000..1087e9f
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TaskDataAdditionPersonRequest {
+
+ private String personId ;//string True 浜哄憳Id锛岀郴缁熷唴浜哄憳浠庤幏鍙栦汉鍛樺垪琛╲2 鎺ュ彛鑾峰彇杩斿洖鍙傛暟涓璸ersonId锛岀郴缁熷浜哄憳锛屼汉鍛業d鐢辫皟鐢ㄦ柟鎸囧畾锛屼綔涓轰汉鍛樺敮涓�鏍囧織锛屾渶澶ч暱搴︿负64锛屽寘鍚暟瀛椼�佸瓧姣嶏紙灏忓啓锛夊拰涓垝绾匡紙-锛�
+ private String operatorType ;//number True 鎿嶄綔绫诲瀷锛�0鏂板锛�1淇敼锛�2鍒犻櫎
+ private String startTime ;//string False 寮�濮嬫棩鏈燂紝閰嶇疆浜哄憳鏉冮檺鐨勬湁鏁堟湡锛屼负绌烘椂榛樿闀挎湡鏈夋晥銆傞噰鐢↖SO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String endTime;// string False 缁撴潫鏃ユ湡锛岄厤缃汉鍛樻潈闄愮殑鏈夋晥鏈燂紝涓虹┖鏃堕粯璁ら暱鏈熸湁鏁堛�傞噰鐢↖SO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String personType;// number False 浜哄憳绫诲瀷锛岄粯璁や负11. 绯荤粺鍐呬汉鍛�2. 绯荤粺澶栦汉鍛� 涓嬭浇绯荤粺澶栦汉鍛樻椂蹇呭～
+ private String name;// string False 浜哄憳濮撳悕锛岀郴缁熷浜哄憳鏃跺繀濉�
+ private String cards ;//object[] False 鍗＄墖淇℃伅锛屼笅杞界郴缁熷浜哄憳鍗＄墖鏉冮檺鏃跺繀濉�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.java
new file mode 100644
index 0000000..2f117e6
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.java
@@ -0,0 +1,16 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TaskDataAdditionRequest {
+
+ private String taskId;//string True 涓嬭浇浠诲姟鍞竴鏍囪瘑
+ private List<TaskDataAdditionResourceRequest> resourceInfos;// object[] True 璧勬簮瀵硅薄
+ private List<TaskDataAdditionPersonRequest> personInfos;// object[] True 浜哄憳淇℃伅
+ private List<TaskDataAdditionCardRequest> cards;// object[] True 浜哄憳淇℃伅
+ private TaskDataAdditionFaceRequest face;// object False 浜鸿劯淇℃伅锛屼笅杞界郴缁熷浜哄憳浜鸿劯鏉冮檺鏃跺繀濉�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.java
new file mode 100644
index 0000000..6335305
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TaskDataAdditionResourceRequest {
+
+ private String resourceIndexCode;// string True 璧勬簮鐨勫敮涓�鏍囪瘑锛�32浣嶆暟瀛�+瀛楁瘝锛堝皬鍐欙級瀛楃涓诧紝璧勬簮涓鸿澶囷紝鏍规嵁鑾峰彇璧勬簮鍒楄〃v2鎺ュ彛鑾峰彇杩斿洖鍙傛暟indexCode
+ private String resourceType;// string True 璧勬簮绫诲瀷,鍙傝�冮檮褰旳.50 璁惧閫氶亾绫诲瀷
+ private Integer[] channelNos ;//number[] True 璧勬簮閫氶亾鍙�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskProgressRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskProgressRequest.java
new file mode 100644
index 0000000..64bf009
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TaskProgressRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TaskProgressRequest {
+
+ private String taskId;//string True 涓嬭浇浠诲姟鍞竴鏍囪瘑
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.java
new file mode 100644
index 0000000..19db336
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class TaskAdditionResponse {
+
+ private String taskId ;//string False 涓嬭浇浠诲姟鍞竴鏍囪瘑锛�32浣嶆暟瀛�+瀛楁瘝瀛楃涓�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.java
new file mode 100644
index 0000000..9af6cc4
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.java
@@ -0,0 +1,13 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class TaskProgressResourceInfoResponse {
+
+ private String resourceIndexCode;// string False 璧勬簮鐨勫敮涓�鏍囪瘑
+ private String resourceType;// string False 璧勬簮绫诲瀷锛屽弬鑰冮檮褰旳.50 璁惧閫氶亾绫诲瀷
+ private Integer[] channelNos;// number[] False 璧勬簮閫氶亾鍙�
+ private String[] channelIndexCodes;// string[] False 璧勬簮閫氶亾鍞竴鏍囪瘑锛堝湪鏉冮檺涓嬭浇鍜岄厤缃帴鍙ｅ叆鍙傛椂瀵瑰簲鏌ヨ鎺ュ彛浼氳繑鍥烇紝涓嶄綔涓烘煡璇㈡帴鍙ｇ殑鏌ヨ鏉′欢锛�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.java
new file mode 100644
index 0000000..d72f273
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.java
@@ -0,0 +1,23 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class TaskProgressResourceResponse {
+
+ private TaskProgressResourceInfoResponse resourceInfo;// object False 璧勬簮瀵硅薄
+ private String startTime;// string False 涓嬭浇寮�濮嬫椂闂� 閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String updateTime;// string False 涓嬭浇杩涘害鏇存柊鏃堕棿 閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String endTime;// string False 涓嬭浇缁撴潫鏃堕棿 閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private Integer leftTime;// number False 涓嬭浇鍓╀綑鏃堕棿锛屽崟浣嶏細绉�
+ private String errorCode;// string False 涓嬭浇閿欒鐮侊紝鍙傝�冮檮褰旹.2.3 鍑哄叆鎺у埗鏉冮檺閿欒鐮�
+ private Integer downloadResult;// number False 涓嬭浇缁撴灉锛堝綋涓嬭浇缁撴潫鏃舵湁鍊硷紝0:鎴愬姛,1:澶辫触锛�2锛氶儴鍒嗗け璐ワ級
+ private Integer consumeTime;// number False 涓嬭浇鐢ㄦ椂锛屽崟浣嶏細绉�
+ private String downloadStatus;// string False 涓嬭浇鐘舵��
+ private Boolean isDownloadFinished;// boolean False 鏄惁涓嬭浇缁撴潫
+ private Integer downloadPercent;// number False 涓嬭浇鐧惧垎姣�
+ private Integer totalPersonCount;// number False 涓嬭浇鎬讳汉鏁�
+ private Integer downloadPersonCount;// number False 宸蹭笅鍙戜汉鍛樻暟閲�
+ private Integer successedPersonCount;// number False 涓嬭浇鎴愬姛浜哄憳鏁伴噺
+ private Integer failedPersonCount;// number False 涓嬭浇澶辫触浜哄憳鏁伴噺
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.java
new file mode 100644
index 0000000..167e7b2
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.java
@@ -0,0 +1,20 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class TaskProgressResponse {
+
+ private String taskId ;//string False 涓嬭浇浠诲姟鍞竴鏍囪瘑锛�32浣嶆暟瀛�+瀛楁瘝瀛楃涓�
+
+ private String tagId;// string False 鏍囩,鐢ㄤ簬鍖哄垎涓嶅悓涓氬姟缁勪欢锛屽缓璁娇鐢ㄧ粍浠舵爣璇嗐�傚彧鏀寔1-32涓暟瀛楀拰灏忓啓瀛楁瘝銆�
+ private Integer taskType;// number False 涓嬭浇浠诲姟绫诲瀷 ,鍙傝�冮檮褰旳.53 浠诲姟涓嬭浇绫诲瀷璇存槑
+ private Integer taskOptType;//number False 浠诲姟鎿嶄綔绫诲瀷0:鍒濆鍖栦笅杞�,銆�1:寮傚姩涓嬭浇, 2:鎸囧畾涓嬭浇-鏅�氫换鍔�, 3:鎸囧畾涓嬭浇-蹇�熶换鍔�,4鑷姩涓嬭浇, 5:鍚屾涓嬭浇
+ private String startTime ;//string False 涓嬭浇寮�濮嬫椂闂� 閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private Integer totalPercent ;//number False 涓嬭浇鎬昏繘搴�
+ private Integer leftTime;// number False 涓嬭浇鍓╀綑鏃堕棿
+ private Integer consumeTime ;//number False 涓嬭浇鎬荤敤鏃�
+ private Boolean isDownloadFinished;// boolean False 涓嬭浇鏄惁缁撴潫
+ private String resourceDownloadProgress;// object[] False 璧勬簮涓嬭浇璇︽儏
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 488cfb3..c7af861 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -556,6 +556,90 @@
}
return null;
}
+ /**
+ *娴峰悍鍒涘缓涓�鍗￠�氫笅杞戒换鍔�
+ * @return
+ */
+ public static BaseResponse<TaskAdditionResponse> taskAddition(TaskAdditionRequest param){
+ log.info("銆愭捣搴峰垱寤轰竴鍗￠�氫笅杞戒换鍔°��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.taskAddition(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<TaskAdditionResponse>>(){};
+ BaseResponse<TaskAdditionResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒涘缓涓�鍗￠�氫笅杞戒换鍔�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垱寤轰竴鍗￠�氫笅杞戒换鍔°��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ // saveInterfaceLog(param,res);
+ }
+ return null;
+ }
+ /**
+ *娴峰悍涓�鍗￠�氫换鍔℃坊鍔犳暟鎹�
+ * @return
+ */
+ public static BaseResponse taskDataAddition(TaskDataAdditionRequest param){
+ log.info("銆愭捣搴蜂竴鍗￠�氫换鍔℃坊鍔犳暟鎹��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.taskDataAddition(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍涓�鍗￠�氫换鍔℃坊鍔犳暟鎹�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂竴鍗￠�氫换鍔℃坊鍔犳暟鎹��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ // saveInterfaceLog(param,res);
+ }
+ return null;
+ }
+ /**
+ *娴峰悍涓�鍗￠�氫换鍔¤繘搴︽煡璇�
+ * @return
+ */
+ public static BaseResponse<TaskProgressResponse> taskDataAddition(TaskProgressRequest param){
+ log.info("銆愭捣搴蜂竴鍗￠�氫换鍔¤繘搴︽煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.taskProgress(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<TaskProgressResponse> >(){};
+ BaseResponse<TaskProgressResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍涓�鍗￠�氫换鍔¤繘搴︽煡璇�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂竴鍗￠�氫换鍔¤繘搴︽煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ // saveInterfaceLog(param,res);
+ }
+ return null;
+ }
+ /**
+ *娴峰悍涓�鍗￠�氫换鍔″紑濮嬫墽琛�
+ * @return
+ */
+ public static BaseResponse taskStart(TaskProgressRequest param){
+ log.info("銆愭捣搴蜂竴鍗￠�氫换鍔″紑濮嬫墽琛屻��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.taskStart(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍涓�鍗￠�氫换鍔″紑濮嬫墽琛�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂竴鍗￠�氫换鍔″紑濮嬫墽琛屻��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ // saveInterfaceLog(param,res);
+ }
+ return null;
+ }
private static void logResult(BaseResponse res,String name) {
if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
--
Gitblit v1.9.3