From 0b8838c8dd02161c5e7577162d8cd3318d133b68 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 16 十二月 2025 17:02:13 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 157 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 6dfe258..fe4025f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -244,9 +244,45 @@
}
if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
initReginCameralList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ }else if(Constants.equalsInteger(req.getWithCameras(),Constants.TWO)){
+ initReginCameralList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginFireDeviveList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginSensorList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
}
List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
return data;
+ }
+ private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,String name) {
+ List<CarmeraListVO> carmeraListVOList = fireDeviceList();
+ if(carmeraListVOList!=null && carmeraListVOList.size()>0){
+ for(PageRegionInfoResponse p : allList){
+ for(CarmeraListVO c : carmeraListVOList){
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+ if(p.getCarmeraList()==null){
+ p.setCarmeraList(new ArrayList<>());
+ }
+ p.getCarmeraList().add(c);
+ }
+ }
+ }
+ }
+ }
+ private void initReginSensorList(List<PageRegionInfoResponse> allList,String name) {
+ List<CarmeraListVO> carmeraListVOList = sensorList();
+ if(carmeraListVOList!=null && carmeraListVOList.size()>0){
+ for(PageRegionInfoResponse p : allList){
+ for(CarmeraListVO c : carmeraListVOList){
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+ if(p.getCarmeraList()==null){
+ p.setCarmeraList(new ArrayList<>());
+ }
+ p.getCarmeraList().add(c);
+ }
+ }
+ }
+ }
}
private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
CarmeraListVO re = new CarmeraListVO();
@@ -343,6 +379,110 @@
t.setStatusName(p.getStatusName());
data.add(t);
}
+ }
+ return data;
+ }
+ public List<CarmeraListVO> sensorList(){
+ List<SensorStatusListResponse> allList = new ArrayList<>();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
+ while (hasNext){
+ //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+ SensorStatusListRequest param = new SensorStatusListRequest();
+ param.setRegionIndexCode("-1");
+ param.setPageSize(100);
+ param.setPageNo(curPage);
+ BaseResponse<BaseListPageResponse<SensorStatusListResponse>> response = HKService.sensorStatusSearch(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ BaseListPageResponse<SensorStatusListResponse> r = response.getData();
+ curTotal += 100;
+ if(curTotal >= r.getTotal()){
+ hasNext = false;
+ }
+ if(r.getList() == null || r.getList().size()==0){
+ hasNext =false;
+ }else{
+ allList.addAll(r.getList());
+ }
+ curPage++;
+ }
+
+ List<CarmeraListVO> data = new ArrayList<>();
+ for(SensorStatusListResponse p : allList){
+ CarmeraListVO t = new CarmeraListVO();
+ t.setIndexCode(p.getIndexCode());
+ t.setReginCode(p.getRegionIndexCode());
+ t.setName(p.getCn());
+ t.setStatus(p.getUnitStatus());
+ //0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬�
+ if(t.getStatus()!=null && t.getStatus() == 0){
+ t.setStatusName("鏈敞鍐�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 1){
+ t.setStatusName("姝ｅ父");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 2){
+ t.setStatusName("淇涓�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 3){
+ t.setStatusName("寮傚父鐘舵��");
+ }
+ data.add(t);
+ }
+ return data;
+ }
+ public List<CarmeraListVO> fireDeviceList(){
+ List<FireDeviceStatusListResponse> allList = new ArrayList<>();
+ boolean hasNext = true;
+ int curTotal = 0;
+ int curPage = 1;
+ while (hasNext){
+ //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+ FireDeviceStatuslListRequest param = new FireDeviceStatuslListRequest();
+ param.setRegionIndexCode("-1");
+ param.setPageSize(100);
+ param.setPageNo(curPage);
+ BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> response = HKService.fireDeviceStatusSearch(param);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ BaseListPageResponse<FireDeviceStatusListResponse> r = response.getData();
+ curTotal += 100;
+ if(curTotal >= r.getTotal()){
+ hasNext = false;
+ }
+ if(r.getList() == null || r.getList().size()==0){
+ hasNext =false;
+ }else{
+ allList.addAll(r.getList());
+ }
+ curPage++;
+ }
+
+ List<CarmeraListVO> data = new ArrayList<>();
+ for(FireDeviceStatusListResponse p : allList){
+ CarmeraListVO t = new CarmeraListVO();
+ t.setIndexCode(p.getIndexCode());
+ t.setReginCode(p.getRegionIndexCode());
+ t.setName(p.getCn());
+ t.setStatus(p.getUnitStatus());
+ //0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬�
+ if(t.getStatus()!=null && t.getStatus() == 0){
+ t.setStatusName("鏈敞鍐�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 1){
+ t.setStatusName("姝ｅ父");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 2){
+ t.setStatusName("淇涓�");
+ }
+ if(t.getStatus()!=null && t.getStatus() == 3){
+ t.setStatusName("寮傚父鐘舵��");
+ }
+ data.add(t);
}
return data;
}
@@ -503,12 +643,15 @@
request.setFetchImg(true);
RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
file.setFieldName("event_type");
- file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
+ //瀹夐槻浜嬩欢鍒掑垎鏂瑰紡锛�
+ //閲嶇偣鍖哄煙锛氶噸鐐逛汉鍛�-1644175361銆佸尯鍩熷叆渚�-1644175361銆侀檶鐢熶汉-1644171265銆佽溅杈嗚繚鍋�-1644171265
+ //鍗遍櫓琛屼负锛氫汉鍛樺�掑湴-1644171265銆佹湭甯﹀畨鍏ㄥ附-422000002銆佹娊鐑�-422000000銆佹墦鐢佃瘽-422000001銆佺潯宀�-422400001銆佺宀�-422400000
+ file.setFieldValue("131588,131593,1644171265,422000002,422000000,422000001,422400001,422400000,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
if(type == 1){
- file.setFieldValue("131588");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
+ file.setFieldValue("131588,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
}else if(type == 2){
- file.setFieldValue("131593");//浜哄憳鍛婅 鍗遍櫓琛屼负
+ file.setFieldValue("131593,1644171265,422000002,422000000,422000001,422400001,422400000");//浜哄憳鍛婅 鍗遍櫓琛屼负
}
request.getFiledOptions().add(file);
@@ -525,7 +668,7 @@
request.getFiledOptions().add(fileGte);
RuleEventFiledOptionsRequest fileStatus = new RuleEventFiledOptionsRequest();
- fileStatus.setFieldName("happen_time");
+ fileStatus.setFieldName("handle_status");
fileStatus.setFieldValue("99");
fileStatus.setType("neq");
request.getFiledOptions().add(fileStatus);
@@ -1357,12 +1500,18 @@
List<Long> startTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam1()))
.filter(i->Objects.nonNull(i.getParam1())&&i.getParam1().indexOf(today)>=0)
.map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam1()).getTime()).collect(Collectors.toList());
- Long startTime = Collections.min(startTimeList);
+ Long startTime = null ;
+ if(CollectionUtils.isNotEmpty(startTimeList)){
+ startTime = Collections.min(startTimeList);
+ }
//鑾峰彇缁撴潫鏃堕棿
List<Long> endTimeList = platformLogList.stream()
.filter(i->Objects.nonNull(i.getParam2())&&i.getParam2().indexOf(today)>=0)
.map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam2()).getTime()).collect(Collectors.toList());
- Long endTime = Collections.max(endTimeList);
+ Long endTime = null ;
+ if(CollectionUtils.isNotEmpty(endTimeList)){
+ endTime = Collections.max(endTimeList);
+ }
if(Objects.isNull(startTime)
|| Objects.isNull(endTime) || (startTime>=endTime)){
return BigDecimal.ZERO;
@@ -2089,6 +2238,8 @@
data.setInParkCarTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
+ //2025骞�8鏈�4鏃�09:24:23 鏇存崲鏁版嵁婧� 涓嶄粠娴峰悍鍙�
+ data.setFreeParkingLot(data.getParkingLotTotal()<data.getInParkCarTotal()?Constants.ZERO:data.getParkingLotTotal() - data.getInParkCarTotal());
//褰撳墠鍦ㄥ洯璐ц溅鍙告満鎬绘暟
data.setInParkCarUserTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)).count()
--
Gitblit v1.9.3