#

tzsk

2024-04-11 64f912f0fbbf9b07f6347afa0fcc26d5c099edf3

 src/main/java/com/zy/core/thread/BarcodeThread.java

@@ -3,12 +3,16 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -46,14 +50,24 @@
        this.barcode.delete(0, this.barcode.length());
        this.barcode.append(barcode);
        if(!Cools.isEmpty(barcode)) {
            AgvBasDevpService agvBasDevpService = SpringUtils.getBean(AgvBasDevpService.class);
            News.info("{}号条码器，检索数据：{}", slave.getId(), this.barcode);

            String devNo = slave.getId() == 13 ? "310-1" : slave.getId() == 15 ? "312-2" : slave.getId() == 17 ? "314-1" : slave.getId() == 19 ? "316-1" : null;
            if(!Cools.isEmpty(devNo)){
                barcode = barcode.substring(3,barcode.length());
                agvBasDevpService.updateBarcode(devNo,barcode);
            }
            News.info("{}号条码器，更新成功", slave.getId());
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
            jsonObject.put("barcode", barcode);
            jsonObject.put("id", slave.getId());
            if (OutputQueue.BARCODE.size() >= 32) {
                OutputQueue.BARCODE.poll();
            }
            OutputQueue.BARCODE.offer(jsonObject);

        }
    }

@@ -113,6 +127,7 @@
//                e.printStackTrace();
                connect();
            }

        }
    }