日志模板 创建、删除 同时关联规则表和使用者表 同步更新

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;

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) {

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);
+
     /**
      * 获得日志规则
      *

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);

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<Long> getFormIdByUserId(Long userId);
+
+    /**
+     * 删除使用者
+     * @param formId 模板编号
+     */
+    void deletByFormId(Long formId);
 }

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<LogUseDO> logUseDOS = logUseMapper.selectList(LogUseDO::getUseUserId, userId);
         return convertList(logUseDOS, LogUseDO::getFormId);
     }
+
+    @Override
+    public void deletByFormId(Long formId) {
+
+        logUseMapper.delete(LogUseDO::getFormId, formId);
+    }
 }