增加电能和蒸汽消耗，完善工单机器状态

bsw215583320

2023-06-26 b4b962e1ca05abd8bfc63c80f1adc3df5cfa1a24

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java

@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.entity.DryEquipment;
import org.jeecg.modules.dry.service.IDryEqpTypeService;
import org.jeecg.modules.dry.service.IDryEquipmentService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,6 +54,9 @@
   @Autowired
   private IDryEquipmentService dryEquipmentService;

   @Autowired
   private IDryEqpTypeService dryEqpTypeService;

   /**
    * 分页列表查询
    *
@@ -79,6 +83,25 @@
      Page<DryEquipment> page = new Page<DryEquipment>(pageNo, pageSize);
      IPage<DryEquipment> pageList = dryEquipmentService.page(page, queryWrapper);
      return Result.OK(pageList);
   }

    @ApiOperation(value="查询所有干燥机", notes="查询所有干燥机")
    @GetMapping(value = "/listAll")
   public Result<List<DryEquipment>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
      //------------------------------------------------------------------------------------------------
      //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
      if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
         dryEquipment.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
      }
      //------------------------------------------------------------------------------------------------
      QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

      queryWrapper.orderByAsc("code");
      List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
      eqps.stream().forEach(item -> {
         item.setType(dryEqpTypeService.getById(item.getType()).getName());
      });
      return Result.OK(eqps);
   }

   /**
@@ -152,6 +175,7 @@
   @GetMapping(value = "/queryById")
   public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) {
      DryEquipment dryEquipment = dryEquipmentService.getById(id);
      dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName());
      if(dryEquipment==null) {
         return Result.error("未找到对应数据");
      }