#

Junjie

2023-12-26 bfdefee9b5c28c431891ebf4686d0fdeed6c4665

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

@@ -3,16 +3,16 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SpringUtils;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.mapper.BasLiftOptMapper;
import com.zy.asrs.mapper.BasShuttleOptMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.LiftSlave;
@@ -48,6 +48,10 @@
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private BasLiftOptMapper basLiftOptMapper;
    @Autowired
    private BasShuttleOptMapper basShuttleOptMapper;

    /**
     * 获取当前时间
@@ -316,10 +320,17 @@
            if (shuttleProtocol == null) {
                continue;
            }
            HashMap<String, Object> map = new HashMap<>();
            if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
                //设备离线中
                map.put("deviceNo", shuttleProtocol.getShuttleNo());//设备号-小车号
                map.put("errorMsg", "设备离线");//异常信息
                map.put("device", "四向车");//异常信息
                list.add(map);
            }

            if (shuttleProtocol.getErrState() == 1) {
                //故障中
                HashMap<String, Object> map = new HashMap<>();
                map.put("deviceNo", shuttleProtocol.getShuttleNo());//设备号-小车号
                map.put("errorMsg", shuttleProtocol.getErrCode$());//异常信息
                map.put("device", "四向车");//异常信息
@@ -367,7 +378,20 @@
        return R.ok().add(list);
    }


    /**
     * 获取设备每天运行统计
     */
    @GetMapping("/deviceRunStatistic")
    public R deviceRunStatistic() {
        //获取提升机运行数据
        List<Map<String, Object>> liftList = basLiftOptMapper.selectRunStatistic();
        //获取小车运行数据
        List<Map<String, Object>> shuttleList = basShuttleOptMapper.selectRunStatistic();
        HashMap<String, Object> map = new HashMap<>();
        map.put("lift", liftList);
        map.put("shuttle", shuttleList);
        return R.ok().add(map);
    }