新增规则详情新增

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/notifyconfig/NotifyConfigDetailController.java

@@ -45,6 +45,13 @@ public class NotifyConfigDetailController {
         return success(true);
     }
 
+    @PostMapping("/insertOrUpdateList")
+    @Operation(summary = "创建或修改通知规则角色和模板设置关联")
+    @PreAuthorize("@ss.hasPermission('iscs:notify-config-detail:create')")
+    public CommonResult<Boolean> insertOrUpdateList(@Valid @RequestBody List<NotifyConfigDetailDO> list) {
+        return success(notifyConfigDetailService.insertOrUpdateList(list));
+    }
+
     @DeleteMapping("/deleteNotifyConfigDetailList")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除通知规则角色和模板设置关联")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/job/SopExecutionPlanJob.java

@@ -2,13 +2,13 @@ package cn.iocoder.yudao.module.iscs.job;
 
 import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
-import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
-import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
+import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketSaveReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.sop.vo.SopExecutionPlanRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.jobticket.JobTicketDO;
 import cn.iocoder.yudao.module.iscs.service.jobticket.JobTicketService;
 import cn.iocoder.yudao.module.iscs.service.sop.SopExecutionPlanService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +32,8 @@ public class SopExecutionPlanJob implements JobHandler {
     private SopExecutionPlanService sopExecutionPlanService;
     @Resource
     private JobTicketService jobTicketService;
+    @Resource
+    private AdminUserService adminUserService;
 
     /**
      * 查找需要执行的数据，生成作业
@@ -39,11 +41,15 @@ public class SopExecutionPlanJob implements JobHandler {
      * @param param 参数
      * @return
      */
-
+    // @TenantIgnore
     @Override
-    @TenantIgnore
+    @TenantJob
     public String execute(String param) {
-        TenantUtils.execute(1L, () -> {});
+        /*TenantUtils.execute(1L, () -> {
+            AdminUserRespDTO user = new AdminUserRespDTO();
+            user.setId(0L);
+            return BeanUtils.toBean(user, Response.class);
+        });*/
         String yyyymmdd = DateUtil.format(new Date(), "yyyy-MM-dd");
         SopExecutionPlanRespVO sopExecutionPlanRespVO = new SopExecutionPlanRespVO();
         sopExecutionPlanRespVO.setNextExecutDate(yyyymmdd);

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/notifyconfig/NotifyConfigDetailService.java

@@ -33,6 +33,8 @@ public interface NotifyConfigDetailService extends IService<NotifyConfigDetailDO
      */
     void updateNotifyConfigDetail(@Valid NotifyConfigDetailSaveReqVO updateReqVO);
 
+    Boolean insertOrUpdateList(@Valid List<NotifyConfigDetailDO> list);
+
     /**
     * 批量删除通知规则角色和模板设置关联
     *

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/notifyconfig/NotifyConfigDetailServiceImpl.java

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.iscs.dal.mysql.notifyconfig.NotifyConfigDetailMap
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
@@ -44,11 +45,24 @@ public class NotifyConfigDetailServiceImpl extends ServiceImpl<NotifyConfigDetai
         notifyConfigDetailMapper.updateById(updateObj);
     }
 
+    @Transactional
     @Override
-        public void deleteNotifyConfigDetailListByIds(List<Long> ids) {
+    public Boolean insertOrUpdateList(List<NotifyConfigDetailDO> list) {
+        for (NotifyConfigDetailDO notifyConfigDetailDO : list) {
+            if (notifyConfigDetailDO.getId() != null) {
+                updateById(notifyConfigDetailDO);
+            } else {
+                save(notifyConfigDetailDO);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void deleteNotifyConfigDetailListByIds(List<Long> ids) {
         // 删除
         notifyConfigDetailMapper.physicalDeleteByIds(ids);
-        }
+    }
 
 
     @Override