From 12c096a36542a5886c1d65e2e04d404ac77316f5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 十二月 2023 17:04:17 +0800
Subject: [PATCH] 海康接口封装
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkListResponse.java | 13
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 422 +++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupResponse.java | 15
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddRequest.java | 24 +
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 99 ++++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 18
log/eva.log | 0
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureRequest.java | 11
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.java | 12
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgListResponse.java | 15
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentVistorResponse.java | 18
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EntranceListRequest.java | 10
server/dmvisit_admin/src/main/resources/application.yml | 5
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.java | 11
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java | 19
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceEditRequest.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.java | 16
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.java | 14
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 26
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EntranceListResponse.java | 14
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.java | 11
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 15
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java | 11
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceAddRequest.java | 9
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.java | 16
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.java | 22
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.java | 13
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserDelResponse.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 310 ++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.java | 15
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserAddResponse.java | 11
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgDelRequest.java | 8
/dev/null | 29 -
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgEditRequest.java | 9
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java | 17
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgAddRequest.java | 12
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 40 -
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkListRequest.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.java | 11
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.java | 9
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java | 8
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.java | 11
46 files changed, 1,307 insertions(+), 105 deletions(-)
diff --git a/log/eva.log b/log/eva.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/log/eva.log
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index 46e8cd1..c191c3b 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
@@ -30,7 +30,6 @@
map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
# 缂撳瓨鍐呭璁剧疆
cache:
session:
@@ -46,7 +45,6 @@
smart: true
# 鎺掗櫎璺熻釜鐨刄RL姝ｅ垯
exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.*
-
# 鏃ュ織閰嶇疆
logback:
@@ -69,7 +67,6 @@
compression:
enabled: true
mime-types: application/json
-
port: 10013
tomcat:
max-swallow-size: -1
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/HKUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
similarity index 99%
rename from server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/HKUtil.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
index 757a6ec..bb3223f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/HKUtil.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
@@ -1,9 +1,8 @@
-package com.doumee.core.utils.haikang;
+package com.doumee.core.haikang;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
new file mode 100644
index 0000000..d38d9c5
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -0,0 +1,99 @@
+package com.doumee.core.haikang.model;
+
+import com.doumee.core.utils.Constants;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Data
+public class HKConstants {
+ private Logger logger = LoggerFactory.getLogger(HKConstants.class);
+ //娴峰悍骞冲彴鏍规嵁鐜板満鐜閰嶇疆http杩樻槸https
+ public static String https ;
+ /**
+ * 鑳藉姏寮�鏀惧钩鍙扮殑缃戠珯璺緞 璺緞涓嶇敤淇敼锛屽氨鏄�/artemis
+ */
+ public static final String ARTEMIS_PATH = "/artemis";
+
+ /**
+ * 鎺ュ彛鍦板潃闆嗗悎
+ */
+ public interface InterfacePath{
+ String doorEvents = "/api/acs/v2/door/events";//闂ㄧ浜嬩欢鏌ヨ
+ String rootOrg = "/api/resource/v1/org/rootOrg";//鑾峰彇璺熺粍缁�
+ String addBatchOrg = "/api/resource/v1/org/batch/add";//鎵归噺鏂板缁勭粐
+ String delBatchOrg = "/api/resource/v1/org/batch/delete";//鎵归噺鍒犻櫎缁勭粐
+ String editOrg = "/api/resource/v1/org/single/update";//淇敼缁勭粐
+ String addUser = "/api/resource/v2/person/single/add";//娣诲姞浜哄憳
+ String addBatchUser = "/api/resource/v1/person/batch/add";//鎵归噺娣诲姞浜哄憳
+ String editUser = "/api/resource/v1/person/single/update";//淇敼浜哄憳
+ String delBatchUser = "/api/resource/v1/person/batch/delete";//鎵归噺鍒犻櫎浜哄憳
+ String addFace = "/api/resource/v1/face/single/add";//娣诲姞浜鸿劯
+ String editFace = "/api/resource/v1/face/single/update";//淇敼浜鸿劯
+ String delFace = "/api/resource/v1/face/single/delete";//鍒犻櫎浜鸿劯
+ String acsDeviceList = "/api/resource/v2/acsDevice/search";//鏌ヨ闂ㄧ璁惧鍒楄〃v2
+ String acsDeviceTimeRangeList = "/api/resource/v1/acsDevice/timeRange";//澧為噺鑾峰彇闂ㄧ璁惧鏁版嵁
+ String parkAddition = "/api/pms/v2/parkingSpace/reservations/addition";//杞︿綅棰勭害v2
+ String parkDeletion= "/api/pms/v1/parkingSpace/reservations/deletion";//杞︿綅鍙栨秷棰勭害v2
+ String carChargeAddtion= "/api/pms/v1/car/charge";//鍥哄畾杞﹀厖鍊煎寘鏈�
+ String carChargeDeletion= "/api/pms/v1/car/charge/deletion";//鍥哄畾杞﹀彇娑堝寘鏈�
+ String getParkList= "/api/resource/v1/park/parkList";//鑾峰彇鍋滆溅搴撳垪琛�
+ String getEntranceList= "/api/resource/v1/entrance/entranceList";//鑾峰彇鍑哄叆鍙ｅ垪琛�
+ String visitAppiontment= "/api/visitor/v2/appointment";//璁垮棰勭害v2
+ String visitAppiontmentMDJ= "/api/visitor/v1/appointment/registration";//璁垮棰勭害鍏嶇櫥璁皏2
+ String visitCancel= "/api/visitor/v1/appointment/cancel";//鍙栨秷璁垮棰勭害
+ String facePicture= "/api/resource/v1/person/picture";//鎻愬彇鐢ㄦ埛浜鸿劯鐓х墖
+ String privilegeGroup= "/api/visitor/v1/privilege/group";//鏌ヨ璁垮鏉冮檺缁�
+ }
+
+ /**
+ * 椤旇壊鏋氫妇
+ */
+ public enum Colors {
+
+ SYSTEM(0, "绯荤粺鐢ㄦ埛" )
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ Colors(int key, String name ) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (Constants.UserType c : Constants.UserType.values()) {
+ if (c.getKey() == index) {
+ return c.getName();
+ }
+ }
+ return null;
+ }
+
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
+
+
+
+}
+
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
new file mode 100644
index 0000000..49aa419
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -0,0 +1,310 @@
+package com.doumee.core.haikang.model;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+@Slf4j
+public class HKTools {
+
+// private static final Logger logger = LoggerFactory.getLogger(HKUtil.class);
+
+
+ public static void main(String[] args) throws ParseException {
+
+ }
+ private static Map<String, String> getPath(String str) {
+ final String getCamsApi = HKConstants.ARTEMIS_PATH + str;
+ Map<String, String> path = new HashMap<String, String>(2) {
+ {
+ put(HKConstants.https, getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
+ }
+ };
+ return path;
+ }
+
+ /**
+ * 鑾峰彇闂ㄧ鏃堕棿鏁版嵁闆嗗悎
+ * @return
+ */
+ public static String getRootOrg() {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.rootOrg);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, "", null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+ /**
+ * 鏇存柊缁勭粐淇℃伅
+ * @param body
+ * @return
+ */
+ public static String editOrg(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.editOrg);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+ /**
+ * 鏂板缁勭粐淇℃伅
+ * @param body
+ * @return
+ */
+ public static String addBatchOrg(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchOrg);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 鍒犻櫎缁勭粐淇℃伅
+ * @param body
+ * @return
+ */
+ public static String delOrg(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchOrg);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+ /**
+ * 鏂板浜哄憳淇℃伅
+ * @param body
+ * @return
+ */
+ public static String addUser(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.addUser);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+
+ /**
+ * 鎵归噺鏂板浜哄憳淇℃伅
+ * @param body
+ * @return
+ */
+ public static String addBatchUser(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchUser);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎浜哄憳淇℃伅
+ * @param body
+ * @return
+ */
+ public static String delBatchUser(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchUser);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+ /**
+ * 淇敼浜哄憳淇℃伅
+ * @param body
+ * @return
+ */
+ public static String editUser(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.editUser);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 娣诲姞浜鸿劯淇℃伅
+ * @param body
+ * @return
+ */
+ public static String addFace(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.addFace);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 缂栬緫浜鸿劯淇℃伅
+ * @param body
+ * @return
+ */
+ public static String editFace(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.editFace);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 鍒犻櫎浜鸿劯淇℃伅
+ * @param body
+ * @return
+ */
+ public static String delFace(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.delFace);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 鍏ㄩ噺鑾峰彇杞﹀簱淇℃伅
+ * @param body
+ * @return
+ */
+ public static String parkList(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.getParkList);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 鏍规嵁杞﹀簱缂栫爜鏌ヨ鍑哄叆鍙ｅ垪琛�
+ * @param body
+ * @return
+ */
+ public static String entranceList(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.getEntranceList);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 杞﹁締棰勭害
+ * @param body
+ * @return
+ */
+ public static String parkAddition(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.parkAddition);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 杞﹁締鍙栨秷棰勭害
+ * @param body
+ * @return
+ */
+ public static String parkDeletion(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.parkDeletion);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛�
+ * @param body
+ * @return
+ */
+ public static String carChargeAddtion(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeAddtion);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 鍥哄畾杞﹁締鍙栨秷鍖呮湡
+ * @param body
+ * @return
+ */
+ public static String carChargeDeletion(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeDeletion);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+
+ /**
+ * 鑾峰彇浜鸿劯鏁版嵁锛堟彁鍙栦汉鑴歌闂湴鍧�锛�
+ * @param body
+ * @return
+ */
+ public static InputStream getFaceInputStream(String body) throws Exception{
+
+ Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture);
+ //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
+ }
+ }
+ /**
+ * 鑾峰彇闂ㄧ璁惧鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String acsDeviceList(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 澧為噺鑾峰彇闂ㄧ璁惧鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String acsDeviceTimeRangeList(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 璁垮棰勭害
+ * @param body
+ * @return
+ */
+ public static String visitAppiontment(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontment);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 璁垮鍏嶇櫥璁伴绾�
+ * @param body
+ * @return
+ */
+ public static String visitAppiontmentMDJ(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontmentMDJ);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+ /**
+ * 鍙栨秷璁垮棰勭害
+ * @param body
+ * @return
+ */
+ public static String visitCancel(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.visitCancel);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+ /**
+ * 璁垮鏉冮檺缁�
+ * @param body
+ * @return
+ */
+ public static String privilegeGroup(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.privilegeGroup);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ return result;
+ }
+
+
+
+ /**
+ * 浼犲叆Data绫诲瀷鏃ユ湡锛岃繑鍥炲瓧绗︿覆绫诲瀷鏃堕棿锛圛SO8601鏍囧噯鏃堕棿锛�
+ * @param date
+ * @return
+ */
+ public static String getISO8601Timestamp(Date date){
+ TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
+ //TimeZone tz = TimeZone.getTimeZone("GMT-01");
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+ df.setTimeZone(tz);
+ String nowAsISO = df.format(date);
+ return nowAsISO;
+ }
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
new file mode 100644
index 0000000..63ce885
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
@@ -0,0 +1,8 @@
+package com.doumee.core.haikang.model.param;
+
+import lombok.Data;
+
+@Data
+public class BaseRequst<T> {
+ private T data;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java
new file mode 100644
index 0000000..af0a146
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseResponse.java
@@ -0,0 +1,19 @@
+package com.doumee.core.haikang.model.param;
+
+import lombok.Data;
+
+@Data
+public class BaseResponse<T> {
+ /**
+ * 杩斿洖鐮�
+ * 0锛氭垚鍔�
+ * 鍏朵粬锛氬け璐�
+ * 鍙傝�冮檮褰旹.other.1 璧勬簮鐩綍閿欒鐮�
+ */
+ private String code;
+ /**
+ * 鎺ュ彛鎵ц鎯呭喌璇存槑淇℃伅
+ */
+ private String msg;
+ private T data;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.java
new file mode 100644
index 0000000..6a731f5
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.java
@@ -0,0 +1,13 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class CarChargeAddRequest {
+
+ private String parkSyscode;// string True 鍋滆溅搴撳敮涓�鏍囪瘑锛屽彲閫氳繃鑾峰彇鍋滆溅搴撳垪琛ㄦ帴鍙ｈ幏鍙�
+ private String plateNo;// string True 杞︾墝鍙风爜
+ private String fee;// string False 鍖呮湡璐圭敤锛屽崟浣�:鍏冿紝2浣嶅皬鏁�
+ private String startTime;// string True 鍖呮湡寮�濮嬫椂闂存椂闂存牸寮忥細yyyy-MM-dd锛屽锛�2018-07-26
+ private String endTime;// string True 鍖呮湡缁撴潫鏃堕棿鏃堕棿鏍煎紡锛歽yyy-MM-dd锛屽锛�2018-07-27
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.java
new file mode 100644
index 0000000..af0e117
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class CarChargeDelRequest {
+
+ private String parkSyscode;// string False 鍋滆溅搴撳敮涓�鏍囪瘑,涓虹┖鏃跺垯鍙栨秷褰撳墠杞﹁締鎵�鏈夊仠杞﹀簱鐨勫寘鏈燂紝鍙�氳繃鑾峰彇鍋滆溅搴撳垪琛ㄦ帴鍙ｈ幏鍙�
+ private String plateNo;// string True 杞︾墝鍙风爜
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EntranceListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EntranceListRequest.java
new file mode 100644
index 0000000..adfac1f
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/EntranceListRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class EntranceListRequest {
+
+ private String parkIndexCodes ;// string True 鍋滆溅鍦哄敮涓�鏍囪瘑闆� 澶氫釜鍊间娇鐢ㄨ嫳鏂囬�楀彿鍒嗛殧,涓嶈秴杩�1000涓紝 鍙�氳繃鑾峰彇鍋滆溅搴撳垪琛ㄦ帴鍙ｈ幏鍙�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceAddRequest.java
new file mode 100644
index 0000000..5576d14
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceAddRequest.java
@@ -0,0 +1,9 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FaceAddRequest {
+ private String personId ;// string True 浜哄憳Id
+ private String faceData;// string True 浜鸿劯鍥剧墖base64缂栫爜鍚庣殑瀛楃鏁版嵁
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceEditRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceEditRequest.java
new file mode 100644
index 0000000..0e99219
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FaceEditRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FaceEditRequest {
+ private String faceId ;// string True 浜鸿劯鍥剧墖Id 锛� 娣诲姞浜鸿劯 鎺ュ彛杩斿洖鎶ユ枃涓殑faceId瀛楁锛� 鎴栬幏鍙栦汉鍛樺垪琛╲2 鎺ュ彛杩斿洖鎶ユ枃涓殑personPhotoIndexCode瀛楁
+ private String faceData;// string True 浜鸿劯鍥剧墖base64缂栫爜鍚庣殑瀛楃鏁版嵁
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureRequest.java
new file mode 100644
index 0000000..6c9c262
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FacePictureRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FacePictureRequest {
+
+ private String picUri ;// string True 鍥剧墖鐩稿URI 閫氳繃鑾峰彇浜哄憳鍒楄〃v2鎺ュ彛杩斿洖鈥減icUri鈥濆瓧娈�
+ private String serverIndexCode;// string True 鍥剧墖鏈嶅姟鍣ㄥ敮涓�鏍囪瘑 閫氳繃鑾峰彇浜哄憳鍒楄〃v2鎺ュ彛杩斿洖鈥渟erverIndexCode鈥濆瓧娈�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgAddRequest.java
new file mode 100644
index 0000000..f348cd8
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgAddRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class OrgAddRequest {
+ private Integer clientId;// number False 璋冪敤鏂规寚瀹氭爣璇嗭紝鎺ュ彛鎵ц鎴愬姛鍚庡皢鏈嶅姟绔敓鎴愮殑鏍囪瘑涓庢鏍囪瘑缁戝畾鍚庤繑鍥� 鎵�浠ュ缓璁瘡娆℃帴鍙ｈ皟鐢紝clientid淇濇寔鍞竴銆�1~10涓瓧绗︼紝鍙敮鎸佹暟瀛椼�� 娉ㄩ噴锛欼SC涓嶅clientid鍋氭牎楠屽拰瀛樺偍
+ private String orgIndexCode;// string False 缁勭粐鍞竴鏍囧織锛屼笉鍏佽涓庡叾瀹冪粍缁囧敮涓�鏍囧織閲嶅锛屽寘鎷凡鍒犻櫎鐨勭粍缁囷紝鍊间负绌烘垨鑰呬笉浼犳瀛楁绯荤粺鑷姩鐢熸垚鍞竴鏍囧織锛涜瀛楁绂佹浼�0鍊笺��
+ private String orgName;// string True 缁勭粐鍚嶇О锛�1~32涓瓧绗︼紱涓嶈兘鍖呭惈 鈥� / \ : * ? " < >
+ private String parentIndexCode ;//string True 鐖剁粍缁囧敮涓�鏍囪瘑鐮�
+ private String orgCode;// string False 缁勭粐缂栫爜锛屽綋娣诲姞灏忓尯鑺傜偣鏃跺繀濉紝缂栫爜浣跨敤01101寮�澶寸殑8浣嶆暟瀛楃紪鐮侊紝褰撴坊鍔犳ゼ鏍嬪崟鍏冩椂蹇呭～锛岀紪鐮佷娇鐢�01101寮�澶寸殑20浣嶆暟瀛楃紪鐮侊紝鍏跺畠鍦烘櫙涓嬫敼鍊兼棤鏁�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgDelRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgDelRequest.java
new file mode 100644
index 0000000..bb5f4d7
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgDelRequest.java
@@ -0,0 +1,8 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class OrgDelRequest {
+ private String[] indexCodes;// string[] True 寰呭垹闄ょ殑缁勭粐indexCode鍒楄〃锛屽崟娆℃彁浜や笂闄愪负1000鏉� 浠庤幏鍙栫粍缁囧垪琛� 鎺ュ彛鑾峰彇杩斿洖鍙傛暟orgIndexCode
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgEditRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgEditRequest.java
new file mode 100644
index 0000000..bad9407
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/OrgEditRequest.java
@@ -0,0 +1,9 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class OrgEditRequest {
+ private String orgIndexCode ;//string True 缁勭粐鏍囪瘑锛屽繀椤讳繚璇佸凡瀛樺湪锛� 鑾峰彇缁勭粐鍒楄〃 鎺ュ彛鑾峰彇杩斿洖鍙傛暟orgIndexCode銆�
+ private String orgName ;//string False 缁勭粐鍚嶇О锛�1~32涓瓧绗︼紱涓嶈兘鍖呭惈 鈥� / \ : * ? " < >
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkListRequest.java
new file mode 100644
index 0000000..103df6a
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkListRequest.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class ParkListRequest {
+
+ private String parkIndexCodes ;// string False 鍋滆溅搴撳敮涓�鏍囪瘑闆嗗悎 澶氫釜鍊间娇鐢ㄨ嫳鏂囬�楀彿鍒嗛殧锛屼笉瓒呰繃1000涓�
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java
new file mode 100644
index 0000000..a0cf691
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java
@@ -0,0 +1,17 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class ParkReservationAddRequest {
+
+ private String parkSyscode;// string True 鍋滆溅搴撳敮涓�鏍囪瘑 鏉ユ簮浜庢煡璇㈠仠杞﹀簱鍒楄〃鎺ュ彛锛屽彲閫氳繃鑾峰彇鍋滆溅搴撳垪琛ㄦ帴鍙ｈ幏鍙�
+ private String plateNo;// string True 杞︾墝鍙风爜
+ private String phoneNo;// string False 鎵嬫満鍙� 绾暟瀛楋紝浣嶆暟鏆備笉闄愬埗
+ private String owner;// string False 鑱旂郴浜哄鍚�
+ private String allowTimes;// number False 鍏佽杩涘嚭娆℃暟锛�0锛氬崟娆�1锛氬娆�
+ private String isCharge ;//string False 鏄惁鏀惰垂0锛氭敹璐�1锛氬厤璐�
+ private String resvWay;// string False 棰勭害鏂瑰紡锛�5:绗笁鏂归绾︼紙榛樿锛�6:璁垮
+ private String startTime ;//string False 棰勭害寮�濮嬫椂闂� 鎸夋椂闂撮绾︽椂蹇呭～锛屾寜娆￠绾︿笉濉� ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+ private String endTime ;//string False 棰勭害缁撴潫鏃堕棿 鎸夋椂闂撮绾︽椂蹇呭～锛屾寜娆￠绾︿笉濉� ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.java
new file mode 100644
index 0000000..a9c1a39
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class ParkReservationDelRequest {
+
+ private String reserveOrderNo ;//string True 棰勭害鍗曞彿
+ private String way ;//number False 鍙栨秷鏂瑰紡1:鐢ㄦ埛鍙栨秷锛堥粯璁わ級 5:璁垮骞冲彴鍙栨秷
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.java
new file mode 100644
index 0000000..4090c3d
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class PrivilegeGroupRequest {
+
+ private String name;// string False 璁垮鏉冮檺缁勫悕绉�
+ private int pageNo ;//number True 褰撳墠椤电爜锛岃姹傚ぇ浜�0
+ private int pageSize ;//number True 姣忛〉璁板綍鎬绘暟锛岃姹傚ぇ浜�0涓斾笉瓒呰繃1000
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.java
new file mode 100644
index 0000000..c61f23f
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+/**
+ * 浜鸿劯base64璇锋眰鍙傛暟
+ */
+@Data
+public class UserAddFaceRequest {
+
+ private String faceData;// string True 浜鸿劯鍥剧墖base64缂栫爜鍚庣殑瀛楃
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddRequest.java
new file mode 100644
index 0000000..0904bc4
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/UserAddRequest.java
@@ -0,0 +1,24 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛鏂板璇锋眰鍙傛暟
+ */
+@Data
+public class UserAddRequest {
+ private Integer clientId;//number False 浜哄憳涓存椂鏍囧織锛屽綋璋冪敤鏂规湭鎸囧畾personId鏃讹紝clientId浣滀负浜哄憳鏍囧織锛屽湪杩斿洖鍊间腑鏍囧織姣忎釜浜哄憳鐨勬坊鍔犵粨鏋溿�傛墍浠ユ瘡娆℃帴鍙ｈ皟鐢紝姣忎釜浜哄憳鐨刢lientid闇�淇濇寔鍞竴锛�1~10涓瓧绗︼紝鍙敮鎸佹暟瀛椼�傛敞锛歝lientid鍙鏈璋冪敤鏈夋晥
+ private String personId ;//string False 浜哄憳ID锛屽彲浠ユ寚瀹氫汉鍛榩ersonId锛屼笉鍏佽涓庡叾浠栦汉鍛榩ersonId閲嶅锛屽寘鎷凡鍒犻櫎鐨勪汉鍛樸�� 涓虹┖鏃跺钩鍙拌嚜鍔ㄧ敓鎴愪汉鍛業D
+ private String personName;// string True 浜哄憳鍚嶇О锛�1~32涓瓧绗︼紱涓嶈兘鍖呭惈 鈥� / \ : * ? " < >
+ private String gender;// string True 鎬у埆锛�1锛氱敺锛�2锛氬コ锛�0锛氭湭鐭�
+ private String orgIndexCode;// string True 鎵�灞炵粍缁囨爣璇嗭紝蹇呴』鏄凡瀛樺湪缁勭粐锛屼粠鑾峰彇缁勭粐鍒楄〃鎺ュ彛鑾峰彇杩斿洖鍙傛暟orgIndexCode
+ private String birthday ;//string False 鍑虹敓鏃ユ湡锛屼妇渚嬶細1992-09-12
+ private String phoneNo ;//string False 鎵嬫満鍙凤紝1-20浣嶆暟瀛�,骞冲彴涓婁汉鍛樹俊鎭疄鍚嶆爣璇嗛�夋嫨涓烘墜鏈哄彿鐮佹椂蹇呭～
+ private String email;// string False 閭锛屼妇渚嬶細hic@163.com
+ private String certificateType;// string False 璇佷欢绫诲瀷锛屽弬鑰冮檮褰旳 鏁版嵁瀛楀吀锛屽钩鍙颁笂浜哄憳淇℃伅瀹炲悕鏍囪瘑閫夋嫨涓鸿韩浠借瘉浠舵椂蹇呭～
+ private String certificateNo;// string False 璇佷欢鍙风爜锛�1-20浣嶆暟瀛楀瓧姣嶏紝骞冲彴涓婁汉鍛樹俊鎭疄鍚嶆爣璇嗛�夋嫨涓鸿韩浠借瘉浠舵椂蹇呭～
+ private String jobNo;// string False 宸ュ彿锛�1-32涓瓧绗︼紝骞冲彴涓婁汉鍛樹俊鎭疄鍚嶆爣璇嗛�夋嫨涓哄伐鍙锋椂蹇呭～
+ private List<UserAddFaceRequest> faces;// object[] False 浜鸿劯淇℃伅
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.java
new file mode 100644
index 0000000..2bb87fd
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.java
@@ -0,0 +1,16 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VisitAppointmentMDJRequest {
+
+ private String receptionistId;// string True 琚浜哄敮涓�鏍囪瘑锛屾煡璇汉鍛樺垪琛╲2鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑personId瀛楁
+ private VisitAppointmentPermissonRequest visitorPermissionSet ;//object False 鏉冮檺闆嗗悎灏佽瀵硅薄
+ private String visitStartTime;// string True 棰勮鏉ヨ鏃堕棿锛屾椂闂村弬鏁伴渶婊¤冻ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+ private String visitEndTime ;// string True 棰勮绂诲紑鏃堕棿锛屾椂闂村弬鏁伴渶婊¤冻ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00棰勮绂诲紑鏃堕棿蹇呴』鏅氫簬褰撳墠鏃堕棿鍜岄璁℃潵璁挎椂闂�
+ private String visitPurpose;// string False 鏉ヨ浜嬬敱锛岄暱搴︿负0锝�32涓瓧绗�
+ private VisitAppointmentVistorRequest visitorInfo ;//object True 璁垮淇℃伅
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.java
new file mode 100644
index 0000000..728f6b4
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class VisitAppointmentPermissonRequest {
+
+ private String defaultPrivilegeGroupFlag ;// string False 鏄惁浣跨敤榛樿鏉冮檺缁�(1锛氫娇鐢紱闈�1锛氫笉浣跨敤)
+ private String[] privilegeGroupIds ;//string[] False 鏉冮檺缁刬ds锛屾煡璇㈣瀹㈡潈闄愮粍鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑privilegeGroupId瀛楁
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.java
new file mode 100644
index 0000000..0a3753b
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.java
@@ -0,0 +1,16 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VisitAppointmentRequest {
+
+ private String receptionistId;// string True 琚浜哄敮涓�鏍囪瘑锛屾煡璇汉鍛樺垪琛╲2鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑personId瀛楁
+ private VisitAppointmentPermissonRequest visitorPermissionSet ;//object False 鏉冮檺闆嗗悎灏佽瀵硅薄
+ private String visitStartTime;// string True 棰勮鏉ヨ鏃堕棿锛屾椂闂村弬鏁伴渶婊¤冻ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+ private String visitEndTime ;// string True 棰勮绂诲紑鏃堕棿锛屾椂闂村弬鏁伴渶婊¤冻ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00棰勮绂诲紑鏃堕棿蹇呴』鏅氫簬褰撳墠鏃堕棿鍜岄璁℃潵璁挎椂闂�
+ private String visitPurpose;// string False 鏉ヨ浜嬬敱锛岄暱搴︿负0锝�32涓瓧绗�
+ private List<VisitAppointmentVistorRequest> visitorInfoList ;// object[] True 璁垮淇℃伅鍒楄〃锛屾渶澶ф敮鎸�128浣嶈瀹紝鍏朵腑鏈�澶氭敮鎸�4浣嶈瀹㈠甫浜鸿劯淇℃伅锛屽鏋滃瓨鍦ㄤ汉鑴镐笂浼犲け璐ワ紝鍒欐暣涓绾﹀け璐ャ��
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.java
new file mode 100644
index 0000000..0ff3b21
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.java
@@ -0,0 +1,22 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class VisitAppointmentVistorRequest {
+
+ private String visitorName ;//sstring True 璁垮濮撳悕锛岄暱搴︿笉瓒呰繃32锛屾敮鎸佷腑鑻辨枃瀛楃锛屼笉鑳藉寘鍚� 鈥� / \ : * ? " < >
+ private String gender;// number True 璁垮鎬у埆1-鐢�,2-濂�
+ private String phoneNo;// string True 鑱旂郴鐢佃瘽锛屽缓璁～鍐欐墜鏈哄彿鐮侊紝浠呮敮鎸佺函鏁板瓧
+ private String plateNo;// string False 杞︾墝鍙凤紝涓嶈兘鍖呭惈 鈥� / \ : * ? " < >
+ private String certificateType;// number False 璇佷欢绫诲瀷锛岃瑙侀檮褰旳.11 璇佷欢绫诲瀷
+ private String certificateNo;//string False 璇佷欢鍙风爜锛�1~20涓暟瀛椼�佸瓧姣嶇粍鎴愶紱璇佷欢鍙风爜闈炵┖鏃讹紝璇佷欢绫诲瀷蹇呭～锛�
+ private String certAddr;// string False 璇佷欢鍦帮紝鏀寔1-128浣嶅瓧姣嶃�佹眽瀛�
+ private String certIssuer;// string False 鍙戣瘉鏈哄叧锛屾敮鎸�1-32浣嶅瓧姣嶃�佹眽瀛�
+ private String nation;// number False
+ private String birthplace;// string False 绫嶈疮锛屾敮鎸�1-32浣嶅瓧姣嶃�佹眽瀛�
+ private String visitorPhoto;// string False 澶村儚base64缂栫爜鐨勫瓧鑺傛祦锛屽浘鐗囨渶澶�200K锛屼粎鏀寔jpg鏍煎紡銆傜敱浜庤瀹㈠ご鍍忛渶瑕佷笅鍙戝埌璁惧锛屽洜姝よ鎺ュ彛浼氬璁垮澶村儚杩涜璐ㄩ噺妫�娴嬶紝鍙湁浜鸿劯璇勫垎澶т簬绛変簬75鏃讹紝鎺ュ彛鎵嶄細杩斿洖鎴愬姛锛屽彲閫氳繃浜鸿劯璇勫垎鎺ュ彛鑾峰彇浜鸿劯鍥剧墖鐨勮瘎鍒嗐�傝鎻愪緵浜斿畼娓呮櫚锛屼汉鑴稿眳涓殑姝ｉ潰浜鸿劯鍏嶅啝鐓х墖
+ private String visitorWorkUnit;// string False 鏉ヨ鍗曚綅锛屾敮鎸�1-32浣嶅瓧绗︼紝涓嶅寘鍚��/馃槜?鈥�<>
+ private String visitorAddress;// string False 璁垮浣忓潃锛屾敮鎸�1-128浣嶄腑鑻辨枃鏁板瓧
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EntranceListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EntranceListResponse.java
new file mode 100644
index 0000000..0b74fa0
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/EntranceListResponse.java
@@ -0,0 +1,14 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class EntranceListResponse {
+
+ private String entranceIndexCode ;// string False 鍑哄叆鍙ｅ敮涓�鏍囪瘑锛堟渶澶ч暱搴�64锛�
+ private String entranceName ;// string False 鍑哄叆鍙ｅ悕绉帮紙鏈�澶ч暱搴�64锛�
+ private String parkIndexCode ;// string False 鍋滆溅鍦哄敮涓�鏍囪瘑锛堟渶澶ч暱搴�64锛�
+ private String roadNum ;// number False 杞﹂亾鏁帮紙鏈�澶ч暱搴�32锛�
+ private String createTime;// string False 鍒涘缓鏃堕棿 瑕佹眰閬靛畧ISO8601鏍囧噯锛屽2018-07-26T21:30:08+08:00琛ㄧず鍖椾含鏃堕棿2017骞�7鏈�26鏃�21鏃�30鍒�08绉�
+ private String updateTime;// string False 鏇存柊鏃堕棿 瑕佹眰閬靛畧ISO8601鏍囧噯锛屽2018-07-26T21:30:08+08:00琛ㄧず鍖椾含鏃堕棿2017骞�7鏈�26鏃�21鏃�30鍒�08绉�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java
new file mode 100644
index 0000000..2b6f0a6
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FaceAddOrEditesponse {
+
+ private String faceId;// string False 浜鸿劯Id
+ private String faceUrl;// string False 浜鸿劯鍥剧墖Url
+ private String personId;// string False 浜哄憳ID
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgListResponse.java
new file mode 100644
index 0000000..2696169
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgListResponse.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class OrgListResponse {
+
+ private String orgIndexCode;// 缁勭粐鍞竴鏍囪瘑鐮侊紙鏈�澶ч暱搴�64锛�
+ private String orgNo ;//string False 缁勭粐缂栧彿锛堟渶澶ч暱搴�64锛�
+ private String orgName;// string False 缁勭粐鍚嶇О锛堟渶澶ч暱搴�64锛� 褰撳墠缁勭粐鐨勫悕绉帮紝濡傞粯璁ら儴闂�
+ private String orgPath ;//string False 缁勭粐鐩綍锛堟渶澶ч暱搴�64锛� 渚嬪锛氶粯璁ら儴闂�/缁煎悎瀹夐槻/寮�鍙戝皬缁�
+ private String parentOrgIndexCode;// string False 鐖剁粍缁囧敮涓�鏍囪瘑鐮侊紙鏈�澶ч暱搴�64锛�
+ private String parentOrgName;// string False 鐖剁粍缁囧悕绉帮紙鏈�澶ч暱搴�64锛�
+ private String updateTime;// string False 鏇存柊鏃堕棿 瑕佹眰閬靛畧ISO8601鏍囧噯锛屽2018-07-26T21:30:08+08:00琛ㄧず鍖椾含鏃堕棿2017骞�7鏈�26鏃�21鏃�30鍒�08绉�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.java
new file mode 100644
index 0000000..8144308
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class OrgOrUserAddFailureResponse {
+ private String clientId ;//number False 璋冪敤鏂规寚瀹欼d
+ private String code ;//string False 閿欒鐮�
+ private String msg ;//string False 閿欒淇℃伅
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.java
new file mode 100644
index 0000000..3ed9d8d
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrgOrUserAddResponse {
+ private List<OrgOrUserAddSuccessResponse> successes ;//object[] False 鎵归噺娣诲姞鎴愬姛鐨勮褰�
+ private List<OrgOrUserAddFailureResponse> failures;// object[] False 鎵归噺娣诲姞澶辫触鐨勮褰�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.java
new file mode 100644
index 0000000..2902311
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class OrgOrUserAddSuccessResponse {
+
+ private String clientId;// number False 璋冪敤鏂规寚瀹欼d
+ private String orgIndexCode;// string False 鏈嶅姟绔敓鎴愮殑鍞竴鏍囪瘑
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkListResponse.java
new file mode 100644
index 0000000..87c32bc
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkListResponse.java
@@ -0,0 +1,13 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class ParkListResponse {
+
+ private String parkIndexCode ;// string False 鍋滆溅搴撳敮涓�鏍囪瘑锛堟渶澶ч暱搴�64锛�
+ private String parentParkIndexCode;// string False 鐖跺仠杞﹀簱鍞竴鏍囪瘑锛堟渶澶ч暱搴�64锛�
+ private String parkName;// string False 鍋滆溅搴撳悕绉帮紙鏈�澶ч暱搴�64锛�
+ private String createTime ;// string False 鍒涘缓鏃堕棿 閬靛畧ISO8601鏍囧噯锛屽2017-11-12T15:41:11.688+08:00琛ㄧず鍖椾含鏃堕棿2017骞�11鏈�12鏃�15鏃�41鍒�11.688绉�
+ private String updateTime;// string False 鏇存柊鏃堕棿 閬靛畧ISO8601鏍囧噯锛屽2017-11-12T15:41:11.688+08:00琛ㄧず鍖椾含鏃堕棿2017骞�11鏈�12鏃�15鏃�41鍒�11.688绉�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.java
new file mode 100644
index 0000000..64fb11a
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.java
@@ -0,0 +1,9 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class ParkReservationAddResponse {
+ private String reserveOrderNo ;//string False 棰勭害鍗曞彿
+ private String reserveTime ;//number False 棰勭害鏈夋晥鏃堕棿锛屽崟浣嶏細鍒嗛挓
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.java
new file mode 100644
index 0000000..4f6f01e
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PrivilegeGroupListResponse {
+
+
+ private String privilegeGroupId;// string False 鏉冮檺缁処D, 鐢ㄤ簬璁垮鐧昏鏃跺璁垮鎺堟潈
+ private String privilegeGroupName;// string False 鏉冮檺缁勫悕绉�
+ private String remark;// string False 鎻忚堪
+ private Integer isDefault ;//number False 鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupResponse.java
new file mode 100644
index 0000000..568f690
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PrivilegeGroupResponse.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PrivilegeGroupResponse {
+
+
+ private int total;// number False 鏌ヨ鏁版嵁璁板綍鎬绘暟
+ private int pageSize;// number False 姣忛〉璁板綍鎬绘暟
+ private int pageNo ;// number False 褰撳墠椤电爜
+ private List<PrivilegeGroupListResponse> list ;// object[] False 鏉冮檺缁勫璞″垪琛�
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserAddResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserAddResponse.java
new file mode 100644
index 0000000..d5ed5d4
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserAddResponse.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UserAddResponse {
+ private String personId ;//string False 鎴愬姛娣诲姞鐨勪汉鍛業d
+ private String faceId;// string False 鎴愬姛娣诲姞鐨勪汉鑴窱d
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserDelResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserDelResponse.java
new file mode 100644
index 0000000..6697a85
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/UserDelResponse.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class UserDelResponse {
+ private String personId ;//string False 浜哄憳鏍囧織
+ private String code ;//string False 閿欒鐮�
+ private String msg;// string False 閿欒淇℃伅
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.java
new file mode 100644
index 0000000..5f82286
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.java
@@ -0,0 +1,14 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import com.doumee.core.haikang.model.param.request.VisitAppointmentPermissonRequest;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentVistorRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VisitAppointmentResponse {
+
+ private String appointRecordId;// string False 棰勭害璁板綍ID锛屽彲浣滀负淇敼銆佸彇娑堥绾︾殑渚濇嵁
+ private List<VisitAppointmentVistorRequest> appointmentInfoList;// object[] False 棰勭害璇︾粏淇℃伅
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentVistorResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentVistorResponse.java
new file mode 100644
index 0000000..a611d64
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/VisitAppointmentVistorResponse.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class VisitAppointmentVistorResponse {
+
+ private String visitorName ;//string False 璁垮濮撳悕锛屾敮鎸佷腑鑻辨枃瀛楃锛屼笉鑳藉寘鍚� 鈥� / \ : * ? " < >
+ private String appointRecordId ;// string False 棰勭害璁板綍ID
+ private String receptionistId ;// string False 琚浜哄敮涓�鏍囪瘑
+ private String receptionistName ;// string False 琚浜哄鍚嶏紝鏀寔涓嫳鏂囧瓧绗︼紝涓嶈兘鍖呭惈 鈥� / \ : * ? " < >
+ private String verificationCode ;//string False 璁垮楠岃瘉鐮侊紝鍙敤浜庤瀹㈠湪璁垮鏈虹櫥璁扮殑鍑瘉锛� 鎴栧悗鏈熶綔涓烘煡璇㈡潯浠朵娇鐢�
+ private String QRCode ;// string False 鍔ㄦ�佷簩缁寸爜鍐呭锛屽闇�瑕佷娇鐢紝灏嗚瀹簩缁寸爜鍐呭杞垚浜岀淮鐮佸浘鐗囧嵆鍙�
+ private String orderId ;//string False 璁垮璁板綍鍞竴鏍囪瘑锛岀敤浜庡凡棰勭害鐧昏銆佽瀹㈢绂荤瓑鎿嶄綔
+ private String picUri ;// string False 璁垮澶村儚,杩斿洖鍥剧墖鐨勭浉瀵筓ri
+ private String svrIndexCode ;// string 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
new file mode 100644
index 0000000..3b332ac
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -0,0 +1,422 @@
+package com.doumee.core.haikang.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.haikang.model.param.request.*;
+import com.doumee.core.haikang.model.param.respose.*;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.HKTools;
+import com.doumee.core.haikang.model.param.BaseRequst;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import com.alibaba.fastjson.TypeReference;
+
+import java.io.InputStream;
+import java.util.List;
+
+@Service
+@Slf4j
+public class HKService {
+ private Logger logger = LoggerFactory.getLogger(HKService.class);
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @PostConstruct
+ public int initHkConfig(){
+ ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
+ ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
+ ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
+ HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
+ return 0;
+ }
+ /**
+ * 鑾峰彇鏍圭粍缁囨暟鎹�
+ * @return
+ */
+ public BaseResponse<OrgListResponse> getRootOrg(BaseRequst param){
+ log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�====");
+ try {
+ String res = HKTools.getRootOrg ();
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<OrgListResponse>>(){};
+ BaseResponse<OrgListResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+
+ }
+ /**
+ * 淇敼缁勭粐鏁版嵁
+ * @return
+ */
+ public BaseResponse editOrg(OrgEditRequest param){
+ log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+
+ String res = HKTools.editOrg(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鎵归噺鏂板缁勭粐鏁版嵁
+ * @return
+ */
+ public BaseResponse<OrgOrUserAddResponse> addBatchOrg(List<OrgAddRequest> param){
+ log.error("銆愭捣搴锋柊澧炵粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+
+ String res = HKTools.addBatchOrg(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<OrgOrUserAddResponse>>(){};
+ BaseResponse<OrgOrUserAddResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴锋柊澧炵粍缁囥��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋柊澧炵粍缁囥��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鎵归噺鍒犻櫎缁勭粐鏁版嵁
+ * @return
+ */
+ public BaseResponse delBatchOrg(OrgDelRequest param){
+ log.error("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+
+ String res = HKTools.delOrg(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴峰垹闄ょ粍缁囥��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垹闄ょ粍缁囥��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鏂板浜哄憳淇℃伅锛堟敮鎸佷汉鑴告暟鎹級
+ * @return
+ */
+ public BaseResponse<UserAddResponse> addUser(UserAddRequest param){
+ log.error("銆愭捣搴锋柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.addUser(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<UserAddResponse>>(){};
+ BaseResponse<UserAddResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴锋柊澧炰汉鍛樸��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *淇敼浜哄憳淇℃伅锛堜笉鏀寔浜鸿劯鏁版嵁锛�
+ * @return
+ */
+ public BaseResponse editUser(UserAddRequest param){
+ log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.editUser(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<UserAddResponse>>(){};
+ BaseResponse<UserAddResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鎵归噺鏂板浜哄憳淇℃伅(鏃犱汉鑴革級
+ * @return
+ */
+ public BaseResponse<OrgOrUserAddResponse> addBatchUser(List<UserAddRequest> param){
+ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.addBatchUser(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<OrgOrUserAddResponse>>(){};
+ BaseResponse<OrgOrUserAddResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鎵归噺鍒犻櫎浜哄憳淇℃伅
+ * @return
+ */
+ public BaseResponse<OrgOrUserAddFailureResponse> delBatchUser(List<UserAddRequest> param){
+ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.delBatchUser(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<OrgOrUserAddFailureResponse>>(){};
+ BaseResponse<OrgOrUserAddFailureResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *娣诲姞浜鸿劯淇℃伅
+ * @return
+ */
+ public BaseResponse<FaceAddOrEditesponse> addFace(List<FaceAddRequest> param){
+ log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.addFace(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
+ BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *缂栬緫浜鸿劯淇℃伅
+ * @return
+ */
+ public BaseResponse<FaceAddOrEditesponse> editFace(List<FaceEditRequest> param){
+ log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.editFace(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
+ BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍒犻櫎浜鸿劯淇℃伅
+ * @return
+ */
+ public BaseResponse delFace(List<FaceEditRequest> param){
+ log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.editFace(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇娴峰悍浜鸿劯璁块棶鍦板潃
+ * @return
+ */
+ public static InputStream getFaceInputStream(FacePictureRequest param) {
+ log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ InputStream res = HKTools.getFaceInputStream(JSONObject.toJSONString(param));
+ log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================鎴愬姛====\n");
+ return res;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ *鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級
+ * @return
+ */
+ public BaseResponse<List<ParkListResponse>> parkList(ParkListRequest param){
+ log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.parkList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<List<ParkListResponse>>>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級
+ * @return
+ */
+ public BaseResponse<List<EntranceListResponse>> entranceList(EntranceListRequest param){
+ log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.entranceList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<List<EntranceListResponse>>>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛�
+ * @return
+ */
+ public BaseResponse carChargeAddtion(CarChargeAddRequest param){
+ log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.carChargeAddtion(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍥哄畾杞﹁締鍙栨秷鍖呮湡
+ * @return
+ */
+ public BaseResponse carChargeDeletion(CarChargeDelRequest param){
+ log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *杞︿綅棰勭害
+ * @return
+ */
+ public BaseResponse<ParkReservationAddResponse> parkReservationAddition(ParkReservationAddRequest param){
+ log.error("銆愭捣搴疯溅浣嶉绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.parkAddition(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<ParkReservationAddResponse>>(){};
+ BaseResponse<ParkReservationAddResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯溅浣嶉绾︺��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯溅浣嶉绾︺��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *杞︿綅鍙栨秷棰勭害
+ * @return
+ */
+ public BaseResponse parkReservationDeletion(ParkReservationDelRequest param){
+ log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *璁垮棰勭害
+ * @return
+ */
+ public BaseResponse<VisitAppointmentResponse> visitAppiontment(VisitAppointmentRequest param){
+ log.error("銆愭捣搴疯瀹㈤绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.visitAppiontment(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<VisitAppointmentResponse>>(){};
+ BaseResponse<VisitAppointmentResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯瀹㈤绾︺��================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈤绾︺��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *璁垮鍏嶇櫥璁伴绾�
+ * @return
+ */
+ public BaseResponse<VisitAppointmentVistorResponse> visitAppiontmentMDJ(VisitAppointmentMDJRequest param){
+ log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.visitAppiontmentMDJ(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<VisitAppointmentVistorResponse> >(){};
+ BaseResponse<VisitAppointmentVistorResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *璁垮鏉冮檺缁勫垪琛ㄦ煡璇紙鍒嗛〉锛�
+ * @return
+ */
+ public BaseResponse<PrivilegeGroupResponse> privilegeGroup(PrivilegeGroupRequest param){
+ log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.privilegeGroup(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<PrivilegeGroupResponse> >(){};
+ BaseResponse<PrivilegeGroupResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================鎴愬姛====\n"+res);
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+}
+
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKConstants.java
deleted file mode 100644
index f2ef51d..0000000
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKConstants.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.doumee.core.utils.haikang.base;
-
-import com.doumee.core.utils.Constants;
-import lombok.Data;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.List;
-
-@Data
-public class HKConstants {
- private Logger logger = LoggerFactory.getLogger(HKConstants.class);
- //娴峰悍骞冲彴鏍规嵁鐜板満鐜閰嶇疆http杩樻槸https
- public static String https ;
- /**
- * 鑳藉姏寮�鏀惧钩鍙扮殑缃戠珯璺緞 璺緞涓嶇敤淇敼锛屽氨鏄�/artemis
- */
- public static final String ARTEMIS_PATH = "/artemis";
-
- /**
- * 鎺ュ彛鍦板潃闆嗗悎
- */
- public interface InterfacePath{
- String doorEvents = "/api/acs/v2/door/events";
- }
-
- /**
- * 椤旇壊鏋氫妇
- */
- public enum Colors {
-
- SYSTEM(0, "绯荤粺鐢ㄦ埛" )
- ;
- // 鎴愬憳鍙橀噺
- private String name;
- private int key;
-
- // 鏋勯�犳柟娉�
- Colors(int key, String name ) {
- this.name = name;
- this.key = key;
- }
-
- // 鏅�氭柟娉�
- public static String getName(int index) {
- for (Constants.UserType c : Constants.UserType.values()) {
- if (c.getKey() == index) {
- return c.getName();
- }
- }
- return null;
- }
-
-
- // get set 鏂规硶
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getKey() {
- return key;
- }
-
- public void setKey(int key) {
- this.key = key;
- }
-
- }
-
-
-
-}
-
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKTools.java
deleted file mode 100644
index f0ebd0e..0000000
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKTools.java
+++ /dev/null
@@ -1,998 +0,0 @@
-package com.doumee.core.utils.haikang.base;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.core.utils.haikang.HKUtil;
-import com.hikvision.artemis.sdk.ArtemisHttpUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-
-@Slf4j
-public class HKTools {
-
-// private static final Logger logger = LoggerFactory.getLogger(HKUtil.class);
-
-
- public static void main(String[] args) throws ParseException {
-
- }
-
- /**
- * 鑾峰彇闂ㄧ鏃堕棿鏁版嵁闆嗗悎
- * @param page
- * @param rows
- * @param start
- * @param end
- * @return
- */
- public static JSONObject doorEvents(int page, int rows, String start, String end) {
- Map<String, String> path = getPath(HKConstants.InterfacePath.doorEvents);
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("startTime", start);
- jsonBody.put("endTime", end);
- jsonBody.put("receiveStartTime", start);
- jsonBody.put("receiveEndTime", end);
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- jsonBody.put("sort", "eventTime");
- jsonBody.put("order", "desc");
- String body = jsonBody.toJSONString();
- log.info(HKConstants.InterfacePath.doorEvents+"--->body鍙傛暟锛�"+body);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(HKConstants.InterfacePath.doorEvents+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- private static Map<String, String> getPath(String str) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + str;
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put(HKConstants.https, getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- return path;
- }
-
- /**
- * 璁垮鏌ヨ
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject fkData(int page, int rows, String visitorId) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/visitor/v1/event/turnover/search";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- jsonBody.put("visitorName", visitorId);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 璁垮璁板綍鍒楄〃
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject fkList(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/visitor/v2/visiting/records";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendPost(path, body);
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- private static String sendPost(Map<String, String> path, String body) {
- return ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);
- }
-
- /**
- * 浜嬩欢璁㈤槄
- * 姝ｅ父寮�闂�--198913
- * @param code
- * @param url
- * @return
- */
- public static JSONObject event(int code, String url) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/eventService/v1/eventSubscriptionByEventTypes";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("eventTypes", Arrays.asList(code));
- jsonBody.put("eventDest", url);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendPost(path, body);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍙栨秷浜嬩欢璁㈤槄
- * @param code
- * @return
- */
- public static JSONObject eventCancle(int code) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/eventService/v1/eventUnSubscriptionByEventTypes";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("eventTypes", Arrays.asList(code));
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendPost(path, body);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鏌ヨ璁㈤槄浜嬩欢
- * @return
- */
- public static JSONObject eventQuery() {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/eventService/v1/eventSubscriptionView";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendPost(path, body);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鑾峰彇缁勭粐鍒楄〃
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject orgList(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/org/orgList";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鑾峰彇缁勭粐鍒楄〃","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- System.out.println(result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 娣诲姞缁勭粐
- * @param jsonArray
- * @return
- */
- public static JSONObject addOrg(JSONArray jsonArray) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/org/batch/add";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonArray.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","娣诲姞缁勭粐","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 淇敼缁勭粐
- * @param jsonBody
- * @return
- */
- public static JSONObject updateOrg(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/org/single/update";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","淇敼缁勭粐","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍒犻櫎缁勭粐
- * @param jsonBody
- * @return
- */
- public static JSONObject delOrg(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/org/batch/delete";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鍒犻櫎缁勭粐","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 闂ㄧ璁惧鍒楄〃
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject deviceList(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v2/acsDevice/search";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
-// jsonBody.put("resourceType", "acsDevice");
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鑾峰彇闂ㄧ璁惧鍒楄〃","0");
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 闂ㄧ鐐瑰垪琛�
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject doorList(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v2/door/search";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","闂ㄧ鐐瑰垪琛�","0");
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧愬垪琛�
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject camerasList(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/cameras";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL
- * @param code
- * @param streamType
- * @return
- */
- public static JSONObject previewURLs(String code, int streamType, String protocol, Integer transmode, String expand, String streamform) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/video/v2/cameras/previewURLs";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- // 鐩戞帶鐐瑰敮涓�鏍囪瘑
- jsonBody.put("cameraIndexCode", code);
- // 鐮佹祦绫诲瀷锛�0:涓荤爜娴�,1:瀛愮爜娴�,2:绗笁鐮佹祦,鍙傛暟涓嶅～锛岄粯璁や负涓荤爜娴�
-/* jsonBody.put("streamType", streamType);
- *//* 鍙栨祦鍗忚锛堝簲鐢ㄥ眰鍗忚锛夛紝鈥渉ik鈥�:HIK绉佹湁鍗忚锛屼娇鐢ㄨ棰慡DK杩涜鎾斁鏃讹紝浼犲叆姝ょ被鍨嬶紱鈥渞tsp鈥�,鈥渞tmp鈥�,鈥渉ls鈥�,鈥渨s鈥濄�傚弬鏁颁笉濉紝榛樿涓篐IK鍗忚 *//*
- jsonBody.put("protocol", protocol);
- //浼犺緭鍗忚锛堜紶杈撳眰鍗忚锛夛紝0:UDP,1:TCP銆傞粯璁ゆ槸TCP
- jsonBody.put("transmode", transmode);
- // 杞爜鏍囧織锛屼笉鎼哄甫姝ゅ瓧娈垫垨浼�0琛ㄧず涓嶈浆鐮侊紝浼�1鎴�2琛ㄧず杞爜銆�
- jsonBody.put("expand", expand);
- // 杈撳嚭鐮佹祦杞皝瑁呮牸寮忥紝鈥減s鈥�:PS灏佽鏍煎紡銆佲�渞tp鈥�:RTP灏佽鍗忚銆傚綋protocol=rtsp鏃剁敓鏁堬紝涓斾笉浼犲�兼椂榛樿涓篟TP灏佽鍗忚銆�
- jsonBody.put("streamform", streamform);*/
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鑾峰彇鐩戞帶鐐归瑙堟祦","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 娣诲姞浜哄憳
- * @param jsonBody
- * @return
- */
- public static JSONObject addPerson(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v2/person/single/add";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","娣诲姞浜哄憳","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鎵归噺娣诲姞浜哄憳
- * @param jsonBody
- * @return
- */
- public static JSONObject batchSave(JSONArray jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/person/batch/add";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鎵归噺娣诲姞浜哄憳","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍒犻櫎浜哄憳
- * @param jsonBody
- * @return
- */
- public static JSONObject delPerson(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/person/batch/delete";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鍒犻櫎浜哄憳","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鑾峰彇浜哄憳鍗″彿
- * @param jsonBody
- * @return
- */
- public static JSONObject getPersonCard(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/irds/v1/card/advance/cardList";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鑾峰彇浜哄憳鍗″彿","1");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍚屾浜哄憳
- * @param jsonBody
- * @return
- */
- public static JSONObject getPersonList(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v2/person/advance/personList";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鑾峰彇浜哄憳鍒楄〃","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 淇敼浜哄憳淇℃伅锛屼笉鍚汉鑴�
- * @param jsonBody
- * @return
- */
- public static JSONObject updatePerson(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/person/single/update";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","淇敼浜哄憳淇℃伅","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 娣诲姞浜鸿劯鏁版嵁
- * @param jsonBody
- * @return
- */
- public static JSONObject addPersonFace(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/face/single/add";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","娣诲姞浜鸿劯鏁版嵁","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 淇敼浜鸿劯鏁版嵁
- * @param jsonBody
- * @return
- */
- public static JSONObject updatePersonFace(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/face/single/update";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","淇敼浜鸿劯鏁版嵁","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍒涘缓涓嬭浇浠诲姟
- * @param taskType(涓嬭浇浠诲姟绫诲瀷 1锛氬崱鐗� 4锛氫汉鑴�)
- *
- * @return
- */
- public static JSONObject newTask(String taskType) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/acps/v1/authDownload/task/addition";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("taskType",taskType);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鍒涘缓涓嬭浇浠诲姟","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍚戜笅杞戒换鍔′腑娣诲姞鏁版嵁
- * @param jsonBody
- * @return
- */
- public static JSONObject addTaskData(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/acps/v1/authDownload/data/addition";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","涓嬭浇浠诲姟娣诲姞鏁版嵁","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 寮�濮嬩笅杞戒换鍔�
- * @param taskId
- * @return
- */
- public static JSONObject startTask(String taskId) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/acps/v1/authDownload/task/start";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("taskId",taskId);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","寮�濮嬩笅杞戒换鍔�","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鍒犻櫎鏈紑濮嬬殑涓嬭浇浠诲姟
- * @param taskId
- * @return
- */
- public static JSONObject deleteTask(String taskId) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/acps/v1/authDownload/task/deletion";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("taskId",taskId);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鍒犻櫎鏈紑濮嬩笅杞戒换鍔�","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鏌ヨ涓嬭浇浠诲姟杩涘害
- * @param taskId
- * @return
- */
- public static JSONObject queryTask(String taskId) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/acps/v1/authDownload/task/progress";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- jsonBody.put("taskId",taskId);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鏌ヨ涓嬭浇浠诲姟杩涘害","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
-
- /**
- * 鏌ヨ浜哄憳涓嬭浇缁撴灉
- * @param jsonBody
- * @return
- */
- public static JSONObject queryPersonResult(JSONObject jsonBody) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/acps/v1/auth_item/list/search";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = sendpost(path, body,"0","鏌ヨ浜哄憳涓嬭浇缁撴灉","0");// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /*public static JSONArray getResourceInfos(List<LhDeviceDO> deviceList){
- JSONArray resourceInfos = new JSONArray();
- deviceList.forEach(v->{
- JSONObject deviceObject = new JSONObject();
- deviceObject.put("resourceIndexCode",v.getId());
- deviceObject.put("resourceType",v.getResourceType());
- String channelNo = v.getChannelNo();
- String[] c = channelNo.split(",");
- int[] array = Arrays.asList(c).stream().mapToInt(Integer::parseInt).toArray();
- JSONArray ca = new JSONArray();
- for (int i =0 ; i<array.length;i++) {
- ca.add(array[i]);
- }
- deviceObject.put("channelNos",ca);
- resourceInfos.add(deviceObject);
- });
- return resourceInfos;
- }*/
- /**
- * 鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject monitoryList(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/cameras";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
-// jsonBody.put("resourceType", "acsDevice");
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = null;
- try {
- result = sendpost(path, body,"0","鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�","1");
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
- /**
- * 鍒嗛〉鑾峰彇鐩戞帶鐐瑰湪绾跨姸鎬�
- * @param page
- * @param rows
- * @return
- */
- public static JSONObject monitoryStatus(int page, int rows) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/nms/v1/online/camera/get";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
-
-// List<String>list=new ArrayList<>();
-// list.add("1a3cb6e19fbc44d8b31ae74e29fb438d");
-// jsonBody.put("indexCodes", list);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = null;
- try {
- result = sendpost(path, body,"0","鍒嗛〉鑾峰彇鐩戞帶鐐瑰湪绾跨姸鎬�","1");
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RLv2
- * @param cameraIndexCode
- * @return
- */
- public static JSONObject monitoryPreview(String cameraIndexCode) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/video/v2/cameras/previewURLs";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("cameraIndexCode", cameraIndexCode);
- jsonBody.put("streamType", "");
- jsonBody.put("protocol", "");
- jsonBody.put("transmode", "");
- jsonBody.put("expand", "");
- jsonBody.put("streamform", "");
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = null;
- try {
- result = sendpost(path, body,"0","鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RLv2","0");
- } catch (Exception e) {
- e.printStackTrace();
- }
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 鑾峰彇鐩戞帶鐐瑰洖鏀�
- * @param cameraIndexCode
- * @return
- */
- public static JSONObject monitoryBackview(String cameraIndexCode,String beginTime,String endTime) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/video/v2/cameras/playbackURLs";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date startDate=null;
- Date endDate=null;
- try {
- startDate = sdf.parse(beginTime);
- endDate = sdf.parse(endTime);
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- jsonBody.put("cameraIndexCode", cameraIndexCode);
- jsonBody.put("recordLocation", "");
- jsonBody.put("protocol", "");
- jsonBody.put("transmode", "");
- jsonBody.put("uuid", "");
- jsonBody.put("expand", "");
- jsonBody.put("streamform", "");
- jsonBody.put("lockType", "");
- jsonBody.put("beginTime", getISO8601Timestamp(startDate));
- jsonBody.put("endTime", getISO8601Timestamp(endDate));
-// jsonBody.put("beginTime", "2021-12-15T00:00:00.000+08:00");
-// jsonBody.put("endTime", "2021-12-16T00:00:00.000+08:00");
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = null;
- try {
-// result = sendPost(path, body);
- result = sendpost(path, body,"0","鑾峰彇鐩戞帶鐐瑰洖鏀�","0");
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * 浜戝彴鎿嶄綔
- * @param cameraIndexCode
- * @return
- */
- public static JSONObject yuntaiOperation(String cameraIndexCode,String action,String command,String speed) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/video/v1/ptzs/controlling";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
-
- jsonBody.put("cameraIndexCode", cameraIndexCode);
- jsonBody.put("action", action);
- jsonBody.put("command", command);
- jsonBody.put("speed", speed);
- jsonBody.put("presetIndex", "");
-
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = null;
- try {
- result = sendpost(path, body,"0","浜戝彴鎿嶄綔","0");
- } catch (Exception e) {
- e.printStackTrace();
- }
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
- }
-
- /**
- * type 0鍐呴儴璋冪敤1澶栭儴璋冪敤
- * msg 鏂规硶鍚�
- * flage 0璧發og鏃ュ織 1涓嶈蛋
- * @param path
- * @param body
- * @param type
- * @return
- */
- private static String sendpost(Map<String, String> path, String body,String type,String msg,String flage) {
- String result = null;
- try {
- result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if("0".equals(flage)){
-// HkMonitoryLogDO hkMonitoryLogDO=new HkMonitoryLogDO();
-// hkMonitoryLogDO.setId(UUID.randomUUID().toString());
-// hkMonitoryLogDO.setMethodName(msg);
-// hkMonitoryLogDO.setType(type);
-// hkMonitoryLogDO.setCreateDate(new Date());
-//
-// hkMonitoryLogDO.setCreator("鍐呴儴璇锋眰");
-// hkMonitoryLogDO.setIsDeleted("0");
-// hkMonitoryLogDO.setRequestData(body);
-// hkMonitoryLogDO.setResponseData(result);
-// hkMonitoryLogDO.setUrl(path.get("https://"));
-// HkMonitoryLogService bean = SpringContextUtil.getBean(HkMonitoryLogService.class);
-// int save = bean.save(hkMonitoryLogDO);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return result;
- }
-
- }
-
-
- /**
- * 鑾峰彇澧為噺浜哄憳鏁版嵁鍒楄〃锛堝垹闄わ紝淇敼锛屾柊澧烇級
- * @param page
- * @param rows
- * @param startTime
- * @param endTime
- * @return
- */
- public static JSONObject userChange(int page, int rows, String startTime, String endTime) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/person/personList/timeRange";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- jsonBody.put("startTime", startTime);
- jsonBody.put("endTime", endTime);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
-// return JSONObject.parseObject("{\"code\":\"1\",\"msg\":\"HKUtil浠ｇ爜娉ㄩ噴锛屽姛鑳藉叧闂璡"}");
- }
-
- /**
- * 鑾峰彇澧為噺浜哄憳鏁版嵁鍒楄〃锛堝垹闄わ紝淇敼锛屾柊澧烇級
- * @param page
- * @param rows
- * @param startTime
- * @param endTime
- * @return
- */
- public static JSONObject orgChange(int page, int rows, String startTime, String endTime) {
- final String getCamsApi = HKConstants.ARTEMIS_PATH + "/api/resource/v1/org/timeRange";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
- JSONObject jsonBody = new JSONObject();
-
- jsonBody.put("pageNo", page);
- jsonBody.put("pageSize", rows);
- jsonBody.put("startTime", startTime);
- jsonBody.put("endTime", endTime);
- String body = jsonBody.toJSONString();
-
- log.info(getCamsApi+"--->body鍙傛暟锛�"+body);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
- log.info(getCamsApi+"--->result鍙傛暟锛�"+result);
- return JSONObject.parseObject(result);
-// return JSONObject.parseObject("{\"code\":\"1\",\"msg\":\"HKUtil浠ｇ爜娉ㄩ噴锛屽姛鑳藉叧闂璡"}");
- }
-
-
- /**
- * 浼犲叆Data绫诲瀷鏃ユ湡锛岃繑鍥炲瓧绗︿覆绫诲瀷鏃堕棿锛圛SO8601鏍囧噯鏃堕棿锛�
- * @param date
- * @return
- */
- public static String getISO8601Timestamp(Date date){
- TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
- //TimeZone tz = TimeZone.getTimeZone("GMT-01");
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
- df.setTimeZone(tz);
- String nowAsISO = df.format(date);
- return nowAsISO;
- }
-
-}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/service/HKService.java
deleted file mode 100644
index 9b6a048..0000000
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/service/HKService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.doumee.core.utils.haikang.service;
-
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.haikang.base.HKConstants;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-
-@Service
-public class HKService {
- private Logger logger = LoggerFactory.getLogger(HKService.class);
- @Autowired
- private SystemDictDataBiz systemDictDataBiz;
-
- @PostConstruct
- public int initHkConfig(){
- ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
- ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
- ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
- HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
- return 0;
- }
-}
-
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index d6aedd1..bb9a3dc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -72,16 +72,8 @@
@ExcelColumn(name="浜嬩欢绫诲瀷")
private String eventType;
- @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
@@ -108,18 +100,8 @@
@ExcelColumn(name="鍗″彿")
private String cardNo;
- @ApiModelProperty(value = "浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢
- 2:涓婁紶鍥剧墖
- 3:鍏ュ満
- 4:鍑哄満
- 5:杞︾墝鐭
- 6:鍥剧墖閲嶄紶", example = "1")
- @ExcelColumn(name="浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢
- 2:涓婁紶鍥剧墖
- 3:鍏ュ満
- 4:鍑哄満
- 5:杞︾墝鐭
- 6:鍥剧墖閲嶄紶")
+ @ApiModelProperty(value = "浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢 2:涓婁紶鍥剧墖 3:鍏ュ満 4:鍑哄満 5:杞︾墝鐭 6:鍥剧墖閲嶄紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢 2:涓婁紶鍥剧墖 3:鍏ュ満 4:鍑哄満 5:杞︾墝鐭 6:鍥剧墖閲嶄紶")
private Integer eventCmd;
@ApiModelProperty(value = "浜嬩欢缂栧彿")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 1ebe053..0a8d143 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -67,26 +67,16 @@
@ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
private String happenTime;
- @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
- ")
- @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
- ")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜 ")
+ @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜 ")
private String srcIndex;
@ApiModelProperty(value = "闂ㄧ鍚嶇О")
@ExcelColumn(name="闂ㄧ鍚嶇О")
private String srcName;
- @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0", example = "1")
@@ -141,16 +131,8 @@
@ExcelColumn(name="浜哄憳缂栧彿")
private String extEventPersonNo;
- @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥
- 1-IC璇诲崱鍣�
- 2-韬唤璇佽鍗″櫒
- 3-浜岀淮鐮佽鍗″櫒
- 4-鎸囩汗澶�", example = "1")
- @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥
- 1-IC璇诲崱鍣�
- 2-韬唤璇佽鍗″櫒
- 3-浜岀淮鐮佽鍗″櫒
- 4-鎸囩汗澶�")
+ @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥 1-IC璇诲崱鍣� 2-韬唤璇佽鍗″櫒 3-浜岀淮鐮佽鍗″櫒 4-鎸囩汗澶�", example = "1")
+ @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥 1-IC璇诲崱鍣� 2-韬唤璇佽鍗″櫒 3-浜岀淮鐮佽鍗″櫒 4-鎸囩汗澶�")
private Integer extEventReaderKind;
@ApiModelProperty(value = "璇诲崱鍣╥d", example = "1")
@@ -165,14 +147,8 @@
@ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
private String svrIndexCode;
- @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
- 2-涓績缁�1涓婁紶
- 3-涓績缁�2涓婁紶
- 0-鏃犳晥", example = "1")
- @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
- 2-涓績缁�1涓婁紶
- 3-涓績缁�2涓婁紶
- 0-鏃犳晥")
+ @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶 2-涓績缁�1涓婁紶 3-涓績缁�2涓婁紶 0-鏃犳晥", example = "1")
+ @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶 2-涓績缁�1涓婁紶 3-涓績缁�2涓婁紶 0-鏃犳晥")
private Integer extEventReportChannel;
@ApiModelProperty(value = "缇ょ粍缂栧彿", example = "1")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index f20de51..acb77ee 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -58,7 +58,18 @@
@ApiModelProperty(value = "浜鸿劯鐓х墖")
@ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
-
+ @ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
+ @ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
+ private String faceServeIndexCode;
+ @ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
+ @ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
+ private String faceId;
+ @ApiModelProperty(value = "浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ExcelColumn(name="浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ private Integer faceStatus;
+ @ApiModelProperty(value = "浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
+ @ExcelColumn(name="浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
+ private String faceInfo;
@ApiModelProperty(value = "鍋ュ悍鐮�")
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
@@ -125,7 +136,7 @@
@ExcelColumn(name="娴峰悍鏍囪瘑")
private Integer hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触", example = "1")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 ", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index 728ff44..296b795 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -71,16 +71,8 @@
@ExcelColumn(name="浜嬩欢绫诲瀷")
private String eventType;
- @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
- @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
- 1-寮�濮�
- 2-鍋滄
- 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
- 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮� 2-鍋滄 4-浜嬩欢鑱斿姩缁撴灉鏇存柊 5-浜嬩欢鍥剧墖寮傛涓婁紶")
private Integer status;
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
@@ -95,10 +87,8 @@
@ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
private String srcParentIndex;
- @ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁
- ")
- @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁
- ")
+ @ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁 ")
+ @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁 ")
private String visitorId;
@ApiModelProperty(value = "濮撳悕")
--
Gitblit v1.9.3