diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 5e291ef..39b2e67 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -1,10 +1,17 @@ package cn.iocoder.yudao.module.tkdata.service.employeehosts; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.iocoder.yudao.module.tkdata.controller.admin.employeehosts.vo.CompletedRateVO; +import cn.iocoder.yudao.module.tkdata.controller.admin.employeehosts.vo.EmployeeHostsPageReqVO; +import cn.iocoder.yudao.module.tkdata.controller.admin.employeehosts.vo.EmployeeHostsSaveReqVO; +import cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO; import cn.iocoder.yudao.module.tkdata.dal.dataobject.newhosts.NewHostsDO; +import cn.iocoder.yudao.module.tkdata.dal.mysql.employeehosts.EmployeeHostsMapper; import cn.iocoder.yudao.module.tkdata.dal.mysql.newhosts.NewHostsMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -12,26 +19,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - -import org.springframework.util.StopWatch; -import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; -import java.util.*; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; -import cn.iocoder.yudao.module.tkdata.controller.admin.employeehosts.vo.*; -import cn.iocoder.yudao.module.tkdata.dal.dataobject.employeehosts.EmployeeHostsDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - -import cn.iocoder.yudao.module.tkdata.dal.mysql.employeehosts.EmployeeHostsMapper; - import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; import static cn.iocoder.yudao.module.tkdata.enums.ErrorCodeConstants.EMPLOYEE_HOSTS_NOT_EXISTS; @@ -71,7 +67,7 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { for (EmployeeHostsDO hostsDO : employeeHostsDOS) { hostsDO.setOperationStatus(updateReqVO.getOperationStatus()); hostsDO.setRemake(updateReqVO.getRemake()); - if (updateReqVO.getFlag() != null){ + if (updateReqVO.getFlag() != null) { hostsDO.setFlag(updateReqVO.getFlag()); } } @@ -87,12 +83,12 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { } @Override - public void deleteEmployeeHostsListByIds(List ids) { + public void deleteEmployeeHostsListByIds(List ids) { // 校验存在 validateEmployeeHostsExists(ids); // 删除 employeeHostsMapper.deleteByIds(ids); - } + } private void validateEmployeeHostsExists(List ids) { List list = employeeHostsMapper.selectByIds(ids); @@ -114,10 +110,15 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { @Override public PageResult getEmployeeHostsPage(EmployeeHostsPageReqVO pageReqVO) { + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); pageReqVO.setTenantId(TenantContextHolder.getTenantId()); - IPage iPage = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); - IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXML(iPage, pageReqVO); - return new PageResult<>(newHostsDOIPage.getRecords(),newHostsDOIPage.getTotal()); + if (loginUser != null) { + pageReqVO.setUserId(loginUser.getId()); + IPage iPage = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXMLWithSelf(iPage, pageReqVO); + return new PageResult<>(newHostsDOIPage.getRecords(), newHostsDOIPage.getTotal()); + } + return null; } @Override @@ -144,10 +145,10 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { .map(NewHostsDO::getHostsId) .collect(Collectors.toList()); int update = newHostsMapper.update(lambdaUpdateWrapper - .in(NewHostsDO::getHostsId,hostsIds) + .in(NewHostsDO::getHostsId, hostsIds) .eq(NewHostsDO::getTenantId, tenantId) .set(NewHostsDO::getIsAssigned, 1)); - log.info("修改租户:{}下 {} 个主播分配状态,共更新 {} 条记录",tenantId,hostsIds.size(),update); + log.info("修改租户:{}下 {} 个主播分配状态,共更新 {} 条记录", tenantId, hostsIds.size(), update); // newHostsMapper.updateBatch(newHostsDOArrayList); return i; @@ -159,11 +160,11 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { pageReqVO.setTenantId(TenantContextHolder.getTenantId()); if (loginUser != null) { pageReqVO.setUserId(loginUser.getId()); - IPage iPage = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); + IPage iPage = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXMLWithSelf(iPage, pageReqVO); - return new PageResult<>(newHostsDOIPage.getRecords(),newHostsDOIPage.getTotal()); + return new PageResult<>(newHostsDOIPage.getRecords(), newHostsDOIPage.getTotal()); } - return null; + return null; } @Override