新增字段

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworklog/WorkflowWorkLogController.java

@@ -1,30 +1,23 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworklog;
 
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 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.module.iscs.controller.admin.workdesign.workflowworklog.vo.WorkflowWorkLogPageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworklog.vo.WorkflowWorkLogRespVO;
-import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworklog.vo.WorkflowWorkLogSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.mappoint.workdesign.WorkflowWorkLogService;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkLogDO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.List;
 
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 
@@ -37,21 +30,6 @@ public class WorkflowWorkLogController {
     @Resource
     private WorkflowWorkLogService workflowWorkLogService;
 
-    @PostMapping("/insertWorkflowWorkLog")
-    @Operation(summary = "创建作业流程操作日志")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-log:create')")
-    public CommonResult<Long> insertWorkflowWorkLog(@Valid @RequestBody WorkflowWorkLogSaveReqVO createReqVO) {
-        return success(workflowWorkLogService.createWorkflowWorkLog(createReqVO));
-    }
-
-    @PutMapping("/updateWorkflowWorkLog")
-    @Operation(summary = "更新作业流程操作日志")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-log:update')")
-    public CommonResult<Boolean> updateWorkflowWorkLog(@Valid @RequestBody WorkflowWorkLogSaveReqVO updateReqVO) {
-        workflowWorkLogService.updateWorkflowWorkLog(updateReqVO);
-        return success(true);
-    }
-
     @DeleteMapping("/deleteWorkflowWorkLogList")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除作业流程操作日志")
@@ -78,17 +56,5 @@ public class WorkflowWorkLogController {
         return success(BeanUtils.toBean(pageResult, WorkflowWorkLogRespVO.class));
     }
 
-    @GetMapping("/exportWorkflowWorkLogExcel")
-    @Operation(summary = "导出作业流程操作日志 Excel")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-log:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportWorkflowWorkLogExcel(@Valid WorkflowWorkLogPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<WorkflowWorkLogDO> list = workflowWorkLogService.getWorkflowWorkLogPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "作业流程操作日志.xls", "数据", WorkflowWorkLogRespVO.class,
-                        BeanUtils.toBean(list, WorkflowWorkLogRespVO.class));
-    }
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworklog/vo/WorkflowWorkLogSaveReqVO.java

@@ -1,10 +1,8 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworklog.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 作业流程操作日志新增/修改 Request VO")
@@ -14,9 +12,11 @@ public class WorkflowWorkLogSaveReqVO {
     @Schema(description = "日志ID，自增长主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26301")
     private Long id;
 
+    @Schema(description = "作业ID，关联作业主表或任务节点表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12724")
+    private Long workId;
+
     @Schema(description = "作业/任务节点ID，关联作业主表或任务节点表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12724")
-    @NotEmpty(message = "作业/任务节点ID，关联作业主表或任务节点表主键不能为空")
-    private String nodeId;
+    private Long nodeId;
 
     @Schema(description = "上一任务节点ID，关联上一节点日志的node_id，作业创建时置NULL", example = "28235")
     private String parentNodeId;
@@ -25,25 +25,21 @@ public class WorkflowWorkLogSaveReqVO {
     private String step;
 
     @Schema(description = "操作用户/任务负责人ID，关联用户表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9545")
-    @NotEmpty(message = "操作用户/任务负责人ID，关联用户表主键不能为空")
     private String userId;
 
     @Schema(description = "操作用户/任务负责人昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @NotEmpty(message = "操作用户/任务负责人昵称不能为空")
     private String nickName;
 
     @Schema(description = "操作用户/任务负责人头像地址，默认空字符串")
     private String avatar;
 
     @Schema(description = "任务/行为开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "任务/行为开始时间不能为空")
     private LocalDateTime taskStartTime;
 
     @Schema(description = "任务/行为完成时间，未完成置NULL，作业创建时与开始时间一致")
     private LocalDateTime taskFinishTime;
 
     @Schema(description = "任务/行为描述，如：创建作业、获取钥匙和锁具、能量隔离", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "任务/行为描述，如：创建作业、获取钥匙和锁具、能量隔离不能为空")
     private String taskContent;
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/mappoint/workdesign/WorkflowWorkLogService.java

@@ -24,20 +24,6 @@ public interface WorkflowWorkLogService extends IService<WorkflowWorkLogDO> {
      */
     Long createWorkflowWorkLog(@Valid WorkflowWorkLogSaveReqVO createReqVO);
 
-    /**
-     * 更新作业流程操作日志
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateWorkflowWorkLog(@Valid WorkflowWorkLogSaveReqVO updateReqVO);
-
-    /**
-     * 删除作业流程操作日志
-     *
-     * @param id 编号
-     */
-    void deleteWorkflowWorkLog(Long id);
-
     /**
     * 批量删除作业流程操作日志
     *

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/mappoint/workdesign/WorkflowWorkLogServiceImpl.java

@@ -36,24 +36,10 @@ public class WorkflowWorkLogServiceImpl extends ServiceImpl<WorkflowWorkLogMappe
     }
 
     @Override
-    public void updateWorkflowWorkLog(WorkflowWorkLogSaveReqVO updateReqVO) {
-        // 更新
-        WorkflowWorkLogDO updateObj = BeanUtils.toBean(updateReqVO, WorkflowWorkLogDO.class);
-        workflowWorkLogMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteWorkflowWorkLog(Long id) {
-        // 删除
-        workflowWorkLogMapper.deleteById(id);
-    }
-
-    @Override
-        public void deleteWorkflowWorkLogListByIds(List<Long> ids) {
+    public void deleteWorkflowWorkLogListByIds(List<Long> ids) {
         // 删除
         workflowWorkLogMapper.deleteByIds(ids);
-        }
-
+    }
 
     @Override
     public WorkflowWorkLogDO getWorkflowWorkLog(Long id) {

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/workdesign/WorkflowWorkLogDO.java

@@ -28,10 +28,14 @@ public class WorkflowWorkLogDO extends BaseDO {
      */
     @TableId
     private Long id;
+    /**
+     * 作业ID
+     */
+    private Long workId;
     /**
      * 作业/任务节点ID，关联作业主表或任务节点表主键
      */
-    private String nodeId;
+    private Long nodeId;
     /**
      * 上一任务节点ID，关联上一节点日志的node_id，作业创建时置NULL
      */