#

luxiaotao1123

2024-04-12 0c45f307facb2698a8278afe10bd50db5d76dfdc

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java

@@ -6,8 +6,10 @@
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.zy.asrs.wcs.core.map.entity.MapWsShuttleVo;
import com.zy.asrs.wcs.core.map.entity.MapWsVo;
import com.zy.asrs.wcs.core.model.NavigateNode;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
@@ -22,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;

/**
 * Created by vincent on 4/11/2024
@@ -78,6 +81,13 @@
            }

            shuttleVo.setCurLocNo(protocol.getCurrentLocNo());

            List<NavigateNode> moveAdvancePath = thread.getMoveAdvancePath();
            if (!Cools.isEmpty(moveAdvancePath)) {
                shuttleVo.setTravelPath(moveAdvancePath.stream()
                        .map(path -> Utils.getLocNo(path.getX(), path.getY(), path.getZ()))
                        .collect(Collectors.toList()));
            }
        }

        return shuttleVos;

 zy-asrs-wcs/src/main/resources/application.yml

@@ -18,9 +18,9 @@
#    url: jdbc:mysql://47.97.1.152:3306/asrs?useUnicode=trKue&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: zy@123
    url: jdbc:mysql://127.0.0.1:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.2.95:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: xltys1995
    password: root
#    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
#    username: sa