Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

weimingfei

4 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

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

@@ -26,6 +26,7 @@
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;
@@ -62,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(),"对不起，该类型分组已经创建，请返回刷新页面查看！");
        }
@@ -120,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) {
@@ -128,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(),"对不起，该类型分组已经创建，请返回刷新页面查看！");
@@ -208,8 +232,8 @@
                }
            }
            systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
                    .eq(SystemUser::getDeleted, Constants.ZERO).eq(SystemUser::getStatus, Constants.ZERO).isNotNull(SystemUser::getOpenid)
                    .in(SystemUser::getId,ids0)  );
                    .eq(SystemUser::getDeleted, Constants.ZERO)
                    .in(SystemUser::getMemberId,ids0)  );
            if (systemUserList!=null) {
                for(PlatformGroup platformGroup : result.getRecords()){
                    platformGroup.setSignInNoticeUserNames(getUserNameFromList(0,platformGroup,systemUserList));
@@ -222,18 +246,17 @@
    }

    private String getUserNameFromList(int i, PlatformGroup platformGroup, List<SystemUser> systemUserList) {
           String ids = i ==0?platformGroup.getSignInNoticeUsers():platformGroup.getSignInNoticeUsers();
           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.isNotBlank(name)){
                                name += ",";
                            }
                            if(StringUtils.equals(user.getId().toString(),s)){
                            if(StringUtils.equals(user.getMemberId().toString(),s)){
                                if(StringUtils.isNotBlank(name)){
                                    name += ",";
                                }
                                name += StringUtils.defaultString(user.getRealname(),user.getUsername());
                            }
                        }
@@ -271,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)){
@@ -367,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())
                               )