From 2e593c1e4bdb6bcb469c474ea48f9580783034a5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 19:16:24 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 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 2574a90..b23de23 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
@@ -400,8 +400,14 @@
request.setSorts(new ArrayList<>());
RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
file.setFieldName("event_type");
- file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
+ if(type == 1){
+ file.setFieldValue("131588");//瀹夐槻鍛婅
+ }else if(type == 2){
+
+ file.setFieldValue("131593");//浜哄憳鍛婅
+ }
request.getFiledOptions().add(file);
SortRequest sort = new SortRequest();
sort.setSortField("happen_time");
@@ -1320,14 +1326,17 @@
VisitDataVO result = new VisitDataVO();
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now()")
.in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now()")
.in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
.eq(Visits::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now()")
.in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
- PageWrap<Visits> pageWrap = new PageWrap<>();
+ /*PageWrap<Visits> pageWrap = new PageWrap<>();
pageWrap.setCapacity(10);
pageWrap.setPage(1);
pageWrap.setModel(new Visits());
@@ -1344,14 +1353,38 @@
list.add(data);
}
result.setRetentionNum(visitsPageData.getTotal());
+ }*/
+
+ String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
+ queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
+ queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
+ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");
+ queryWrapper.eq(Visits::getStatus,Constants.VisitStatus.signin);
+ queryWrapper.apply(" TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+" ");
+ queryWrapper.ne("m.type ",Constants.TWO);
+ queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByDesc(Visits::getEditDate);
+ List<Visits> vr = visitsJoinMapper.selectList(queryWrapper);
+ result.setVisitRetentionDataList(new ArrayList<>());//璁垮婊炵暀鏁版嵁闆嗗悎
+ if(vr!=null&&vr!=null){
+ vr.stream().forEach(s ->{
+ VisitRetentionDataVO t = new VisitRetentionDataVO();
+ t.setName(s.getName());
+ t.setCompanyName(s.getCompanyName());
+ t.setTimeOutMinute(s.getTimeOut());
+ result.getVisitRetentionDataList().add(t);
+ });
}
- result.setVisitRetentionDataList(list);//璁垮婊炵暀鏁版嵁闆嗗悎
return result;
}
@Override
public SecurityBoardVO centerSecurityData(){
-
SecurityBoardVO data = new SecurityBoardVO();
getParkingCarsNum(data);//鑾峰彇杞︿綅鏁版嵁
@@ -1367,8 +1400,12 @@
(int) retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
);
//鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
- data.setInternalTotal(
+ data.setRelatedTotal(
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+ );
+ //鍦ㄥ洯鍐呴儴鍛樺伐浜烘暟
+ data.setInternalTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ONE)).count()
);
//鍦ㄥ洯璁垮鏁伴噺
data.setVisitTotal(
@@ -1408,9 +1445,14 @@
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
&&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
);
+ data.setVideoPluginUrl(getVideoUrl());
return data;
}
+ private String getVideoUrl() {
+ return systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
+ }
+
private void getParkingCarsNum(SecurityBoardVO data) {
try {
BaseResponse<ParkingStatisticResponse> response = HKService.getParkingStatistics();
--
Gitblit v1.9.3