#

luxiaotao1123

2020-11-17 90ffa7515c367e9be9a2c41e954757898ad2df94

#

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

@@ -6,6 +6,10 @@
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.CrnProtocol;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,12 +54,32 @@
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        if (null != crnId) {
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
            if (crnThread != null) {
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                if (crnProtocol != null) {
                    xSpeed = Double.valueOf(crnProtocol.getXSpeed());
                    ySpeed = Double.valueOf(crnProtocol.getYSpeed());
                }
            }
        }

        xSpeed = Double.valueOf(new Random().nextInt(10));
        ySpeed = Double.valueOf(new Random().nextInt(10));

        int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
        int totalLoc = reportQueryMapper.getTotalLocByCrnId();

        return R.ok(
//                Cools.add("year", calendar.get(Calendar.YEAR))
        ).add(crnId);
                Cools.add("xSpeed", xSpeed) // 行走速度
                .add("ySpeed", ySpeed)  // 升降速度
                .add("totalLoc", totalLoc)  // 总库位数
                .add("totalWrk", totalWrk)    // 总任务数

        );
    }

    /**

 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java

@@ -27,4 +27,10 @@
    @Select("select * from asr_loc_use_view")
    LocChartPie getLocUseRate();

    @Select("select count(1) as totalWrk from asr_wrk_mast_log where crn_no = #{crnNo}")
    Integer getTotalWrkByCrnId(Integer crnNo);

    @Select("select count(1) as totalLoc from asr_loc_mast")
    Integer getTotalLocByCrnId();

}

 src/main/webapp/views/monitor/js/monitor.js

@@ -53,7 +53,14 @@
    http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
        if (res.code === 200){

            console.log(res);
            $('#totalLoc').text(res.data.totalLoc);
            $('#totalWrk').text(res.data.totalWrk);

            $('#xSpeed').text(res.data.xSpeed);
            $('#ySpeed').text(res.data.ySpeed);

            // 计数动画
            $('.counter').countUp();
        } else if (res.code === 403){
            parent.location.href = baseUrl+"/login";
        }  else {

 src/main/webapp/views/monitor/monitor.html

@@ -124,7 +124,7 @@
                        <img src="img/a.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count">7777</i>
                                <i class="count" id="totalLoc">0</i>
                                <span class="unit">个</span>
                            </div>
                            <div class="content">库位总数(个)</div>
@@ -134,17 +134,17 @@
                        <img src="img/b.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count">777</i>
                                <span class="unit">个</span>
                                <i class="count" id="totalWrk">0</i>
                                <span class="unit">托</span>
                            </div>
                            <div class="content">使用中库位(个)</div>
                            <div class="content">总任务数(托)</div>
                        </div>
                    </div>
                    <div class="charge-info-elem">
                        <img src="img/c.png">
                        <div class="info-detail">
                            <div class="real-data">
                                <i class="count">33</i>
                                <i class="count" id="">33</i>
                                <span class="unit">托</span>
                            </div>
                            <div class="content">今日入库(托)</div>
@@ -184,10 +184,10 @@
                    <div class="crn-speed">
                        <div class="speed-content">
                            <div>
                                <span>堆垛机走行速度：</span><span class="counter">5.00</span><span>米/秒</span>
                                <span>堆垛机走行速度：</span><span id="xSpeed" class="counter">5.00</span><span>米/秒</span>
                            </div>
                            <div>
                                <span>堆垛机升降速度：</span><span class="counter">5.00</span><span>米/秒</span>
                                <span>堆垛机升降速度：</span><span id="ySpeed" class="counter">5.00</span><span>米/秒</span>
                            </div>
                        </div>
                    </div>
@@ -358,9 +358,6 @@
            //,anim: 'updown' //切换动画方式
        });
    });

    // 计数动画
    $('.counter').countUp();

    /***********************************************************************************/
    /************************************* 折线图 ***************************************/