From e28b420be49bf9f219e3b37e342a09d46bd55c03 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 10:50:22 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 369 insertions(+), 39 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 fb603d3..cb23047 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
@@ -45,8 +45,10 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -93,7 +95,11 @@
private TmsService tmsService;
@Autowired
private PlatformDeviceMapper platformDeviceMapper;
+ @Autowired
+ private CategoryMapper categoryMapper;
+ @Autowired
+ private RedisTemplate<String,Object> stringRedisTemplate;
@Value("${debug_model}")
private Boolean isDebug;
/**
@@ -215,6 +221,32 @@
*/
@Override
public List<PageRegionInfoResponse> getRegionTree(CarmeraListVO req){
+ List<PageRegionInfoResponse> allList =null;
+ if(req.getRefresh() == 0){
+ //榛樿鍙栫紦瀛樻暟鎹�
+ allList = (List<PageRegionInfoResponse>) stringRedisTemplate.opsForValue().get(Constants.RedisKeys.HK_REGIONS_TREE);
+ }
+ if(allList!=null && allList.size()>0){
+ return allList;
+ }
+ allList = getAllRegionList();
+ if(allList==null && allList.size()==0){
+ return allList;
+ }
+ if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
+ initReginCameralList(allList,req );//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ }else if(Constants.equalsInteger(req.getWithCameras(),Constants.TWO)){
+ initReginCameralList(allList,req );//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginFireDeviveList(allList, req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginSensorList(allList,req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ }
+ List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
+ //鍔犲叆缂撳瓨
+ stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_REGIONS_TREE,data);
+ return data;
+ }
+
+ private List<PageRegionInfoResponse> getAllRegionList() {
List<PageRegionInfoResponse> allList = new ArrayList<>();
boolean hasNext = true;
int curTotal = 0;
@@ -241,13 +273,64 @@
}
curPage++;
}
- if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
- initReginCameralList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
- }
- List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
- return data;
+ return allList;
}
- private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
+
+ private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
+ String name =req.getName();
+ 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()) ){
+ if(p.getDeviceList()==null){
+ p.setDeviceList(new ArrayList<>());
+ }
+ p.getDeviceList().add(c);
+ }
+ }
+ }
+ }
+ }
+ private void initReginSensorList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
+ String name =req.getName();
+ 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())){
+ if(p.getSensorList()==null){
+ p.setSensorList(new ArrayList<>());
+ }
+ p.getSensorList().add(c);
+ }
+ }
+ }
+ }
+ }
+ @PostConstruct
+ public void cacheRegionAndDeviceData(){
+ log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅======寮�濮�============");
+ try {
+ CarmeraListVO param =new CarmeraListVO();
+ param.setWithCameras(2);
+ List<PageRegionInfoResponse> resultTree = getRegionTree(param);
+ List<PageRegionInfoResponse> result = getAllRegionList();
+ List<CarmeraListVO> carmeraListVOList = initAllReginCameralList(result);
+ List<CarmeraListVO> sensorList = sensorList();
+ List<CarmeraListVO> fireDeviceList = fireDeviceList();
+ stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_REGIONS_TREE,resultTree);
+ stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_REGIONS,result);//骞抽摵鍖哄煙鍒楄〃
+ stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_CAMERAS,carmeraListVOList);//鎵�鏈夌洃鎺х偣鏁版嵁
+ stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_FIRE_DEVICE,fireDeviceList);//鎵�鏈夋秷闃茶澶囨暟鎹�
+ stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_SENSOR,sensorList);//鎵�鏈変紶鎰熷櫒
+ log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅======鎴愬姛============");
+ }catch (Exception e){
+ log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅澶辫触==================");
+ }
+ }
+ private void initReginCameralList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
+ String name = req.getName();
CarmeraListVO re = new CarmeraListVO();
re.setName(name);
List<CarmeraListVO> carmeraListVOList = cameraList(re);
@@ -259,11 +342,26 @@
if(p.getCarmeraList()==null){
p.setCarmeraList(new ArrayList<>());
}
+ c.setRegionName(p.getName());
p.getCarmeraList().add(c);
}
}
}
}
+ }
+ private List<CarmeraListVO> initAllReginCameralList(List<PageRegionInfoResponse> allList ) {
+ CarmeraListVO re = new CarmeraListVO();
+ List<CarmeraListVO> carmeraListVOList = cameraList(re);
+ if(carmeraListVOList!=null && carmeraListVOList.size()>0){
+ for(PageRegionInfoResponse p : allList){
+ for(CarmeraListVO c : carmeraListVOList){
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
+ c.setRegionName(p.getName());
+ }
+ }
+ }
+ }
+ return carmeraListVOList;
}
/**
* 鑾峰彇鍖哄煙鏍戝舰缁撴瀯鏁版嵁
@@ -298,7 +396,7 @@
curPage++;
}
if(Constants.equalsInteger(req.getWithCameras(),Constants.ONE)){
- initReginCameralList(allList,req.getName());//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginCameralList(allList,req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
}
return allList;
}
@@ -342,6 +440,114 @@
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.setIncludeSubNode(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());
+ t.setRegionName(p.getRegionName());
+ //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.setIncludeSubNode(1);
+ 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());
+ t.setRegionName(p.getRegionName());
+ //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;
}
@@ -489,6 +695,7 @@
}*/
return list;
}
+
@Override
public WaningEventDataVO warningEventData(Integer type){
WaningEventDataVO lastResult = new WaningEventDataVO();
@@ -498,16 +705,39 @@
request.setPageSize(1000);
request.setFiledOptions(new ArrayList<>());
request.setSorts(new ArrayList<>());
+ 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);
+
+ RuleEventFiledOptionsRequest fileLte = new RuleEventFiledOptionsRequest();
+ fileLte.setFieldName("happen_time");
+ fileLte.setFieldValue(DateUtil.formatDate(Utils.Date.getEnd(new Date()),"yyyy-MM-dd HH:mm:ss"));
+ fileLte.setType("lte");
+ request.getFiledOptions().add(fileLte);
+
+ RuleEventFiledOptionsRequest fileGte = new RuleEventFiledOptionsRequest();
+ fileGte.setFieldName("happen_time");
+ fileGte.setFieldValue(DateUtil.formatDate(Utils.Date.getStart(new Date()),"yyyy-MM-dd HH:mm:ss"));
+ fileGte.setType("gte");
+ request.getFiledOptions().add(fileGte);
+
+ RuleEventFiledOptionsRequest fileStatus = new RuleEventFiledOptionsRequest();
+ fileStatus.setFieldName("handle_status");
+ fileStatus.setFieldValue("99");
+ fileStatus.setType("neq");
+ request.getFiledOptions().add(fileStatus);
+
SortRequest sort = new SortRequest();
sort.setSortField("happen_time");
sort.setSortType("desc");
@@ -523,6 +753,9 @@
try {
if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() < Utils.Date.getStart(new Date()).getTime()){
continue;
+ }
+ if(StringUtils.equals(r.getStatus(),"99")){
+ continue;
}
}catch (Exception e){
}
@@ -619,6 +852,9 @@
BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ if(Objects.nonNull(response.getData().getList())){
+ return data;
}
for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
AlarmEventDataVO t = new AlarmEventDataVO();
@@ -1000,13 +1236,21 @@
/**
* 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅淇℃伅闆嗗悎
- *
+ * @param type 0/null = 褰撳ぉ锛�1=褰撴湀锛�2=褰撳勾
* @return
*
*/
@Override
- public AlarmDataVO alarmDataSumByCate(){
- AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(Utils.Date.getStart(new Date()))
+ public AlarmDataVO alarmDataSumByCate(Integer type){
+ Date startDate = Utils.Date.getStart(new Date());
+ if(Objects.nonNull(type)){
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ startDate = Utils.Date.getStart(DateUtil.getFirstThisYearDate());
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ startDate = Utils.Date.getStart(DateUtil.getFirstThisMonthDate());
+ }
+ }
+ AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(startDate)
,(DateUtil.getPlusTime2(new Date())));
return alarmDataVO;
}
@@ -1024,6 +1268,7 @@
Date lastMonth = DateUtil.addMonthToDate(month,-1);//涓婃湀
Date year = Utils.Date.getStart(new Date());//浠婂勾
Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
+ log.error("1銆�=====================>"+DateUtil.getCurrDateTime());
List<PlatformJob> monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -1032,12 +1277,13 @@
.select(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getType,PlatformJob::getType)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
+// .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
Constants.PlatformJobStatus.LEAVED.getKey(),
Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
.apply("year(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));
+ log.error("2銆�=====================>"+DateUtil.getCurrDateTime());
List<PlatformJob> yearNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -1049,6 +1295,8 @@
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
.apply("year(done_date) = year('"+DateUtil.getPlusTime2(year)+"') and done_date<= now() "));
+
+ log.error("3銆�=====================>"+DateUtil.getCurrDateTime());
List<PlatformJob> monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -1061,7 +1309,8 @@
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
.apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastMonth)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(lastMonth)+"') and done_date<= '"
+DateUtil.getPlusTime2(lastMonth)+"'"));
-
+
+ log.error("4銆�=====================>"+DateUtil.getCurrDateTime());
List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
@@ -1077,9 +1326,10 @@
data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湀鍑哄簱閲�
data.setYearOutTotal(getSumTotalByList(yearNum,null,null) );//鏈勾鍑哄簱閲�
data.setYearLastOutTotal(getSumTotalByList(yearLastNum,null,null) );//鍘诲勾鍑哄簱閲�
- data.setMonthOutTimes(monthNum!=null?monthNum.size():0);
+ data.setMonthOutTimes(monthNum!=null?monthNum.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)||Constants.equalsInteger(i.getType(),Constants.THREE)).collect(Collectors.toList()).size():0);
data.setYearOutTimes(yearNum!=null?yearNum.size():0);
+ log.error("5銆�=====================>"+DateUtil.getCurrDateTime());
//==========浠婂ぉ涔嬪墠鏈畬鎴愬嚭鍏ュ簱浠诲姟
List<PlatformJob> beforeJobNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
@@ -1095,6 +1345,7 @@
.apply(" to_days(create_date) < to_days(now()) ")
);
+ log.error("6銆�=====================>"+DateUtil.getCurrDateTime());
//==========浠婂ぉ鍑哄叆搴撳畬鎴愰噺
List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
@@ -1107,6 +1358,7 @@
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
.apply(" to_days(done_date) = to_days(now())"));
+ log.error("7銆�=====================>"+DateUtil.getCurrDateTime());
//==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔� 鏈畬鎴愮殑----
List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
@@ -1119,18 +1371,39 @@
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
.apply(" to_days(create_date) = to_days(now()) and done_date is null "));
+ log.error("8銆�=====================>"+DateUtil.getCurrDateTime());
BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//浠婂ぉ涔嬪墠鏈畬鎴愬嚭搴撲换鍔�
+ log.error("9銆�=====================>"+DateUtil.getCurrDateTime());
BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//浠婂ぉ涓嬪彂鍑哄簱浠诲姟
+ log.error("10銆�=====================>"+DateUtil.getCurrDateTime());
BigDecimal beforeInNum = (getSumTotalByList(beforeJobNum,1,null));//浠婂ぉ涔嬪墠鏈畬鎴愬叆搴撲换鍔�
+ log.error("11銆�=====================>"+DateUtil.getCurrDateTime());
BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
+ log.error("12銆�=====================>"+DateUtil.getCurrDateTime());
data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//浠婃棩瀹屾垚閲�
+ log.error("13銆�=====================>"+DateUtil.getCurrDateTime());
data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
+ log.error("14銆�=====================>"+DateUtil.getCurrDateTime());
data.setCurrentInNum(beforeInNum.add(data.getCurrentInDoneNum()).add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
+ log.error("15銆�=====================>"+DateUtil.getCurrDateTime());
data.setCurrentOutNum(beforeOutNum.add(data.getCurrentOutDoneNum()).add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
+ log.error("16銆�=====================>"+DateUtil.getCurrDateTime());
data.setTodayOutRate(getDayTotalRata(data.getCurrentOutDoneNum(),DateUtil.getToday()));//褰撴棩鍑哄簱鏁堢巼
+ log.error("17銆�=====================>"+DateUtil.getCurrDateTime());
data.setTodayInRate(getDayTotalRata(data.getCurrentInDoneNum(),DateUtil.getToday()));//褰撴棩鍏ュ簱鏁堢巼
- data.setMonthOutRate(getMonthRata(monthNum,Constants.ZERO));//鏈湀鍑哄簱鏁堢巼
- data.setMonthInRate(getMonthRata(monthNum,Constants.ONE));//鏈湀鍑哄簱鏁堢巼
+ log.error("18銆�=====================>"+DateUtil.getCurrDateTime());
+ //鏌ヨ鏈湀鍏ㄩ儴鏃ュ織
+ List<PlatformLog> monthLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
+ .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+ .and(i->i.isNotNull(PlatformLog::getParam1).or().isNotNull(PlatformLog::getParam2))
+ .apply("year(CREATE_DATE) = year('"+DateUtil.getPlusTime2(month)+"') and month(CREATE_DATE) = month('"+DateUtil.getPlusTime2(month)+"') ")
+ );
+
+
+ data.setMonthOutRate(getMonthRata(monthLogList,monthNum,Constants.ZERO));//鏈湀鍑哄簱鏁堢巼
+ log.error("19銆�=====================>"+DateUtil.getCurrDateTime());
+ data.setMonthInRate(getMonthRata(monthLogList,monthNum,Constants.ONE));//鏈湀鍏ュ簱鏁堢巼
+ log.error("20銆�=====================>"+DateUtil.getCurrDateTime());
//------------浠婃棩鍑哄叆搴撴晥鐜�----------------
// BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//
// BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);//
@@ -1202,7 +1475,7 @@
}
- private BigDecimal getMonthRata(List<PlatformJob> list, Integer type) {
+ private BigDecimal getMonthRata(List<PlatformLog> monthLogList,List<PlatformJob> list, Integer type) {
BigDecimal r = new BigDecimal(0);
if(list==null || list.size() == 0){
return r;
@@ -1235,11 +1508,28 @@
filter(i->jobDate.equals(DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd"))).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(platformJobList)){
//鑾峰彇浠婂ぉ鐨�
- r = r.add(this.getDayTotalRata(getSumTotalByList(platformJobList,type,null),jobDate));
+ r = r.add(this.getDayTotalForMonthRata(monthLogList,getSumTotalByList(platformJobList,type,null),jobDate));
}
}
r = r.divide(new BigDecimal(Integer.toString(jobList.size())),2,BigDecimal.ROUND_HALF_UP);
}
+ }
+ return r;
+ }
+
+ private BigDecimal getDayTotalForMonthRata(List<PlatformLog> allList ,BigDecimal totalAmount,String today) {
+ BigDecimal r = new BigDecimal(0);
+ //鏌ヨ浠婃棩鏈�鏃�/鏈�鏅氱殑浣滀笟鏁版嵁
+ List<PlatformLog> platformLogList = allList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(today)).collect(Collectors.toList());
+// platformLogMapper.selectList(new QueryWrapper<PlatformLog>()
+// .lambda()
+// .apply(" ( DATE_FORMAT( param1 ,'%Y-%m-%d' ) = '"+today+"' or DATE_FORMAT( param2 ,'%Y-%m-%d' ) = '"+today+"' ) ")
+// );
+ if(totalAmount.compareTo(BigDecimal.ZERO)==0||CollectionUtils.isEmpty(platformLogList)){
+ return BigDecimal.ZERO;
+ }
+ if(platformLogList!=null && platformLogList.size()>0){
+ return this.getWorkTime(totalAmount,platformLogList,today);
}
return r;
}
@@ -1256,7 +1546,7 @@
return BigDecimal.ZERO;
}
if(platformLogList!=null && platformLogList.size()>0){
- return this.getWorkTime(totalAmount,platformLogList);
+ return this.getWorkTime(totalAmount,platformLogList,today);
}
return r;
}
@@ -1267,30 +1557,32 @@
* @param platformLogList
* @return
*/
- public BigDecimal getWorkTime(BigDecimal totalAmount,List<PlatformLog> platformLogList){
+ public BigDecimal getWorkTime(BigDecimal totalAmount,List<PlatformLog> platformLogList,String today){
if(CollectionUtils.isEmpty(platformLogList)){
return BigDecimal.ZERO;
}
//鑾峰彇寮�濮嬫椂闂�
- List<Long> startTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam1())).map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam1()).getTime()).collect(Collectors.toList());
- Long startTime = Collections.min(startTimeList);
+ 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 = null ;
+ if(CollectionUtils.isNotEmpty(startTimeList)){
+ startTime = Collections.min(startTimeList);
+ }
//鑾峰彇缁撴潫鏃堕棿
- List<Long> endTimeList = platformLogList.stream().filter(i->Objects.nonNull(i.getParam2())).map(i->DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",i.getParam2()).getTime()).collect(Collectors.toList());
- Long endTime = Collections.max(endTimeList);
+ 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 = null ;
+ if(CollectionUtils.isNotEmpty(endTimeList)){
+ endTime = Collections.max(endTimeList);
+ }
if(Objects.isNull(startTime)
|| Objects.isNull(endTime) || (startTime>=endTime)){
return BigDecimal.ZERO;
}
return totalAmount.divide(new BigDecimal(( endTime - startTime )+"").divide(new BigDecimal("3600000"),2,BigDecimal.ROUND_HALF_UP),2,BigDecimal.ROUND_HALF_UP) ;
}
-
-
-
-
-
-
-
-
private BigDecimal getSumTotalByList(List<PlatformJob> list,Integer type,Integer status) {
@@ -1498,12 +1790,13 @@
data.setDeviceTypeList(list);
Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
- .apply("to_days(create_date) = to_days(now())" ) );
+ .apply(" DATE_FORMAT(create_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerTotalNum(totalNum !=null?totalNum.intValue():0);//浠婃棩闅愭偅鏁伴噺
totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
- .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
- .apply("to_days(check_date) = to_days(now())" ) );
+// .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
+ .eq(HiddenDanger::getStatus,Constants.ZERO )
+ .apply(" DATE_FORMAT(create_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
return data;
}
@@ -2010,7 +2303,9 @@
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()
);
@@ -2045,8 +2340,44 @@
&&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.wxysCar)).count()
);
data.setVideoPluginUrl(getVideoUrl());
+
+ data.setOutHyLotTotal(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.OUT_HY_LOT_TOTAL).getCode()));
+
+
+ data.setInParkCarList(this.getInParkCars(data));
+
return data;
}
+
+
+ public List<Map<String,Object>> getInParkCars(SecurityBoardVO securityBoardVO){
+ List<Map<String,Object>> mapList = categoryMapper.selectJoinMaps(new MPJLambdaWrapper<Category>()
+ .select(Category::getName)
+ .select(" ( select count(1) from retention r where r.isdeleted = 0 and r.CATEGORY_PARENT_ID = t.id and r.TYPE = 3 ) as total ")
+ .eq(Category::getType,Constants.ONE)
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .isNull(Category::getParentId)
+ .groupBy(Category::getName)
+
+ );
+ if(CollectionUtils.isEmpty(mapList)){
+ mapList = new ArrayList<>();
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("name","鏈煡杞﹁締");
+ map.put("total", retentionMapper.selectCount(
+ new MPJLambdaWrapper<Retention>()
+ .eq(Retention::getIsdeleted,Constants.ZERO)
+ .isNull(Retention::getCategoryId)
+ .eq(Retention::getCarType,Constants.SIX)
+ )
+ );
+ mapList.add(map);
+ return mapList;
+
+ }
+
+
private String getVideoUrl() {
return systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
@@ -3060,7 +3391,6 @@
}
}
return r ;
-
}
--
Gitblit v1.9.3