zy-wcs.git - Gitblit

parent: 55868ae6 | 补丁 | 提交 | show whitespace

lsh

2024-10-21 632c1351c9f0ba96d1f43e46aed2bcbd4a50e7d6

2个文件已修改

1个文件已添加

	src/main/java/com/zy/asrs/controller/RgvController.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index.html	129 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
import com.zy.asrs.domain.param.EnergyGatheringRingParam;
import com.zy.asrs.domain.param.RgvOperatorParam;
import com.zy.asrs.domain.param.RgvWrkMastParam;
import com.zy.asrs.domain.param.RingThroughParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.*;
@@ -413,4 +415,31 @@
        return R.ok().add(result);
    }

    @PostMapping("/ring/through/task/wrk/mast/position/data")
//    @ManagerAuth(memo = "站点信息")
    public R ringThroughTaskWrkMast(){
        List<RgvWrkMastParam> result = new ArrayList<>();
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
        for (WrkMast wrkMast : wrkMasts){
            RgvWrkMastParam rgvWrkMastParam = new RgvWrkMastParam(wrkMast);
            if (Cools.isEmpty(rgvWrkMastParam.getRgvNo())){
                rgvWrkMastParam.setRgvSts("未绑定");
            } else {
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvWrkMastParam.getRgvNo());
                if (rgvThread == null) {
                    rgvWrkMastParam.setRgvSts("未知");
                } else {
                    RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                    if (rgvProtocol == null) {
                        rgvWrkMastParam.setRgvSts("未知");
                    } else {
                        rgvWrkMastParam.setRgvSts(rgvProtocol.statusType.desc);
                    }
                }
            }
            result.add(rgvWrkMastParam);
        }
        return R.ok().add(result);
    }

}

 src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java

New file
@@ -0,0 +1,46 @@
package com.zy.asrs.domain.param;

import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.utils.TimeCalculatorUtils;
import lombok.Data;

import java.util.Date;

/**
 * Created by vincent on 2020-06-02
 */
@Data
public class RgvWrkMastParam {

    // RGV号
    private Integer rgvNo;
    // 工作号
    private Long wrkNo;
    // 工作状态
    private Long wrkSts;
    private String wrkSts$;
    // 工位1目标站
    private Integer staNo;
    // 工位1源站
    private Integer sourceStaNo;
    //下发时间
    private String modiTime;
    //更新时间
    private String appeTime;
    private String rgvSts;

    public RgvWrkMastParam(){};


    public RgvWrkMastParam(WrkMast wrkMast){
        this.wrkNo = wrkMast.getWrkNo();
        this.rgvNo = wrkMast.getRgvNo();
        this.sourceStaNo = wrkMast.getSourceStaNo();
        this.staNo = wrkMast.getStaNo();
        this.wrkSts = wrkMast.getWrkSts();
        this.wrkSts$ = wrkMast.getWrkSts$();
        this.modiTime = wrkMast.getModiTime$();
        this.appeTime = wrkMast.getAppeTime$();
    }
}

 src/main/webapp/views/index.html

@@ -81,13 +81,49 @@
        .station:hover, .bus:hover {
            transform: scale(1.4);
        }

        .task-bar {
            position: fixed;
            top: 10%;
            transform: translateY(-50%);
            width: 25%; /* 设置宽度 */
            background-color: rgba(255, 255, 255, 0); /* 半透明背景 */

            border-radius: 5px;
            padding: 10px;
            box-shadow: 0 0 10px rgba(0, 0, 0, 0);
            z-index: 1000; /* 确保在其他元素之上 */
        }

        .task-bar-div1 {
            width: 100%; /* 设置宽度 */
            background-color: rgba(255, 255, 255, 0.8); /* 半透明背景 */
            box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
        }

        .left-task-bar {
            left: 20px; /* 距离左边的距离 */
        }

        .right-task-bar {
            right: 20px; /* 距离右边的距离 */
        }

        .el-table .warning-row {
            background: oldlace;
        }

        .el-table .success-row {
            background: #f0f9eb;
        }
    </style>
</head>
<body>
    <!--<header>-->
    <!--    环形穿梭车智能系统-->
    <!--</header>-->
    <div id="app" class="map">
    <div id="app">
        <div  class="map">
<!--        <div class="inner-ring"></div>-->
<!--        <div class="outer-ring"></div>-->
        <div v-for="track in energyGatheringRing" class="inner-ring" :style="{  borderColor: track.trackColor , boxShadow :  'inset 0 0 30px '+track.radiationColor+', 0 0 20px '+track.radiationColor}"></div>
@@ -99,13 +135,76 @@
        <!-- Buses -->
        <div v-for="bus in tableDataRgv" class="bus" :style="{ top: bus.valueX + '%', left: bus.valueY + '%' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
    </div>

        <!-- Left Task Bar -->
        <div class="task-bar left-task-bar" >
            <div>
                <el-tooltip :content="'Switch value: ' + value" placement="top">
                    <el-switch
                            v-model="value"
                            active-color="#13ce66"
                            inactive-color="#ff4949"
                            active-value="100"
                            inactive-value="0">
                    </el-switch>
                </el-tooltip>
            </div>
            <div v-if="value === '100' ">
                <el-table
                        :data="tableDataLeft"
                        style="width: 100%"
                        :row-class-name="tableRowClassName">
                    <el-table-column
                            prop="wrkNo"
                            label="工作号"
                            width="80">
                    </el-table-column>
                    <el-table-column
                            prop="wrkSts$"
                            label="工作状态">
                    </el-table-column>
                    <el-table-column
                            prop="staNo"
                            label="目标站">
                    </el-table-column>
                    <el-table-column
                            prop="sourceStaNo"
                            label="源站">
                    </el-table-column>
                    <el-table-column
                            prop="modiTime"
                            label="下发时间">
                    </el-table-column>
                    <el-table-column
                            prop="modiTime"
                            label="更新时间">
                    </el-table-column>
                    <el-table-column
                            prop="rgvSts"
                            label="RGV状态">
                    </el-table-column>
                </el-table>
            </div>
        </div>

        <!-- Right Task Bar -->
        <div id = "app3"  class="task-bar right-task-bar">
            <h3>任务信息</h3>
            <p>任务3: 描述3</p>
            <p>任务4: 描述4</p>
            <!-- 这里可以动态生成任务信息 -->
        </div>
    </div>

    <script>
        var app = new Vue({
            el: '#app',
            data: {
                value: '100',
                tableDataRgv: [],
                tableDataDev: [],
                energyGatheringRing: []
                energyGatheringRing: [],
                tableDataLeft: []
            },
            created(){
                this.init();
@@ -118,13 +217,39 @@
                    this.getTableDataRgv()
                    this.getTableDataDev()
                    this.getTableDataTrack()
                    this.getTableDataLeft()

                    setInterval(() => {
                        this.getTableDataRgv()
                        this.getTableDataDev()
                        this.getTableDataTrack()
                        this.getTableDataLeft()
                    }, 1000)
                },
                tableRowClassName({row, rowIndex}) {
                    if (rowIndex === 1) {
                        return 'warning-row';
                    } else if (rowIndex === 3) {
                        return 'success-row';
                    }
                    return '';
                },
                getTableDataLeft() {
                    let that = this;
                    $.ajax({
                        url: baseUrl + "/rgv/ring/through/task/wrk/mast/position/data",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
                        data: {},
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'post',
                        success: function (res) {
                            that.tableDataLeft = res.data
                        }
                    });
                },
                getTableDataRgv() {
                    let that = this;
                    $.ajax({

			@@ -2,11 +2,13 @@

			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.annotations.ManagerAuth;
			import com.core.common.Cools;
			import com.core.common.R;
			import com.core.exception.CoolException;
			import com.zy.asrs.domain.enums.RgvStatusType;
			import com.zy.asrs.domain.param.EnergyGatheringRingParam;
			import com.zy.asrs.domain.param.RgvOperatorParam;
			import com.zy.asrs.domain.param.RgvWrkMastParam;
			import com.zy.asrs.domain.param.RingThroughParam;
			import com.zy.asrs.domain.vo.*;
			import com.zy.asrs.entity.*;
			@@ -413,4 +415,31 @@
			return R.ok().add(result);
			}

			@PostMapping("/ring/through/task/wrk/mast/position/data")
			// @ManagerAuth(memo = "站点信息")
			public R ringThroughTaskWrkMast(){
			List<RgvWrkMastParam> result = new ArrayList<>();
			List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
			for (WrkMast wrkMast : wrkMasts){
			RgvWrkMastParam rgvWrkMastParam = new RgvWrkMastParam(wrkMast);
			if (Cools.isEmpty(rgvWrkMastParam.getRgvNo())){
			rgvWrkMastParam.setRgvSts("未绑定");
			} else {
			RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvWrkMastParam.getRgvNo());
			if (rgvThread == null) {
			rgvWrkMastParam.setRgvSts("未知");
			} else {
			RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
			if (rgvProtocol == null) {
			rgvWrkMastParam.setRgvSts("未知");
			} else {
			rgvWrkMastParam.setRgvSts(rgvProtocol.statusType.desc);
			}
			}
			}
			result.add(rgvWrkMastParam);
			}
			return R.ok().add(result);
			}

			}

New file
			@@ -0,0 +1,46 @@
			package com.zy.asrs.domain.param;

			import com.core.common.Cools;
			import com.zy.asrs.entity.WrkMast;
			import com.zy.asrs.utils.TimeCalculatorUtils;
			import lombok.Data;

			import java.util.Date;

			/**
			* Created by vincent on 2020-06-02
			*/
			@Data
			public class RgvWrkMastParam {

			// RGV号
			private Integer rgvNo;
			// 工作号
			private Long wrkNo;
			// 工作状态
			private Long wrkSts;
			private String wrkSts$;
			// 工位1目标站
			private Integer staNo;
			// 工位1源站
			private Integer sourceStaNo;
			//下发时间
			private String modiTime;
			//更新时间
			private String appeTime;
			private String rgvSts;

			public RgvWrkMastParam(){};


			public RgvWrkMastParam(WrkMast wrkMast){
			this.wrkNo = wrkMast.getWrkNo();
			this.rgvNo = wrkMast.getRgvNo();
			this.sourceStaNo = wrkMast.getSourceStaNo();
			this.staNo = wrkMast.getStaNo();
			this.wrkSts = wrkMast.getWrkSts();
			this.wrkSts$ = wrkMast.getWrkSts$();
			this.modiTime = wrkMast.getModiTime$();
			this.appeTime = wrkMast.getAppeTime$();
			}
			}

			@@ -81,13 +81,49 @@
			.station:hover, .bus:hover {
			transform: scale(1.4);
			}

			.task-bar {
			position: fixed;
			top: 10%;
			transform: translateY(-50%);
			width: 25%; /* 设置宽度 */
			background-color: rgba(255, 255, 255, 0); /* 半透明背景 */

			border-radius: 5px;
			padding: 10px;
			box-shadow: 0 0 10px rgba(0, 0, 0, 0);
			z-index: 1000; /* 确保在其他元素之上 */
			}

			.task-bar-div1 {
			width: 100%; /* 设置宽度 */
			background-color: rgba(255, 255, 255, 0.8); /* 半透明背景 */
			box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
			}

			.left-task-bar {
			left: 20px; /* 距离左边的距离 */
			}

			.right-task-bar {
			right: 20px; /* 距离右边的距离 */
			}

			.el-table .warning-row {
			background: oldlace;
			}

			.el-table .success-row {
			background: #f0f9eb;
			}
			</style>
			</head>
			<body>
			<!--<header>-->
			<!-- 环形穿梭车智能系统-->
			<!--</header>-->
			<div id="app" class="map">
			<div id="app">
			<div class="map">
			<!-- <div class="inner-ring"></div>-->
			<!-- <div class="outer-ring"></div>-->
			<div v-for="track in energyGatheringRing" class="inner-ring" :style="{ borderColor: track.trackColor , boxShadow : 'inset 0 0 30px '+track.radiationColor+', 0 0 20px '+track.radiationColor}"></div>
			@@ -99,13 +135,76 @@
			<!-- Buses -->
			<div v-for="bus in tableDataRgv" class="bus" :style="{ top: bus.valueX + '%', left: bus.valueY + '%' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
			</div>

			<!-- Left Task Bar -->
			<div class="task-bar left-task-bar" >
			<div>
			<el-tooltip :content="'Switch value: ' + value" placement="top">
			<el-switch
			v-model="value"
			active-color="#13ce66"
			inactive-color="#ff4949"
			active-value="100"
			inactive-value="0">
			</el-switch>
			</el-tooltip>
			</div>
			<div v-if="value === '100' ">
			<el-table
			:data="tableDataLeft"
			style="width: 100%"
			:row-class-name="tableRowClassName">
			<el-table-column
			prop="wrkNo"
			label="工作号"
			width="80">
			</el-table-column>
			<el-table-column
			prop="wrkSts$"
			label="工作状态">
			</el-table-column>
			<el-table-column
			prop="staNo"
			label="目标站">
			</el-table-column>
			<el-table-column
			prop="sourceStaNo"
			label="源站">
			</el-table-column>
			<el-table-column
			prop="modiTime"
			label="下发时间">
			</el-table-column>
			<el-table-column
			prop="modiTime"
			label="更新时间">
			</el-table-column>
			<el-table-column
			prop="rgvSts"
			label="RGV状态">
			</el-table-column>
			</el-table>
			</div>
			</div>

			<!-- Right Task Bar -->
			<div id = "app3" class="task-bar right-task-bar">
			<h3>任务信息</h3>
			<p>任务3: 描述3</p>
			<p>任务4: 描述4</p>
			<!-- 这里可以动态生成任务信息 -->
			</div>
			</div>

			<script>
			var app = new Vue({
			el: '#app',
			data: {
			value: '100',
			tableDataRgv: [],
			tableDataDev: [],
			energyGatheringRing: []
			energyGatheringRing: [],
			tableDataLeft: []
			},
			created(){
			this.init();
			@@ -118,13 +217,39 @@
			this.getTableDataRgv()
			this.getTableDataDev()
			this.getTableDataTrack()
			this.getTableDataLeft()

			setInterval(() => {
			this.getTableDataRgv()
			this.getTableDataDev()
			this.getTableDataTrack()
			this.getTableDataLeft()
			}, 1000)
			},
			tableRowClassName({row, rowIndex}) {
			if (rowIndex === 1) {
			return 'warning-row';
			} else if (rowIndex === 3) {
			return 'success-row';
			}
			return '';
			},
			getTableDataLeft() {
			let that = this;
			$.ajax({
			url: baseUrl + "/rgv/ring/through/task/wrk/mast/position/data",
			headers: {
			'token': localStorage.getItem('token')
			},
			data: {},
			dataType: 'json',
			contentType: 'application/json;charset=UTF-8',
			method: 'post',
			success: function (res) {
			that.tableDataLeft = res.data
			}
			});
			},
			getTableDataRgv() {
			let that = this;
			$.ajax({