#

ytfl

3 天以前 41ba2fa12a59c14cfed1c226e71b06596ba0fe50

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -19,6 +20,9 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.common.service.CommonService;
import com.zy.common.utils.News;
import com.zy.common.utils.RedisUtil;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
@@ -28,18 +32,21 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.*;

/**
@@ -61,6 +68,12 @@
    private LocMastMapper locMastMapper;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private ConfigService configService;
    @Autowired
    private CommonService commonService;
    @Autowired
    private RedisUtil redisUtil;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -91,6 +104,24 @@
    /************************** 实时数据 ******************************/
    /****************************************************************/

    @PostMapping("/devpTaskCount")
    @ManagerAuth(memo = "输送线任务数量")
    public R devpTaskCount(){
        int devpTaskStackOver = 20;
        Config config = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "devpTaskStackOver"));
        if (config != null) {
            devpTaskStackOver = Integer.parseInt(config.getValue());
        }

        Integer devpWorkingCount = commonService.queryDevpWorkingCount();

        HashMap<String, Object> map = new HashMap<>();
        map.put("devpTaskStackOver", devpTaskStackOver);
        map.put("devpWorkingCount", devpWorkingCount);
        return R.ok().add(map);
    }

    @PostMapping("/latest/data/site")
    @ManagerAuth(memo = "站点实时数据")
    public R siteLatestData(){
@@ -108,9 +139,9 @@
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());
            vos.add(vo);
        }
        redisUtil.set("siteLatestData", JSON.toJSONString(vos));
        return R.ok().add(vos);
    }

@@ -155,6 +186,7 @@
            vos.add(vo);

        }
        redisUtil.set("crnLatestData", JSON.toJSONString(vos));
        return R.ok().add(vos);
    }

@@ -308,4 +340,15 @@
        return R.ok().add(JSON.toJSONString(jsonObjects));
    }

    @GetMapping("/getLedInfos")
    public R getLedInfos(HttpServletRequest request) {
        String remoteAddr = request.getRemoteAddr();
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getIp().equals(remoteAddr)) {
                return R.ok().add(slave);
            }
        }
        return R.ok();
    }

}