#

luxiaotao1123

2024-09-23 5dd33a7b7895aea43bed61071ceb5295aa16e8a2

#

 zy-acs-flow/src/i18n/core/chineseMessages.js

@@ -100,7 +100,7 @@
            details: 'Details',
            error: "A client error occurred and your request couldn't be completed.",

            invalid_form: 'The form is not valid. Please check for errors',
            invalid_form: '表单无效 请检查是否有错误!',
            loading: 'Please wait',
            no: 'No',
            not_found:
@@ -159,7 +159,7 @@
            application_update_available: 'A new version is available.',
        },
        validation: {
            required: 'Required',
            required: '必填项',
            minLength: 'Must be %{min} characters at least',
            maxLength: 'Must be %{max} characters or less',
            minValue: 'Must be at least %{min}',

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java

@@ -9,7 +9,7 @@

public interface TaskService extends IService<Task> {

    void buildActionList(Task task);
    String generateSeqNum();

    Task pick(TaskStsType taskStsType);


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

@@ -10,7 +10,9 @@
import com.zy.acs.manager.manager.mapper.BusMapper;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
@@ -19,6 +21,9 @@
@Slf4j
@Service("busService")
public class BusServiceImpl extends ServiceImpl<BusMapper, Bus> implements BusService {

    @Autowired
    private TaskService taskService;

    @Override
    public Bus selectByUuid(String uuid) {
@@ -51,7 +56,9 @@
                    return "Origin cannot be empty!";
                }
            }

            if (Cools.isEmpty(dto.getSeqNum())) {
                dto.setSeqNum(taskService.generateSeqNum());
            }
        }
        return null;
    }

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

@@ -1,17 +1,20 @@
package com.zy.acs.manager.manager.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.entity.FuncSta;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.TaskMapper;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.FuncStaService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,20 +32,12 @@
    private LocService locService;
    @Autowired
    private FuncStaService funcStaService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Override
    public void buildActionList(Task task) {
        List<String> codeList = JSONArray.parseArray(task.getPhase(), String.class);
        if (Cools.isEmpty(codeList)) {
            throw new BusinessException(task.getSeqNum() + "任务解析步骤失败");
        }
        for (String data : codeList) {
            Code code = codeService.selectByData(data);


        }


    public synchronized String generateSeqNum() {
        return String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19);
    }

    @Override