From 718ee116f61bb5afeccd0d65eeda96b0f0ccfbb2 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 16 Apr 2024 00:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E6=9D=BF=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E3=80=81=E5=88=A0=E9=99=A4=20=20=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=85=B3=E8=81=94=E8=A7=84=E5=88=99=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E8=A1=A8=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/worklog/vo/rule/LogRuleRespVO.java | 3 +++ .../system/service/worklog/LogFormServiceImpl.java | 6 ++++++ .../system/service/worklog/LogRuleService.java | 7 +++++++ .../system/service/worklog/LogRuleServiceImpl.java | 14 ++++++++++++-- .../system/service/worklog/LogUseService.java | 6 ++++++ .../system/service/worklog/LogUseServiceImpl.java | 6 ++++++ 6 files changed, 40 insertions(+), 2 deletions(-) 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 d28d90a0..0494cd96 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,6 +16,9 @@ public class LogRuleRespVO { @ExcelProperty("编号") private Long id; + @Schema(description = "日志模板编号", example = "2") + private Long formId; + @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/service/worklog/LogFormServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogFormServiceImpl.java index fcb6d577..e8f71652 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogFormServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogFormServiceImpl.java @@ -68,6 +68,12 @@ public class LogFormServiceImpl implements LogFormService { this.validateFormExists(id); // 删除 formMapper.deleteById(id); + + //同步删除规则 + logRuleService.deleteLogRuleByFormId(id); + + //同步删除模板使用者 + logUseService.deletByFormId(id); } private void validateFormExists(Long id) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleService.java index ccd7727c..13f87aec 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleService.java @@ -37,6 +37,13 @@ public interface LogRuleService { */ void deleteLogRule(Long id); + /** + * 删除日志规则 + * + * @param formId 模板编号 + */ + void deleteLogRuleByFormId(Long formId); + /** * 获得日志规则 * diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java index 456ac625..e5584227 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java @@ -58,8 +58,8 @@ public class LogRuleServiceImpl implements LogRuleService { //把规则编号更新至日志模板表中 LogFormDO updateObj = new LogFormDO(); - updateObj.setId(createReqVO.getFormId()); - updateObj.setRuleId(createReqVO.getId()); + updateObj.setId(logRule.getFormId()); + updateObj.setRuleId(logRule.getId()); logFormMapper.updateById(updateObj); // 返回 @@ -96,6 +96,16 @@ public class LogRuleServiceImpl implements LogRuleService { logRuleMapper.deleteById(id); } + @Override + public void deleteLogRuleByFormId(Long formId) { + + if (logRuleMapper.selectCount(LogRuleDO::getFormId, formId) > 0L) { + + //删除规则 + logRuleMapper.delete(LogRuleDO::getFormId, formId); + } + } + private void validateLogRuleExists(Long id) { if (logRuleMapper.selectById(id) == null) { throw exception(LOG_RULE_NOT_EXISTS); 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 index a1941c09..d4f93f23 100644 --- 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 @@ -56,4 +56,10 @@ public interface LogUseService { * @return 日志模板编号组 */ List getFormIdByUserId(Long userId); + + /** + * 删除使用者 + * @param formId 模板编号 + */ + void deletByFormId(Long formId); } \ 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 index b6e7150f..cef46aea 100644 --- 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 @@ -87,4 +87,10 @@ public class LogUseServiceImpl implements LogUseService { List logUseDOS = logUseMapper.selectList(LogUseDO::getUseUserId, userId); return convertList(logUseDOS, LogUseDO::getFormId); } + + @Override + public void deletByFormId(Long formId) { + + logUseMapper.delete(LogUseDO::getFormId, formId); + } } \ No newline at end of file