#

luxiaotao1123

2024-12-24 c96f71b55d1cf81dc7119202b31678e0368087cb

#

 version/db/sqlIndex

@@ -9,6 +9,9 @@
CREATE INDEX idx_loc_sts_uuid ON man_loc_sts(uuid);
CREATE INDEX idx_task_sts_uuid ON man_task_sts(uuid);
CREATE INDEX idx_task_type_uuid ON man_task_type(uuid);
CREATE INDEX idx_task_seq_num ON man_task(seq_num);
CREATE INDEX idx_task_agv_id ON man_task(agv_id);
CREATE INDEX idx_task_agv_id_task_sts ON man_task(agv_id, task_sts);
CREATE INDEX idx_zone_uuid ON man_zone(uuid);
CREATE INDEX idx_agv_detail_agv_id ON man_agv_detail(agv_id);
CREATE INDEX idx_config_flag ON sys_config(flag);
CREATE INDEX idx_config_flag ON sys_config(flag);

 zy-acs-flow/src/i18n/en.js

@@ -119,7 +119,6 @@
        operation: 'Operation',
        config: 'Config',
        tenant: 'Tenant',
        role: 'Role',
        userLogin: 'Token',
        base: 'Base',
        warehouse: 'Warehouse',
@@ -217,7 +216,6 @@
            },
            user: {
                username: "username",
                password: "password",
                password: "password",
                confirmPwd: "confirm password",
                nickname: "nickname",
@@ -494,6 +492,7 @@
                endNode: "end node",
                posType: "type",
                backpack: "backpack",
                algoTime: "algo time",
                state: "state",
                segDesc: "seg no",
            },
@@ -676,7 +675,6 @@
                        MOVE: 'MOVE',
                        TO_CHARGE: 'TO_CHARGE',
                        TO_STANDBY: 'TO_STANDBY',
                        TO_CHARGE: 'TO_CHARGE',
                        LOC_TO_LOC: 'LOC_TO_LOC',
                        LOC_TO_STA: 'LOC_TO_STA',
                        STA_TO_LOC: 'STA_TO_LOC',

 zy-acs-flow/src/i18n/zh.js

@@ -119,7 +119,6 @@
        operation: '操作日志',
        config: '配置参数',
        tenant: '租户管理',
        role: '角色管理',
        userLogin: '登录日志',
        base: '基础档案',
        warehouse: '仓库管理',
@@ -493,6 +492,7 @@
                endNode: "作业节点",
                posType: "作业类型",
                backpack: "背篓",
                algoTime: "算法耗时",
                state: "状态",
                segDesc: "作业编号",
            },
@@ -673,7 +673,6 @@
                control: {
                    type: {
                        MOVE: '移动',
                        TO_CHARGE: '去充电',
                        TO_STANDBY: '去待机位',
                        TO_CHARGE: '去充电',
                        LOC_TO_LOC: '库位到库位',

 zy-acs-flow/src/page/segment/SegmentList.jsx

@@ -220,6 +220,7 @@
                                    </ReferenceField>
                                    <TextField source="posType" label="table.field.segment.posType" sortable={false} />
                                    <NumberField source="backpack" label="table.field.segment.backpack" sortable={false} />
                                    <NumberField source="algoTime" label="table.field.segment.algoTime" sortable={false} />
                                    <ReferenceField source="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
                                        <TextField source="data" />
                                    </ReferenceField>

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java

@@ -119,7 +119,12 @@
                    for (Segment segment : segments) {
                        long startTime = System.currentTimeMillis();
                        trafficService.trigger(segment);
                        log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
                        long algoTime = System.currentTimeMillis() - startTime;
                        log.info("traffic calculation spend {} ms", algoTime);
                        if (segment.getState().equals(SegmentStateType.RUNNING.toString())) {
                            segment.setAlgoTime((int) algoTime);
                            segmentService.updateById(segment);
                        }
                    }

                } catch (Exception e) {

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java

@@ -89,6 +89,12 @@
    private Integer backpack;

    /**
     * 算法耗时
     */
    @ApiModelProperty(value= "算法耗时")
    private Integer algoTime;

    /**
     * 进度
     */
    @ApiModelProperty(value= "进度")
@@ -143,44 +149,6 @@
    private String memo;

    public Segment() {}

    public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.travelId = travelId;
        this.taskId = taskId;
        this.agvId = agvId;
        this.serial = serial;
        this.startNode = startNode;
        this.endNode = endNode;
        this.state = state;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    Segment segment = new Segment(
//            null,    // 编号
//            null,    // 任务组
//            null,    // 任务
//            null,    // AGV
//            null,    // 序号
//            null,    // 起始节点
//            null,    // 目标节点
//            null,    // 进度
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间
//            null    // 备注
//    );

    public String getTravelId$(){
        TravelService service = SpringUtils.getBean(TravelService.class);