*

lsh

2025-01-12 22a8757b3184ce4ad949957f5ee207caffaf600a

 src/main/java/com/zy/asrs/controller/MonitorController.java

@@ -13,16 +13,15 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.*;
@@ -46,6 +45,46 @@
    /**
     * 获取当前时间
     */
    @PostMapping("/barcode/two")
    public R barcodeTwo(@RequestParam Integer palletizingNo) {

        String barcode = "";
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getDriveSta()) {
                if (inSta.getStaNo().equals(palletizingNo)){
                    // 获取条码扫描仪信息
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                    if (barcodeThread == null) {
                        continue;
                    }
                    barcode = barcodeThread.getBarcode();

                    if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                            barcode = "";
                        }
                    } else {
                        break;
                    }
                }
            }
        }



        Date now = new Date();
//        Calendar calendar = Calendar.getInstance();
//        calendar.setTime(now);
        return R.ok(
                Cools.add("barcode", barcode).add("Date",now)
        );
    }

    /**
     * 获取当前时间
     */
    @GetMapping("/date")
    public R monitorDate() {
        Date now = new Date();