From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 208 insertions(+), 20 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 05ad10f..360a658 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
@@ -2,35 +2,36 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.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.PlatformJob;
-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.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -43,6 +44,8 @@
@Autowired
private PlatformGroupMapper platformGroupMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private PlatformJoinMapper platformJoinMapper;
@@ -60,9 +63,12 @@
|| platformGroup.getType()<0){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ platformGroup.setAutoCall(Constants.formatIntegerNum(platformGroup.getAutoCall()));
+ platformGroup.setIsVirtual(Constants.formatIntegerNum(platformGroup.getIsVirtual()));
if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda()
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
.eq(PlatformGroup::getType,platformGroup.getType())
+ .eq(PlatformGroup::getIsVirtual,platformGroup.getIsVirtual())
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
}
@@ -118,6 +124,23 @@
deleteById(id,user);
}
}
+ @Override
+ public void updateAutoCallById(PlatformGroup platform) {
+ PlatformGroup model =platformGroupMapper.selectById(platform.getId());
+ if(model ==null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヨ褰曚俊鎭笉瀛樺湪锛�");
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = platform.getLoginUserInfo();
+ }
+ PlatformGroup update = new PlatformGroup();
+ update.setId(model.getId());
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setAutoCall(platform.getAutoCall());
+ platformGroupMapper.updateById(update);
+ }
@Override
public void updateById(PlatformGroup platformGroup) {
@@ -126,9 +149,12 @@
|| platformGroup.getType()<0){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ platformGroup.setAutoCall(Constants.formatIntegerNum(platformGroup.getAutoCall()));
+ platformGroup.setIsVirtual(Constants.formatIntegerNum(platformGroup.getIsVirtual()));
if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda()
.eq(PlatformGroup::getIsdeleted,Constants.ZERO)
.eq(PlatformGroup::getType,platformGroup.getType())
+ .eq(PlatformGroup::getIsVirtual,platformGroup.getIsVirtual())
.ne(PlatformGroup::getId,platformGroup.getId())
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
@@ -191,7 +217,53 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(platformGroupMapper.selectPage(page, queryWrapper));
+ PageData<PlatformGroup> result =PageData.from(platformGroupMapper.selectPage(page, queryWrapper));
+ if(result !=null && result.getRecords()!=null){
+ List<String > ids0 = new ArrayList<>();
+ List<SystemUser> systemUserList ;
+ for(PlatformGroup platformGroup : result.getRecords()){
+ if( StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers()) || StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers())) {
+ if( StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers()) ){
+ ids0.addAll(Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")));
+ }
+ if( StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers()) ){
+ ids0.addAll(Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")));
+ }
+ }
+ }
+ systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .in(SystemUser::getMemberId,ids0) );
+ if (systemUserList!=null) {
+ for(PlatformGroup platformGroup : result.getRecords()){
+ platformGroup.setSignInNoticeUserNames(getUserNameFromList(0,platformGroup,systemUserList));
+ platformGroup.setUnFinishNoticeUserNames(getUserNameFromList(1,platformGroup,systemUserList));
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private String getUserNameFromList(int i, PlatformGroup platformGroup, List<SystemUser> systemUserList) {
+ String ids = i ==0?platformGroup.getSignInNoticeUsers():platformGroup.getUnFinishNoticeUsers();
+ String name = "";
+ if( StringUtils.isNotBlank(ids)) {
+ List<String > ids0 = Arrays.asList(ids.split(","));
+ if (systemUserList!=null) {
+ for(SystemUser user :systemUserList){
+ for(String s : ids0){
+ if(StringUtils.equals(user.getMemberId().toString(),s)){
+ if(StringUtils.isNotBlank(name)){
+ name += ",";
+ }
+ name += StringUtils.defaultString(user.getRealname(),user.getUsername());
+ }
+ }
+ }
+ }
+ }
+ return name;
}
@Override
@@ -202,10 +274,16 @@
@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)
);
//鏌ヨ鏈堝彴缁勪笅鎵�鏈夋湀鍙�
@@ -214,10 +292,13 @@
.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)
- .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)
+ .orderByAsc(Platform::getSortnum)
);
//澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
- 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)
@@ -240,14 +321,121 @@
}
}
}
- 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 = "+Constants.PlatformJobLogType.WORKING.getKey()+" 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 = "+Constants.PlatformJobLogType.CALLED.getKey()+" order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
+ .select(" case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end ioQty ")
+ .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();
+ platformWorkVO.setCurrentDate(new Date());
+ 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)){
+ for(PlatformJob i :platformJobList){
+ if(Constants.equalsInteger(i.getOrigin(),Constants.ZERO)){
+ i.setWmsContractNum(i.getContractNum());
+ }
+ }
+ 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(i.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey()) && Constants.equalsInteger(i.getPlatformGroupId(),platform.getGroupId()) )||
+ ( Constants.equalsInteger(platform.getId(),i.getPlatformId()) &&
+ 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