From 6c5d0a4a9264b7508c7ffe81b45ba239cabf2244 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 10 四月 2024 17:59:08 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java | 32 ++++++++++++++++
server/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroTokenManager.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 24 ++++++++++-
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 12 ++++++
5 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java b/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
index 590c909..2081ede 100644
--- a/server/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java
+++ b/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<>();
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
index 3a2fd8c..5075098 100644
--- 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
@@ -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";//鏌ヨ鍦哄唴杞﹀仠杞︿俊鎭�
}
/**
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
index e1227e3..446c04c 100644
--- 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
@@ -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;
+ }
+
}
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
index c1fb070..161ba1f 100644
--- 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
@@ -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);
diff --git a/server/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroTokenManager.java b/server/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroTokenManager.java
index 1ba1679..d5f3b40 100644
--- a/server/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroTokenManager.java
+++ b/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 {
--
Gitblit v1.9.3