提交 fa2eaeac 编辑于 作者: 喻训浩's avatar 喻训浩
浏览文件

fix: avi修改

上级 f61c5598

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/PaintshopStation.java

+6 −1
原始行号 差异行号 差异行
@@ -6,6 +6,7 @@ import lombok.Data; 
import net.vtstar.user.search.JoinColumn;

import net.vtstar.user.search.Search;

import net.vtstar.zhongtong.avi.monitoring.domain.Skid;

import net.vtstar.zhongtong.avi.monitoring.domain.enums.Direction;

import net.vtstar.zhongtong.avi.monitoring.domain.enums.ProductionType;

import net.vtstar.zhongtong.avi.monitoring.domain.enums.StationState;

import net.vtstar.zhongtong.avi.monitoring.domain.vo.StationPos;
@@ -63,7 +64,7 @@ public class PaintshopStation implements Serializable { 
    private String landNo;



    @ApiModelProperty(notes = "平移车道编号")

    //@Column(name = "vehicle_lane_code")

    @Column(name = "vehicle_lane_code")

    @Search

    private String vehicleLaneCode;
@@ -117,6 +118,10 @@ public class PaintshopStation implements Serializable { 
    @ApiModelProperty(notes = "工艺流向", hidden = true)

    private Boolean flow;



    @Column(name = "ve_direction")

    @ApiModelProperty(notes = "相对平移车位置", hidden = true)

    private Direction direction;



    @ApiModelProperty(notes = "工位平移车位置", hidden = true)

    private StationPos pos;

}

src/main/java/net/vtstar/zhongtong/avi/global/constant/Constant.java

+7 −7
原始行号 差异行号 差异行
@@ -2,10 +2,6 @@ package net.vtstar.zhongtong.avi.global.constant; 


public class Constant {



    public static long totalSize = 0;



    public static long totalTimeOut = 0;



    //redis滑撬前缀

    public static final String SKID_PREFIX = "skid:";

    //redis工位前缀
@@ -14,6 +10,10 @@ public class Constant { 
    public static final String ROOM_PREFIX = "room:";

    //redis报警前缀

    public static final String WARNING_PREFIX = "warning:";

    //redis平移车前缀

    public static final String VEHICLE_PREFIX = "vehicle:";

    //redis 工位下车缓存前缀

    public static final String STATION_OUT_PREFIX = "STATION:OUT:";



    public static final String AREA_PREFIX = "area:";
@@ -22,7 +22,7 @@ public class Constant { 
    //进车数统计

    public static final String BUS_SIZE_IN = "BUS:IN";

    //进车数统计

    public static final String BUS_SIZE_OUT = "BUS:OUT";

    public static final String BUS_SIZE_OUT = "BUS:OUT:";



    public static final String HANZHUANG_VEHICLE1_RFID = "rfid68";
@@ -34,6 +34,6 @@ public class Constant { 
    //焊装平移车道2车身号

    public static final String HANZHUANG_VEHICLE2_BUSNO_KEY = "HZC2:";



    //redis平移车信号到位

    public static final String VEHICLE_PREFIX = "VEHICLE:STATE";

//    //redis平移车信号到位

//    public static final String VEHICLE_PREFIX = "VEHICLE:STATE";

}

src/main/java/net/vtstar/zhongtong/avi/ledlamp/service/LedService.java

+2 −3
原始行号 差异行号 差异行
@@ -72,10 +72,9 @@ public class LedService { 
        }*/



        if (ledNo.equals("1") || ledNo.equals("2") || ledNo.equals("3") || ledNo.equals("4")) {

            List<Warning> warnings = new ArrayList<>();

            vo.setWarningList(warnings);

            vo.setRoomInfoList(new ArrayList<>());

            warningCache.get(ledNo);

            List warningList = warningCache.get(Constant.LED_PREFIX + ledNo, ArrayList.class);

            vo.setWarningList(warningList);

        } else {

            List<WorkRoom> room = new ArrayList<>();

            List<String> eqpCodeList = new ArrayList<>();

src/main/java/net/vtstar/zhongtong/avi/monitoring/domain/Vehicle.java

+12 −1
原始行号 差异行号 差异行
@@ -6,6 +6,7 @@ import lombok.Data; 


import javax.persistence.Column;

import javax.persistence.Table;

import java.util.Date;



@ApiModel("平移车")

@Data
@@ -20,7 +21,7 @@ public class Vehicle { 


    @ApiModelProperty(notes = "所属平移车道（从东向西（1,2,3,4））")

    @Column(name = "lane")

    private Integer lane;

    private String lane;



    @ApiModelProperty(notes = " 转动：正转（true），反转（false）")

    private Boolean turn;
@@ -50,4 +51,14 @@ public class Vehicle { 


    @ApiModelProperty(notes = "当前绑定滑撬")

    private String currentRfid;



    @ApiModelProperty(notes = "信号发生时间")

    private Date occurTime;



    @Column(name = "sequence")

    @ApiModelProperty(notes = "上下顺序")

    private Date sequence;



    @ApiModelProperty("当前绑定滑撬")

    private Skid skid;

}

src/main/java/net/vtstar/zhongtong/avi/monitoring/domain/enums/Direction.java

0 → 100644
+14 −0
原始行号 差异行号 差异行 
package net.vtstar.zhongtong.avi.monitoring.domain.enums;



/**

 * @author Yu Xunhao

 * @description 方向

 * @date 2019-11-17

 * @update

 */

public enum Direction {



    EAST,



    WEST

}