#
1
2025-05-09 45d7fbba5d02e1f65cab0c328d5deafa3094b2cb
#
3个文件已修改
47 ■■■■■ 已修改文件
src/main/java/com/zy/core/ServerBootstrap.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/ScaleThread.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/ServerBootstrap.java
@@ -68,10 +68,10 @@
//        for (Slave led : slaveProperties.getLed()) {
//            MessageQueue.init(SlaveType.Led, led);
//        }
//        // 初始化磅称mq
//        for (Slave scale : slaveProperties.getScale()) {
//            MessageQueue.init(SlaveType.Scale, scale);
//        }
        // 初始化磅称mq
        for (Slave scale : slaveProperties.getScale()) {
            MessageQueue.init(SlaveType.Scale, scale);
        }
//        // 初始化台车mq
//        for (Slave car : slaveProperties.getCar()) {
//            MessageQueue.init(SlaveType.Car, car);
@@ -114,13 +114,13 @@
//            new Thread(ledThread).start();
//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
//        }
//        // 初始化磅秤线程
//        log.info("初始化磅秤线程...................................................");
//        for (Slave scale : slaveProperties.getScale()) {
//            ScaleThread scaleThread = new ScaleThread(scale);
//            new Thread(scaleThread).start();
//            SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
//        }
        // 初始化磅秤线程
        log.info("初始化磅秤线程...................................................");
        for (Slave scale : slaveProperties.getScale()) {
            ScaleThread scaleThread = new ScaleThread(scale);
            new Thread(scaleThread).start();
            SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
        }
    }
src/main/java/com/zy/core/thread/ScaleThread.java
@@ -53,9 +53,11 @@
                byte[] read = read(8, 100);
                if (null != read) {
                    String s = new String(read);
                    if (!Cools.isEmpty(s) && s.startsWith("=")) {
                        scale = Double.parseDouble(s.substring(1));
                    if (!Cools.isEmpty(s) && s.startsWith("\u0002+")) {
//                    if (!Cools.isEmpty(s) && s.startsWith("=")) {
                        scale = Double.parseDouble(s.substring(1))/100;
                        System.out.println("scale:"+scale+"ip:"+slave.getIp());
//                        String substring = s.substring(1);
//                        String s1 = new StringBuilder(substring).reverse().toString();//逆序
//                        scale = Double.parseDouble(s1);
@@ -120,13 +122,13 @@
            dataOutputStream = new DataOutputStream(socket.getOutputStream());
            dataInputStream = new DataInputStream(socket.getInputStream());
//            log.info("条码扫描仪连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
            deviceErrorService.deleteDeviceError("scale", slave.getId());
//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
//            deviceErrorService.deleteDeviceError("scale", slave.getId());
        } catch (Exception e) {
            socket = null;
            log.error("磅秤连接失败!!! ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
            deviceErrorService.addDeviceError("scale", slave.getId(), "磅秤连接失败");
//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
//            deviceErrorService.addDeviceError("scale", slave.getId(), "磅秤连接失败");
            return false;
        }
        return true;
src/main/resources/application-prod.yml
@@ -243,9 +243,16 @@
    # 磅秤
  scale[0]:
    id: 1
    ip: 10.10.10.207
    ip: 10.10.10.202
    port: 5005
    staNo: 281
    staNo: 1004
    devpPlcId: 1
    # 磅秤
  scale[1]:
    id: 2
    ip: 10.10.10.203
    port: 5005
    staNo: 1022
    devpPlcId: 1
  crn[0]: #堆垛机1
    ip: 10.10.10.10