Merge branch 'herb' of https://gitee.com/baoshwi/herb into herb

zhuguifei

2024-11-27 86f19c30b243337f1400244f3a0426c13e54a475

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

@@ -36,6 +36,7 @@
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -106,21 +107,39 @@
      //------------------------------------------------------------------------------------------------
      QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

      queryWrapper.orderByAsc("code");
      List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
      List<DryEquipmentVo> equipmentVos = new ArrayList<>();
      eqps.stream().forEach(item -> {
         DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
         DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
         dryEquipmentVo.setType(dryEqpType.getName());
         dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
         dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
         dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption());
         equipmentVos.add(dryEquipmentVo);
      });
      return Result.OK(equipmentVos);
       List<DryEquipmentVo> equipmentVos = getDryEquipmentVos(queryWrapper);
       return Result.OK(equipmentVos);
   }

    @NotNull
    private List<DryEquipmentVo> getDryEquipmentVos(QueryWrapper<DryEquipment> queryWrapper) {
       queryWrapper.orderByAsc("code");
       List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
       List<DryEquipmentVo> equipmentVos = new ArrayList<>();
       eqps.stream().forEach(item -> {
          DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
          DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
          dryEquipmentVo.setType(dryEqpType.getName());
          dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
          dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
          dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption());
          equipmentVos.add(dryEquipmentVo);
       });
       return equipmentVos;
    }


    @ApiOperation(value="查询租户所有干燥机", notes="查询租户所有干燥机")
    @GetMapping(value = "/listTenantEqp")
    public Result<List<DryEquipmentVo>> queryTenantAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
      TenantContext.setTenant(dryEquipment.getTenantId()+"");

       QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

       List<DryEquipmentVo> equipmentVos = getDryEquipmentVos(queryWrapper);
       return Result.OK(equipmentVos);
    }