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

fix: avi修改

上级 5a5c3c1b

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

+10 −3
原始行号 差异行号 差异行
@@ -57,7 +57,7 @@ public class PaintshopStation implements Serializable { 
    private String laneCode;



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

    //@JoinColumn(tableName = PaintshopLane.class, name = "vehicle_lane_code")

    @Column(name = "vehicle_lane_code")

    @Search

    private String vehicleLaneCode;
@@ -89,6 +89,10 @@ public class PaintshopStation implements Serializable { 
    @ApiModelProperty(value = "车体类型")

    private ProductionType busType;



    @ApiModelProperty(notes = "状态", hidden = true)

    @Column(name = "status")

    private String status;



    @ApiModelProperty(notes = "旧状态", hidden = true)

    private StationState oldState;
@@ -98,6 +102,9 @@ public class PaintshopStation implements Serializable { 
    @ApiModelProperty(notes = "当前绑定滑撬", hidden = true)

    private Skid skid;



    @ApiModelProperty(notes = "工位正反转,正转true，翻转false", hidden = true)

    private Boolean turn;

    @ApiModelProperty(notes = "工位反转", hidden = true)

    private Boolean turnR;



    @ApiModelProperty(notes = "工位正转", hidden = true)

    private Boolean turnF;

}

src/main/java/net/vtstar/zhongtong/avi/global/config/CacheConfig.java

+10 −0
原始行号 差异行号 差异行
@@ -32,4 +32,14 @@ public class CacheConfig { 
    Cache laneStationCache(ConcurrentMapCacheManager cacheManager) {

        return cacheManager.getCache("laneStationCache");

    }



    @Bean

    Cache vehicleCache(ConcurrentMapCacheManager cacheManager) {

        return cacheManager.getCache("vehicleCache");

    }



    @Bean

    Cache skidCache(ConcurrentMapCacheManager cacheManager) {

        return cacheManager.getCache("skidCache");

    }

}

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

+2 −2
原始行号 差异行号 差异行
@@ -6,9 +6,9 @@ public class Constant { 


    public static final String STATION_PREFIX = "station:";



    public static final String HANZHUANG_VEHICLE1_RFID = "11111";

    public static final String HANZHUANG_VEHICLE1_RFID = "rfid68";



    public static final String HANZHUANG_VEHICLE2_RFID = "22222";

    public static final String HANZHUANG_VEHICLE2_RFID = "rfid69";



    public static final String HANZHUANG_VEHICLE1_BUSNO_KEY = "HZC1";

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

+11 −0
原始行号 差异行号 差异行
@@ -4,24 +4,35 @@ import io.swagger.annotations.ApiModel; 
import io.swagger.annotations.ApiModelProperty;

import lombok.Data;



import javax.persistence.Column;

import javax.persistence.Table;



@ApiModel("平移车")

@Data

@Table(name = "vehicle")

public class Vehicle {



    @Column(name = "id")

    private Long id;



    @ApiModelProperty(notes = "别名（平移车号）")

    private String alias;



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

    @Column(name = "lane")

    private Integer lane;



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

    private Boolean turn;



    @Column(name = "code")

    @ApiModelProperty(notes = "rfid信息")

    private String code;



    @Column(name = "mqtt_prefix")

    @ApiModelProperty(notes = "rfid信息")

    private String mqttPrefix;



    @ApiModelProperty(notes = "左侧有无车信号")

    private Boolean leftSignal;

src/main/java/net/vtstar/zhongtong/avi/monitoring/domain/bo/MQTTMessageBO.java

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



import lombok.Data;



import java.util.Date;



@Data

public class MQTTMessageBO {



    private Integer State;



    private String ID;



    private String createDate;

}