From 875483cd934dd8c35ab608f5b4a7416a0c930dc3 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 12 Apr 2024 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 4 + .../controller/admin/user/UserController.java | 10 + .../admin/worklog/LogInstanceController.java | 10 +- .../vo/loginstance/LogInstancePageReqVO.java | 3 - .../vo/loginstance/LogInstanceRespVO.java | 3 - .../vo/loginstance/LogInstanceSaveReqVO.java | 9 +- .../worklog/vo/rule/LogRulePageReqVO.java | 3 - .../admin/worklog/vo/rule/LogRuleRespVO.java | 4 - .../worklog/vo/rule/LogRuleSaveReqVO.java | 4 - .../dal/dataobject/worklog/LogInstanceDO.java | 6 - .../dal/dataobject/worklog/LogReadDo.java | 49 +++++ .../dal/dataobject/worklog/LogRuleDO.java | 4 - .../dal/dataobject/worklog/LogUseDO.java | 47 +++++ .../dal/mysql/user/AdminUserMapper.java | 5 + .../dal/mysql/worklog/LogInstanceMapper.java | 6 +- .../dal/mysql/worklog/LogRuleMapper.java | 6 +- .../dal/mysql/worklog/LogUseMapper.java | 16 ++ .../system/service/user/AdminUserService.java | 13 +- .../service/user/AdminUserServiceImpl.java | 13 +- .../worklog/LogInstanceServiceImpl.java | 179 ++++++++++-------- .../system/service/worklog/LogUseService.java | 35 ++++ .../service/worklog/LogUseServiceImpl.java | 55 ++++++ .../worklog/dto/LogReadUserRespDTO.java | 16 ++ .../service/worklog/dto/LogUseSaveReqDTO.java | 32 ++++ .../src/main/resources/application-local.yaml | 4 +- .../src/main/resources/bootstrap.yaml | 1 + .../resources/mapper/user/AdminUserMapper.xml | 16 ++ .../mapper/user/LogInstanceMapper.xml | 85 +++++++++ .../src/test/resources/sql/create_tables.sql | 3 + 29 files changed, 506 insertions(+), 135 deletions(-) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogUseDO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogUseMapper.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseService.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseServiceImpl.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogUseSaveReqDTO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 4c78abcb..19c6311e 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -176,4 +176,8 @@ public interface ErrorCodeConstants { ErrorCode LOG_INSTANCE_NOT_EXISTS = new ErrorCode(1_009_010_002, "日志实例的拓展不存在"); ErrorCode LOG_RULE_NOT_EXISTS = new ErrorCode(1_009_010_003, "日志规则不存在"); + + ErrorCode LOG_RULE_NOT_FIND = new ErrorCode(1_009_010_004, "该模板没配置规则"); + + ErrorCode LOG_USE_NOT_EXISTS = new ErrorCode(1_009_010_005, "模板不存在"); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index 0824c3f2..fe7e72e5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -140,6 +140,16 @@ public class UserController { return success(UserConvert.INSTANCE.convert(user, dept, post)); } + @PostMapping("/getByDeptIds") + @Operation(summary = "获得用户详情") + @PreAuthorize("@ss.hasPermission('system:user:query')") + public CommonResult> getUserByDeptIds(@RequestBody Collection deptIds) { + + List user = userService.getUserByDeptIds(deptIds); + + return success(user); + } + @GetMapping("/export") @Operation(summary = "导出用户") @PreAuthorize("@ss.hasPermission('system:user:export')") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java index 659ef72c..74dbad00 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java @@ -41,14 +41,14 @@ public class LogInstanceController { private LogInstanceService logInstanceService; @PostMapping("/create") - @Operation(summary = "创建日志实例的拓展") + @Operation(summary = "创建日志实例") @PreAuthorize("@ss.hasPermission('system:log-instance:create')") public CommonResult createLogInstance(@Valid @RequestBody LogInstanceSaveReqVO createReqVO) { return success(logInstanceService.createLogInstance(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新日志实例的拓展") + @Operation(summary = "更新日志实例") @PreAuthorize("@ss.hasPermission('system:log-instance:update')") public CommonResult updateLogInstance(@Valid @RequestBody LogInstanceSaveReqVO updateReqVO) { logInstanceService.updateLogInstance(updateReqVO); @@ -56,7 +56,7 @@ public class LogInstanceController { } @DeleteMapping("/delete") - @Operation(summary = "删除日志实例的拓展") + @Operation(summary = "删除日志实例") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('system:log-instance:delete')") public CommonResult deleteLogInstance(@RequestParam("id") Long id) { @@ -65,7 +65,7 @@ public class LogInstanceController { } @GetMapping("/get") - @Operation(summary = "获得日志实例的拓展") + @Operation(summary = "获得日志实例") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:log-instance:query')") public CommonResult getLogInstance(@RequestParam("id") Long id) { @@ -82,7 +82,7 @@ public class LogInstanceController { } @GetMapping("/page") - @Operation(summary = "获得日志实例的拓展分页") + @Operation(summary = "获得我收到的日志分页列表") @PreAuthorize("@ss.hasPermission('system:view-log:query')") public CommonResult> getLogInstancePage(@Valid LogInstancePageReqVO pageReqVO) { PageResult pageResult = logInstanceService.getLogInstancePage(pageReqVO); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java index 61d36372..be81dd11 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstancePageReqVO.java @@ -38,9 +38,6 @@ public class LogInstancePageReqVO extends PageParam { @Schema(description = "模板值") private Map formVariables; - @Schema(description = "日志阅读状态", example = "2") - private Map readStatus; - @Schema(description = "附件信息") private List fileItems ; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceRespVO.java index b2d3b780..6ba8f38d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceRespVO.java @@ -35,9 +35,6 @@ public class LogInstanceRespVO { @Schema(description = "模板值") private Map formVariables; - @Schema(description = "日志阅读状态", example = "2") - private Map readStatus; - @Schema(description = "附件信息") private List fileItems ; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceSaveReqVO.java index 4c1e156d..041f2374 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogInstanceSaveReqVO.java @@ -15,12 +15,10 @@ public class LogInstanceSaveReqVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20649") private Long id; - @Schema(description = "日志发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24292") - @NotNull(message = "发起日志的用户编号不能为空") + @Schema(description = "日志发起人的用户编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "24292") private Long startUserId; - @Schema(description = "日志发起人的部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24292") - @NotNull(message = "发起日志的用户编号不能为空") + @Schema(description = "日志发起人的部门编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "24292") private Long deptId; @Schema(description = "日志实例的名字", example = "张三") @@ -35,9 +33,6 @@ public class LogInstanceSaveReqVO { @Schema(description = "模板值") private Map formVariables; - @Schema(description = "日志阅读状态", example = "2") - private Map readStatus; - @Schema(description = "附件信息") private List fileItems ; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRulePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRulePageReqVO.java index 1aff5090..874becdf 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRulePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRulePageReqVO.java @@ -17,9 +17,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class LogRulePageReqVO extends PageParam { - @Schema(description = "模板使用部门组") - private String deptIds; - @Schema(description = "日志类型 字典值 详情参考work_log_type", example = "2") private Integer type; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleRespVO.java index 2e1f87de..d28d90a0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleRespVO.java @@ -16,10 +16,6 @@ public class LogRuleRespVO { @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; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleSaveReqVO.java index 4a838719..c0a3c1de 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/rule/LogRuleSaveReqVO.java @@ -12,10 +12,6 @@ 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; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogInstanceDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogInstanceDO.java index b0d6013c..f25025d5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogInstanceDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogInstanceDO.java @@ -61,12 +61,6 @@ public class LogInstanceDO extends BaseDO { @TableField(typeHandler = JacksonTypeHandler.class) private Map formVariables; - /** - * 日志阅读状态 - */ - @TableField(typeHandler = JacksonTypeHandler.class) - private Map readStatus; - /** * 附件基本信息 */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java new file mode 100644 index 00000000..bfa94f9a --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java @@ -0,0 +1,49 @@ +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_read") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class LogReadDo extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + + /** + * 日志实例编号 + */ + private Long logInstanceId; + + /** + * 日这发起人的用户编号 + */ + private Long startUserId; + + /** + * 日志查看人的用户编号 + */ + private Long readUserId; + + /** + * 日志查看状态 + * 0：未读 + * 1：已读 + */ + private Integer readStatus; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogRuleDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogRuleDO.java index 4e1eadc5..e9633a88 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogRuleDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogRuleDO.java @@ -24,10 +24,6 @@ public class LogRuleDO extends BaseDO { */ @TableId private Long id; - /** - * 模板使用部门组 - */ - private String deptIds; /** * 日志类型 */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogUseDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogUseDO.java new file mode 100644 index 00000000..0de8e7bc --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogUseDO.java @@ -0,0 +1,47 @@ +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_use") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class LogUseDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + + /** + * 模板编号 + */ + private Long formId; + + /** + * 规则编号 + */ + private Long ruleId; + + /** + * 使用者编号 + */ + private Long useUserId; + + /** + * 使用者部门编号 + */ + private Long useUserDept; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index 7ebc6f7b..241edc39 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -4,6 +4,7 @@ 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.user.vo.user.UserPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserRespVO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -53,4 +54,8 @@ public interface AdminUserMapper extends BaseMapperX { } void emptyOpenId(@Param("openId") String openId); + + List selectListByRoleId(@Param("roleId") Long roleId); + + List selectByDeptIds(@Param("deptIds") Collection deptIds); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java index 4341bd29..b684b937 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java @@ -3,8 +3,10 @@ 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.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstancePageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.ibatis.annotations.Mapper; /** @@ -21,22 +23,22 @@ public interface LogInstanceMapper extends BaseMapperX { .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 selectMyPage(Long userId, LogInstancePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() .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)); } + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogRuleMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogRuleMapper.java index a4407855..acbfab21 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogRuleMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogRuleMapper.java @@ -4,7 +4,11 @@ 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.LogFormDO; +import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO; import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogRuleDO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.ibatis.annotations.Mapper; /** @@ -17,10 +21,8 @@ public interface LogRuleMapper extends BaseMapperX { default PageResult selectPage(LogRulePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(LogRuleDO::getDeptIds, reqVO.getDeptIds()) .eqIfPresent(LogRuleDO::getType, reqVO.getType()) .betweenIfPresent(LogRuleDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(LogRuleDO::getId)); } - } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogUseMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogUseMapper.java new file mode 100644 index 00000000..e79ef5d6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogUseMapper.java @@ -0,0 +1,16 @@ +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.dal.dataobject.worklog.LogUseDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 日志模板使用者 Mapper + * + * @author 符溶馨 + */ +@Mapper +public interface LogUseMapper extends BaseMapperX { +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index f1538311..2201dc9c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -5,10 +5,7 @@ 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.user.vo.profile.UserProfileUpdatePasswordReqVO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO; +import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import javax.validation.Valid; @@ -148,6 +145,14 @@ public interface AdminUserService { */ List getUserListByDeptIds(Collection deptIds); + /** + * 获得指定岗位的用户数组 + * + * @param deptIds 岗位数组 + * @return 用户数组 + */ + List getUserByDeptIds(Collection deptIds); + /** * 获得指定岗位的用户数组 * diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index cdbc4a26..f4fc1af6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -15,10 +15,7 @@ import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils; import cn.iocoder.yudao.module.infra.api.file.FileApi; import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO; +import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; @@ -251,6 +248,14 @@ public class AdminUserServiceImpl implements AdminUserService { return userMapper.selectListByDeptIds(deptIds); } + @Override + public List getUserByDeptIds(Collection deptIds) { + if (CollUtil.isEmpty(deptIds)) { + return Collections.emptyList(); + } + return userMapper.selectByDeptIds(deptIds); + } + @Override public List getUserListByPostIds(Collection postIds) { if (CollUtil.isEmpty(postIds)) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java index 457860ad..1f5fbc8c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java @@ -6,26 +6,23 @@ import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.Lo 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.dict.DictDataDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogFormDO; 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.dataobject.worklog.LogRuleDO; 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 cn.iocoder.yudao.module.system.service.dict.DictDataService; +import cn.iocoder.yudao.module.system.service.user.AdminUserService; 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.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LOG_INSTANCE_NOT_EXISTS; +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LOG_RULE_NOT_FIND; /** * 日志实例的拓展 Service 实现类 @@ -40,90 +37,108 @@ public class LogInstanceServiceImpl implements LogInstanceService { private LogInstanceMapper logInstanceMapper; @Resource - private MenuService menuService; + private DictDataService dictDataService; @Resource - private PermissionService permissionService; + private LogRuleService logRuleService; @Resource - private RoleService roleService; + private LogFormService logFormService; @Resource - private UserRoleMapper userRoleMapper; - - @Resource - private AdminUserMapper adminUserMapper; - - @Resource - private DeptService deptService; + private AdminUserService adminUserService; @Override public Long createLogInstance(LogInstanceSaveReqVO createReqVO) { - // 插入 + LogInstanceDO logInstance = BeanUtils.toBean(createReqVO, LogInstanceDO.class); + + //获取日志类型 + LogFormDO logFormDo = logFormService.getForm(createReqVO.getFormId()); + LogRuleDO logRuleDO = logRuleService.getLogRule(logFormDo.getRuleId()); + if (logRuleDO == null) { + throw exception(LOG_RULE_NOT_FIND); + } + + //获取部门信息 + AdminUserDO adminUserDO = adminUserService.getUser(getLoginUserId()); + + //获取字典值 + DictDataDO dictDataDO = dictDataService.getDictData("work_log_type", String.valueOf(logRuleDO.getType())); + + //设置发起人用户编号 + logInstance.setStartUserId(getLoginUserId()); + //设置发起人部门编号 + logInstance.setDeptId(adminUserDO.getDeptId()); + //设置日志类型 + logInstance.setType(logRuleDO.getType()); + //设置日志名称 + logInstance.setName(adminUserDO.getNickname() + "的" + dictDataDO.getLabel()); + + // 插入 logInstanceMapper.insert(logInstance); - //根据查询权限获取menuID - List menuIds = menuService.getMenuIdListByPermissionFromCache("system:view-log:query"); - if (menuIds != null && !menuIds.isEmpty()) { - - Map readStatus = new HashMap<>(); - List roles = new ArrayList<>(); - - //根据menuID 获取 roleIds - Set roleIds = permissionService.getMenuRoleIdListByMenuIdFromCache(menuIds.get(0)); - - List 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 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 userDos = adminUserMapper.selectListByRoleId(roleDo.getId()); - for (AdminUserDO userDO : userDos) { - - Set deptIds = deptService.getChildDeptIdListFromCache(userDO.getDeptId()); - //权限部门与发起人部门一致时 - if (deptIds.contains(createReqVO.getDeptId())) { - - readStatus.put(String.valueOf(userDO.getId()), "0"); - } - } - } - } - - //通过满足条件的roleId 查询所有用户信息 - List userRoleDOS = userRoleMapper.selectListByRoleIds(roles); - for (UserRoleDO userRoleDO : userRoleDOS) { - - readStatus.put(String.valueOf(userRoleDO.getUserId()), "0"); - } - - LogInstanceDO updateObj = new LogInstanceDO(); -// updateObj.setReadStatus(JsonObject.); -// logInstanceMapper.updateById(); - } +// //根据查询权限获取menuID +// List menuIds = menuService.getMenuIdListByPermissionFromCache("system:view-log:query"); +// if (menuIds != null && !menuIds.isEmpty()) { +// +// Map readStatus = new HashMap<>(); +// List roles = new ArrayList<>(); +// +// //根据menuID 获取 roleIds +// Set roleIds = permissionService.getMenuRoleIdListByMenuIdFromCache(menuIds.get(0)); +// +// List 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 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 userDos = adminUserMapper.selectListByRoleId(roleDo.getId()); +// for (AdminUserDO userDO : userDos) { +// +// Set deptIds = deptService.getChildDeptIdListFromCache(userDO.getDeptId()); +// //权限部门与发起人部门一致时 +// if (deptIds.contains(createReqVO.getDeptId())) { +// +// readStatus.put(String.valueOf(userDO.getId()), "0"); +// } +// } +// } +// } +// +// //通过满足条件的roleId 查询所有用户信息 +// List userRoleDOS = userRoleMapper.selectListByRoleIds(roles); +// for (UserRoleDO userRoleDO : userRoleDOS) { +// +// readStatus.put(String.valueOf(userRoleDO.getUserId()), "0"); +// } +// +// LogInstanceDO updateObj = new LogInstanceDO(); +// updateObj.setReadStatus(); +//// logInstanceMapper.updateById(); +// } // 返回 return logInstance.getId(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseService.java new file mode 100644 index 00000000..592da923 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseService.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.system.service.worklog; + +import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogUseDO; +import cn.iocoder.yudao.module.system.service.worklog.dto.LogUseSaveReqDTO; + +/** + * 日志模板使用者 Service 接口 + * + * @author 符溶馨 + */ +public interface LogUseService { + + /** + * 创建日志模板使用者 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createLogUse(LogUseSaveReqDTO createReqVO); + + /** + * 更新日志模板使用者 + * + * @param updateReqVO 更新信息 + */ + void updateLogUse(LogUseSaveReqDTO updateReqVO); + + /** + * 获得日志模板使用者 + * + * @param id 编号 + * @return 日志模板使用者 + */ + LogUseDO getLogUse(Long id); +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseServiceImpl.java new file mode 100644 index 00000000..f37ab7b9 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseServiceImpl.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.system.service.worklog; + +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogUseDO; +import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogUseMapper; +import cn.iocoder.yudao.module.system.service.worklog.dto.LogUseSaveReqDTO; +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_USE_NOT_EXISTS; + +/** + * 日志模板使用者 Service 实现类 + * + * @author 符溶馨 + */ +@Service +@Validated +public class LogUseServiceImpl implements LogUseService { + + @Resource + private LogUseMapper logUseMapper; + + @Override + public Long createLogUse(LogUseSaveReqDTO createReqVO) { + // 插入 + LogUseDO logUse = BeanUtils.toBean(createReqVO, LogUseDO.class); + logUseMapper.insert(logUse); + // 返回 + return logUse.getId(); + } + + @Override + public void updateLogUse(LogUseSaveReqDTO updateReqVO) { + // 校验存在 + validateLogUseExists(updateReqVO.getFormId()); + // 更新 + LogUseDO updateObj = BeanUtils.toBean(updateReqVO, LogUseDO.class); + logUseMapper.updateById(updateObj); + } + + private void validateLogUseExists(Long formId) { + if (logUseMapper.selectCount(LogUseDO::getFormId, formId) == 0L) { + throw exception(LOG_USE_NOT_EXISTS); + } + } + + @Override + public LogUseDO getLogUse(Long id) { + return logUseMapper.selectById(id); + } +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java new file mode 100644 index 00000000..f3b16d1d --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogReadUserRespDTO.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.system.service.worklog.dto; + +import lombok.Data; + +/** + * 日志可查看用户 Response DTO + * + */ +@Data +public class LogReadUserRespDTO { + + /** + * 可查看日志的用户编号 + */ + private Long userId; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogUseSaveReqDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogUseSaveReqDTO.java new file mode 100644 index 00000000..727ff150 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/dto/LogUseSaveReqDTO.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.system.service.worklog.dto; + +import lombok.Data; + +/** + * 日志模板使用者新增/修改 Request DTO + */ +@Data +public class LogUseSaveReqDTO { + + private Long id; + + /** + * 日志模板编号 + */ + private Long formId; + + /** + * 模板规则编号 + */ + private Long ruleId; + + /** + * 使用模板用户编号 + */ + private Long useUserId; + + /** + * 使用模板用户部门编号 + */ + private Long useUserDept; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml index 6a749708..c74890d1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml @@ -47,7 +47,7 @@ spring: # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 username: root - password: root + password: 123456 # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 @@ -58,7 +58,7 @@ spring: # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 username: root - password: root + password: 123456 # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml index 7abdef88..d80b600d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml @@ -4,6 +4,7 @@ spring: profiles: active: local #local +# active: dev # active: prod server: diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml index 732f606c..3fac9071 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/AdminUserMapper.xml @@ -14,4 +14,20 @@ set open_id = null where open_id = #{openId} + + + + \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml new file mode 100644 index 00000000..8f56c501 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/user/LogInstanceMapper.xml @@ -0,0 +1,85 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql index 78d4e83d..764e6d0d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql +++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql @@ -3,9 +3,11 @@ CREATE TABLE IF NOT EXISTS "system_dept" ( "name" varchar(30) NOT NULL DEFAULT '', "parent_id" bigint NOT NULL DEFAULT '0', "sort" int NOT NULL DEFAULT '0', + "level" int(11) NOT NULL DEFAULT '0', "leader_user_id" bigint DEFAULT NULL, "phone" varchar(11) DEFAULT NULL, "email" varchar(50) DEFAULT NULL, + "flag" varchar(255) NOT NULL, "status" tinyint NOT NULL, "creator" varchar(64) DEFAULT '', "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -248,6 +250,7 @@ CREATE TABLE IF NOT EXISTS "system_users" ( "update_time" timestamp not null default current_timestamp, "deleted" bit not null default false, "tenant_id" bigint not null default '0', + "open_id" varchar(255) DEFAULT NULL, primary key ("id") ) comment '用户信息表';