From 6d2c778ff0c2be03fb64ecaeae45c09c92771637 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 23 七月 2025 15:34:59 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 142 insertions(+), 28 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 8fdcc2f..485dd99 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
@@ -93,7 +93,8 @@
private TmsService tmsService;
@Autowired
private PlatformDeviceMapper platformDeviceMapper;
-
+ @Autowired
+ private CategoryMapper categoryMapper;
@Value("${debug_model}")
private Boolean isDebug;
/**
@@ -489,6 +490,7 @@
}*/
return list;
}
+
@Override
public WaningEventDataVO warningEventData(Integer type){
WaningEventDataVO lastResult = new WaningEventDataVO();
@@ -498,16 +500,36 @@
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");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
if(type == 1){
- file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setFieldValue("131588");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
}else if(type == 2){
- file.setFieldValue("131593");//浜哄憳鍛婅
+ file.setFieldValue("131593");//浜哄憳鍛婅 鍗遍櫓琛屼负
}
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("happen_time");
+ fileStatus.setFieldValue("99");
+ fileStatus.setType("neq");
+ request.getFiledOptions().add(fileStatus);
+
SortRequest sort = new SortRequest();
sort.setSortField("happen_time");
sort.setSortType("desc");
@@ -523,6 +545,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 +644,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 +1028,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 +1060,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)
@@ -1038,6 +1075,7 @@
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 +1087,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 +1101,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)
@@ -1080,6 +1121,7 @@
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 +1137,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 +1150,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 +1163,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 +1267,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 +1300,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 +1338,7 @@
return BigDecimal.ZERO;
}
if(platformLogList!=null && platformLogList.size()>0){
- return this.getWorkTime(totalAmount,platformLogList);
+ return this.getWorkTime(totalAmount,platformLogList,today);
}
return r;
}
@@ -1267,15 +1349,19 @@
* @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());
+ 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);
//鑾峰彇缁撴潫鏃堕棿
- 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());
+ 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);
if(Objects.isNull(startTime)
|| Objects.isNull(endTime) || (startTime>=endTime)){
@@ -1283,14 +1369,6 @@
}
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 +1576,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(check_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
return data;
}
@@ -2010,7 +2089,7 @@
data.setInParkCarTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
- //鍦ㄥ洯杞﹁締
+ //褰撳墠鍦ㄥ洯璐ц溅鍙告満鎬绘暟
data.setInParkCarUserTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)).count()
);
@@ -2045,8 +2124,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 +3175,6 @@
}
}
return r ;
-
}
--
Gitblit v1.9.3