#

yxFwq

2025-04-01 74fd6eb7fb0322078f7946f51073f20e90231df1

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

@@ -154,6 +154,7 @@
        List<JarStateTableVo> list = new ArrayList<>();
        List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
        for (BasJar basJar : jars) {
            if (basJar.getJarCode()>2) continue;
            // 表格行
            JarStateTableVo vo = new JarStateTableVo();
            vo.setJarNo(basJar.getJarNo());   //  RGV号
@@ -165,16 +166,54 @@
            vo.setRegion(basJar.getRegion());
            vo.setJarCode(basJar.getJarCode());
            vo.setJarErr(basJar.getJarErr$());

            vo.setJarTemperature(basJar.getJarTemperature());
            vo.setJarTemperature$(basJar.getJarTemperature().toString()+"℃");
            vo.setJarPressure(basJar.getJarPressure());
            vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
            vo.setJarCount(basJar.getJarCount());//最大储量
            vo.setJarCount$(basJar.getJarCount().toString()+"托");//最大储量

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

            vo.setLeftDoorOpen(basJar.getLeftDoorOpen());
            vo.setLeftDoorClose(basJar.getLeftDoorClose());
            vo.setRightDoorOpen(basJar.getRightDoorOpen());
            vo.setRightDoorClose(basJar.getRightDoorClose());

            /**
             * 左门(checkBox)
             */
            vo.setLeftDoor(basJar.getLeftDoor().equals("N")? "关闭":"打开");

            /**
             * 右门(checkBox)
             */
            vo.setRightDoor(basJar.getRightDoor().equals("N")? "关闭":"打开");

            /**
             * 左门可开(checkBox)
             */
            vo.setLeftInEnable(basJar.getLeftInEnable());

            /**
             * 左门可关(checkBox)
             */
            vo.setLeftOutEnable(basJar.getLeftOutEnable());


            /**
             * 右门可开(checkBox)
             */
            vo.setRightInEnable(basJar.getRightInEnable());

            /**
             * 右门可关(checkBox)
             */
            vo.setRightOutEnable(basJar.getRightOutEnable());

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