#

zjj

2024-11-02 ccc38e955d12c9f39faf9fadd82cec9b60904795

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

@@ -9,21 +9,21 @@
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.Task;
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.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.*;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2020/11/16
@@ -38,6 +38,9 @@
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private SlaveProperties slaveProperties;

    ArrayList<Object> programs = new ArrayList<>();
    HashMap<Integer,String> lcd = new HashMap<>();

    /**
     * 获取当前时间
@@ -271,7 +274,53 @@
        return R.ok().add(errorMsg);
    }

    /**
     * 节目
     */
    @GetMapping("/led/program")
    public R monitorProgramShow(@RequestParam("ledId") Integer ledId) {
        String program = "";
        for (Object object : programs) {
            program = lcd.get(ledId);

        }
        return R.ok().add(program);
    }


    /**
     * 显示节目
     */
    @RequestMapping("/led/add/program")
    public R addProgram(Integer ledId, String msg) {
        lcd.put(ledId,msg);
        for (int i = 0; i < programs.size(); i++) {
            Object o = programs.get(i);
            System.out.println(o);
        }
        programs.add(lcd);
        Iterator<Object> iterator = programs.iterator();
        while (iterator.hasNext()) {
            // 获取循环的值
            Object next = iterator.next();
            // 如果存在两个相同的值
            if (programs.indexOf(next) != programs.lastIndexOf(next)) {
                // 移除最后那个相同的值
                iterator.remove();
            }
        }
        System.out.println(programs);
        return R.ok();
    }

    /**
     * 移除节目
     */
    @RequestMapping("/led/remove/program")
    public R removeProgram(Integer ledId, String msg) {

        return R.ok();
    }