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ï¼äººè¸ å ¶ä»åèéå½A.53 ä»»å¡ä¸è½½ç±»å说æ } 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:è¶ çº§å¡ } 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 äººè¸æ°æ®ï¼Keyï¼ä¸ºäººè¸ç¼å· Valueï¼ä¸ºäººè¸å¾çhttpsä¸è½½çURLï¼å¾çè¦æ±æµè§å¨å¯ä»¥ç´æ¥æå¼ï¼ä¸æ¯æéå®å } 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ï¼ç³»ç»å 人åä»è·å人åå表v2 æ¥å£è·åè¿ååæ°ä¸personIdï¼ç³»ç»å¤äººåï¼äººåIdç±è°ç¨æ¹æå®ï¼ä½ä¸ºäººåå¯ä¸æ å¿ï¼æå¤§é¿åº¦ä¸º64ï¼å 嫿°åã忝ï¼å°åï¼åä¸å线ï¼-ï¼ private String operatorType ;//number True æä½ç±»åï¼0æ°å¢ï¼1ä¿®æ¹ï¼2å é¤ private String startTime ;//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 String personType;// number False 人åç±»åï¼é»è®¤ä¸º11. ç³»ç»å 人å2. ç³»ç»å¤äººå ä¸è½½ç³»ç»å¤äººåæ¶å¿ å¡« private String name;// string False 人åå§åï¼ç³»ç»å¤äººåæ¶å¿ å¡« private String cards ;//object[] False å¡çä¿¡æ¯ï¼ä¸è½½ç³»ç»å¤äººåå¡çæéæ¶å¿ å¡« } 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 人è¸ä¿¡æ¯ï¼ä¸è½½ç³»ç»å¤äººåäººè¸æéæ¶å¿ å¡« } 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 èµæºç±»å,åèéå½A.50 设å¤ééç±»å private Integer[] channelNos ;//number[] True èµæºééå· } 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 ä¸è½½ä»»å¡å¯ä¸æ è¯ } 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使°å+忝å符串 } 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 èµæºç±»åï¼åèéå½A.50 设å¤ééç±»å private Integer[] channelNos;// number[] False èµæºééå· private String[] channelIndexCodes;// string[] False èµæºééå¯ä¸æ è¯ï¼å¨æéä¸è½½åé ç½®æ¥å£å ¥åæ¶å¯¹åºæ¥è¯¢æ¥å£ä¼è¿åï¼ä¸ä½ä¸ºæ¥è¯¢æ¥å£çæ¥è¯¢æ¡ä»¶ï¼ } 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 ä¸è½½é误ç ï¼åèéå½E.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 ä¸è½½å¤±è´¥äººåæ°é } 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 ä¸è½½ä»»å¡ç±»å ,åèéå½A.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 èµæºä¸è½½è¯¦æ } 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)){