#

yxFwq

2024-11-23 e973fbaf60de8891ddbd99c775932139c366af89

#

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

@@ -145,10 +145,14 @@
            vo.setJarTemperature(basJar.getJarTemperature());
            vo.setJarTemperature$(basJar.getJarTemperature().toString()+"℃");
            vo.setJarPressure(basJar.getJarPressure());
            vo.setJarPressure$(basJar.getJarPressure().toString()+"Pa");
            vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
            vo.setJarCount(basJar.getJarCount());//最大储量
            vo.setJarCount$(basJar.getJarCount().toString()+"托");//最大储量

            vo.setHoldingTime(basJar.getHoldingTime().toString());//保温时间
            vo.setOpenTime(basJar.getOpenTime().toString());//开门时间
            vo.setCloseTime(basJar.getCloseTime().toString());//关门时间

        }
        return R.ok().add(list);
    }

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

@@ -8,6 +8,7 @@
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
import java.util.Date;

@Data
@TableName("asr_bas_jar")
@@ -167,6 +168,27 @@
    @TableField("jar_pressure")
    private Float jarPressure;

    /**
     * 保温时间
     */
    @ApiModelProperty(value= "保温时间")
    @TableField("holding_time")
    private Date holdingTime;

    /**
     * 开门时间
     */
    @ApiModelProperty(value= "开门时间")
    @TableField("open_time")
    private Date openTime;

    /**
     * 关门时间
     */
    @ApiModelProperty(value= "关门时间")
    @TableField("close_time")
    private Date closeTime;

    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/asrs/entity/vo/JarStateTableVo.java

@@ -42,5 +42,9 @@
    private Integer jarCount = 0;
    private String jarCount$ = "-";

    private String holdingTime = "-";
    private String openTime = "-";
    private String closeTime = "-";

    private List<JarMastTableVo> jarMastTableVoList;
}

 src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java

@@ -52,7 +52,7 @@
        }
        if (crnp.getCrnErr() != null) {
            if (crnp.getCrnErr() != 0) {
                log.error("{}号堆垛机异常，异常码{}", crnNo, crnp.getCrnErr());
                log.error("{}号堆垛机异常，异常码{}", crnNo, crnp.getCrnErr()+crnp.getCrnErr$());
                return false;
            }
        }

 src/main/resources/mapper/BasJarMapper.xml

@@ -26,6 +26,9 @@
        <result column="burial" property="burial" />
        <result column="jar_temperature" property="jarTemperature" />
        <result column="jar_pressure" property="jarPressure" />
        <result column="holding_time" property="holdingTime" />
        <result column="open_time" property="openTime" />
        <result column="close_time" property="closeTime" />

    </resultMap>


 src/main/webapp/views/deviceOperate/jarOperate.html

@@ -96,6 +96,12 @@
                                </el-descriptions-item>
                                <el-descriptions-item label="最大储量">{{ tableData[currentIndex].jarCount$ }}
                                </el-descriptions-item>
                                <el-descriptions-item label="保温时间">{{ tableData[currentIndex].holdingTime }}
                                </el-descriptions-item>
                                <el-descriptions-item label="开门时间">{{ tableData[currentIndex].openTime }}
                                </el-descriptions-item>
                                <el-descriptions-item label="关门时间">{{ tableData[currentIndex].closeTime }}
                                </el-descriptions-item>
                                <el-descriptions-item label="故障代码">{{ tableData[currentIndex].jarErr }}
                                </el-descriptions-item>
                            </el-descriptions>