server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
@@ -1,6 +1,15 @@ package com.doumee.service.impl; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.param.BaseListPageResponse; import com.doumee.core.haikang.model.param.BaseResponse; import com.doumee.core.haikang.model.param.request.AcsDeviceStatusListRequest; import com.doumee.core.haikang.model.param.request.TempCarInRecordListRequest; import com.doumee.core.haikang.model.param.respose.AscDeviceStatusInfoResponse; import com.doumee.core.haikang.model.param.respose.TempCarInRecordInfoResponse; import com.doumee.core.haikang.service.HKService; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.dao.business.VisitEventMapper; @@ -57,9 +66,32 @@ CountDataResponse cModel =carEventMapper.selectJoinOne(CountDataResponse.class,wrapper); vModel.setMemberCarNum(vModel.getMemberCarNum());//今日员工车辆进场数 vModel.setVisitCarNum(vModel.getCarInNum() - vModel.getMemberCarNum());//今日预约车辆进场数 vModel.setCarNum(getCarInRecordCount()); return vModel; } public int getCarInRecordCount(){ try { List<TempCarInRecordInfoResponse> allDoorList = new ArrayList<>(); Date date =DateUtil.getDateFromString(DateUtil.getShortTime(new Date()) +" 00:00:00"); int curPage = 1; //分页遍历循环查询所有门禁设备数据 TempCarInRecordListRequest param = new TempCarInRecordListRequest(); param.setStartTime(DateUtil.getISO8601Timestamp2(date)); param.setPageNo(curPage); param.setPageSize(1); BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> response = HKService.tempCarInRecords(param); if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，海康同步数据失败~"); } BaseListPageResponse r = response.getData(); return r.getTotal(); }catch (Exception e){ } return 0; } @Override public List<CarsDataListResponse> carsDataList(BaseRequest param){ List<CarsDataListResponse> list = new ArrayList<>(); server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -85,6 +85,7 @@ String vehicleTimeRangeList= "/api/resource/v1/vehicle/timeRange";//增量获取车辆数据 String facePictureCheck= "/api/frs/v1/face/picture/check";//人脸评分 String acsDeviceStatus= "/api/nms/v1/online/acs_device/get";//获取门禁设备在线状态 String tempCarInRecords= "/api/pms/v1/tempCarInRecords/page";//查询场内车停车信息 } /** server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -719,4 +719,16 @@ return result; } /** * 查询场内车停车信息 * @param body * @return */ public static String tempCarInRecords(String body) { Map<String, String> path = getPath(HKConstants.InterfacePath.tempCarInRecords); 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/service/HKService.java
@@ -153,16 +153,16 @@ * @return */ public static BaseResponse<List<UserDelResponse>> delBatchUser(UserDelRequest param){ log.info("【海康批量新增人员】================开始===="+JSONObject.toJSONString(param)); log.info("【海康批量删除人员】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.delBatchUser(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<List<UserDelResponse>>>(){}; BaseResponse<List<UserDelResponse >> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"海康批量新增人员"); logResult(result,"海康批量删除人员"); return result; }catch (Exception e){ log.error("【海康批量新增人员】================失败====：\n"+ e.getMessage()); log.error("【海康批量删除人员】================失败====：\n"+ e.getMessage()); } return null; } @@ -981,6 +981,24 @@ } return null; } /** *查询场内车停车信息（分页） * @return */ public static BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> tempCarInRecords(TempCarInRecordListRequest param){ log.info("【海康查询场内车停车信息】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.tempCarInRecords(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> >(){}; BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"海康查询场内车停车信息"); return result; }catch (Exception e){ log.error("【海康查询场内车停车信息】================失败====：\n"+ e.getMessage()); } return null; } private static void logResult(BaseResponse res,String name) { if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){ log.info("【"+name+"】================成功====\n"+res); server/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroTokenManager.java
@@ -8,7 +8,7 @@ /** * 默认Token管理器 * @author Eva.Caesar Liu * @date 2023/03/21 14:49 * @date 2023/03/21 14:49 36143 45311 */ @Component public class ShiroTokenManager {
