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

fix: avi修改

上级 321d6c73

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

+14 −2
原始行号 原始行 差异行号 差异行
@@ -8,6 +8,7 @@ import net.vtstar.user.search.Search; 
import net.vtstar.zhongtong.avi.monitoring.domain.Skid;

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

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

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.enums.StationState;

import net.vtstar.zhongtong.avi.monitoring.domain.vo.StationPos;

import org.hibernate.validator.constraints.Length;

import org.hibernate.validator.constraints.Length;





import javax.persistence.Column;

import javax.persistence.Column;
@@ -52,12 +53,17 @@ public class PaintshopStation implements Serializable { 
    private Long laneId;

    private Long laneId;





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

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

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

    @Column(name = "vehicle_lane_code")

    @Search

    @Search

    private String laneCode;

    private String laneCode;





    @ApiModelProperty(notes = "从上至下车道号")

    @Column(name = "lane_no")

    @Search

    private String landNo;



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

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

    @Column(name = "vehicle_lane_code")

    //@Column(name = "vehicle_lane_code")

    @Search

    @Search

    private String vehicleLaneCode;

    private String vehicleLaneCode;
@@ -107,4 +113,10 @@ public class PaintshopStation implements Serializable { 




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

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

    private Boolean turnF;

    private Boolean turnF;



    @ApiModelProperty(notes = "工艺流向", hidden = true)

    private Boolean flow;



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

    private StationPos pos;

}
 
}

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/PretreamentMachineJob.java

+2 −1
原始行号 原始行 差异行号 差异行
@@ -30,7 +30,8 @@ public class PretreamentMachineJob extends GatherJob { 
    @Override

    @Override

    public boolean handleObject(EquipmentData equipmentData) {

    public boolean handleObject(EquipmentData equipmentData) {

        PretreatmentMachine data = (PretreatmentMachine) equipmentData;

        PretreatmentMachine data = (PretreatmentMachine) equipmentData;

        Integer state = data.getStatus();

      //  Integer state = data.getStatus();

        Integer state = 1;

        if (state != null && state ==1) {

        if (state != null && state ==1) {

            return false;

            return false;

        }

        }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/AutomaticSpotWeldingMachineJob.java

+2 −1
原始行号 原始行 差异行号 差异行
@@ -30,7 +30,8 @@ public class AutomaticSpotWeldingMachineJob extends GatherJob { 
    @Override

    @Override

    public boolean handleObject(EquipmentData equipmentData) {

    public boolean handleObject(EquipmentData equipmentData) {

        AutomaticSpotWeldingMachine data = (AutomaticSpotWeldingMachine) equipmentData;

        AutomaticSpotWeldingMachine data = (AutomaticSpotWeldingMachine) equipmentData;

        Integer state = data.getStatus();

//        Integer state = data.getStatus();

        Integer state = 1;

        if (state != null && state == 0) {

        if (state != null && state == 0) {

            return false;

            return false;

        }

        }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlcControlTireMachine2Job.java

+2 −1
原始行号 原始行 差异行号 差异行
@@ -30,7 +30,8 @@ public class PlcControlTireMachine2Job extends GatherJob { 
    @Override

    @Override

    public boolean handleObject(EquipmentData equipmentData) {

    public boolean handleObject(EquipmentData equipmentData) {

        PlcControlTireMachine2 data = (PlcControlTireMachine2) equipmentData;

        PlcControlTireMachine2 data = (PlcControlTireMachine2) equipmentData;

        Integer state = data.getStatus();

//        Integer state = data.getStatus();

        Integer state = 1;

        if (state != null && state == 0) {

        if (state != null && state == 0) {

            return false;

            return false;

        }

        }

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

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




    public static final String HANZHUANG_VEHICLE2_RFID = "rfid69";

    public static final String HANZHUANG_VEHICLE2_RFID = "rfid69";





    public static final String HANZHUANG_VEHICLE1_BUSNO_KEY = "HZC1";

    //焊装平移车道1车身号

    public static final String HANZHUANG_VEHICLE1_BUSNO_KEY = "HZC1:";





    public static final String HANZHUANG_VEHICLE2_BUSNO_KEY = "HZC2";

    //焊装平移车道2车身号

    public static final String HANZHUANG_VEHICLE2_BUSNO_KEY = "HZC2:";





    //redis平移车信号到位

    //redis平移车信号到位

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

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