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-15 10:48:09 +08:00
parent 0aaceb6529
commit b39b25c09e
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogStatisticsController.java
View File

@ -1,12 +1,20 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.system.controller.admin.worklog.dto.statistics.LogStatisticsDetailsListDTO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRulePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRuleRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.statistics.LogStatisticsDetailsListVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.statistics.LogStatisticsModelVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import cn.iocoder.yudao.module.system.service.worklog.LogStatisticsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
@ -14,9 +22,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 工作日志统计")
@RestController
@ -46,4 +58,15 @@ public class LogStatisticsController {
return success(list);
}
// @GetMapping("/export-excel")
// @Operation(summary = "导出日志规则 Excel")
// @OperateLog(type = EXPORT)
// public void exportLogRuleExcel(@Valid LogRulePageReqVO pageReqVO,
// HttpServletResponse response) throws IOException {
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
// List<LogRuleDO> list = logRuleService.getLogRulePage(pageReqVO).getList();
// // 导出 Excel
// ExcelUtils.write(response, "日志规则.xls", "数据", LogRuleRespVO.class,
// BeanUtils.toBean(list, LogRuleRespVO.class));
// }
}

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

@ -62,16 +62,6 @@ public interface LogInstanceService {
*/
List<DeptRespVO> getDeptInfo();
/**
* 获得我的日志的分页
*
* @param userId 用户编号
* @param pageReqVO 分页请求
* @return 流程实例的分页
* 获取上一篇日志
*/
PageResult<LogInstanceRespVO> getMyProcessInstancePage(Long userId, LogInstancePageReqVO pageReqVO);
/**
* 获取我管理的日志列表(时间区间)
*

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

@ -45,14 +45,6 @@ public interface LogRuleService {
*/
LogRuleDO getLogRule(Long id);
/**
* 获得日志规则
*
* @param formId 模板编号
* @return 日志规则
*/
LogRuleDO getLogRuleByFormId(Long formId);
/**
* 获得日志规则分页
*

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

@ -107,11 +107,6 @@ public class LogRuleServiceImpl implements LogRuleService {
return logRuleMapper.selectById(id);
}
@Override
public LogRuleDO getLogRuleByFormId(Long formId) {
return logRuleMapper.selectOne(LogRuleDO::getFormId, formId);
}
@Override
public PageResult<LogRuleDO> getLogRulePage(LogRulePageReqVO pageReqVO) {
return logRuleMapper.selectPage(pageReqVO);