From 7c54e8233ccad83697a84317a4b8194d85d7fd42 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十一月 2024 18:19:16 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 341 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 285 insertions(+), 56 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 2e64ef8..2feae0f 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
@@ -2,31 +2,35 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
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.BaseListPageRequest;
-import com.doumee.core.haikang.model.param.request.SensorStatusListRequest;
-import com.doumee.core.haikang.model.param.respose.PageCameraInfoResponse;
-import com.doumee.core.haikang.model.param.respose.PageFireChannelInfoResponse;
-import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
-import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
+import com.doumee.core.haikang.model.param.request.*;
+import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.impl.PlatformJobServiceImpl;
+import com.doumee.service.business.impl.VisitsServiceImpl;
import com.doumee.service.business.third.BoardService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,6 +49,8 @@
@Autowired
private PlatformLogMapper platformLogMapper;
@Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
private PlatformWarnEventMapper platformWarnEventMapper;
@Autowired
private PlatformJobMapper platformJobMapper;
@@ -52,6 +58,12 @@
private PlatformWmsDetailMapper platformWmsDetailMapper;
@Autowired
private PlatformMapper platformMapper;
+ @Autowired
+ private VisitsJoinMapper visitsJoinMapper;
+ @Autowired
+ private RetentionMapper retentionMapper;
+ @Autowired
+ private PlatformGroupMapper platformGroupMapper;
/**
* 鑾峰彇鍖哄煙鏍戝舰缁撴瀯鏁版嵁
* @return
@@ -91,11 +103,13 @@
return data;
}
private void initReginCameralList(List<PageRegionInfoResponse> allList,String name) {
- List<CarmeraListVO> carmeraListVOList = cameraList(null);
+ CarmeraListVO re = new CarmeraListVO();
+ re.setName(name);
+ List<CarmeraListVO> carmeraListVOList = cameraList(re);
if(carmeraListVOList!=null && carmeraListVOList.size()>0){
for(PageRegionInfoResponse p : allList){
for(CarmeraListVO c : carmeraListVOList){
- if(StringUtils.equals(p.getRegionIndexCode(),c.getReginCode())
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
&& (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
if(p.getCarmeraList()==null){
p.setCarmeraList(new ArrayList<>());
@@ -174,13 +188,15 @@
List<CarmeraListVO> data = new ArrayList<>();
for(PageCameraInfoResponse p : allList){
- CarmeraListVO t = new CarmeraListVO();
- t.setIndexCode(p.getCameraIndexCode());
- t.setReginCode(p.getRegionIndexCode());
- t.setName(p.getCameraName());
- t.setStatus(p.getStatus());
- t.setStatusName(p.getStatusName());
- data.add(t);
+ if(StringUtils.isBlank(req.getName()) ||StringUtils.contains(p.getCameraName(),req.getName())){
+ CarmeraListVO t = new CarmeraListVO();
+ t.setIndexCode(p.getCameraIndexCode());
+ t.setReginCode(p.getRegionIndexCode());
+ t.setName(p.getCameraName());
+ t.setStatus(p.getStatus());
+ t.setStatusName(p.getStatusName());
+ data.add(t);
+ }
}
return data;
}
@@ -248,28 +264,42 @@
@Override
public List<PlatformGroupFinishVO> platformGroupFinish(){
List<PlatformGroupFinishVO> data = new ArrayList<>();
- List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
- .selectSum( PlatformWmsDetail::getIoQty)
- .selectAs(PlatformGroup::getName, PlatformWmsDetail::getGroupName)
- .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
- .rightJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
- .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
- .eq(PlatformJob::getIsdeleted, Constants.ZERO)
- .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
- , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
- , Constants.PlatformJobStatus.LEAVED.getKey())
- .apply("to_days(t1.create_date) = to_days(now())")
- .groupBy(PlatformGroup::getId)
+ List<PlatformGroup> groups = platformGroupMapper.selectJoinList(PlatformGroup.class, new MPJLambdaWrapper<PlatformGroup>()
+ .select("(select sum(a.TOTAL_NUM) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0 and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
+ .selectAll(PlatformGroup.class)
+ .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
);
- if(jobList!=null){
- for(PlatformWmsDetail d : jobList){
+ if(groups!=null && groups.size()>0){
+ List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
+ .selectSum( PlatformWmsDetail::getIoQty)
+ .selectAs(PlatformGroup::getId, PlatformWmsDetail::getGroupId)
+ .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+ .eq(PlatformJob::getIsdeleted, Constants.ZERO)
+ .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+ , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ , Constants.PlatformJobStatus.LEAVED.getKey())
+ .apply("to_days(t1.create_date) = to_days(now())")
+ .groupBy(PlatformJob::getPlatformGroupId)
+ );
+ for(PlatformGroup d : groups){
PlatformGroupFinishVO t = new PlatformGroupFinishVO();
- t.setFinishData(Constants.formatBigdecimal(d.getIoQty()).intValue());
- t.setPlatformGroupName(d.getGroupName());
+ if(jobList!=null){
+ for(PlatformWmsDetail dd : jobList){
+ if(Constants.equalsInteger(dd.getGroupId(),d.getId())){
+ d.setTotalNum(dd.getIoQty());
+ }
+ }
+ }
+ t.setFinishData(Constants.formatBigdecimal(d.getTotalNum()).intValue()+Constants.formatBigdecimal(d.getOrtherTotalNum()).intValue());
+ t.setPlatformGroupName(d.getName());
+ data.add(t);
}
}
+
return data;
}
+
@Override
public CarWorkSituationVO carWorkSituation(int limit){
CarWorkSituationVO carWorkSituationVO = new CarWorkSituationVO();
@@ -279,6 +309,204 @@
);
carWorkSituationVO.setPlatformLogList(platformLogList);
return carWorkSituationVO;
+ }
+ @Override
+ public List<SecurityDeviceDataVO> securityDeviceData(){
+ List<SecurityDeviceDataVO> list = new ArrayList<>();
+ SecureDevStatusTotalRequest request =new SecureDevStatusTotalRequest();
+ request.setIncludeBool("");
+ request.setRegionIds(new String[]{});
+ BaseResponse<List<SecureDevStatusListResponse>> result = HKService.getSecureDevStatusList(request) ;
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ List<SecureDevStatusListResponse> rlist = result.getData();
+ for(SecureDevStatusListResponse r :rlist){
+ SecurityDeviceDataVO data = new SecurityDeviceDataVO();
+ data.setDeviceType(r.getDevTypeName());
+ data.setOnlineNum(r.getOnlineCount());
+ data.setOfflineDeviceNum(r.getOfflineCount());
+ data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
+ list.add(data);
+ }
+ }
+ /*
+ Random random = new Random();
+ for (int i = 1; i <= 3; i++) {
+ SecurityDeviceDataVO data = new SecurityDeviceDataVO();
+ data.setDeviceType("璁惧绫诲瀷_"+i);
+ data.setOnlineNum(random.nextInt(10));
+ data.setOfflineDeviceNum(random.nextInt(10));
+ data.setTotalNum(data.getOnlineNum() + data.getOfflineDeviceNum() );
+ list.add(data);
+ }*/
+ return list;
+ }
+ @Override
+ public WaningEventDataVO warningEventData(Integer type){
+ WaningEventDataVO lastResult = new WaningEventDataVO();
+ List<WaningEventDataListVO> list = new ArrayList<>();
+ RuleEventSearchRequest request = new RuleEventSearchRequest();
+ request.setPageNo(1);
+ request.setPageSize(10);
+ request.setFiledOptions(new ArrayList<>());
+ request.setSorts(new ArrayList<>());
+ RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
+ file.setFieldName("event_type");
+ file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setType("in");
+ request.getFiledOptions().add(file);
+ SortRequest sort = new SortRequest();
+ sort.setSortField("happen_time");
+ sort.setSortType("desc");
+ request.getSorts().add(sort);
+ BaseResponse<BaseListPageResponse< RuleEventSearchDataResponse>> result = HKService.ruleEventSearch(request);
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ List<RuleEventSearchDataResponse> rlist = result.getData().getList();
+ lastResult.setTotal(result.getData().getTotal());
+ if(rlist!=null){
+ String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
+ String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
+ for(RuleEventSearchDataResponse r :rlist){
+ WaningEventDataListVO data = new WaningEventDataListVO();
+ data.setAddr(r.getSrc_name());
+ data.setImg(r.getImage_url());
+ if(data.getImg()!=null){
+ data.setImg(data.getImg().replace(privateIp,publicIp));
+ }
+ data.setTitle(r.getEvent_type_name());
+ data.setCreateDate(DateUtil.getPlusTime(DateUtil.getISO8601DateByStr(r.getHappen_time())));
+// data.setContent(r.get);
+ list.add(data);
+ }
+ }
+
+ }
+ lastResult.setList(list);
+ return lastResult;
+ }
+ @Override
+ public String getCarmeraPreviemUrl(CarmeraListVO param){
+ CameraPreviewURLsRequest request = new CameraPreviewURLsRequest();
+ request.setCameraIndexCode(param.getIndexCode());
+ BaseResponse<CamerasPreviewURLsResponse> result = HKService.cameraPreviewURLs(request);
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ return result.getData().getUrl();
+
+ }
+ return null;
+ }
+ @Override
+ public VisitDataVO visitSecurityData(){
+ //寰呰闂�佸凡鐧昏銆佸凡绂诲紑
+
+ VisitDataVO result = new VisitDataVO();
+ result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+ .eq(Visits::getIsdeleted,Constants.ZERO)
+ .in(Visits::getStatus,Constants.VisitStatus.pass,Constants.VisitStatus.xfSuccess )));//寰呰闂�
+ result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+ .eq(Visits::getIsdeleted,Constants.ZERO)
+ .in(Visits::getStatus,Constants.VisitStatus.signout,Constants.VisitStatus.signin )));//宸茬櫥璁�
+ result.setWaitVisitNum(visitsJoinMapper.selectCount(new MPJLambdaWrapper<Visits>()
+ .eq(Visits::getIsdeleted,Constants.ZERO)
+ .in(Visits::getStatus,Constants.VisitStatus.signout )));//宸茬绂�
+ PageWrap<Visits> pageWrap = new PageWrap<>();
+ pageWrap.setCapacity(10);
+ pageWrap.setPage(1);
+ pageWrap.setModel(new Visits());
+ pageWrap.getModel().setLevelStatus(Constants.ZERO);
+ pageWrap.getModel().setStatus(Constants.TWO);
+ PageData<Visits> visitsPageData = VisitsServiceImpl.retentionPageBiz(pageWrap,visitsJoinMapper,systemDictDataBiz);
+ List<VisitRetentionDataVO> list = new ArrayList<>();
+ if(visitsPageData !=null && visitsPageData.getRecords() !=null && visitsPageData.getRecords().size()>0){
+ for (Visits model : visitsPageData.getRecords()) {
+ VisitRetentionDataVO data = new VisitRetentionDataVO();
+ data.setName(model.getName());
+ data.setCompanyName(model.getCompanyName());
+ data.setTimeOutMinute(Constants.formatIntegerNum(model.getTimeOut()));
+ list.add(data);
+ }
+ result.setRetentionNum(visitsPageData.getTotal());
+ }
+ result.setVisitRetentionDataList(list);//璁垮婊炵暀鏁版嵁闆嗗悎
+ return result;
+
+ }
+ @Override
+ public SecurityBoardVO centerSecurityData(){
+
+
+ SecurityBoardVO data = new SecurityBoardVO();
+ getParkingCarsNum(data);//鑾峰彇杞︿綅鏁版嵁
+ Random random = new Random();
+
+ List<Retention> retentionList = retentionMapper.selectJoinList(Retention.class,
+ new MPJLambdaWrapper<Retention>()
+ .selectAll(Retention.class)
+ .selectAs(Company::getType,Retention::getCompanyType)
+ .leftJoin(Company.class,Company::getId,Retention::getCompanyId)
+ );
+
+ //浠婃棩鍦ㄥ洯浜烘暟
+ data.setInParkTotal(
+ (int) retentionList.stream().filter(i->!Constants.equalsInteger(i.getType(),Constants.THREE)).count()
+ );
+ //鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
+ data.setInternalTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+ );
+ //鍦ㄥ洯璁垮鏁伴噺
+ data.setVisitTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Objects.isNull(i.getCompanyType())).count()
+ );
+ //鍦ㄥ洯杞﹁締
+ data.setInternalCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count()
+ );
+ //鍦ㄥ洯鐩稿叧鏂硅溅杈�
+ data.setRelatedCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+ &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.relation)).count()
+ );
+ //鍐呴儴杞﹁締
+ data.setInternalCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+ &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.internal)).count()
+ );
+ //鏉ヨ杞﹁締
+ data.setVisitCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+ &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.visitor)).count()
+ );
+ //鑷敱鐗╂祦杞︽暟閲�
+ data.setVisitCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+ &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.selfTruck)).count()
+ );
+ //甯傚叕鍙稿嵏璐ц溅鏁伴噺
+ data.setInternalJobCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+ &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.cityComTruck)).count()
+ );
+ //澶栧崗杞︽暟閲�
+ data.setRelatedJobCarTotal(
+ (int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
+ &&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
+ );
+ return data;
+ }
+
+ private void getParkingCarsNum(SecurityBoardVO data) {
+ try {
+ BaseResponse<ParkingStatisticResponse> response = HKService.getParkingStatistics();
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null
+ ||response.getData().getTodayParkingDataDto() == null){
+ return;
+ }
+ data.setParkingLotTotal(Constants.formatIntegerNum(response.getData().getTodayParkingDataDto().getTotalPlace()));//鎬昏溅浣�
+ data.setFreeParkingLot(Constants.formatIntegerNum(response.getData().getTodayParkingDataDto().getLeftPlace()));//鍓╀綑杞︿綅
+ data.setParkingUseRate(Constants.formatBigdecimal(response.getData().getTodayParkingDataDto().getUseRate()));//杞︿綅浣跨敤鐜�
+ }catch (Exception e){
+
+ }
}
@Override
@@ -290,22 +518,6 @@
.eq(Platform::getIsdeleted, Constants.ZERO)
.orderByAsc(Platform::getSortnum)
);
- /**
- * WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ),
- * WART_SIGN_IN(1, "寰呯鍒�","寰呯鍒�" ),
- * WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
- * IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
- * CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
- * WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
- * DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ),
- * TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
- * EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
- * AUTHED_LEAVE(9, "宸叉巿鏉冪鍥�","宸叉巿鏉冪鍥�" ),
- * LEAVED(10, "宸茬鍥� ","宸茬鍥� " ),
- * OVER_NUMBER(11, "宸茶繃鍙�","宸茶繃鍙�" ),
- * CANCEL(12, "宸插彇娑�","宸插彇娑�" ),
- */
-
if(platformList!=null && platformList.size()>0){
List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
.selectAll( PlatformJob.class)
@@ -328,7 +540,7 @@
}else{
platformDurationVO.setWorkType(Constants.ZERO);//濡傛灉鏄嵏璐�
}
- Integer workMinute = job.getWorkNum().multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
+ Integer workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
Date overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//棰勮瀹屾垚鏃堕棿
platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
@@ -374,7 +586,22 @@
public List<WorkEfficiencyVO> workEfficiency(Integer type){
//浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
List<WorkEfficiencyVO> workEfficiencyVOList = new ArrayList<>();
- List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
+ List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
+ .selectAll( PlatformJob.class)
+ .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", PlatformJob::getIoQty)
+ .apply("to_days(t.create_date) = to_days(now())")
+ .eq(Platform::getIsdeleted, Constants.ZERO)
+ .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
+ , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+ , Constants.PlatformJobStatus.LEAVED.getKey())
+ .in(Constants.equalsInteger(type,Constants.ZERO),PlatformJob::getType,new Integer[]{0,2,4})
+ .in(Constants.equalsInteger(type,Constants.ONE),PlatformJob::getType,new Integer[]{1,3})
+
+ );
+ if(jobList==null || jobList.size()==0){
+ return workEfficiencyVOList;
+ }
+ /* List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
.selectAll( PlatformWmsDetail.class)
.selectAs( PlatformJob::getDoneDate,PlatformWmsDetail::getDoneDate)
.leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
@@ -386,28 +613,30 @@
, Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
, Constants.PlatformJobStatus.LEAVED.getKey())
.apply("to_days(t1.create_date) = to_days(now())")
- );
+ );*/
int curtotalNum = 0;
Date today = Utils.Date.getStart(new Date());
long curTime=0, lastTime=0;
for (int i = 0; i < 8; i++) {
lastTime = curTime;//涓婃鐨勬椂闂�
int curHour = 8+(i*2);
- long time = curHour*60*60*1000 + today.getTime();
+ curTime = curHour*60*60*1000 + today.getTime();
WorkEfficiencyVO workEfficiencyVO = new WorkEfficiencyVO();
workEfficiencyVO.setWorkTime(curHour+":00");
+ workEfficiencyVO.setTotalWorkNum(0);
+ workEfficiencyVO.setWorkNum(0);
if(jobList!=null && jobList.size()>0){
- for(PlatformWmsDetail detail : jobList){
- if(detail.getDoneDate()!=null && detail.getDoneDate().getTime()<= time){
+ for(PlatformJob detail : jobList){
+ if(detail.getDoneDate()!=null && detail.getDoneDate().getTime()<= curTime){
//褰撳墠閲�
if(detail.getDoneDate()!=null && detail.getDoneDate().getTime() > lastTime){
//鍖洪棿鍊� 鍙栧疄杩�2灏忔椂鍐呯殑绱鍊�
- workEfficiencyVO.setWorkNum(Constants.formatIntegerNum(workEfficiencyVO.getWorkNum())+Constants.formatBigdecimal(detail.getIoQty()).intValue());
+ workEfficiencyVO.setWorkNum(Constants.formatIntegerNum(workEfficiencyVO.getWorkNum())+Constants.formatBigdecimal(detail.getIoQty()).intValue() +Constants.formatBigdecimal(detail.getTotalNum()).intValue());
+ //绱Н閲�
}
- //绱Н閲�
- curtotalNum += Constants.formatBigdecimal(detail.getIoQty()).intValue();
}
}
+ curtotalNum += Constants.formatIntegerNum(workEfficiencyVO.getWorkNum()) ;
}
workEfficiencyVO.setTotalWorkNum(curtotalNum);//绱鍊�
workEfficiencyVOList.add(workEfficiencyVO);
@@ -419,7 +648,7 @@
List<PlatformDurationVO> platformDurationList = new ArrayList<>();
List<Platform> jobList = platformMapper.selectJoinList(Platform.class, new MPJLambdaWrapper<Platform>()
.selectAll( Platform.class)
- .select(" ( select ROUND( ifnull(SUM(pl.PARAM3),0)/60 , 2 ) from platform_log pl where pl.remark = t.id and to_days(pl.CREATE_DATE) =to_days now())",Platform::getWorkCountTime)
+ .select(" (select ROUND( SUM(ifnull(pl.PARAM3,0)/60 ) , 2 ) from platform_log pl where pl.remark = t.id and to_days(pl.CREATE_DATE) =to_days(now()))",Platform::getWorkCountTime)
.eq(Platform::getIsdeleted, Constants.ZERO)
);
if(jobList!=null){
--
Gitblit v1.9.3