1

luxiaotao1123

1 天以前 3a6155c8c3464152e0bc6267059a045c0d102c49

1

 zy-acs-flow/package-lock.json

Diff too large

 zy-acs-flow/vite.config.js

@@ -15,6 +15,8 @@
    server: {
      port: 5000,
      host: '0.0.0.0',
      open: true,
      cors: true,
      // available in run dev
      proxy: {
        '/api': {

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java

@@ -40,7 +40,8 @@
                        agvDataService.dataProcess(protocol);
                    }

                } catch (Exception ignore) {}
                } catch (Exception ignore) {
                }
            }
        });
        thread.start();

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -780,6 +780,7 @@
                            continue;
                        }


                        String next = pathListPart.get(i);

                        Code nextCode = codeService.getCacheByData(next);
@@ -854,6 +855,23 @@
                            lastDirection = nextDirection;
                        }

                        actionList.add(new Action(
                                null,    // 编号
                                task.getBusId(),    // 总线
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                ActionTypeType.RunToWaitHeight.desc,    // 名称
                                1D,    // 属性값
                                lastCode.getData(),    // 地面码
                                "350",   // 动作参数
                                ActionTypeType.RunToWaitHeight.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                        ));


                        // run
                        ActionTypeType actionType = ActionTypeType.StraightAheadTurnable;
                        if (reverse) {

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java

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

        String agvNo = task.getAgvNo();
        int[] codeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(lev, task.getCodeData());

        if(codeMatrixIdx==null){
            return new ArrayList<>();
        }
        DynamicNode dynamicNode = dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]];
        int serial = dynamicNode.getSerial();


 zy-acs-manager/src/main/resources/application.yml

@@ -8,7 +8,7 @@
    static-path-pattern: /**
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://10.10.10.200:3306/jbly?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://127.0.0.1:3306/jbly?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: xltys1995
    type: com.alibaba.druid.pool.DruidDataSource
@@ -43,7 +43,7 @@
    enabled: false

redis:
  host: 10.10.10.200
  host: 127.0.0.1
  password: xltys1995
  port: 6379
  max: 30