#cs1

yxFwq

2024-11-24 4eed2d245b3af6f3e69da1f6e4c68956292391ed

#cs1

 src/main/java/com/zy/asrs/entity/BasJar.java

@@ -189,6 +189,34 @@
    @TableField("close_time")
    private Date closeTime;

    /**
     * 左门开门
     */
    @ApiModelProperty(value= "左门开门")
    @TableField("left_door_open")
    private Integer leftDoorOpen;

    /**
     * 左门关门
     */
    @ApiModelProperty(value= "左门关门")
    @TableField("left_door_close")
    private Integer leftDoorClose;

    /**
     * 右门开门
     */
    @ApiModelProperty(value= "右门开门")
    @TableField("right_door_open")
    private Integer rightDoorOpen;

    /**
     * 右门关门
     */
    @ApiModelProperty(value= "右门关门")
    @TableField("right_door_close")
    private Integer rightDoorClose;

    public BasJar() {}

    public BasJar(Integer jarNo,Integer region,Integer jarCode,Integer staNo,Integer jarStatus,Integer jarCount,Integer jarErr,String leftDoor,String rightDoor,String leftInEnable,String leftOutEnable,String autoing,Integer jarMode,String rightInEnable,String rightOutEnable) {

 src/main/java/com/zy/core/model/protocol/JarProtocol.java

@@ -160,6 +160,10 @@
        basJar.setAutoing(autoing?"Y":"N");
        basJar.setJarTemperature(jarTemperature);
        basJar.setJarPressure(jarPressure);
        basJar.setLeftDoorOpen(leftDoorOpen);
        basJar.setLeftDoorClose(leftDoorClose);
        basJar.setRightDoorOpen(rightDoorOpen);
        basJar.setRightDoorClose(rightDoorClose);
        if (holdingSign){
            basJar.setHoldingTime(new Date());
            holdingSign = false;

 src/main/resources/mapper/BasJarMapper.xml

@@ -29,6 +29,10 @@
        <result column="holding_time" property="holdingTime" />
        <result column="open_time" property="openTime" />
        <result column="close_time" property="closeTime" />
        <result column="left_door_open" property="leftDoorOpen" />
        <result column="left_door_close" property="leftDoorClose" />
        <result column="right_door_open" property="rightDoorOpen" />
        <result column="right_door_close" property="rightDoorClose" />

    </resultMap>