#

luxiaotao1123

2024-12-03 94dfc4e2ce954fb08976091fc22c3f7a1aa8d0fc

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java

@@ -12,6 +12,7 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

/**
@@ -50,6 +51,10 @@
    @Autowired
    private PatrolService patrolService;

    @RequestMapping(value = "/system/info", method = {RequestMethod.GET, RequestMethod.POST})
    public R systemInfo() {
        return R.ok("RCS-FLOW-1.0.0");
    }

    @GetMapping("/dead/lock")
    public R aaa() {

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java

@@ -96,7 +96,7 @@

                // if there is a running task whose destination is this funSta, then that means this funSta is occupied
                if (0 < taskService.count(new LambdaQueryWrapper<Task>()
                        .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
                        .in(Task::getTaskType, TaskTypeType.TO_STANDBY.val(), TaskTypeType.TO_CHARGE.val())
                        .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
                        .eq(Task::getDestCode, code)
                )) {
@@ -110,7 +110,7 @@
                if (null == agv) {
                    // if there is a running task whose destination is this funSta, then that means this funSta is occupied
                    if (0 < taskService.count(new LambdaQueryWrapper<Task>()
                            .eq(Task::getTaskType, TaskTypeType.TO_STANDBY.val())
                            .in(Task::getTaskType, TaskTypeType.TO_STANDBY.val(), TaskTypeType.TO_CHARGE.val())
                            .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
                            .eq(Task::getDestCode, code)
                    )) {