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

日志模块

Browse Source
This commit is contained in:
furongxin 2024-04-11 17:53:06 +08:00
parent 229748d4c1
commit 0c503823e4
32 changed files with 1634 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogFormController.java Normal file
View File

@ -0,0 +1,78 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.*;
import cn.iocoder.yudao.module.system.convert.worklog.LogFormConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO;
import cn.iocoder.yudao.module.system.service.worklog.LogFormService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
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.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 日志动态表单")
@RestController
@RequestMapping("/system/worklog/form")
@Validated
public class LogFormController {
@Resource
private LogFormService formService;
@PostMapping("/create")
@Operation(summary = "创建动态表单")
@PreAuthorize("@ss.hasPermission('worklog:form:create')")
public CommonResult<Long> createForm(@Valid @RequestBody LogFormCreateReqVO createReqVO) {
return success(formService.createForm(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新动态表单")
@PreAuthorize("@ss.hasPermission('worklog:form:update')")
public CommonResult<Boolean> updateForm(@Valid @RequestBody LogFormUpdateReqVO updateReqVO) {
formService.updateForm(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除动态表单")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('worklog:form:delete')")
public CommonResult<Boolean> deleteForm(@RequestParam("id") Long id) {
formService.deleteForm(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得动态表单")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('worklog:form:query')")
public CommonResult<LogFormRespVO> getForm(@RequestParam("id") Long id) {
LogFormDO form = formService.getForm(id);
return success(LogFormConvert.INSTANCE.convert(form));
}
@GetMapping("/list-all-simple")
@Operation(summary = "获得动态表单的精简列表", description = "用于表单下拉框")
public CommonResult<List<LogFormSimpleRespVO>> getSimpleForms() {
List<LogFormDO> list = formService.getFormList();
return success(LogFormConvert.INSTANCE.convertList2(list));
}
@GetMapping("/page")
@Operation(summary = "获得动态表单分页")
@PreAuthorize("@ss.hasPermission('worklog:form:query')")
public CommonResult<PageResult<LogFormRespVO>> getFormPage(@Valid LogFormPageReqVO pageVO) {
PageResult<LogFormDO> pageResult = formService.getFormPage(pageVO);
return success(LogFormConvert.INSTANCE.convertPage(pageResult));
}
}

104
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java Normal file
View File

@ -0,0 +1,104 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstancePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceSaveReqVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
import cn.iocoder.yudao.module.system.service.worklog.LogInstanceService;
@Tag(name = "管理后台 - 日志实例的拓展")
@RestController
@RequestMapping("/system/log-instance")
@Validated
public class LogInstanceController {
@Resource
private LogInstanceService logInstanceService;
@PostMapping("/create")
@Operation(summary = "创建日志实例的拓展")
@PreAuthorize("@ss.hasPermission('system:log-instance:create')")
public CommonResult<Long> createLogInstance(@Valid @RequestBody LogInstanceSaveReqVO createReqVO) {
return success(logInstanceService.createLogInstance(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新日志实例的拓展")
@PreAuthorize("@ss.hasPermission('system:log-instance:update')")
public CommonResult<Boolean> updateLogInstance(@Valid @RequestBody LogInstanceSaveReqVO updateReqVO) {
logInstanceService.updateLogInstance(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除日志实例的拓展")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('system:log-instance:delete')")
public CommonResult<Boolean> deleteLogInstance(@RequestParam("id") Long id) {
logInstanceService.deleteLogInstance(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得日志实例的拓展")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('system:log-instance:query')")
public CommonResult<LogInstanceRespVO> getLogInstance(@RequestParam("id") Long id) {
LogInstanceDO logInstance = logInstanceService.getLogInstance(id);
return success(BeanUtils.toBean(logInstance, LogInstanceRespVO.class));
}
@GetMapping("/my-page")
@Operation(summary = "获得我的日志分页列表", description = "在【我的日志】菜单中，进行调用")
@PreAuthorize("@ss.hasPermission('system:log-instance:query')")
public CommonResult<PageResult<LogInstanceRespVO>> getMyLogInstancePage(@Valid LogInstancePageReqVO pageReqVO) {
return success(logInstanceService.getMyProcessInstancePage(getLoginUserId(), pageReqVO));
}
@GetMapping("/page")
@Operation(summary = "获得日志实例的拓展分页")
@PreAuthorize("@ss.hasPermission('system:view-log:query')")
public CommonResult<PageResult<LogInstanceRespVO>> getLogInstancePage(@Valid LogInstancePageReqVO pageReqVO) {
PageResult<LogInstanceDO> pageResult = logInstanceService.getLogInstancePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, LogInstanceRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出日志实例的拓展 Excel")
@PreAuthorize("@ss.hasPermission('system:log-instance:export')")
@OperateLog(type = EXPORT)
public void exportLogInstanceExcel(@Valid LogInstancePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<LogInstanceDO> list = logInstanceService.getLogInstancePage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "日志实例的拓展.xls", "数据", LogInstanceRespVO.class,
BeanUtils.toBean(list, LogInstanceRespVO.class));
}
}

93
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogRuleController.java Normal file
View File

@ -0,0 +1,93 @@
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.pojo.PageResult;
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.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.rule.LogRuleSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import cn.iocoder.yudao.module.system.service.worklog.LogRuleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
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.*;
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
@RequestMapping("/system/log-rule")
@Validated
public class LogRuleController {
@Resource
private LogRuleService logRuleService;
@PostMapping("/create")
@Operation(summary = "创建日志规则")
@PreAuthorize("@ss.hasPermission('system:log-rule:create')")
public CommonResult<Long> createLogRule(@Valid @RequestBody LogRuleSaveReqVO createReqVO) {
return success(logRuleService.createLogRule(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新日志规则")
@PreAuthorize("@ss.hasPermission('system:log-rule:update')")
public CommonResult<Boolean> updateLogRule(@Valid @RequestBody LogRuleSaveReqVO updateReqVO) {
logRuleService.updateLogRule(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除日志规则")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('system:log-rule:delete')")
public CommonResult<Boolean> deleteLogRule(@RequestParam("id") Long id) {
logRuleService.deleteLogRule(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得日志规则")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('system:log-rule:query')")
public CommonResult<LogRuleRespVO> getLogRule(@RequestParam("id") Long id) {
LogRuleDO logRule = logRuleService.getLogRule(id);
return success(BeanUtils.toBean(logRule, LogRuleRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得日志规则分页")
@PreAuthorize("@ss.hasPermission('system:log-rule:query')")
public CommonResult<PageResult<LogRuleRespVO>> getLogRulePage(@Valid LogRulePageReqVO pageReqVO) {
PageResult<LogRuleDO> pageResult = logRuleService.getLogRulePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, LogRuleRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出日志规则 Excel")
@PreAuthorize("@ss.hasPermission('system:log-rule:export')")
@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));
}
}

29
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/form/LogFormBaseVO.java Normal file
View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* 动态表单 Base VO，提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/
@Data
public class LogFormBaseVO {
@Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotNull(message = "表单名称不能为空")
private String name;
@Schema(description = "日志绑定规则编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1")
private String ruleId;
@Schema(description = "表单状态-参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "表单状态不能为空")
private Integer status;
@Schema(description = "备注", example = "我是备注")
private String remark;
}

25
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/form/LogFormCreateReqVO.java Normal file
View File

@ -0,0 +1,25 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
@Schema(description = "管理后台 - 动态表单创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LogFormCreateReqVO extends LogFormBaseVO {
@Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单的配置不能为空")
private String conf;
@Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单项的数组不能为空")
private List<String> fields;
}

18
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/form/LogFormPageReqVO.java Normal file
View File

@ -0,0 +1,18 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@Schema(description = "管理后台 - 动态表单分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LogFormPageReqVO extends PageParam {
@Schema(description = "表单名称", example = "芋道")
private String name;
}

31
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/form/LogFormRespVO.java Normal file
View File

@ -0,0 +1,31 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "管理后台 - 动态表单 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LogFormRespVO extends LogFormBaseVO {
@Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单的配置不能为空")
private String conf;
@Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单项的数组不能为空")
private List<String> fields;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
}

16
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/form/LogFormSimpleRespVO.java Normal file
View File

@ -0,0 +1,16 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - 流程表单精简 Response VO")
@Data
public class LogFormSimpleRespVO {
@Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;
}

29
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/form/LogFormUpdateReqVO.java Normal file
View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
@Schema(description = "管理后台 - 动态表单更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LogFormUpdateReqVO extends LogFormBaseVO {
@Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "表单编号不能为空")
private Long id;
@Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单的配置不能为空")
private String conf;
@Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "表单项的数组不能为空")
private List<String> fields;
}

51
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java Normal file
View File

@ -0,0 +1,51 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 日志实例的拓展分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LogInstancePageReqVO extends PageParam {
@Schema(description = "发起日志的用户编号", example = "24292")
private Long startUserId;
@Schema(description = "日志发起人的部门编号", example = "24292")
private Long deptId;
@Schema(description = "日志实例的名字", example = "张三")
private String name;
@Schema(description = "日志类型 字典值 详情参考work_log_type", example = "2")
private Integer type;
@Schema(description = "模板编号", example = "11857")
private Long formId;
@Schema(description = "模板值")
private Map<String, Object> formVariables;
@Schema(description = "日志阅读状态", example = "2")
private Map<String, Object> readStatus;
@Schema(description = "附件信息")
private List<UploadUserFile> fileItems ;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

47
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceRespVO.java Normal file
View File

@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload.UploadUserFile;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@Schema(description = "管理后台 - 日志实例的拓展 Response VO")
@Data
@ExcelIgnoreUnannotated
public class LogInstanceRespVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20649")
private Long id;
@Schema(description = "日志发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24292")
private Long startUserId;
@Schema(description = "日志发起人的部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24292")
private Long deptId;
@Schema(description = "日志实例的名字", example = "张三")
private String name;
@Schema(description = "日志类型 字典值 详情参考work_log_type", example = "2")
private Integer type;
@Schema(description = "模板编号", example = "11857")
private Long formId;
@Schema(description = "模板值")
private Map<String, Object> formVariables;
@Schema(description = "日志阅读状态", example = "2")
private Map<String, Object> readStatus;
@Schema(description = "附件信息")
private List<UploadUserFile> fileItems ;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
}

44
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceSaveReqVO.java Normal file
View File

@ -0,0 +1,44 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import java.util.List;
import java.util.Map;
@Schema(description = "管理后台 - 日志实例的拓展新增/修改 Request VO")
@Data
public class LogInstanceSaveReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20649")
private Long id;
@Schema(description = "日志发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24292")
@NotNull(message = "发起日志的用户编号不能为空")
private Long startUserId;
@Schema(description = "日志发起人的部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24292")
@NotNull(message = "发起日志的用户编号不能为空")
private Long deptId;
@Schema(description = "日志实例的名字", example = "张三")
private String name;
@Schema(description = "日志类型 字典值 详情参考work_log_type", example = "2")
private Integer type;
@Schema(description = "模板编号", example = "11857")
private Long formId;
@Schema(description = "模板值")
private Map<String, Object> formVariables;
@Schema(description = "日志阅读状态", example = "2")
private Map<String, Object> readStatus;
@Schema(description = "附件信息")
private List<UploadUserFile> fileItems ;
}

45
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRulePageReqVO.java Normal file
View File

@ -0,0 +1,45 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 日志规则分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class LogRulePageReqVO extends PageParam {
@Schema(description = "模板使用部门组")
private String deptIds;
@Schema(description = "日志类型 字典值 详情参考work_log_type", example = "2")
private Integer type;
@Schema(description = "日报情况，需提交的日期")
private String weekDays;
@Schema(description = "提交开始时间段")
private String startTime;
@Schema(description = "提交结束时间段")
private String endTime;
@Schema(description = "提醒时间(小时)")
private Integer remindTime;
@Schema(description = "统计时间")
private String statisticalTime;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

51
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleRespVO.java Normal file
View File

@ -0,0 +1,51 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 日志规则 Response VO")
@Data
@ExcelIgnoreUnannotated
public class LogRuleRespVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21181")
@ExcelProperty("编号")
private Long id;
@Schema(description = "模板使用部门组", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("模板使用部门组")
private Long deptIds;
@Schema(description = "日志类型 字典值 详情参考work_log_type", example = "2")
@ExcelProperty("日志类型")
private Integer type;
@Schema(description = "日报情况，需提交的日期")
@ExcelProperty("日报情况，需提交的日期")
private String weekDays;
@Schema(description = "提交开始时间段")
@ExcelProperty("提交开始时间段")
private String startTime;
@Schema(description = "提交结束时间段")
@ExcelProperty("提交结束时间段")
private String endTime;
@Schema(description = "提醒时间(小时)")
@ExcelProperty("提醒时间(小时)")
private Integer remindTime;
@Schema(description = "统计时间段")
@ExcelProperty("统计时间段")
private String statisticalTime;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

37
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleSaveReqVO.java Normal file
View File

@ -0,0 +1,37 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 日志规则新增/修改 Request VO")
@Data
public class LogRuleSaveReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21181")
private Long id;
@Schema(description = "模板使用部门组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "模板使用部门组不能为空")
private String deptIds;
@Schema(description = "日志类型", example = "2")
private Integer type;
@Schema(description = "日报情况，需提交的日期")
private String weekDays;
@Schema(description = "提交开始时间段")
private String startTime;
@Schema(description = "提交结束时间段")
private String endTime;
@Schema(description = "提醒时间(小时)")
private Integer remindTime;
@Schema(description = "统计时间段")
private String statisticalTime;
}

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/upload/UploadUserFile.java Normal file
View File

@ -0,0 +1,17 @@
package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 功能描述 用于给日志附件同用的上传文件对象
*/
@Data
public class UploadUserFile {
@Schema(description = "文件原始名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.jpg")
private String name;
@Schema(description = "文件URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "http://xxx.xxx/xx/xx/123.jpgss")
private String url;
}

34
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/worklog/LogFormConvert.java Normal file
View File

@ -0,0 +1,34 @@
package cn.iocoder.yudao.module.system.convert.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormCreateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormSimpleRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormUpdateReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
* 动态表单 Convert
*
* @author furongxin
*/
@Mapper
public interface LogFormConvert {
LogFormConvert INSTANCE = Mappers.getMapper(LogFormConvert.class);
LogFormDO convert(LogFormCreateReqVO bean);
LogFormDO convert(LogFormUpdateReqVO bean);
LogFormRespVO convert(LogFormDO bean);
List<LogFormSimpleRespVO> convertList2(List<LogFormDO> list);
PageResult<LogFormRespVO> convertPage(PageResult<LogFormDO> page);
}

26
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/worklog/LogInstanceConvert.java Normal file
View File

@ -0,0 +1,26 @@
package cn.iocoder.yudao.module.system.convert.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* 日志详情 Convert
*
* @author furongxin
*/
@Mapper
public interface LogInstanceConvert {
LogInstanceConvert INSTANCE = Mappers.getMapper(LogInstanceConvert.class);
LogInstanceDO convert(LogInstanceSaveReqVO bean);
LogInstanceRespVO convert(LogInstanceDO bean);
PageResult<LogInstanceRespVO> convertPage(PageResult<LogInstanceDO> page);
}

61
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogFormDO.java Normal file
View File

@ -0,0 +1,61 @@
package cn.iocoder.yudao.module.system.dal.dataobject.worklog;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.List;
/**
* 日志的表单定义
* 用于日志的申请表单，需要动态配置的场景
*
*/
@TableName(value = "work_log_form", autoResultMap = true)
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LogFormDO extends BaseDO {
/**
* 编号
*/
@TableId
private Long id;
/**
* 表单名
*/
private String name;
/**
* 规则ID
*/
private Long ruleId;
/**
* 状态
*/
private Integer status;
/**
* 表单的配置
*/
private String conf;
/**
* 表单项的数组
*
* 目前直接将 https://github.com/JakHuang/form-generator 生成的 JSON 串，直接保存
* 定义：https://github.com/JakHuang/form-generator/issues/46
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List<String> fields;
/**
* 备注
*/
private String remark;
}

75
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogInstanceDO.java Normal file
View File

@ -0,0 +1,75 @@
package cn.iocoder.yudao.module.system.dal.dataobject.worklog;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.upload.UploadUserFile;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.List;
import java.util.Map;
/**
* 日志的详情
*
*/
@TableName(value = "work_log_instance_ext", autoResultMap = true)
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LogInstanceDO extends BaseDO {
/**
* 编号
*/
@TableId
private Long id;
/**
* 日志发起人的用户ID
*/
private Long startUserId;
/**
* 日志发起人的部门ID
*/
private Long deptId;
/**
* 日志名称
*/
private String name;
/**
* 日报类型
*/
private Integer type;
/**
* 日志模板编号
*/
private Long formId;
/**
* 日志模板值
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private Map<String, Object> formVariables;
/**
* 日志阅读状态
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private Map<String, Object> readStatus;
/**
* 附件基本信息
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List<UploadUserFile> fileItems ;
}

56
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogRuleDO.java Normal file
View File

@ -0,0 +1,56 @@
package cn.iocoder.yudao.module.system.dal.dataobject.worklog;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
/**
* 日志规则 DO
*
* @author 符溶馨
*/
@TableName("work_log_rule")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LogRuleDO extends BaseDO {
/**
* 编号
*/
@TableId
private Long id;
/**
* 模板使用部门组
*/
private String deptIds;
/**
* 日志类型
*/
private Integer type;
/**
* 日报情况，需提交的日期
*/
private String weekDays;
/**
* 提交开始时间段
*/
private String startTime;
/**
* 提交结束时间段
*/
private String endTime;
/**
* 提醒时间(小时)
*/
private Integer remindTime;
/**
* 统计时间段
*/
private String statisticalTime;
}

18
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogFormMapper.java Normal file
View File

@ -0,0 +1,18 @@
package cn.iocoder.yudao.module.system.dal.mysql.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormPageReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LogFormMapper extends BaseMapperX<LogFormDO> {
default PageResult<LogFormDO> selectPage(LogFormPageReqVO reqVO) {
return selectPage(reqVO, new QueryWrapperX<LogFormDO>()
.likeIfPresent("name", reqVO.getName())
.orderByDesc("id"));
}
}

42
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java Normal file
View File

@ -0,0 +1,42 @@
package cn.iocoder.yudao.module.system.dal.mysql.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstancePageReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
import org.apache.ibatis.annotations.Mapper;
/**
* 日志实例的拓展 Mapper
*
* @author 符溶馨
*/
@Mapper
public interface LogInstanceMapper extends BaseMapperX<LogInstanceDO> {
default PageResult<LogInstanceDO> selectPage(LogInstancePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<LogInstanceDO>()
.eqIfPresent(LogInstanceDO::getStartUserId, reqVO.getStartUserId())
.likeIfPresent(LogInstanceDO::getName, reqVO.getName())
.eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId())
.eqIfPresent(LogInstanceDO::getFormVariables, reqVO.getFormVariables())
.eqIfPresent(LogInstanceDO::getReadStatus, reqVO.getReadStatus())
.eqIfPresent(LogInstanceDO::getFileItems, reqVO.getFileItems())
.betweenIfPresent(LogInstanceDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(LogInstanceDO::getId));
}
default PageResult<LogInstanceDO> selectMyPage(Long userId, LogInstancePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<LogInstanceDO>()
.eqIfPresent(LogInstanceDO::getStartUserId, userId)
.likeIfPresent(LogInstanceDO::getName, reqVO.getName())
.eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId())
.eqIfPresent(LogInstanceDO::getFormVariables, reqVO.getFormVariables())
.eqIfPresent(LogInstanceDO::getReadStatus, reqVO.getReadStatus())
.eqIfPresent(LogInstanceDO::getFileItems, reqVO.getFileItems())
.betweenIfPresent(LogInstanceDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(LogInstanceDO::getId));
}
}

26
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogRuleMapper.java Normal file
View File

@ -0,0 +1,26 @@
package cn.iocoder.yudao.module.system.dal.mysql.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRulePageReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import org.apache.ibatis.annotations.Mapper;
/**
* 日志规则 Mapper
*
* @author 符溶馨
*/
@Mapper
public interface LogRuleMapper extends BaseMapperX<LogRuleDO> {
default PageResult<LogRuleDO> selectPage(LogRulePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<LogRuleDO>()
.eqIfPresent(LogRuleDO::getDeptIds, reqVO.getDeptIds())
.eqIfPresent(LogRuleDO::getType, reqVO.getType())
.betweenIfPresent(LogRuleDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(LogRuleDO::getId));
}
}

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
View File

@ -85,6 +85,7 @@ public class NoticeServiceImpl implements NoticeService {
@Resource
private SubscribeMessageSendApi subscribeMessageSendApi;
@Override
public void sendNotice(NoticeDO notice) {
//获取当前登陆用户的名称
LoginUser user = SecurityFrameworkUtils.getLoginUser() ;

85
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogFormService.java Normal file
View File

@ -0,0 +1,85 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormCreateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormUpdateReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO;
import javax.validation.Valid;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
public interface LogFormService {
/**
* 创建动态表单
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createForm(@Valid LogFormCreateReqVO createReqVO);
/**
* 更新动态表单
*
* @param updateReqVO 更新信息
*/
void updateForm(@Valid LogFormUpdateReqVO updateReqVO);
/**
* 删除动态表单
*
* @param id 编号
*/
void deleteForm(Long id);
/**
* 获得动态表单
*
* @param id 编号
* @return 动态表单
*/
LogFormDO getForm(Long id);
/**
* 获得动态表单列表
*
* @return 动态表单列表
*/
List<LogFormDO> getFormList();
/**
* 获得动态表单列表
*
* @param ids 编号
* @return 动态表单列表
*/
List<LogFormDO> getFormList(Collection<Long> ids);
/**
* 获得动态表单 Map
*
* @param ids 编号
* @return 动态表单 Map
*/
default Map<Long, LogFormDO> getFormMap(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) {
return Collections.emptyMap();
}
return CollectionUtils.convertMap(this.getFormList(ids), LogFormDO::getId);
}
/**
* 获得动态表单分页
*
* @param pageReqVO 分页查询
* @return 动态表单分页
*/
PageResult<LogFormDO> getFormPage(LogFormPageReqVO pageReqVO);
}

110
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogFormServiceImpl.java Normal file
View File

@ -0,0 +1,110 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.hutool.core.lang.Assert;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormCreateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.form.LogFormUpdateReqVO;
import cn.iocoder.yudao.module.system.convert.worklog.LogFormConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO;
import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogFormMapper;
import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.system.service.worklog.dto.LogFormFieldRespDTO;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
/**
* 动态表单 Service 实现类
*
* @author 风里雾里
*/
@Service
@Validated
public class LogFormServiceImpl implements LogFormService{
@Resource
private LogFormMapper formMapper;
@Override
public Long createForm(LogFormCreateReqVO createReqVO) {
this.checkFields(createReqVO.getFields());
// 插入
LogFormDO form = LogFormConvert.INSTANCE.convert(createReqVO);
formMapper.insert(form);
// 返回
return form.getId();
}
@Override
public void updateForm(LogFormUpdateReqVO updateReqVO) {
this.checkFields(updateReqVO.getFields());
// 校验存在
this.validateFormExists(updateReqVO.getId());
// 更新
LogFormDO updateObj = LogFormConvert.INSTANCE.convert(updateReqVO);
formMapper.updateById(updateObj);
}
@Override
public void deleteForm(Long id) {
// 校验存在
this.validateFormExists(id);
// 删除
formMapper.deleteById(id);
}
private void validateFormExists(Long id) {
if (formMapper.selectById(id) == null) {
throw exception(ErrorCodeConstants.FORM_NOT_EXISTS);
}
}
@Override
public LogFormDO getForm(Long id) {
return formMapper.selectById(id);
}
@Override
public List<LogFormDO> getFormList() {
return formMapper.selectList();
}
@Override
public List<LogFormDO> getFormList(Collection<Long> ids) {
return formMapper.selectBatchIds(ids);
}
@Override
public PageResult<LogFormDO> getFormPage(LogFormPageReqVO pageReqVO) {
return formMapper.selectPage(pageReqVO);
}
/**
* 校验 Field，避免 field 重复
*
* @param fields field 数组
*/
private void checkFields(List<String> fields) {
if (true) { // TODO 芋艿：兼容 Vue3 工作流：因为采用了新的表单设计器，所以暂时不校验
return;
}
Map<String, String> fieldMap = new HashMap<>(); // key 是 vModel，value 是 label
for (String field : fields) {
LogFormFieldRespDTO fieldDTO = JsonUtils.parseObject(field, LogFormFieldRespDTO.class);
Assert.notNull(fieldDTO);
String oldLabel = fieldMap.put(fieldDTO.getVModel(), fieldDTO.getLabel());
// 如果不存在，则直接返回
if (oldLabel == null) {
continue;
}
// 如果存在，则报错
throw exception(ErrorCodeConstants.FORM_FIELD_REPEAT, oldLabel, fieldDTO.getLabel(), fieldDTO.getVModel());
}
}
}

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

@ -0,0 +1,64 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstancePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
import javax.validation.Valid;
/**
* 日志实例的拓展 Service 接口
*
* @author 符溶馨
*/
public interface LogInstanceService {
/**
* 创建日志实例的拓展
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createLogInstance(@Valid LogInstanceSaveReqVO createReqVO);
/**
* 更新日志实例的拓展
*
* @param updateReqVO 更新信息
*/
void updateLogInstance(@Valid LogInstanceSaveReqVO updateReqVO);
/**
* 删除日志实例的拓展
*
* @param id 编号
*/
void deleteLogInstance(Long id);
/**
* 获得日志实例的拓展
*
* @param id 编号
* @return 日志实例的拓展
*/
LogInstanceDO getLogInstance(Long id);
/**
* 获得日志实例的拓展分页
*
* @param pageReqVO 分页查询
* @return 日志实例的拓展分页
*/
PageResult<LogInstanceDO> getLogInstancePage(LogInstancePageReqVO pageReqVO);
/**
* 获得我的日志的分页
*
* @param userId 用户编号
* @param pageReqVO 分页请求
* @return 流程实例的分页
*/
PageResult<LogInstanceRespVO> getMyProcessInstancePage(Long userId, LogInstancePageReqVO pageReqVO);
}

170
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java Normal file
View File

@ -0,0 +1,170 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstancePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceSaveReqVO;
import cn.iocoder.yudao.module.system.convert.worklog.LogInstanceConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogInstanceMapper;
import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.permission.MenuService;
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LOG_INSTANCE_NOT_EXISTS;
/**
* 日志实例的拓展 Service 实现类
*
* @author 符溶馨
*/
@Service
@Validated
public class LogInstanceServiceImpl implements LogInstanceService {
@Resource
private LogInstanceMapper logInstanceMapper;
@Resource
private MenuService menuService;
@Resource
private PermissionService permissionService;
@Resource
private RoleService roleService;
@Resource
private UserRoleMapper userRoleMapper;
@Resource
private AdminUserMapper adminUserMapper;
@Resource
private DeptService deptService;
@Override
public Long createLogInstance(LogInstanceSaveReqVO createReqVO) {
// 插入
LogInstanceDO logInstance = BeanUtils.toBean(createReqVO, LogInstanceDO.class);
logInstanceMapper.insert(logInstance);
//根据查询权限获取menuID
List<Long> menuIds = menuService.getMenuIdListByPermissionFromCache("system:view-log:query");
if (menuIds != null && !menuIds.isEmpty()) {
Map<String, String> readStatus = new HashMap<>();
List<Long> roles = new ArrayList<>();
//根据menuID 获取 roleIds
Set<Long> roleIds = permissionService.getMenuRoleIdListByMenuIdFromCache(menuIds.get(0));
List<RoleDO> roleDOS = roleService.getRoleList(roleIds);
for (RoleDO roleDo : roleDOS) {
if (Objects.equals(roleDo.getDataScope(), DataScopeEnum.ALL.getScope())) { //数据权限是全部时
roles.add(roleDo.getId());
}else if (Objects.equals(roleDo.getDataScope(), DataScopeEnum.DEPT_CUSTOM.getScope())) { //数据权限是指定部门
//指定部门组里存在 发起人的部门
if (roleDo.getDataScopeDeptIds().contains(createReqVO.getDeptId())) {
roles.add(roleDo.getId());
}
}else if (Objects.equals(roleDo.getDataScope(), DataScopeEnum.DEPT_ONLY.getScope())) { //数据权限是本部门
List<AdminUserDO> userDos = adminUserMapper.selectListByRoleId(roleDo.getId());
for (AdminUserDO userDO : userDos) {
//权限部门与发起人部门一致时
if (Objects.equals(userDO.getDeptId(), createReqVO.getDeptId())) {
readStatus.put(String.valueOf(userDO.getId()), "0");
}
}
}else if (Objects.equals(roleDo.getDataScope(), DataScopeEnum.DEPT_AND_CHILD.getScope())) { //数据权限是本部门及一下
//根据规则ID 查询用户信息
List<AdminUserDO> userDos = adminUserMapper.selectListByRoleId(roleDo.getId());
for (AdminUserDO userDO : userDos) {
Set<Long> deptIds = deptService.getChildDeptIdListFromCache(userDO.getDeptId());
//权限部门与发起人部门一致时
if (deptIds.contains(createReqVO.getDeptId())) {
readStatus.put(String.valueOf(userDO.getId()), "0");
}
}
}
}
//通过满足条件的roleId 查询所有用户信息
List<UserRoleDO> userRoleDOS = userRoleMapper.selectListByRoleIds(roles);
for (UserRoleDO userRoleDO : userRoleDOS) {
readStatus.put(String.valueOf(userRoleDO.getUserId()), "0");
}
LogInstanceDO updateObj = new LogInstanceDO();
// updateObj.setReadStatus(JsonObject.);
// logInstanceMapper.updateById();
}
// 返回
return logInstance.getId();
}
@Override
public void updateLogInstance(LogInstanceSaveReqVO updateReqVO) {
// 校验存在
validateLogInstanceExists(updateReqVO.getId());
// 更新
LogInstanceDO updateObj = BeanUtils.toBean(updateReqVO, LogInstanceDO.class);
logInstanceMapper.updateById(updateObj);
}
@Override
public void deleteLogInstance(Long id) {
// 校验存在
validateLogInstanceExists(id);
// 删除
logInstanceMapper.deleteById(id);
}
private void validateLogInstanceExists(Long id) {
if (logInstanceMapper.selectById(id) == null) {
throw exception(LOG_INSTANCE_NOT_EXISTS);
}
}
@Override
public LogInstanceDO getLogInstance(Long id) {
return logInstanceMapper.selectById(id);
}
@Override
public PageResult<LogInstanceDO> getLogInstancePage(LogInstancePageReqVO pageReqVO) {
return logInstanceMapper.selectPage(pageReqVO);
}
@Override
public PageResult<LogInstanceRespVO> getMyProcessInstancePage(Long userId, LogInstancePageReqVO pageReqVO) {
return LogInstanceConvert.INSTANCE.convertPage(logInstanceMapper.selectMyPage(userId, pageReqVO));
}
}

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

@ -0,0 +1,55 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRulePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRuleSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import javax.validation.Valid;
/**
* 日志规则 Service 接口
*
* @author 符溶馨
*/
public interface LogRuleService {
/**
* 创建日志规则
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createLogRule(@Valid LogRuleSaveReqVO createReqVO);
/**
* 更新日志规则
*
* @param updateReqVO 更新信息
*/
void updateLogRule(@Valid LogRuleSaveReqVO updateReqVO);
/**
* 删除日志规则
*
* @param id 编号
*/
void deleteLogRule(Long id);
/**
* 获得日志规则
*
* @param id 编号
* @return 日志规则
*/
LogRuleDO getLogRule(Long id);
/**
* 获得日志规则分页
*
* @param pageReqVO 分页查询
* @return 日志规则分页
*/
PageResult<LogRuleDO> getLogRulePage(LogRulePageReqVO pageReqVO);
}

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

@ -0,0 +1,71 @@
package cn.iocoder.yudao.module.system.service.worklog;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRulePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.rule.LogRuleSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO;
import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogRuleMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LOG_RULE_NOT_EXISTS;
/**
* 日志规则 Service 实现类
*
* @author 符溶馨
*/
@Service
@Validated
public class LogRuleServiceImpl implements LogRuleService {
@Resource
private LogRuleMapper logRuleMapper;
@Override
public Long createLogRule(LogRuleSaveReqVO createReqVO) {
// 插入
LogRuleDO logRule = BeanUtils.toBean(createReqVO, LogRuleDO.class);
logRuleMapper.insert(logRule);
// 返回
return logRule.getId();
}
@Override
public void updateLogRule(LogRuleSaveReqVO updateReqVO) {
// 校验存在
validateLogRuleExists(updateReqVO.getId());
// 更新
LogRuleDO updateObj = BeanUtils.toBean(updateReqVO, LogRuleDO.class);
logRuleMapper.updateById(updateObj);
}
@Override
public void deleteLogRule(Long id) {
// 校验存在
validateLogRuleExists(id);
// 删除
logRuleMapper.deleteById(id);
}
private void validateLogRuleExists(Long id) {
if (logRuleMapper.selectById(id) == null) {
throw exception(LOG_RULE_NOT_EXISTS);
}
}
@Override
public LogRuleDO getLogRule(Long id) {
return logRuleMapper.selectById(id);
}
@Override
public PageResult<LogRuleDO> getLogRulePage(LogRulePageReqVO pageReqVO) {
return logRuleMapper.selectPage(pageReqVO);
}
}

25
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogFormFieldRespDTO.java Normal file
View File

@ -0,0 +1,25 @@
package cn.iocoder.yudao.module.system.service.worklog.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
* Bpm 表单的 Field 表单项 Response DTO
* 字段的定义，可见 https://github.com/JakHuang/form-generator/issues/46 文档
*
*/
@Data
public class LogFormFieldRespDTO {
/**
* 表单标题
*/
private String label;
/**
* 表单字段的属性名，可自定义
*/
@JsonProperty(value = "vModel")
private String vModel;
}