最新版本541200007

jiangping

2025-05-07 162ff90bafae549ba42cebaa9991049564cc4567

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java

@@ -2,11 +2,14 @@

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;
@@ -21,16 +24,13 @@
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.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 +43,8 @@

    @Autowired
    private PlatformGroupMapper platformGroupMapper;
    @Autowired
    private SystemUserMapper systemUserMapper;

    @Autowired
    private PlatformJoinMapper platformJoinMapper;
@@ -191,7 +193,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
@@ -222,6 +270,7 @@
                        .eq(Platform::getIsdeleted, Constants.ZERO)
                        .eq(Objects.nonNull(platformDataDTO.getQueryType())&&!Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ZERO),
                                Platform::getStatus,Constants.ZERO)
                        .orderByAsc(Platform::getSortnum)
        );
        //处理我的月台信息 是否配置隐藏
        if(Constants.equalsInteger(platformDataDTO.getQueryType(),Constants.ONE)){
@@ -292,6 +341,7 @@

    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(
@@ -299,6 +349,11 @@
                    || 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()
                );
@@ -343,7 +398,6 @@
                .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)