From 88a34566f7c3f77d90daa3fd57fb0abca3e1b5e6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 二月 2025 09:12:06 +0800
Subject: [PATCH] ll
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index ea52c99..f49d098 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -297,13 +297,13 @@
.apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')")
.apply(pageWrap.getModel().getQueryStatusForPower() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatusForPower()+"')")
.apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')")
+ .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformJob::getCreateDate, pageWrap.getModel().getCreateDateStart())
+ .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformJob::getCreateDate, pageWrap.getModel().getCreateDateEnd())
.ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
.le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))
.ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart()))
.le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd()))
- .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
- .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()))
.isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
.isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
.exists(StringUtils.isNotBlank(pageWrap.getModel().getWmsContractNum()),
@@ -346,15 +346,12 @@
.apply("( t1.isdeleted = 0 or t.PLATFORM_ID is null )")
.eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
.like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
-
.apply(Objects.nonNull(pageWrap.getModel().getCallType())
&&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.ONE),
" ( " +
" ( t.`STATUS` = "+Constants.PlatformJobStatus.WAIT_CALL.getKey()+" and t.PLATFORM_GROUP_ID = ( SELECT p.group_id FROM platform p WHERE p.id = "+pageWrap.getModel().getPlatformId()+" LIMIT 1 ) )" +
") "
)
-
-
.apply(Objects.nonNull(pageWrap.getModel().getCallType())
&&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.TWO),
" ( " +
@@ -365,8 +362,6 @@
" (t.`STATUS` = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_ID = "+pageWrap.getModel().getPlatformId()+" ) " +
") "
)
-
-
.and(Objects.nonNull(pageWrap.getModel().getCallType())
&&Constants.equalsInteger(pageWrap.getModel().getCallType(),Constants.THREE),
i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
@@ -428,8 +423,6 @@
}
}
}
-
-
public void queryWaitNum(PlatformJob platformJob){
if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
//鏌ヨ褰撳墠鎵�鏈夋帓闃熸暟閲�
@@ -442,11 +435,10 @@
.eq(PlatformJob::getPlatformGroupId,platformJob.getPlatformGroupId())
// .like(PlatformJob::getArriveDate,DateUtil.dateTypeToString(platformJob.getArriveDate(),"yyyy-MM-dd"))
);
-
- for (PlatformJob linePlatformJob:lineUpAllList) {
- this.getWmsJobData(linePlatformJob);
- }
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(lineUpAllList)){
+ for (PlatformJob linePlatformJob:lineUpAllList) {
+ this.getWmsJobData(linePlatformJob);
+ }
//鏌ヨ鎺掗槦鍦ㄦ垜鍓嶉潰鐨勬暟鎹�
List<PlatformJob> lineUpNum = lineUpAllList.stream().filter(i->Objects.nonNull(i.getSignDate())&&i.getSignDate().getTime()<platformJob.getSignDate().getTime()).collect(Collectors.toList());
platformJob.setLineUpNum(lineUpNum.size());
@@ -457,7 +449,10 @@
//璁＄畻棰勮绛夊緟鏃堕棿
List<Platform> platformList = platformJoinMapper.selectList(new QueryWrapper<Platform>().lambda()
.eq(Platform::getIsdeleted,Constants.ZERO).eq(Platform::getGroupId,platformJob.getPlatformGroupId()));
- BigDecimal workRate = platformList.stream().map(m->m.getWorkRate()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ BigDecimal workRate = new BigDecimal(0);
+ if(platformList!=null){
+ workRate = platformList.stream().map(m->Constants.formatBigdecimal(m.getWorkRate())).reduce(BigDecimal.ZERO,BigDecimal::add);
+ }
if(sumWorkRate.compareTo(BigDecimal.ZERO) > Constants.ZERO && workRate.compareTo(BigDecimal.ZERO) > Constants.ZERO ){
BigDecimal sumMinute = sumWorkRate.divide(workRate,1, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(60L));
Integer sumMinuteInteger = sumMinute.intValue();
@@ -476,7 +471,9 @@
platformJob.setWaitTime("棰勮绛夊緟锛�-灏忔椂-鍒嗛挓");
}
}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())
- || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
+ || Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.LEAVED.getKey())){
//鏌ヨ鏈�鍚庡紑濮嬩换鍔＄殑鏈堝彴璁板綍 鏃ュ織琛� 鍥犱负瀛樺湪寮傚父鎸傝捣 杞Щ 绛夐棶棰�
PlatformLog platformLog = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
.eq(PlatformLog::getJobId,platformJob.getId())
@@ -484,7 +481,7 @@
.orderByDesc(PlatformLog::getCreateDate)
.last(" limit 1")
);
- if(Objects.nonNull(platformLog)){
+ if(Objects.nonNull(platformLog) && platformJob.getWorkRate()!=null && platformJob.getWorkRate().compareTo(new BigDecimal(0))>0){
BigDecimal sumMinute = platformJob.getTotalNum().divide(platformJob.getWorkRate(),1, RoundingMode.HALF_DOWN).multiply(BigDecimal.valueOf(60L));
platformJob.setFinishTimeStr(DateUtil.DateToStr(DateUtil.afterMinutesDate(platformLog.getCreateDate(),sumMinute.intValue()),"HH:mm"));
}
@@ -494,9 +491,12 @@
.isNotNull(PlatformLog::getParam3)
.ne(PlatformLog::getParam3,Constants.ZERO+"")
.orderByDesc(PlatformLog::getCreateDate));
- platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(m.getParam3())).reduce(Long.valueOf(0),Long::sum));
+ if(platformLogList!=null){
+ platformJob.setWorkTime(platformLogList.stream().map(m->Long.valueOf(StringUtils.defaultString(m.getParam3(),"0"))).reduce(Long.valueOf(0),Long::sum));
+ }
}
+ platformJob.setWorkTimeStr(DateUtil.getTimeStrBySecond(platformJob.getWorkTime()));
}
@@ -534,7 +534,6 @@
//鏌ヨ鍓嶆柟鎺掗槦鏁伴噺
this.queryWaitNum(platformJob);
}
-
driverHomeVO.setPlatformJobList(platformJobList);
// 鍥尯瀵艰鍥� 鍥剧墖
driverHomeVO.setReservationMap(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.PLATFORM_GUIDEMAP).getCode());
@@ -601,11 +600,17 @@
BeanUtils.copyProperties(platformJob,oldPlatformJob);
if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ZERO)){
+ if(!StringUtils.equals(platformJob.getDrivierPhone(),signInDTO.getLoginUserInfo().getMobile())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅");
}
this.distanceSignIn(signInDTO,platformJob);
}else if(Constants.equalsInteger(signInDTO.getSignType(),Constants.ONE)){
+ if(!StringUtils.equals(platformJob.getDrivierPhone(),signInDTO.getLoginUserInfo().getMobile())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟鐘舵�佸凡娴佽浆锛岃鍒锋柊鏌ョ湅");
}
@@ -653,7 +658,6 @@
|| Objects.isNull(signInDTO.getLnt())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"缁忕含搴︿俊鎭紓甯�");
}
-
//鑾峰彇绛惧埌鐐圭殑缁忕含搴�
Double lat = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LAT).getCode());
Double lnt = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LNT).getCode());
@@ -678,11 +682,9 @@
}
}
-
@Override
public PlatformJob getDetail(JobDetailDTO jobDetailDTO){
- if(Objects.isNull(jobDetailDTO)
- || Objects.isNull(jobDetailDTO.getJobId())){
+ if(Objects.isNull(jobDetailDTO) || Objects.isNull(jobDetailDTO.getJobId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
PlatformJob platformJob = platformJobMapper.selectById(jobDetailDTO.getJobId());
@@ -692,14 +694,16 @@
if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())){
//寰呯鍒� 璁＄畻璺濈
if(Objects.nonNull(jobDetailDTO.getLnt())&&Objects.nonNull(jobDetailDTO.getLat())){
- //鑾峰彇绛惧埌鐐圭殑缁忕含搴�
- Double lat = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LAT).getCode());
- Double lnt = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LNT).getCode());
- //鑾峰彇2涓偣鐨勮窛绂籜绫�
- Double getDistanceDouble = PositionUtil.getDistance(jobDetailDTO.getLnt(),jobDetailDTO.getLat(),lnt,lat);
- //杞崲km
- BigDecimal getDistance = BigDecimal.valueOf(getDistanceDouble).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP);
- platformJob.setGetDistance(getDistance);
+ if(jobDetailDTO.getLat()!=null && jobDetailDTO.getLnt()!=null){
+ //鑾峰彇绛惧埌鐐圭殑缁忕含搴�
+ Double lat = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LAT).getCode());
+ Double lnt = Double.parseDouble(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_PLACE_LNT).getCode());
+ //鑾峰彇2涓偣鐨勮窛绂籜绫�
+ Double getDistanceDouble = PositionUtil.getDistance(jobDetailDTO.getLnt(),jobDetailDTO.getLat(),lnt,lat);
+ //杞崲km
+ BigDecimal getDistance = BigDecimal.valueOf(getDistanceDouble).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP);
+ platformJob.setGetDistance(getDistance);
+ }
}
}else if( Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
|| Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())
@@ -887,7 +891,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())) {
+ if(Objects.nonNull(platformJob.getDrivierPhone())) {
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobCallIn,platformJob);
}
return platformJob;
@@ -896,7 +900,7 @@
public void sendWxNotice(String objCode,PlatformJob platformJob){
SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted, Constants.ZERO)
- .eq(SystemUser::getType, Constants.ZERO)
+ .in(SystemUser::getType, Constants.ZERO,Constants.TWO)
.eq(SystemUser::getMobile,platformJob.getDrivierPhone())
.last(" limit 1 "));
if (Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())) {
@@ -1138,7 +1142,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())){
+ if(Objects.nonNull(platformJob.getDrivierPhone())){
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobSingIn,platformJob);
}
@@ -1274,7 +1278,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())) {
+ if(Objects.nonNull(platformJob.getDrivierPhone())) {
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobMove,platformJob);
}
@@ -1327,7 +1331,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())){
+ if(Objects.nonNull(platformJob.getDrivierPhone())){
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobOverNum,platformJob);
}
@@ -1379,7 +1383,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())) {
+ if(Objects.nonNull(platformJob.getDrivierPhone())) {
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobError,platformJob);
}
@@ -1433,7 +1437,7 @@
SmsConstants.platformJobContent.platformJobWorking,platform.getName(),null
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())) {
+ if(Objects.nonNull(platformJob.getDrivierPhone())) {
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobWorking,platformJob);
}
//骞挎挱 led閫氱煡
@@ -1534,7 +1538,7 @@
);
//鍏紬鍙锋ā鏉挎秷鎭�
- if(Objects.nonNull(platformJob.getDriverId())) {
+ if(Objects.nonNull(platformJob.getDrivierPhone())) {
this.sendWxNotice(WxPlatConstants.platformJobContent.platformJobFinish,platformJob);
}
@@ -2195,8 +2199,11 @@
List<PlatformJob> calledList = platformJobList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList());
largeScreenDataVO.setWaitWorkList(calledList);
}
+// String u = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.BIGSCREEN_UUID);
+// if(StringUtils.isBlank(u)){
String u = UUID.randomUUID().toString();
redisTemplate.opsForValue().set(Constants.RedisKeys.BIGSCREEN_UUID,u,3, TimeUnit.MINUTES);
+// }
String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),Constants.WxUrlParams.BISCREEN_CODE,u);
largeScreenDataVO.setQrCode(url);
largeScreenDataVO.setAttention(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_ATTENTION).getCode());
--
Gitblit v1.9.3