ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

获取我管理的模版

Browse Source
This commit is contained in:
aikai 2024-04-12 20:43:28 +08:00
parent 2dbe7c387e
commit f0ca0baa0c
4 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.system.controller.admin.auth;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
@ -27,7 +26,6 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleService.java
View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRuleSa
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import javax.validation.Valid;
import java.util.List;
/**
* 日志规则 Service 接口
@ -52,4 +53,11 @@ public interface LogRuleService {
*/
PageResult<LogRuleDO> getLogRulePage(LogRulePageReqVO pageReqVO);
/**
* 通过规则ids获取规则
*
* @param ruleIds
* @return
*/
List<LogRuleDO> getLogRuleByIds(List<Long> ruleIds);
}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java
View File

@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LOG_RULE_NOT_EXISTS;
@ -68,4 +69,9 @@ public class LogRuleServiceImpl implements LogRuleService {
return logRuleMapper.selectPage(pageReqVO);
}
@Override
public List<LogRuleDO> getLogRuleByIds(List<Long> ruleIds) {
return logRuleMapper.selectBatchIds(ruleIds);
}
}

33
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/WorkLogStatisticsServiceImpl.java
View File

@ -1,15 +1,19 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.module.system.controller.admin.worklog.dto.statistics.WorkLogStatisticsModelDTO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.statistics.WorkLogStatisticsModelVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogFormMapper;
import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogUseMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
* 工作日志统计 Service 实现类
@ -20,7 +24,11 @@ import java.util.List;
@Validated
public class WorkLogStatisticsServiceImpl implements WorkLogStatisticsService {
@Resource
private LogFormService logFormService;
private LogFormMapper logFormMapper;
@Resource
private LogRuleService logRuleService;
@Resource
private LogUseMapper logUseMapper;
@ -32,8 +40,23 @@ public class WorkLogStatisticsServiceImpl implements WorkLogStatisticsService {
if (!formIds.isEmpty()) {
return Collections.emptyList();
}
List<LogFormDO> formList = logFormService.getFormList(formIds);
List<LogFormDO> formList = logFormMapper.selectList(new LambdaQueryWrapper<LogFormDO>()
.in(LogFormDO::getId, formIds)
.eq(LogFormDO::getStatus, 1)
.isNotNull(LogFormDO::getRuleId)
);
List<Long> ruleIds = formList.stream().map(LogFormDO::getRuleId).collect(Collectors.toList());
List<LogRuleDO> logRuleDOS = new ArrayList<>();
Map<Long, LogRuleDO> ruleMap = new HashMap<>();
if (CollectionUtil.isNotEmpty(ruleIds)) {
logRuleDOS = logRuleService.getLogRuleByIds(ruleIds);
ruleMap = logRuleDOS.stream().collect(Collectors.toMap(LogRuleDO::getId, v -> v));
}
for (LogFormDO logFormDO : formList) {
LogRuleDO logRuleDO = ruleMap.get(logFormDO.getRuleId());
//统计谁
}
return null;
}
}