修改节点

yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java

@@ -60,7 +60,7 @@ public class BpmFormServiceImpl implements BpmFormService {
     public void updateStatus(BpmFormStatusReqVO updateReqVO) {
         if (updateReqVO.getStatus().equals(1)) {
             Integer nodeByFormId = iscsCommonApi.getNodeByFormId(updateReqVO.getId());
-            Assert.isTrue(nodeByFormId > 0, "表单正在被使用，不可删除");
+            Assert.isFalse(nodeByFormId > 0, "表单正在被使用，不可删除");
         }
         formMapper.update(Wrappers.<BpmFormDO>lambdaUpdate()
                 .eq(BpmFormDO::getId, updateReqVO.getId())

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknode/vo/WorkflowWorkNodeRespVO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo;
 
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknodeuser.vo.WorkflowWorkNodeUserRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkPointRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketLockRespVO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -157,4 +159,10 @@ public class WorkflowWorkNodeRespVO {
     @Schema(description = "作业单号")
     private String workName;
 
+    @Schema(description = "节点point数据")
+    private List<WorkflowWorkPointRespVO> points;
+
+    @Schema(description = "节点的lock数据")
+    private List<WorkflowWorkTicketLockRespVO> locks;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknodeuser/vo/WorkflowWorkNodeUserPageReqVO.java

@@ -1,10 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknodeuser.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -25,6 +26,15 @@ public class WorkflowWorkNodeUserPageReqVO extends PageParam {
     @Schema(description = "用户组ID", example = "28276")
     private Long userGroupId;
 
+    @ExcelProperty("上锁时间")
+    private LocalDateTime lockTime;
+
+    @ExcelProperty("解锁时间")
+    private LocalDateTime unlockTime;
+
+    @ExcelProperty("状态:0初始、1已上锁/已共锁、2已解锁/已解共锁")
+    private String status;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknodeuser/vo/WorkflowWorkNodeUserRespVO.java

@@ -18,7 +18,7 @@ public class WorkflowWorkNodeUserRespVO {
 
     @Schema(description = "作业节点ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9442")
     @ExcelProperty("作业节点ID")
-    private Long workNodeId;
+    private Long nodeId;
 
     @Schema(description = "类型：responsible-负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("类型：responsible-负责人")
@@ -56,4 +56,13 @@ public class WorkflowWorkNodeUserRespVO {
     @ExcelProperty("cardNfc")
     private String cardNfc;
 
+    @ExcelProperty("上锁时间")
+    private LocalDateTime lockTime;
+
+    @ExcelProperty("解锁时间")
+    private LocalDateTime unlockTime;
+
+    @ExcelProperty("状态:0初始、1已上锁/已共锁、2已解锁/已解共锁")
+    private String status;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknodeuser/vo/WorkflowWorkNodeUserSaveReqVO.java

@@ -1,9 +1,12 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknodeuser.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 作业节点人员关联新增/修改 Request VO")
 @Data
@@ -26,4 +29,13 @@ public class WorkflowWorkNodeUserSaveReqVO {
     @Schema(description = "用户组ID", example = "28276")
     private Long userGroupId;
 
+    @ExcelProperty("上锁时间")
+    private LocalDateTime lockTime;
+
+    @ExcelProperty("解锁时间")
+    private LocalDateTime unlockTime;
+
+    @ExcelProperty("状态:0初始、1已上锁/已共锁、2已解锁/已解共锁")
+    private String status;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/WorkflowWorkTicketController.java

@@ -1,94 +1,73 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle;
 
-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.workhandle.vo.WorkflowWorkTicketPageReqVO;
-import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketRespVO;
-import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketSaveReqVO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkTicketDO;
-import cn.iocoder.yudao.module.iscs.service.workdesign.WorkflowWorkTicketService;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.*;
+import cn.iocoder.yudao.module.iscs.service.workdesign.WorkflowWorkHandleService;
 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 org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-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;
 
 
-@Tag(name = "管理后台 - 作业票")
+@Tag(name = "管理后台 - 作业票处理过程")
 @RestController
-@RequestMapping("/isc/workflow-work-ticket")
+@RequestMapping("/isc/work-handle")
 @Validated
 public class WorkflowWorkTicketController {
 
     @Resource
-    private WorkflowWorkTicketService workflowWorkTicketService;
+    private WorkflowWorkHandleService workflowWorkHandleService;
 
-    @PostMapping("/insertWorkflowWorkTicket")
-    @Operation(summary = "创建作业票")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-ticket:create')")
-    public CommonResult<Long> insertWorkflowWorkTicket(@Valid @RequestBody WorkflowWorkTicketSaveReqVO createReqVO) {
-        return success(workflowWorkTicketService.createWorkflowWorkTicket(createReqVO));
+    @PostMapping("/insertWorkTicket")
+    @Operation(summary = "下发作业票")
+    public CommonResult<Boolean> insertWorkTicket(@Valid @RequestBody WorkHandleSaveReqVO vo) {
+        return success(workflowWorkHandleService.insertWorkTicket(vo));
     }
 
-    @PutMapping("/updateWorkflowWorkTicket")
-    @Operation(summary = "更新作业票")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-ticket:update')")
-    public CommonResult<Boolean> updateWorkflowWorkTicket(@Valid @RequestBody WorkflowWorkTicketSaveReqVO updateReqVO) {
-        workflowWorkTicketService.updateWorkflowWorkTicket(updateReqVO);
-        return success(true);
+    @PostMapping("/updatePointLock")
+    @Operation(summary = "点位上锁")
+    public CommonResult<Boolean> updatePointLock(@Valid @RequestBody KeyBackVO vo) {
+        return success(workflowWorkHandleService.updatePointLock(vo));
     }
 
-    @DeleteMapping("/deleteWorkflowWorkTicketList")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除作业票")
-                @PreAuthorize("@ss.hasPermission('isc:workflow-work-ticket:delete')")
-    public CommonResult<Boolean> deleteWorkflowWorkTicketList(@RequestParam("ids") List<Long> ids) {
-        workflowWorkTicketService.deleteWorkflowWorkTicketListByIds(ids);
-        return success(true);
+    @PostMapping("/updateUserLock")
+    @Operation(summary = "人员共锁")
+    public CommonResult<Boolean> updateUserLock(@Valid @RequestBody UserLockVO vo) {
+        return success(workflowWorkHandleService.updateUserLock(vo));
     }
 
-    @GetMapping("/selectWorkflowWorkTicketById")
-    @Operation(summary = "获得作业票")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-ticket:query')")
-    public CommonResult<WorkflowWorkTicketRespVO> selectWorkflowWorkTicketById(@RequestParam("id") Long id) {
-        WorkflowWorkTicketDO workflowWorkTicket = workflowWorkTicketService.getWorkflowWorkTicket(id);
-        return success(BeanUtils.toBean(workflowWorkTicket, WorkflowWorkTicketRespVO.class));
+    @PostMapping("/updateUserUnlock")
+    @Operation(summary = "人员解除共锁")
+    public CommonResult<Boolean> updateUserUnlock(@Valid @RequestBody UserLockVO vo) {
+        return success(workflowWorkHandleService.updateUserUnlock(vo));
     }
 
-    @GetMapping("/getWorkflowWorkTicketPage")
-    @Operation(summary = "获得作业票分页")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-ticket:query')")
-    public CommonResult<PageResult<WorkflowWorkTicketRespVO>> getWorkflowWorkTicketPage(@Valid WorkflowWorkTicketPageReqVO pageReqVO) {
-        PageResult<WorkflowWorkTicketDO> pageResult = workflowWorkTicketService.getWorkflowWorkTicketPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, WorkflowWorkTicketRespVO.class));
+
+    /*@PostMapping("/insertUnlockKey")
+    @Operation(summary = "点位解锁前取钥匙")
+    public CommonResult<Boolean> insertUnlockKey(@Valid @RequestBody UnlockKeyVO vo) {
+        return success(workflowWorkHandleService.insertUnlockKey(vo));
+    }*/
+
+    @PostMapping("/updatePointUnlock")
+    @Operation(summary = "点位解除上锁")
+    public CommonResult<Boolean> updatePointUnlock(@Valid @RequestBody KeyBackVO vo) {
+        return success(workflowWorkHandleService.updatePointUnlock(vo));
     }
 
-    @GetMapping("/exportWorkflowWorkTicketExcel")
-    @Operation(summary = "导出作业票 Excel")
-    @PreAuthorize("@ss.hasPermission('isc:workflow-work-ticket:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportWorkflowWorkTicketExcel(@Valid WorkflowWorkTicketPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<WorkflowWorkTicketDO> list = workflowWorkTicketService.getWorkflowWorkTicketPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "作业票.xls", "数据", WorkflowWorkTicketRespVO.class,
-                        BeanUtils.toBean(list, WorkflowWorkTicketRespVO.class));
+    @PostMapping("/updateBackLock")
+    @Operation(summary = "归还挂锁")
+    public CommonResult<Boolean> updateBackLock(@Valid @RequestBody List<HandleLockVO> list) {
+        return success(workflowWorkHandleService.updateBackLock(list));
     }
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/HandleKeyVO.java

@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 作业票新增/修改 Request VO")
+@Data
+public class HandleKeyVO {
+
+    @Schema(description = "钥匙nfc")
+    private String keyNfc;
+
+    @Schema(description = "柜子标识")
+    private String hardwareCode;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/HandleLockVO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 作业票新增/修改 Request VO")
+@Data
+public class HandleLockVO {
+
+    @Schema(description = "所属任务ID")
+    private Long nodeId;
+
+    @Schema(description = "挂锁nfc")
+    private String lockNfc;
+
+    @Schema(description = "柜子标识")
+    private String hardwareCode;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/KeyBackVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 钥匙上传数据")
+@Data
+public class KeyBackVO {
+
+    @Schema(description = "钥匙nfc")
+    private String keyNfc;
+
+    @Schema(description = "柜子标识")
+    private String hardwareCode;
+
+    @Schema(description = "点位和挂锁对应关系")
+    private List<PointLockVO> list;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/PointLockVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 作业票新增/修改 Request VO")
+@Data
+public class PointLockVO {
+
+    @Schema(description = "所属任务ID", example = "25154")
+    private Long nodeId;
+
+    @Schema(description = "点位NFC")
+    private String pointNfc;
+
+    @Schema(description = "挂锁nfc")
+    private String lockNfc;
+
+
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/UnlockKeyVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 解锁前取钥匙")
+@Data
+public class UnlockKeyVO {
+
+    @Schema(description = "所属任务ID", example = "25154")
+    private Long nodeId;
+
+    @Schema(description = "取出的钥匙NFC列表")
+    private List<HandleKeyVO> keyNfcList;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/UserLockVO.java

@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 作业票新增/修改 Request VO")
+@Data
+public class UserLockVO {
+
+    @Schema(description = "所属任务ID", example = "25154")
+    private Long nodeId;
+
+    @Schema(description = "共锁人nfc")
+    private String cardNfc;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/WorkHandleSaveReqVO.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 作业票新增/修改 Request VO")
+@Data
+public class WorkHandleSaveReqVO {
+
+    @Schema(description = "所属任务ID", example = "25154")
+    private Long nodeId;
+
+    @Schema(description = "作业票详情json")
+    private String ticketContent;
+
+    @Schema(description = "取出的钥匙NFC列表")
+    private List<HandleKeyVO> keyNfcList;
+
+    @Schema(description = "取出的挂锁NFC列表")
+    private List<HandleLockVO> lockNfcList;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/WorkflowWorkTicketLockPageReqVO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -22,17 +23,17 @@ public class WorkflowWorkTicketLockPageReqVO extends PageParam {
     @Schema(description = "挂锁NFC")
     private String lockNfc;
 
-    @Schema(description = "隔离点ID", example = "20835")
-    private Long isolationPointId;
+    @ExcelProperty("隔离点nfc")
+    private String isolationPointNfc;
 
     @Schema(description = "锁具状态(0-待取出 1-未上锁 2-已上锁 3-待解锁 4-已解锁 5-已归还)", example = "1")
     private String lockStatus;
 
-    @Schema(description = "取出硬件ID", example = "5002")
-    private Long fromHardwareId;
+    @Schema(description = "取出硬件code", example = "5002")
+    private String fromHardwareCode;
 
-    @Schema(description = "归还硬件ID", example = "24496")
-    private Long toHardwareId;
+    @Schema(description = "归还硬件code", example = "24496")
+    private String toHardwareCode;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/WorkflowWorkTicketLockRespVO.java

@@ -28,21 +28,18 @@ public class WorkflowWorkTicketLockRespVO {
     @ExcelProperty("挂锁NFC")
     private String lockNfc;
 
-    @Schema(description = "隔离点ID", example = "20835")
-    @ExcelProperty("隔离点ID")
-    private Long isolationPointId;
+    @ExcelProperty("隔离点nfc")
+    private String isolationPointNfc;
 
     @Schema(description = "锁具状态(0-待取出 1-未上锁 2-已上锁 3-待解锁 4-已解锁 5-已归还)", example = "1")
     @ExcelProperty("锁具状态(0-待取出 1-未上锁 2-已上锁 3-待解锁 4-已解锁 5-已归还)")
     private String lockStatus;
 
-    @Schema(description = "取出硬件ID", example = "5002")
-    @ExcelProperty("取出硬件ID")
-    private Long fromHardwareId;
+    @Schema(description = "取出硬件code", example = "5002")
+    private String fromHardwareCode;
 
-    @Schema(description = "归还硬件ID", example = "24496")
-    @ExcelProperty("归还硬件ID")
-    private Long toHardwareId;
+    @Schema(description = "归还硬件code", example = "24496")
+    private String toHardwareCode;
 
     @Schema(description = "备注", example = "你说的对")
     @ExcelProperty("备注")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workhandle/vo/WorkflowWorkTicketLockSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 作业票关联挂锁新增/修改 Request VO")
 @Data
@@ -22,17 +22,17 @@ public class WorkflowWorkTicketLockSaveReqVO {
     @Schema(description = "挂锁NFC")
     private String lockNfc;
 
-    @Schema(description = "隔离点ID", example = "20835")
-    private Long isolationPointId;
+    @ExcelProperty("隔离点nfc")
+    private String isolationPointNfc;
 
     @Schema(description = "锁具状态(0-待取出 1-未上锁 2-已上锁 3-待解锁 4-已解锁 5-已归还)", example = "1")
     private String lockStatus;
 
-    @Schema(description = "取出硬件ID", example = "5002")
-    private Long fromHardwareId;
+    @Schema(description = "取出硬件code", example = "5002")
+    private String fromHardwareCode;
 
-    @Schema(description = "归还硬件ID", example = "24496")
-    private Long toHardwareId;
+    @Schema(description = "归还硬件code", example = "24496")
+    private String toHardwareCode;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

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

@@ -1,11 +1,12 @@
 package cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 作业节点人员关联 DO
@@ -43,6 +44,18 @@ public class WorkflowWorkNodeUserDO extends BaseDO {
      * 用户组ID
      */
     private Long userGroupId;
+    /**
+     * 上锁时间
+     */
+    private LocalDateTime lockTime;
+    /**
+     * 解锁时间
+     */
+    private LocalDateTime unlockTime;
+    /**
+     * 状态:0初始、1已上锁/已共锁、2已解锁/已解共锁
+     */
+    private String status;
 
 
 }

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

@@ -39,21 +39,21 @@ public class WorkflowWorkTicketLockDO extends BaseDO {
      */
     private String lockNfc;
     /**
-     * 隔离点ID
+     * 隔离点nfc
      */
-    private Long isolationPointId;
+    private String isolationPointNfc;
     /**
      * 锁具状态(0-待取出 1-未上锁 2-已上锁 3-待解锁 4-已解锁 5-已归还)
      */
     private String lockStatus;
     /**
-     * 取出硬件ID
+     * 取出硬件CODE
      */
-    private Long fromHardwareId;
+    private String fromHardwareCode;
     /**
-     * 归还硬件ID
+     * 归还硬件CODE
      */
-    private Long toHardwareId;
+    private String toHardwareCode;
     /**
      * 备注
      */

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workdesign/WorkflowWorkTicketLockMapper.java

@@ -20,10 +20,10 @@ public interface WorkflowWorkTicketLockMapper extends BaseMapperX<WorkflowWorkTi
                 .eqIfPresent(WorkflowWorkTicketLockDO::getTicketId, reqVO.getTicketId())
                 .eqIfPresent(WorkflowWorkTicketLockDO::getNodeId, reqVO.getNodeId())
                 .eqIfPresent(WorkflowWorkTicketLockDO::getLockNfc, reqVO.getLockNfc())
-                .eqIfPresent(WorkflowWorkTicketLockDO::getIsolationPointId, reqVO.getIsolationPointId())
+                .eqIfPresent(WorkflowWorkTicketLockDO::getIsolationPointNfc, reqVO.getIsolationPointNfc())
                 .eqIfPresent(WorkflowWorkTicketLockDO::getLockStatus, reqVO.getLockStatus())
-                .eqIfPresent(WorkflowWorkTicketLockDO::getFromHardwareId, reqVO.getFromHardwareId())
-                .eqIfPresent(WorkflowWorkTicketLockDO::getToHardwareId, reqVO.getToHardwareId())
+                .eqIfPresent(WorkflowWorkTicketLockDO::getFromHardwareCode, reqVO.getFromHardwareCode())
+                .eqIfPresent(WorkflowWorkTicketLockDO::getToHardwareCode, reqVO.getToHardwareCode())
                 .eqIfPresent(WorkflowWorkTicketLockDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(WorkflowWorkTicketLockDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(WorkflowWorkTicketLockDO::getId));

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowDesignNodeServiceImpl.java

@@ -90,7 +90,13 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
         }
         try {
             List<WorkflowDesignNodeDO> workflowDesignNodeDOS = parseJsonToList(content);
-            workflowDesignNodeDOS.forEach(o -> o.setDesignId(designId));
+            workflowDesignNodeDOS.forEach(o -> {
+                o.setDesignId(designId);
+                // 临时吧上锁人给负责人，防止解除隔离点位找不到任务
+                if ("releaseIsolation".equals(o.getType()) && StringUtils.isNotBlank(o.getLockPerson())) {
+                    o.setWorkerUserId(Long.valueOf(o.getLockPerson()));
+                }
+            });
             saveBatch(workflowDesignNodeDOS);
             if (!workflowDesignNodeDOS.isEmpty()) {
                 workflowDesignService.update(Wrappers.<WorkflowDesignDO>lambdaUpdate()

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleService.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.iscs.service.workdesign;
+
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.*;
+
+import java.util.List;
+
+/**
+ * 作业票处理过程 Service 接口
+ *
+ * @author 博士安全
+ */
+public interface WorkflowWorkHandleService {
+
+
+    Boolean insertWorkTicket(WorkHandleSaveReqVO vo);
+
+    Boolean updatePointLock(KeyBackVO vo);
+
+    Boolean updateUserLock(UserLockVO vo);
+
+    Boolean updateUserUnlock(UserLockVO vo);
+
+    // Boolean insertUnlockKey(UnlockKeyVO vo);
+
+    Boolean updatePointUnlock(KeyBackVO vo);
+
+    Boolean updateBackLock(List<HandleLockVO> list);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleServiceImpl.java

@@ -0,0 +1,391 @@
+package cn.iocoder.yudao.module.iscs.service.workdesign;
+
+import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.ApprovalNodeReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.*;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.*;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 作业票处理过程 Service 实现类
+ *
+ * @author 博士安全
+ */
+@Service
+@Validated
+public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService {
+
+    @Autowired
+    private WorkflowWorkTicketService ticketService;
+    @Autowired
+    private WorkflowWorkTicketKeyService keyService;
+    @Autowired
+    private WorkflowWorkTicketLockService lockService;
+    @Autowired
+    private WorkflowWorkPointService pointService;
+    @Autowired
+    private WorkflowWorkNodeUserService nodeUserService;
+    @Autowired
+    private AdminUserService adminUserService;
+    @Autowired
+    private WorkflowWorkService workflowWorkService;
+    @Autowired
+    private WorkflowWorkNodeService workflowWorkNodeService;
+
+
+    @Override
+    public Boolean insertWorkTicket(WorkHandleSaveReqVO vo) {
+        Assert.notNull(vo.getNodeId(), "nodeId不可为空");
+        // 检查是否重复下发作业
+        List<WorkflowWorkTicketDO> list = ticketService.list(Wrappers.<WorkflowWorkTicketDO>lambdaQuery().eq(WorkflowWorkTicketDO::getNodeId, vo.getNodeId()));
+        Assert.isTrue(list.isEmpty(), "切勿重复下发作业");
+        WorkflowWorkNodeDO nodeDO = workflowWorkNodeService.getById(vo.getNodeId());
+
+        LocalDateTime now = LocalDateTime.now();
+        Long ticketId = 0L;
+        if (StringUtils.isNotBlank(vo.getTicketContent())) {
+            WorkflowWorkTicketDO workflowWorkTicketDO = new WorkflowWorkTicketDO();
+            workflowWorkTicketDO.setNodeId(vo.getNodeId());
+            workflowWorkTicketDO.setTicketContent(vo.getTicketContent());
+            workflowWorkTicketDO.setTicketStatus("2");
+            workflowWorkTicketDO.setTicketStartTime(now);
+            ticketService.save(workflowWorkTicketDO);
+            ticketId = workflowWorkTicketDO.getId();
+        }
+        if (!vo.getKeyNfcList().isEmpty()) {
+            List<WorkflowWorkTicketKeyDO> keyDOList = new ArrayList<>();
+            for (HandleKeyVO key : vo.getKeyNfcList()) {
+                WorkflowWorkTicketKeyDO workflowWorkTicketKeyDO = new WorkflowWorkTicketKeyDO();
+                workflowWorkTicketKeyDO.setTicketId(ticketId);
+                workflowWorkTicketKeyDO.setNodeId(vo.getNodeId());
+                workflowWorkTicketKeyDO.setKeyNfc(key.getKeyNfc());
+                workflowWorkTicketKeyDO.setCollectTime(now);
+                workflowWorkTicketKeyDO.setKeyStatus("1");
+                workflowWorkTicketKeyDO.setTicketType(0);
+                workflowWorkTicketKeyDO.setFromHardwareCode(key.getHardwareCode());
+                keyDOList.add(workflowWorkTicketKeyDO);
+            }
+            keyService.saveBatch(keyDOList);
+        }
+
+        if (!vo.getLockNfcList().isEmpty() && "isolation".equals(nodeDO.getType())) {
+            // isolation节点才需要新增，releaseIsolation节点不需要
+            List<WorkflowWorkTicketLockDO> lockDOList = new ArrayList<>();
+            for (HandleLockVO lock : vo.getLockNfcList()) {
+                WorkflowWorkTicketLockDO workflowWorkTicketLockDO = new WorkflowWorkTicketLockDO();
+                workflowWorkTicketLockDO.setTicketId(ticketId);
+                workflowWorkTicketLockDO.setNodeId(vo.getNodeId());
+                workflowWorkTicketLockDO.setLockNfc(lock.getLockNfc());
+                workflowWorkTicketLockDO.setLockStatus("1");
+                workflowWorkTicketLockDO.setFromHardwareCode(lock.getHardwareCode());
+                lockDOList.add(workflowWorkTicketLockDO);
+            }
+            lockService.saveBatch(lockDOList);
+        }
+        return true;
+    }
+
+    @Transactional
+    @Override
+    public Boolean updatePointLock(KeyBackVO keyBackVO) {
+        LocalDateTime now = LocalDateTime.now();
+        List<PointLockVO> list = keyBackVO.getList();
+        if (!list.isEmpty()) {
+            Long nodeId = list.get(0).getNodeId();
+            Assert.notNull(nodeId, "nodeId不可为空");
+            for (PointLockVO vo : list) {
+                Assert.notBlank(vo.getPointNfc(), "pointNfc不可为空");
+                Assert.notBlank(vo.getLockNfc(), "lockNfc不可为空");
+                pointService.update(Wrappers.<WorkflowWorkPointDO>lambdaUpdate()
+                        .eq(WorkflowWorkPointDO::getNodeId, vo.getNodeId())
+                        .eq(WorkflowWorkPointDO::getPointNfc, vo.getPointNfc())
+                        .set(WorkflowWorkPointDO::getLockNfc, vo.getLockNfc())
+                        .set(WorkflowWorkPointDO::getLockTime, now)
+                        .set(WorkflowWorkPointDO::getStatus, "1"));
+            }
+            // 检测上锁完成，更改上锁人状态
+            List<WorkflowWorkPointDO> unclockPoints = pointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
+                    .eq(WorkflowWorkPointDO::getNodeId, nodeId)
+                    .eq(WorkflowWorkPointDO::getStatus, "0"));
+            if (unclockPoints.isEmpty()) {
+                // 说明全部点位上锁完成，可以更新上锁人状态
+                nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
+                        .eq(WorkflowWorkNodeUserDO::getNodeId, nodeId)
+                        .eq(WorkflowWorkNodeUserDO::getType, "jtlocker")
+                        .set(WorkflowWorkNodeUserDO::getStatus, "1")
+                        .set(WorkflowWorkNodeUserDO::getLockTime, now));
+            }
+
+            // 帮助归还钥匙
+            String keyNfc = keyBackVO.getKeyNfc();
+            if (StringUtils.isNotBlank(keyNfc)) {
+                // 开始归还钥匙
+                keyService.update(Wrappers.<WorkflowWorkTicketKeyDO>lambdaUpdate()
+                        .eq(WorkflowWorkTicketKeyDO::getNodeId, nodeId)
+                        .eq(WorkflowWorkTicketKeyDO::getKeyNfc, keyNfc)
+                        .set(WorkflowWorkTicketKeyDO::getKeyStatus, "2")
+                        .set(WorkflowWorkTicketKeyDO::getToHardwareCode, keyBackVO.getHardwareCode()));
+            }
+        }
+        return true;
+    }
+
+    @Transactional
+    @Override
+    public Boolean updateUserLock(UserLockVO vo) {
+        // 开始共锁
+        Assert.notNull(vo.getNodeId(), "nodeId不可为空");
+        Assert.notNull(vo.getCardNfc(), "cardNfc不可为空");
+
+        // 检查是不是所有点位已经上锁，不是不可共锁
+        List<WorkflowWorkPointDO> unlockPoints = pointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
+                .eq(WorkflowWorkPointDO::getNodeId, vo.getNodeId())
+                .eq(WorkflowWorkPointDO::getStatus, "0"));
+        Assert.isTrue(unlockPoints.isEmpty(), "共锁失败，存在未上锁的的点位!");
+
+        AdminUserDO adminUserDO = adminUserService.getOne(Wrappers.<AdminUserDO>lambdaQuery()
+                .eq(AdminUserDO::getCardNfc, vo.getCardNfc()));
+        Assert.notNull(adminUserDO, "共锁失败，工卡未录入!");
+        // 检查是否是需要的共锁人
+        WorkflowWorkNodeUserDO nodeUserDO = nodeUserService.getOne(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
+                .eq(WorkflowWorkNodeUserDO::getNodeId, vo.getNodeId())
+                .eq(WorkflowWorkNodeUserDO::getUserId, adminUserDO.getId()));
+        Assert.notNull(nodeUserDO, "共锁失败，您不是共锁人!");
+        LocalDateTime now = LocalDateTime.now();
+        nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
+                .eq(WorkflowWorkNodeUserDO::getId, nodeUserDO.getId())
+                .set(WorkflowWorkNodeUserDO::getLockTime, now)
+                .set(WorkflowWorkNodeUserDO::getStatus, "1"));
+
+        // 共锁完成之后检测是不是所有点位上锁(未上锁不可共锁，所以前面检测了，现在不用管了，只要检测全部共锁完成就行)和共锁完成，完成后审批这个node
+        List<WorkflowWorkNodeUserDO> list = nodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
+                .eq(WorkflowWorkNodeUserDO::getNodeId, vo.getNodeId())
+                .eq(WorkflowWorkNodeUserDO::getType, "jtcolocker")
+                .ne(WorkflowWorkNodeUserDO::getStatus, "1"));
+        if (list.isEmpty()) {
+            // 说明没有共锁人需求或者全部共锁完成，可以审批节点
+            ApprovalNodeReqVO approvalNodeReqVO = new ApprovalNodeReqVO();
+            approvalNodeReqVO.setNodeId(vo.getNodeId());
+            approvalNodeReqVO.setApprovalStatus("approved");
+            approvalNodeReqVO.setApprovalOpinion("approved");
+            workflowWorkService.updateNodeApproval(approvalNodeReqVO);
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean updateUserUnlock(UserLockVO vo) {
+        // 开始解除共锁
+        Assert.notNull(vo.getNodeId(), "nodeId不可为空");
+        Assert.notNull(vo.getCardNfc(), "cardNfc不可为空");
+        AdminUserDO adminUserDO = adminUserService.getOne(Wrappers.<AdminUserDO>lambdaQuery()
+                .eq(AdminUserDO::getCardNfc, vo.getCardNfc()));
+        Assert.notNull(adminUserDO, "共锁失败，工卡未录入!");
+        WorkflowWorkNodeDO byId = workflowWorkNodeService.getById(vo.getNodeId());
+        Long fatherNodeId = 0L;
+        if (StringUtils.isNotBlank(byId.getIsolationNodeUuid())) {
+            // 如果是解除节点的查询操作，则查询对应隔离节点的数据
+            WorkflowWorkNodeDO one = workflowWorkNodeService.getOne(Wrappers.<WorkflowWorkNodeDO>lambdaQuery()
+                    .eq(WorkflowWorkNodeDO::getWorkId, byId.getWorkId())
+                    .eq(WorkflowWorkNodeDO::getUuid, byId.getIsolationNodeUuid()));
+            fatherNodeId = one.getId();
+        }
+        // 检查是否是需要的共锁人
+        WorkflowWorkNodeUserDO nodeUserDO = nodeUserService.getOne(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
+                .eq(WorkflowWorkNodeUserDO::getNodeId, fatherNodeId)
+                .eq(WorkflowWorkNodeUserDO::getUserId, adminUserDO.getId())
+                .eq(WorkflowWorkNodeUserDO::getStatus, "1"));
+        Assert.notNull(nodeUserDO, "解除共锁失败，您不是共锁人或您未共锁!");
+        LocalDateTime now = LocalDateTime.now();
+        nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
+                .eq(WorkflowWorkNodeUserDO::getId, nodeUserDO.getId())
+                .set(WorkflowWorkNodeUserDO::getUnlockTime, now)
+                .set(WorkflowWorkNodeUserDO::getStatus, "2"));
+        return true;
+    }
+
+    /*@Override
+    public Boolean insertUnlockKey(UnlockKeyVO vo) {
+        Assert.notNull(vo.getNodeId(), "nodeId不可为空");
+        LocalDateTime now = LocalDateTime.now();
+        if (!vo.getKeyNfcList().isEmpty()) {
+            ArrayList<WorkflowWorkTicketKeyDO> workflowWorkTicketKeyDOS = new ArrayList<>();
+            for (HandleKeyVO handleKeyVO : vo.getKeyNfcList()) {
+                WorkflowWorkTicketKeyDO workflowWorkTicketKeyDO = new WorkflowWorkTicketKeyDO();
+                workflowWorkTicketKeyDO.setNodeId(vo.getNodeId());
+                workflowWorkTicketKeyDO.setKeyNfc(handleKeyVO.getKeyNfc());
+                workflowWorkTicketKeyDO.setFromHardwareCode(handleKeyVO.getHardwareCode());
+                workflowWorkTicketKeyDO.setCollectTime(now);
+                workflowWorkTicketKeyDO.setKeyStatus("1");
+                workflowWorkTicketKeyDO.setTicketType(1);
+                workflowWorkTicketKeyDOS.add(workflowWorkTicketKeyDO);
+            }
+            keyService.saveBatch(workflowWorkTicketKeyDOS);
+        }
+        return true;
+    }*/
+
+    @Transactional
+    @Override
+    public Boolean updatePointUnlock(KeyBackVO keyBackVO) {
+        LocalDateTime now = LocalDateTime.now();
+        if (!keyBackVO.getList().isEmpty()) {
+            Long nodeId = keyBackVO.getList().get(0).getNodeId();
+            Long fatherNodeId = 0L;
+            Assert.notNull(nodeId, "nodeId不可为空");
+            WorkflowWorkNodeDO byId = workflowWorkNodeService.getById(nodeId);
+            if (StringUtils.isNotBlank(byId.getIsolationNodeUuid())) {
+                // 如果是解除节点的查询操作，则查询对应隔离节点的数据
+                WorkflowWorkNodeDO one = workflowWorkNodeService.getOne(Wrappers.<WorkflowWorkNodeDO>lambdaQuery()
+                        .eq(WorkflowWorkNodeDO::getWorkId, byId.getWorkId())
+                        .eq(WorkflowWorkNodeDO::getUuid, byId.getIsolationNodeUuid()));
+                fatherNodeId = one.getId();
+            }
+            // 检查是不是所有人都已经解除共锁
+            pointUnlockCheck(fatherNodeId);
+            for (PointLockVO vo : keyBackVO.getList()) {
+                Assert.notBlank(vo.getPointNfc(), "pointNfc不可为空");
+                pointService.update(Wrappers.<WorkflowWorkPointDO>lambdaUpdate()
+                        .eq(WorkflowWorkPointDO::getNodeId, fatherNodeId)
+                        .eq(WorkflowWorkPointDO::getPointNfc, vo.getPointNfc())
+                        .set(WorkflowWorkPointDO::getUnlockTime, now)
+                        .set(WorkflowWorkPointDO::getStatus, "2"));
+            }
+
+            // 检测解除共锁(未解除不可解锁，前面pointUnlockCheck判断了现在不用判断了)和点位解锁是否完成
+            checkBackAutoApproval(nodeId, fatherNodeId);
+            /*List<WorkflowWorkPointDO> unlockPoints = pointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
+                    .eq(WorkflowWorkPointDO::getNodeId, fatherNodeId)
+                    .ne(WorkflowWorkPointDO::getStatus, "2"));
+            if (unlockPoints.isEmpty()) {
+                // 全部解锁完成开始审批
+                ApprovalNodeReqVO approvalNodeReqVO = new ApprovalNodeReqVO();
+                approvalNodeReqVO.setNodeId(nodeId);
+                approvalNodeReqVO.setApprovalStatus("approved");
+                approvalNodeReqVO.setApprovalOpinion("approved");
+                workflowWorkService.updateNodeApproval(approvalNodeReqVO);
+
+                // 同时更新上锁人解锁完成状态
+                nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
+                        .eq(WorkflowWorkNodeUserDO::getNodeId, fatherNodeId)
+                        .eq(WorkflowWorkNodeUserDO::getType, "jtlocker")
+                        .set(WorkflowWorkNodeUserDO::getStatus, "2")
+                        .set(WorkflowWorkNodeUserDO::getUnlockTime, now));
+            }*/
+
+            // 帮助归还钥匙
+            String keyNfc = keyBackVO.getKeyNfc();
+            if (StringUtils.isNotBlank(keyNfc)) {
+                // 开始归还钥匙
+                keyService.update(Wrappers.<WorkflowWorkTicketKeyDO>lambdaUpdate()
+                        .eq(WorkflowWorkTicketKeyDO::getNodeId, nodeId)
+                        .eq(WorkflowWorkTicketKeyDO::getKeyNfc, keyNfc)
+                        .set(WorkflowWorkTicketKeyDO::getKeyStatus, "2")
+                        .set(WorkflowWorkTicketKeyDO::getToHardwareCode, keyBackVO.getHardwareCode()));
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 检测是不是钥匙和锁都还完，如果是，自动审批当前节点
+     * @param nodeId 解除隔离节点的nodeId
+     * @param fatherNodeId 隔离节点的nodeId
+     * @return
+     */
+    private Boolean checkBackAutoApproval(Long nodeId, Long fatherNodeId) {
+        LocalDateTime now = LocalDateTime.now();
+        // 检测钥匙是不是还了
+        List<WorkflowWorkTicketKeyDO> list = keyService.list(Wrappers.<WorkflowWorkTicketKeyDO>lambdaQuery()
+                .eq(WorkflowWorkTicketKeyDO::getNodeId, nodeId)
+                .ne(WorkflowWorkTicketKeyDO::getKeyStatus, "2"));
+        if (!list.isEmpty()) {
+            return false;
+        } else {
+            // 同时更新上锁人解锁完成状态
+            nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
+                    .eq(WorkflowWorkNodeUserDO::getNodeId, fatherNodeId)
+                    .eq(WorkflowWorkNodeUserDO::getType, "jtlocker")
+                    .set(WorkflowWorkNodeUserDO::getStatus, "2")
+                    .set(WorkflowWorkNodeUserDO::getUnlockTime, now));
+        }
+
+        // 检测挂锁是不是还了
+        List<WorkflowWorkTicketLockDO> list2 = lockService.list(Wrappers.<WorkflowWorkTicketLockDO>lambdaQuery()
+                .eq(WorkflowWorkTicketLockDO::getNodeId, fatherNodeId)
+                .ne(WorkflowWorkTicketLockDO::getLockStatus, "5"));
+        if (!list2.isEmpty()) {
+            return false;
+        }
+
+        // 全部解锁完成开始审批
+        ApprovalNodeReqVO approvalNodeReqVO = new ApprovalNodeReqVO();
+        approvalNodeReqVO.setNodeId(nodeId);
+        approvalNodeReqVO.setApprovalStatus("approved");
+        approvalNodeReqVO.setApprovalOpinion("approved");
+        workflowWorkService.updateNodeApproval(approvalNodeReqVO);
+
+        return true;
+    }
+
+    private Boolean pointUnlockCheck(Long nodeId) {
+        // 检查是不是所有人都已经解除共锁
+        List<WorkflowWorkNodeUserDO> list = nodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
+                .eq(WorkflowWorkNodeUserDO::getNodeId, nodeId)
+                .eq(WorkflowWorkNodeUserDO::getType, "jtcolocker")
+                .eq(WorkflowWorkNodeUserDO::getStatus, "1"));
+        if (!list.isEmpty()) {
+            List<Long> colockUserIds = list.stream().map(WorkflowWorkNodeUserDO::getUserId).toList();
+            List<AdminUserDO> userList = adminUserService.getUserList(colockUserIds);
+            String colockUserNames = userList.stream().map(AdminUserDO::getNickname).collect(Collectors.joining(","));
+            Assert.isTrue(false, colockUserNames + "未解除共锁，暂不可解锁");
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean updateBackLock(List<HandleLockVO> list) {
+        // 直接还
+        // LocalDateTime now = LocalDateTime.now();
+        if (!list.isEmpty()) {
+            Long nodeId = list.get(0).getNodeId();
+            Assert.notNull(nodeId, "nodeId不能为空!");
+            WorkflowWorkNodeDO byId = workflowWorkNodeService.getById(nodeId);
+
+            for (HandleLockVO vo : list) {
+                Assert.notNull(vo.getLockNfc(), "lockNfc不可为空");
+                Assert.notNull(vo.getHardwareCode(), "hardwareCode不可为空");
+                lockService.update(Wrappers.<WorkflowWorkTicketLockDO>lambdaUpdate()
+                        .eq(WorkflowWorkTicketLockDO::getLockNfc, vo.getLockNfc())
+                        .set(WorkflowWorkTicketLockDO::getLockStatus, "5")
+                        .set(WorkflowWorkTicketLockDO::getToHardwareCode, vo.getHardwareCode()));
+            }
+
+            if (StringUtils.isNotBlank(byId.getIsolationNodeUuid())) {
+                // 如果是解除节点的查询操作，则查询对应隔离节点的数据
+                WorkflowWorkNodeDO one = workflowWorkNodeService.getOne(Wrappers.<WorkflowWorkNodeDO>lambdaQuery()
+                        .eq(WorkflowWorkNodeDO::getWorkId, byId.getWorkId())
+                        .eq(WorkflowWorkNodeDO::getUuid, byId.getIsolationNodeUuid()));
+                Long fatherNodeId = one.getId();
+
+                // 检测是不是都已经
+                checkBackAutoApproval(nodeId, fatherNodeId);
+            }
+        }
+        return true;
+    }
+
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkNodeServiceImpl.java

@@ -9,13 +9,12 @@ import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeSaveReqVO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowDesignNodeDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeUserDO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.isolationpoint.IsolationPointDO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.*;
 import cn.iocoder.yudao.module.iscs.dal.mysql.workdesign.WorkflowWorkNodeMapper;
 import cn.iocoder.yudao.module.iscs.enums.MessageEnum;
 import cn.iocoder.yudao.module.iscs.enums.WorkTypeEnum;
+import cn.iocoder.yudao.module.iscs.service.isolationpoint.IsolationPointService;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.appnotify.AppNotifySendService;
 import cn.iocoder.yudao.module.system.service.notify.NotifySendService;
@@ -66,11 +65,16 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
     private AdminUserService adminUserService;
     @Resource
     private AppNotifySendService appNotifySendService;
+    @Resource
+    private WorkflowWorkPointService workflowWorkPointService;
+    @Resource
+    private IsolationPointService isolationPointService;
 
 
     @Override
     public void updateWorkflowWorkNode(WorkflowWorkNodeSaveReqVO updateReqVO) {
         Assert.notNull(updateReqVO.getNodeId(), "nodeId不能为空!");
+        WorkflowWorkNodeDO byId = getById(updateReqVO.getNodeId());
         // 更新
         WorkflowWorkNodeDO updateObj = BeanUtils.toBean(updateReqVO, WorkflowWorkNodeDO.class);
         updateObj.setId(updateReqVO.getNodeId());
@@ -84,8 +88,16 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
             workflowWorkNodeUserService.saveBatch(updateReqVO.getNodeUserDOList());
         }
 
+
+        // 检测点位数据是否重新生成
+        if (!byId.getIsolationPoints().equals(updateReqVO.getIsolationPoints())) {
+            // 开始修改点位
+            analysisPointSave(updateReqVO.getNodeId(), updateReqVO.getIsolationPoints());
+        }
+
     }
 
+
     @Override
     public WorkflowWorkNodeDO getWorkflowWorkNode(Long id) {
         return workflowWorkNodeMapper.selectById(id);
@@ -128,7 +140,7 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
         });
         saveBatch(workNodeDOList);
 
-        // 存储上锁人、公锁人
+        // 存储上锁人、公锁人、点位
         List<WorkflowWorkNodeUserDO> workflowWorkNodeUserDOS = new ArrayList<>();
         for (WorkflowWorkNodeDO nodeDO : workNodeDOList) {
             if ("isolation".equals(nodeDO.getType())) {
@@ -155,6 +167,9 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
                         }
                     }
                 }
+
+                // 解析点位进行存储
+                analysisPointSave(nodeDO.getId(), nodeDO.getIsolationPoints());
             }
         }
         if (!workflowWorkNodeUserDOS.isEmpty()) {
@@ -163,6 +178,24 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
         return true;
     }
 
+    private void analysisPointSave(Long nodeId, String isolationPoints) {
+        // 二话不说，先删除一遍再新增
+        workflowWorkPointService.remove(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
+                .eq(WorkflowWorkPointDO::getNodeId, nodeId));
+        List<Long> longs = parseStringToLongList(isolationPoints);
+        if (!longs.isEmpty()) {
+            List<IsolationPointDO> isolationPointDOS = isolationPointService.listByIds(longs);
+            List<WorkflowWorkPointDO> workflowWorkPointDOS = new ArrayList<>();
+            for (IsolationPointDO pointDO : isolationPointDOS) {
+                WorkflowWorkPointDO workflowWorkPointDO = new WorkflowWorkPointDO();
+                workflowWorkPointDO.setNodeId(nodeId);
+                workflowWorkPointDO.setPointNfc(pointDO.getPointNfc());
+                workflowWorkPointDOS.add(workflowWorkPointDO);
+            }
+            workflowWorkPointService.saveBatch(workflowWorkPointDOS);
+        }
+    }
+
     /**
      * 将形如 "[105,104]" 的字符串解析为 List<Long>
      *
@@ -173,7 +206,8 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
     public static List<Long> parseStringToLongList(String str) {
         // 1. 校验入参非空
         if (str == null || str.trim().isEmpty()) {
-            throw new IllegalArgumentException("待解析字符串不能为空");
+            return new ArrayList<>();
+            // throw new IllegalArgumentException("待解析字符串不能为空");
         }
 
         try {

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkServiceImpl.java

@@ -11,10 +11,9 @@ import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.StartWorkVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknodeuser.vo.WorkflowWorkNodeUserRespVO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowDesignDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeUserDO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkPointRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketLockRespVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.*;
 import cn.iocoder.yudao.module.iscs.dal.mysql.workdesign.WorkflowWorkMapper;
 import cn.iocoder.yudao.module.iscs.utils.MonthTimeUtil;
 import cn.iocoder.yudao.module.iscs.utils.RandomCodeUtil;
@@ -56,6 +55,10 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
     private WorkflowWorkNodeUserService workflowWorkNodeUserService;
     @Resource
     private AdminUserService adminUserService;
+    @Resource
+    private WorkflowWorkPointService workflowWorkPointService;
+    @Resource
+    private WorkflowWorkTicketLockService workflowWorkTicketLockService;
 
     @Transactional
     @Override
@@ -156,15 +159,31 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
             List<WorkflowWorkNodeRespVO> nodeRespVOS = BeanUtils.toBean(list, WorkflowWorkNodeRespVO.class);
             bean.setWorkflowWorkNodeDOList(nodeRespVOS);
 
-            // 2.节点设置的人员信息
             if (!list.isEmpty()) {
                 List<Long> nodeIds = list.stream().map(WorkflowWorkNodeDO::getId).collect(Collectors.toList());
+                // 2.节点设置的人员信息
                 List<WorkflowWorkNodeUserDO> nodeUserDOList = workflowWorkNodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
                         .in(WorkflowWorkNodeUserDO::getNodeId, nodeIds));
                 for (WorkflowWorkNodeRespVO vo : nodeRespVOS) {
                     List<WorkflowWorkNodeUserDO> nodeUserDOS = nodeUserDOList.stream().filter(o -> o.getNodeId().equals(vo.getId())).toList();
                     vo.setNodeUserList(BeanUtils.toBean(nodeUserDOS, WorkflowWorkNodeUserRespVO.class));
                 }
+
+                // 3.节点设置的点位信息
+                List<WorkflowWorkPointDO> points = workflowWorkPointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
+                        .in(WorkflowWorkPointDO::getNodeId, nodeIds));
+                for (WorkflowWorkNodeRespVO vo : nodeRespVOS) {
+                    List<WorkflowWorkPointDO> pointDOS = points.stream().filter(o -> o.getNodeId().equals(vo.getId())).toList();
+                    vo.setPoints(BeanUtils.toBean(pointDOS, WorkflowWorkPointRespVO.class));
+                }
+
+                // 4.节点设置的取锁信息
+                List<WorkflowWorkTicketLockDO> locks = workflowWorkTicketLockService.list(Wrappers.<WorkflowWorkTicketLockDO>lambdaQuery()
+                        .in(WorkflowWorkTicketLockDO::getNodeId, nodeIds));
+                for (WorkflowWorkNodeRespVO vo : nodeRespVOS) {
+                    List<WorkflowWorkTicketLockDO> lockDOS = locks.stream().filter(o -> o.getNodeId().equals(vo.getId())).toList();
+                    vo.setLocks(BeanUtils.toBean(lockDOS, WorkflowWorkTicketLockRespVO.class));
+                }
             }
         }
         return bean;
@@ -294,6 +313,13 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
         }
         bean.setInitiatorName(workflowWorkDO.getInitiatorName() + phone);
         // 获取人员信息
+        if (StringUtils.isNotBlank(byId.getIsolationNodeUuid())) {
+            // 如果是解除节点的查询操作，则查询对应隔离节点的数据
+            WorkflowWorkNodeDO one = workflowWorkNodeService.getOne(Wrappers.<WorkflowWorkNodeDO>lambdaQuery()
+                    .eq(WorkflowWorkNodeDO::getWorkId, byId.getWorkId())
+                    .eq(WorkflowWorkNodeDO::getUuid, byId.getIsolationNodeUuid()));
+            nodeId = one.getId();
+        }
         List<WorkflowWorkNodeUserDO> nodeUserDOList = workflowWorkNodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
                 .eq(WorkflowWorkNodeUserDO::getNodeId, nodeId));
         if (!nodeUserDOList.isEmpty()) {
@@ -310,6 +336,15 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
             }
             bean.setNodeUserList(nodeUserRespVOList);
         }
+        // 3.节点设置的点位信息
+        List<WorkflowWorkPointDO> points = workflowWorkPointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
+                .in(WorkflowWorkPointDO::getNodeId, nodeId));
+        bean.setPoints(BeanUtils.toBean(points, WorkflowWorkPointRespVO.class));
+
+        // 4.节点设置的取锁信息
+        List<WorkflowWorkTicketLockDO> locks = workflowWorkTicketLockService.list(Wrappers.<WorkflowWorkTicketLockDO>lambdaQuery()
+                .in(WorkflowWorkTicketLockDO::getNodeId, nodeId));
+        bean.setLocks(BeanUtils.toBean(locks, WorkflowWorkTicketLockRespVO.class));
         return bean;
     }
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java

@@ -57,6 +57,12 @@ public class AuthPermissionInfoRespVO {
         @Schema(description = "用户邮箱", example = "yudao@iocoder.cn")
         private String email;
 
+        @Schema(description = "手机号")
+        private String mobile;
+
+        @Schema(description = "性别")
+        private Integer sex;
+
     }
 
     @Schema(description = "管理后台 - 登录用户的菜单信息 Response VO")