server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -65,4 +65,12 @@ String result = hkSyncPrivilegeService.syncHkParks(param); return ApiResponse.success(result); } @PreventRepeat @ApiOperation("ãæµ·åº·ãäºä»¶è®¢é æ¨é对æ¥å¤çæ¥å£") @PostMapping("/push") // @RequiresPermissions("business:hksync:privilege") public ApiResponse push(@RequestBody ParkListRequest param) { String result = hkSyncPrivilegeService.syncHkParks(param); return ApiResponse.success(result); } } server/dmvisit_service/src/main/java/com/doumee/config/SpringContextUtil.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,33 @@ package com.doumee.config; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; @Component public class SpringContextUtil implements ApplicationContextAware { private static ApplicationContext applicationContext; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } public static ApplicationContext getApplicationContext() { return applicationContext; } public static Object getBean(String name) { return getApplicationContext().getBean(name); } public static <T> T getBean(Class<T> clazz) { return getApplicationContext().getBean(clazz); } public static <T> T getBean(String name, Class<T> clazz) { return getApplicationContext().getBean(name, clazz); } } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -1,10 +1,17 @@ package com.doumee.core.haikang.model; import com.alibaba.fastjson.JSONObject; import com.doumee.config.SpringContextUtil; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.InterfaceLog; import com.doumee.service.business.InterfaceLogService; import com.hikvision.artemis.sdk.ArtemisHttpUtil; import com.hikvision.artemis.sdk.config.ArtemisConfig; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.tomcat.util.bcel.Const; import org.yaml.snakeyaml.scanner.Constant; import java.io.IOException; import java.io.InputStream; @@ -19,10 +26,24 @@ // private static final Logger logger = LoggerFactory.getLogger(HKUtil.class); public static void main(String[] args) throws ParseException { } private static void saveInterfaceLog(String s, String result,Map<String, String> path) { InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class); if(bean !=null){ InterfaceLog hkMonitoryLogDO=new InterfaceLog(); hkMonitoryLogDO.setType(0); hkMonitoryLogDO.setCreateDate(new Date()); hkMonitoryLogDO.setIsdeleted(0); hkMonitoryLogDO.setRequest(s); hkMonitoryLogDO.setRemark(result); hkMonitoryLogDO.setName(path.get(HKConstants.https)); hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https)); bean.create(hkMonitoryLogDO); } } private static Map<String, String> getPath(String str) { final String getCamsApi = HKConstants.ARTEMIS_PATH + str; Map<String, String> path = new HashMap<String, String>(2) { @@ -40,8 +61,10 @@ 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ç±»ååæ° saveInterfaceLog("",result,path); return result; } /** * æ´æ°ç»ç»ä¿¡æ¯ @@ -51,6 +74,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -62,6 +86,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -72,6 +97,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -83,6 +109,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -95,6 +122,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -106,6 +134,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -117,6 +146,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -127,6 +157,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -137,6 +168,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -147,6 +179,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -157,6 +190,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -167,6 +201,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -177,6 +212,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -187,6 +223,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -197,6 +234,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -207,6 +245,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -237,6 +276,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -247,6 +287,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -257,6 +298,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -267,6 +309,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } @@ -278,6 +321,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -288,6 +332,7 @@ 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ç±»ååæ° saveInterfaceLog(body,result,path); return result; } /** @@ -298,6 +343,7 @@ public static String eventSub(String body) { Map<String, String> path = getPath(HKConstants.InterfacePath.eventSub); String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请æ±application/jsonç±»ååæ° saveInterfaceLog(body,result,path); return result; } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventDeviceDataRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventDeviceDataRequest<T> { private ExtEventIdentityCardInfo ExtEventIdentityCardInfo;// 人å身份è¯ä¿¡æ¯ å¦ ä¸é private ExtEventIdentityCardInfo ExtEventCustomerNumInfo;// ééäºä»¶ä¿¡æ¯ å¦ ä¸é private Integer ExtAccessChannel ;//Number 人åééå· å¦ 32 private Integer ExtEventAlarmInID;// Number æ¥è¦è¾å ¥/é²åºéé å¦ 32 private Integer ExtEventAlarmOutID ;//Number æ¥è¦è¾åºéé å¦ 32 private String ExtEventCardNo;//String å¡å· å¦ 32 private Integer ExtEventCaseID ;//Number äºä»¶è¾å ¥éé å¦ 32 private Integer ExtEventCode;// Number äºä»¶ç±»å代ç å¦ 32 åè§éå½D.2.1.1 é¨ç¦äºä»¶ç±»å private Integer ExtEventDoorID;// Number é¨ç¼å· å¦ 32 private String ExtEventIDCardPictureURL;// String 身份è¯å¾çURL å¦ 200 private Integer ExtEventInOut;// Number è¿åºæ¹å å¦ 32 è¿åºç±»å1ï¼è¿0ï¼åº-1:æªç¥ è¦æ±ï¼è¿é¨è¯»å¡å¨æ¨ç 设置为1ï¼åºé¨è¯»å¡å¨æ¨ç 设置为2 private Integer ExtEventLocalControllerID;// Number 就尿§å¶å¨id å¦ 32 就尿§å¶å¨ç¼å·,0-é¨ç¦ä¸»æº,1-255ä»£è¡¨å°±å°æ§å¶å¨ private Integer ExtEventMainDevID;// Number ä¸»è®¾å¤æ¨ç å¦ 32 private String ExtEventPersonNo;// String 人åç¼å· å¦ 32 以人为ä¸å¿è®¾å¤ä¼ä¸æ¥ private String ExtEventPictureURL;// String å¾ççurl å¦ 32 private Integer ExtEventReaderID;// Number 读å¡å¨id å¦ 32 private Integer ExtEventReaderKind;// Number 读å¡å¨ç±»å« å¦ 32 0-æ æ1-IC读å¡å¨2-身份è¯è¯»å¡å¨3-äºç»´ç 读å¡å¨4-æçº¹å¤´ private Integer ExtEventReportChannel;// Number æ¥åä¸ä¼ éé å¦ 32 1-å¸é²ä¸ä¼ 2-ä¸å¿ç»1ä¸ä¼ 3-ä¸å¿ç»2ä¸ä¼ 0-æ æ private Integer ExtEventRoleID;// Number 群ç»ç¼å· å¦ 32 private Integer ExtEventSubDevID;// Number åæ§å¶å¨ç¡¬ä»¶ID å¦ 32 private Integer ExtEventSwipNum;// Number å·å¡æ¬¡æ° å¦ 32 private Integer ExtEventType;// Number äºä»¶ç±»å å¦ 32 äºä»¶ç±»åï¼å¦æ®éé¨ç¦äºä»¶ä¸º0,身份è¯ä¿¡æ¯äºä»¶ä¸º1ï¼å®¢æµéç»è®¡ä¸º2 private Integer ExtEventVerifyID;// Number å¤é认è¯åºå· å¦ 32 private Integer ExtEventWhiteListNo;// Number ç½åååå· å¦ 32 1-8ï¼ä¸º0æ æ private String ExtReceiveTime;// String äºä»¶ä¸æ¥é©±å¨çæ¶é´ æ¯ 32 ç¨äºç»è®¡äºä»¶ä¸æ¥å»¶æ¶ï¼Unixæ¶é´æ³ï¼ç²¾ç¡®å°å¾®ç§ï¼ä¾ï¼ "1558576265810000"代表 2019/5/23 9:51:5.000 private Integer Seq;// Number äºä»¶æµæ°´å· æ¯ 32 äºä»¶æµæ°´å·ï¼ä¸º0æ æ private String UserType;// Number ç¨æ·ç±»å å¦ 32 人åç±»åï¼0 æªç¥ï¼1 æ®éï¼2 æ¥å®¾ï¼3 é»ååï¼4 管çå private String svrIndexCode ;//String å¾çæå¡å¨å¯ä¸ç¼ç å¦ 32 } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventParkDataRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,34 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventParkDataRequest { private Integer alarmCar ;// Number æ¯å¦é»ååæ è¯ï¼1-é»åå 0-éé»ååï¼ å¦ private String cardNo ;// String å¡å· å¦ 16 private Integer eventCmd;// Number äºä»¶å· æ¯ 1:å线äºä»¶2:ä¸ä¼ å¾ç3:å ¥åº4:åºåº5:车çç«æ£6:å¾çéä¼ private String eventIndex;// String äºä»¶ç¼å· æ¯ 64 private String gateIndex;// String åºå ¥å£ç¼å· æ¯ 64 private String gateName;// String åºå ¥å£åç§° æ¯ 64 private Integer inoutType;// Number è¿åºåºç±»åï¼0ï¼è¿åºï¼1ï¼åºåº æ¯ private Integer mainLogo;// Number 车è¾ä¸»åç å¦ private String parkIndex ;// String å车åºç¼å· æ¯ 64 private String parkName ;// String å车åºåç§° æ¯ 64 private EventParkPicRequest picUrl ;//Object å¦ private String svrIndex;// String å¾çæå¡å¨ç¼å· å¦ 32 private Integer plateBelieve ;//Number 车ç置信度 æ¯ åå¼èå´ï¼0â100 private Integer plateColor ;//Number 车çé¢è² æ¯ åè§éå½A.15 车çé¢è² private String plateNo ;//String 车çå· æ¯ 32 private Integer plateType;// Number 车çç±»å æ¯ åè§éå½A.14 车çç±»å private String roadwayIndex;// String 车éç¼å· æ¯ 64 private String roadwayName;// String 车éåç§° æ¯ 64 private Integer roadwayType;// Number 车éç±»å æ¯ 1ï¼å ¥åºè½¦é 2ï¼åºåºä¸æ¶è´¹è½¦é 3ï¼åºåºç¼´è´¹è½¦é 4ï¼ä¸å¤®ç¼´è´¹è½¦é private Integer subLogo;// Number 车è¾ååç å¦ private Integer subModel;// Number ååç年款 å¦ private String time;// String æ¶é´ æ¯ 64 ISOæ ¼å¼ private Integer vehicleClass;// Number 车è¾å±æ§ æ¯ private Integer vehicleColor;// Number 车è¾é¢è² æ¯ private Integer vehicleType;// Number 车è¾ç±»å æ¯ private EventParkInResultRequest inResult; //Object æ¾è¡ç»ææ°æ® } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventParkInResultRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,9 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventParkInResultRequest { private EventParkRlsRequest rlsResult ;// æ¾è¡ç»ææ°æ® æ¯ } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventParkPicRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,11 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventParkPicRequest { private String platePicUrl;// String 车çå¾ç å¦ 256 private String vehiclePicUrl;// String 车è¾å¾ç å¦ 256 } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventParkRlsRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventParkRlsRequest { private Integer releaseAuth ;// Number æ¾è¡æé æ¯ 64 åè§éå½A.65 æ¾è¡æé private Integer releaseReason ;// Number æ¾è¡åå æ¯ 64 åè§åè§éå½A.67 æ¾è¡åå private Integer releaseResult ;// Number æ¾è¡ç»æ æ¯ 64 åè§éå½A.66 æ¾è¡ç»æ private Integer releaseResultEx ;//Number æ°ä½ç³»æ¾è¡ç»æ æ¯ 64 åè§éå½A.68 æ°ä½ç³»æ¾è¡ç»æ private Integer releaseWay ;// Number æ¾è¡æ¹å¼ æ¯ 64 åè§éå½A.69 æ¾è¡æ¹å¼ } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventPushInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventPushInfoRequest { private String eventId;// String äºä»¶å¯ä¸æ è¯ æ¯ 64 private String srcIndex;// String äºä»¶æºç¼å·ï¼ç©çè®¾å¤æ¯èµæºç¼å· æ¯ 64 private String srcType;// String äºä»¶æºç±»å æ¯ 16 private Integer eventType ;//Number äºä»¶ç±»å æ¯ private String srcName;// String äºä»¶æºåç§° å¦ 64 private Integer status ;//Number äºä»¶ç¶æ æ¯ 0-ç¬æ¶1-å¼å§2-忢3-äºä»¶èå²4-äºä»¶èå¨ç»ææ´æ°5-弿¥å¾çä¸ä¼ private Integer timeout ;//Number èå²è¶ æ¶æ¶é´ æ¯ åä½ï¼ç§ private String happenTime ;//String äºä»¶åçæ¶é´ï¼è®¾å¤æ¶é´ï¼ æ¯ 64 private String srcParentIndex ;//String äºä»¶åççäºä»¶æºç¶è®¾å¤ç¼å· å¦ 64 private EventDeviceDataRequest data; } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventPushParamRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; import java.util.List; @Data public class EventPushParamRequest { private String sendTime;// P String äºä»¶ä»æ¥æ¶è ï¼ç¨åºå¤çåï¼ååºçæ¶é´ æ¯ 32 äºä»¶åéæ¶é´ private String ability;// P String äºä»¶ç±»å« æ¯ 64 æ è¯å车åºäºä»¶ private String[] uids;// String[] ç¨æ·id å¦ ä¸é private String[] clients ;//String[] ç»ä»¶æ è¯ å¦ ä¸é private List<EventPushInfoRequest> events;// P Events[] äºä»¶ä¿¡æ¯ æ¯ ä¸é } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventPushRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventPushRequest { // private String parkIndexCodes ;// string False å车åºå¯ä¸æ è¯éå å¤ä¸ªå¼ä½¿ç¨è±æéå·åéï¼ä¸è¶ è¿1000个 private String method ;// String æ¹æ³åï¼ç¨äºæ è¯æ¥æç¨é æ¯ 16 äºä»¶åºå®OnEventNotify private EventPushParamRequest params ;// Params äºä»¶åæ°ä¿¡æ¯ æ¯ ä¸é å ·ä½åæ°ä¿¡æ¯ } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/EventVisitDataRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class EventVisitDataRequest { private String visitorId ;//String 访客id æ¯ 64 对åºè®¿å®¢æ¥è®¿è®°å½ä¸çorderIdåæ®µ private String personName;// String å§å æ¯ 32 private Integer sex;// Number æ§å« æ¯ 1-ç·2-女 private Integer idType;// Number è¯ä»¶ç±»å å¦ 111ï¼èº«ä»½è¯ private String idNo;// String è¯ä»¶å·ç å¦ 64 private String beVisitedPersonName;// String 被访é®äººå§å æ¯ 64 private String beVisitedPersonOrg ;//String 被访é®äººæå±ç»ç» æ¯ 64 private String visitorWorkUint;// String æ¥è®¿åä½ å¦ 64 private String visitorCode;// String 访客éªè¯ç å¦ 64 private String purpose;// String æ¥è®¿äºç± å¦ 64 private String signOrg;// String è¯ä»¶ç¾åæºå ³ å¦ 64 private String startTime ;//String æ¥è®¿æ¶é´ å¦ ISO8601æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åº ä¾å¦å京æ¶é´ï¼ 2018-07-26T15:00:00+08:00 private String endTime;// String ç¦»å¼æ¶é´ å¦ ISO8601æ ¼å¼ï¼yyyy-MM-ddTHH:mm:ss+å½åæ¶åº ä¾å¦å京æ¶é´ï¼ 2018-07-26T15:00:00+08:00 private String phone;// String ææºå·ç æ¯ 64 private String carNo;// String 车çå· å¦ private String photoUrl;// String ç §çuri å¦ private String captureUrl;// String ææå¾çuri å¦ private String svrIndexCode;// String å¾çå卿å¡å¨å¯ä¸æ è¯ å¦ private String beVisitedPersonId;// String 被访é®äººId æ¯ private String beVisitedPersonOrgId;// String 被访é®äººæå±ç»ç»Id æ¯ } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/ExtEventCustomerNumInfo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class ExtEventCustomerNumInfo<T> { private Integer AccessChannel;// Number ééå· å¦ 32 private Integer EntryTimes ;//Number è¿äººæ° å¦ 32 private Integer ExitTimes ;//Number åºäººæ° å¦ 32 private Integer TotalTimes ;//Number æ»éè¡äººæ° å¦ 32 } server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/ExtEventIdentityCardInfo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.doumee.core.haikang.model.param.request.event; import lombok.Data; @Data public class ExtEventIdentityCardInfo { private String Address;// String ä½å å¦ 512 private String Birth;// String åºçæ¥æ å¦ 32 ä¾ï¼ â1999-6-30â private String EndDate;// String æææ¥æç»ææ¶é´ å¦ 32 ä¾ï¼ â2028-10-12â private String IdNum ;//String 身份è¯id å¦ 32 private String IssuingAuthority;// String ç¾åæºå ³ å¦ 32 private String Name;// String å§å å¦ 32 private Integer Nation ;//Number å¦ 32 0-æªç¥ private Integer Sex;// Number æ§å« å¦ 32 æ§å«0-æªç¥1-ç·2-女 private String StartDate;// String æææ¥æå¼å§æ¶é´ å¦ 32 ä¾ï¼ â2018-10-12â private Integer TermOfValidity;// Number æ¯å¦é¿æææ å¦ 32 0-å¦ï¼æææªæ¢æ¥æææï¼ 1-æ¯ï¼æææªæ¢æ¥ææ æï¼ } server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -9,6 +9,8 @@ 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.doumee.dao.business.model.InterfaceLog; import com.doumee.service.business.InterfaceLogService; import com.hikvision.artemis.sdk.config.ArtemisConfig; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -21,9 +23,9 @@ import com.alibaba.fastjson.TypeReference; import java.io.InputStream; import java.util.Date; import java.util.List; //@Service @Slf4j public class HKService { private Logger logger = LoggerFactory.getLogger(HKService.class); @@ -44,7 +46,6 @@ log.error("ãæµ·åº·è·åæ ¹ç»ç»ã================失败====ï¼\n"+ e.getMessage()); } return null; } /** * ä¿®æ¹ç»ç»æ°æ® @@ -431,8 +432,9 @@ */ public static BaseResponse eventSub(EventSubRequest param){ log.error("ãæµ·åº·äºä»¶è®¢é ã================å¼å§===="+JSONObject.toJSONString(param)); String res = null; try { String res = HKTools.eventSub(JSONObject.toJSONString(param)); res = HKTools.eventSub(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse >(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); @@ -440,6 +442,8 @@ return result; }catch (Exception e){ log.error("ãæµ·åº·äºä»¶è®¢é ã================失败====ï¼\n"+ e.getMessage()); }finally { // saveInterfaceLog(param,res); } return null; } server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -20,6 +20,7 @@ public static final String HK_APPSECRET ="HK_APPSECRET" ; public static final String HK_HTTPS ="HK_HTTPS" ; public static final String HK_PUSH_URL = "HK_PUSH_URL"; public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ; /** * mq tag server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
@@ -61,8 +61,7 @@ @ApiModelProperty(value = "å°åä¿¡æ¯") @ExcelColumn(name="å°åä¿¡æ¯") @JsonFormat(pattern = "yyyy-MM-dd") private Date url; private String url; @ApiModelProperty(value = "请æ±åæ°") @ExcelColumn(name="请æ±åæ°") server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -119,8 +119,7 @@ queryWrapper.lambda().eq(InterfaceLog::getName, pageWrap.getModel().getName()); } if (pageWrap.getModel().getUrl() != null) { queryWrapper.lambda().ge(InterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl())); queryWrapper.lambda().le(InterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl())); queryWrapper.lambda().like(InterfaceLog::getUrl, pageWrap.getModel().getUrl()); } if (pageWrap.getModel().getRequest() != null) { queryWrapper.lambda().eq(InterfaceLog::getRequest, pageWrap.getModel().getRequest()); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
@@ -8,12 +8,14 @@ import com.doumee.core.haikang.model.param.BaseResponse; import com.doumee.core.haikang.model.param.request.EventSubRequest; import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest; import com.doumee.core.haikang.model.param.respose.OrgListResponse; import com.doumee.core.haikang.model.param.respose.PrivilegeGroupInfoResponse; import com.doumee.core.haikang.model.param.respose.PrivilegeGroupListResponse; import com.doumee.core.haikang.service.HKService; import com.doumee.core.utils.Constants; import com.doumee.dao.business.DeviceRoleMapper; import com.doumee.dao.business.model.DeviceRole; import com.doumee.dao.system.model.SystemDictData; import com.hikvision.artemis.sdk.config.ArtemisConfig; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -43,8 +45,28 @@ HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode(); //å¼å§è®¢é é¨ç¦äºä»¶ã访客äºä»¶ãåå车åºäºä»¶ startHkEventSub(); //è·åæ ¹ç»ç»ç¼ç getRootOrgCode(); return 0; } /** * è·åæ ¹ç»ç»ç¼ç */ private void getRootOrgCode() { SystemDictData org = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_ROOTORG_CODE); if(org!=null){ String rootOrgId =org.getCode(); if(StringUtils.isBlank(rootOrgId)){ BaseResponse<OrgListResponse> res = HKService.getRootOrg(null); if(res !=null && res.getData()!=null && StringUtils.isNotBlank(res.getData().getOrgIndexCode())){ org.setCode(res.getData().getOrgIndexCode()); org.setUpdateTime(new Date()); systemDictDataBiz.updateById( org); } } } } /** * 订é é¨ç¦äºä»¶ã访客äºä»¶ãåå车åºäºä»¶