log/eva.log
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 # æé¤è·è¸ªçURLæ£å 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 server/dmvisit_service/src/main/java/com/doumee/core/haikang/HKUtil.java
ÎļþÃû´Ó server/dmvisit_service/src/main/java/com/doumee/core/utils/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; 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";//访客é¢çº¦å ç»è®°v2 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; } } } 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);// æ ¹æ®ç°åºç¯å¢é¨ç½²ç¡®è®¤æ¯httpè¿æ¯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ç±»åæ¥æï¼è¿ååç¬¦ä¸²ç±»åæ¶é´ï¼ISO8601æ åæ¶é´ï¼ * @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; } } 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; } 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ï¼æå * å ¶ä»ï¼å¤±è´¥ * åèéå½E.other.1 èµæºç®å½é误ç */ private String code; /** * æ¥å£æ§è¡æ åµè¯´æä¿¡æ¯ */ private String msg; private T data; } 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 å æç»ææ¶é´æ¶é´æ ¼å¼ï¼yyyy-MM-ddï¼å¦ï¼2018-07-27 } 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 车çå·ç } 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ä¸ªï¼ å¯éè¿è·åå车åºå表æ¥å£è·å } 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ç¼ç åçåç¬¦æ°æ® } 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åæ®µï¼ æè·å人åå表v2 æ¥å£è¿åæ¥æä¸çpersonPhotoIndexCodeåæ®µ private String faceData;// string True 人è¸å¾çbase64ç¼ç åçåç¬¦æ°æ® } 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æ¥å£è¿åâpicUriâåæ®µ private String serverIndexCode;// string True å¾çæå¡å¨å¯ä¸æ è¯ éè¿è·å人åå表v2æ¥å£è¿åâserverIndexCodeâåæ®µ } 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个å符ï¼åªæ¯ææ°åã æ³¨éï¼ISCä¸å¯¹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使°åç¼ç ï¼å ¶å®åºæ¯ä¸æ¹å¼æ æ } 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 } 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个å符ï¼ä¸è½å å« â / \ : * ? " < > } 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个 } 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æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åºï¼ä¾å¦å京æ¶é´ï¼2018-07-26T15:00:00+08:00 private String endTime ;//string False é¢çº¦ç»ææ¶é´ ææ¶é´é¢çº¦æ¶å¿ å¡«ï¼ææ¬¡é¢çº¦ä¸å¡« ISO8601æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åºï¼ä¾å¦å京æ¶é´ï¼2018-07-26T15:00:00+08:00 } 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:访客平å°åæ¶ } 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 } 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ç¼ç åçå符 } 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ä½ä¸ºäººåæ å¿ï¼å¨è¿åå¼ä¸æ å¿æ¯ä¸ªäººåçæ·»å ç»æãæä»¥æ¯æ¬¡æ¥å£è°ç¨ï¼æ¯ä¸ªäººåçclientidéä¿æå¯ä¸ï¼1~10个å符ï¼åªæ¯ææ°åãæ³¨ï¼clientidåªå¯¹æ¬æ¬¡è°ç¨ææ private String personId ;//string False 人åIDï¼å¯ä»¥æå®äººåpersonIdï¼ä¸å 许ä¸å ¶ä»äººåpersonIdéå¤ï¼å æ¬å·²å é¤ç人åã 为空æ¶å¹³å°èªå¨çæäººåID 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 è¯ä»¶ç±»åï¼åèéå½A æ°æ®åå ¸ï¼å¹³å°ä¸äººåä¿¡æ¯å®åæ è¯éæ©ä¸ºèº«ä»½è¯ä»¶æ¶å¿ å¡« private String certificateNo;// string False è¯ä»¶å·ç ï¼1-20使°å忝ï¼å¹³å°ä¸äººåä¿¡æ¯å®åæ è¯éæ©ä¸ºèº«ä»½è¯ä»¶æ¶å¿ å¡« private String jobNo;// string False å·¥å·ï¼1-32个å符ï¼å¹³å°ä¸äººåä¿¡æ¯å®åæ è¯éæ©ä¸ºå·¥å·æ¶å¿ å¡« private List<UserAddFaceRequest> faces;// object[] False 人è¸ä¿¡æ¯ } 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 被访人å¯ä¸æ è¯ï¼æ¥è¯¢äººåå表v2æ¥å£è·åè¿åæ¥æä¸çpersonIdåæ®µ private VisitAppointmentPermissonRequest visitorPermissionSet ;//object False æééåå°è£ 对象 private String visitStartTime;// string True é¢è®¡æ¥è®¿æ¶é´ï¼æ¶é´åæ°é满足ISO8601æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åºï¼ä¾å¦å京æ¶é´ï¼2018-07-26T15:00:00+08:00 private String visitEndTime ;// string True é¢è®¡ç¦»å¼æ¶é´ï¼æ¶é´åæ°é满足ISO8601æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åºï¼ä¾å¦å京æ¶é´ï¼2018-07-26T15:00:00+08:00é¢è®¡ç¦»å¼æ¶é´å¿ é¡»æäºå½åæ¶é´åé¢è®¡æ¥è®¿æ¶é´ private String visitPurpose;// string False æ¥è®¿äºç±ï¼é¿åº¦ä¸º0ï½32个å符 private VisitAppointmentVistorRequest visitorInfo ;//object True è®¿å®¢ä¿¡æ¯ } 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 æéç»idsï¼æ¥è¯¢è®¿å®¢æéç»æ¥å£è·åè¿åæ¥æä¸çprivilegeGroupIdåæ®µ } 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 被访人å¯ä¸æ è¯ï¼æ¥è¯¢äººåå表v2æ¥å£è·åè¿åæ¥æä¸çpersonIdåæ®µ private VisitAppointmentPermissonRequest visitorPermissionSet ;//object False æééåå°è£ 对象 private String visitStartTime;// string True é¢è®¡æ¥è®¿æ¶é´ï¼æ¶é´åæ°é满足ISO8601æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åºï¼ä¾å¦å京æ¶é´ï¼2018-07-26T15:00:00+08:00 private String visitEndTime ;// string True é¢è®¡ç¦»å¼æ¶é´ï¼æ¶é´åæ°é满足ISO8601æ ¼å¼ï¼yyyy-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ä½è®¿å®¢å¸¦äººè¸ä¿¡æ¯ï¼å¦æåå¨äººè¸ä¸ä¼ 失败ï¼åæ´ä¸ªé¢çº¦å¤±è´¥ã } 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 è¯ä»¶ç±»åï¼è¯¦è§éå½A.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ä½ä¸è±ææ°å } 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ç§ } 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 } 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ç§ } 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 è°ç¨æ¹æå®Id private String code ;//string False é误ç private String msg ;//string False éè¯¯ä¿¡æ¯ } 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 æ¹éæ·»å 失败çè®°å½ } 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 è°ç¨æ¹æå®Id private String orgIndexCode;// string False æå¡ç«¯çæçå¯ä¸æ è¯ } 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ç§ } 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 é¢çº¦æææ¶é´ï¼åä½ï¼åé } 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 æéç»ID, ç¨äºè®¿å®¢ç»è®°æ¶å¯¹è®¿å®¢ææ private String privilegeGroupName;// string False æéç»åç§° private String remark;// string False æè¿° private Integer isDefault ;//number False æ¯å¦æ¯é»è®¤æéç»0: æ¯1: å¦ } 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 æéç»å¯¹è±¡å表 } 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 æåæ·»å ç人åId private String faceId;// string False æåæ·»å ç人è¸Id } 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 éè¯¯ä¿¡æ¯ } 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 é¢çº¦è¯¦ç»ä¿¡æ¯ } 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 访客头å,è¿åå¾ççç¸å¯¹Uri private String svrIndexCode ;// string False å¾çå卿å¡çå¯ä¸æ è¯ } 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; } } server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKConstants.java
ÎļþÒÑɾ³ý server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/base/HKTools.java
ÎļþÒÑɾ³ý server/dmvisit_service/src/main/java/com/doumee/core/utils/haikang/service/HKService.java
ÎļþÒÑɾ³ý 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 = "äºä»¶ç¼å·") 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 = "读å¡å¨id", 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") 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; 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 = "å§å")