From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 146 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 132 insertions(+), 14 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 227a194..3df5317 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -6,19 +6,24 @@
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.PlatformGroupMapper;
import com.doumee.dao.business.PlatformShowParamMapper;
+import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
-import com.doumee.dao.business.model.Platform;
-import com.doumee.dao.business.model.PlatformGroup;
-import com.doumee.dao.business.model.PlatformShowParam;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.web.reqeust.PlatformDataDTO;
+import com.doumee.dao.web.response.PlatformGroupWorkVO;
+import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.service.business.PlatformGroupService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.PlatformJobService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.java.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -45,6 +50,9 @@
@Autowired
private PlatformShowParamMapper platformShowParamMapper;
+ @Autowired
+ private PlatformJobJoinMapper platformJobJoinMapper;
+
@Override
public Integer create(PlatformGroup platformGroup) {
if(platformGroup.getType() ==null
@@ -58,11 +66,11 @@
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
}
-
+ platformGroup.setStatus(Constants.ZERO);
platformGroup.setIsdeleted(Constants.ZERO);
platformGroup.setCreator(platformGroup.getLoginUserInfo().getId());
platformGroup.setCreateDate(new Date());
- platformGroup.setEditDate(platformGroup.getEditDate());
+ platformGroup.setEditDate(platformGroup.getCreateDate());
platformGroup.setEditor(platformGroup.getCreator());
platformGroupMapper.insert(platformGroup);
return platformGroup.getId();
@@ -125,8 +133,8 @@
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
}
- platformGroup.setEditDate(platformGroup.getEditDate());
- platformGroup.setEditor(platformGroup.getCreator());
+ platformGroup.setEditDate(new Date());
+ platformGroup.setEditor(platformGroup.getLoginUserInfo().getId());
platformGroupMapper.updateById(platformGroup);
}
@@ -194,22 +202,30 @@
@Override
- public List<PlatformGroup> getAllPlatformGroup(Integer queryType,LoginUserInfo loginUserInfo) {
+ public List<PlatformGroup> getAllPlatformGroup(PlatformDataDTO platformDataDTO, LoginUserInfo loginUserInfo) {
+ if(Objects.isNull(platformDataDTO)
+ || Objects.isNull(platformDataDTO.getQueryType())
+ || Objects.isNull(platformDataDTO.getQueryData())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
List<PlatformGroup> platformGroups = platformGroupMapper.selectList(
new QueryWrapper<PlatformGroup>()
- .lambda().eq(PlatformGroup::getIsdeleted, Constants.ZERO)
+ .lambda()
+ .eq(PlatformGroup::getIsdeleted, Constants.ZERO)
.orderByAsc(PlatformGroup::getSortnum)
);
//鏌ヨ鏈堝彴缁勪笅鎵�鏈夋湀鍙�
List<Platform> allPlatformList = platformJoinMapper.selectJoinList(Platform.class,
new MPJLambdaWrapper<Platform>()
.selectAll(Platform.class)
+ .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ")
.eq(Platform::getIsdeleted, Constants.ZERO)
- //TODO 寰呯‘璁ゆ湀鍙扮姸鎬佸瓧娈�
- .eq(Objects.nonNull(queryType)&&!Constants.equalsInteger(queryType,Constants.ZERO),Platform::getStatus,Constants.ZERO)
+ .eq(Objects.nonNull(platformDataDTO.getQueryType())&&!Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ZERO),
+ Platform::getStatus,Constants.ZERO)
);
//澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
- if(Constants.equalsInteger(queryType,Constants.TWO)){
+ if(Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ONE)){
+ //鏌ヨ褰撳墠鐧诲綍浜洪厤缃殑鍙煡鐪嬫湀鍙�
List<PlatformShowParam> platformShowParamList = platformShowParamMapper.selectList(new QueryWrapper<PlatformShowParam>()
.lambda()
.eq(PlatformShowParam::getIsdeleted, Constants.ZERO)
@@ -232,11 +248,113 @@
}
}
}
- for (PlatformGroup platformGroup:platformGroups) {
- platformGroup.setPlatformList(allPlatformList.stream().filter(m->Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ if(Constants.equalsInteger(platformDataDTO.getQueryData(),Constants.ONE)){
+ //鏌ヨ浠婂ぉ鎵�鏈夌殑浠诲姟鏁版嵁
+ List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
+ .select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
+ .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
+ .selectAs(PlatformBooks::getId,PlatformJob::getBookId)
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
+ .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply(" ( t1.isdeleted = 0 or t.PLATFORM_ID is null ) ")
+ .in(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+ Constants.PlatformJobStatus.IN_WAIT.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WORKING.getKey(),
+ Constants.PlatformJobStatus.EXCEPTION.getKey(),
+ Constants.PlatformJobStatus.OVER_NUMBER.getKey(),
+ Constants.PlatformJobStatus.TRANSFERING.getKey()
+ )
+// .like(PlatformJob::getArriveDate,DateUtil.getCurrDate())
+ .orderByDesc(PlatformJob::getCreateDate)
+ );
+ for (Platform platform:allPlatformList) {
+ PlatformWorkVO platformWorkVO = PlatformGroupServiceImpl.getPlatformWorkVO(platform,platformJobList);
+ platform.setPlatformWorkVO(platformWorkVO);
+ }
+ for (PlatformGroup platformGroup:platformGroups) {
+ platformGroup.setPlatformList(allPlatformList.stream().filter(m->m.getShowConfig()&&Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ }
+ }else{
+ for (PlatformGroup platformGroup:platformGroups) {
+ platformGroup.setPlatformList(allPlatformList.stream().filter(m->Constants.equalsInteger(m.getGroupId(),platformGroup.getId())).collect(Collectors.toList()));
+ }
}
return platformGroups;
}
+ public static PlatformWorkVO getPlatformWorkVO(Platform platform,List<PlatformJob> platformJobList){
+ PlatformWorkVO platformWorkVO = new PlatformWorkVO();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
+ //鑾峰彇鏈堝彴缁勪笅鐨勬墍鏈変綔涓氭暟鎹�
+ List<PlatformJob> platformJobs = platformJobList.stream().filter(
+ i->Constants.equalsInteger(i.getPlatformId(),platform.getId())
+ || Constants.equalsInteger(i.getPlatformGroupId(),platform.getGroupId())
+ ).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobs)){
+ platformWorkVO.setWorkNum(
+ platformJobs.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platform.getId()) && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())).collect(Collectors.toList()).size()
+ );
+ platformWorkVO.setCallNum(
+ platformJobs.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),platform.getId()) && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList()).size()
+ );
+
+ platformWorkVO.setWaitNum(
+ platformJobs.stream().filter(i->
+ Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ ).collect(Collectors.toList()).size()
+ +
+ platformJobList.stream().filter(i->Constants.equalsInteger(platform.getId(),i.getPlatformId())
+ && (Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) || Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey())
+ )
+ ).collect(Collectors.toList()).size()
+ );
+ platformWorkVO.setExceptionNum(
+ platformJobs.stream().filter(i->Constants.equalsInteger(platform.getId(),i.getPlatformId())
+ && Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())).collect(Collectors.toList()).size()
+ );
+ platformWorkVO.setPlatformJobList(platformJobs.stream().filter(
+ i->Constants.equalsInteger(platform.getId(),i.getPlatformId()) && !Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
+ ).collect(Collectors.toList()));
+ }
+ }
+ return platformWorkVO;
+ }
+
+
+
+ @Override
+ public PlatformGroupWorkVO getPlatformGroupWork(Integer platformGroupId){
+ PlatformGroupWorkVO platformGroupWorkVO = new PlatformGroupWorkVO();
+ platformGroupWorkVO.setExceptionNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
+ .eq(PlatformJob::getPlatformGroupId,platformGroupId)
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
+ )
+ );
+
+ platformGroupWorkVO.setWaitNum(platformJobJoinMapper.selectJoinCount(new MPJLambdaWrapper<PlatformJob>()
+ .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply(" ( t1.isdeleted = 0 or t.PLATFORM_ID is null ) ")
+ .eq(PlatformJob::getPlatformGroupId,platformGroupId)
+ .and( i->i.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey()).or()
+ .eq(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()).or()
+ .apply(" ( t.status = "+Constants.PlatformJobStatus.TRANSFERING.getKey()+" and t.PLATFORM_GROUP_ID = "+platformGroupId+" ) ")
+ )
+ )
+ );
+ return platformGroupWorkVO;
+ }
+
+
}
+
--
Gitblit v1.9.3