最新版本541200007

doum

3 天以前 66b84de58e3efae14c1e258ee716e02ad9557497

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

@@ -2,6 +2,10 @@

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
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;
@@ -21,13 +25,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
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;

/**
@@ -40,6 +44,8 @@

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

    @Autowired
    private PlatformJoinMapper platformJoinMapper;
@@ -57,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(),"对不起，该类型分组已经创建，请返回刷新页面查看！");
        }
@@ -115,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) {
@@ -123,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(),"对不起，该类型分组已经创建，请返回刷新页面查看！");
@@ -188,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
@@ -219,6 +294,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)){
@@ -297,6 +373,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()
                );
@@ -310,7 +391,7 @@
                        ).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(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())
                               )