新增配方记录功能并优化相关实体和VO

baoshiwei

2024-10-25 a3344947e1ff54fcae8f09140ab0d05e2ba26f31

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

@@ -1,5 +1,6 @@
package org.jeecg.modules.dry.controller;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,6 +10,8 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.bean.BeanUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.system.query.QueryGenerator;
@@ -16,6 +19,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.common.CacheConstants;
import org.jeecg.modules.dry.entity.DryEqpType;
import org.jeecg.modules.dry.entity.DryEquipment;
import org.jeecg.modules.dry.service.IDryEqpTypeService;
import org.jeecg.modules.dry.service.IDryEquipmentService;
@@ -25,6 +29,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.dry.vo.DryEquipmentVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -92,7 +97,7 @@

    @ApiOperation(value="查询所有干燥机", notes="查询所有干燥机")
    @GetMapping(value = "/listAll")
   public Result<List<DryEquipment>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
   public Result<List<DryEquipmentVo>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
      //------------------------------------------------------------------------------------------------
      //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
      if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
@@ -103,10 +108,17 @@

      queryWrapper.orderByAsc("code");
      List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
      List<DryEquipmentVo> equipmentVos = new ArrayList<>();
      eqps.stream().forEach(item -> {
         item.setType(dryEqpTypeService.getById(item.getType()).getName());
         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(eqps);
      return Result.OK(equipmentVos);
   }


@@ -139,6 +151,7 @@
   @RequiresPermissions("dry:dry_equipment:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody DryEquipment dryEquipment) {
      // 删除redis缓存
      redisUtil.del(CacheConstants.RedisKeyEnum.EQP_MAP.getCode());
      dryEquipmentService.updateById(dryEquipment);

@@ -186,13 +199,18 @@
   //@AutoLog(value = "干燥机-通过id查询")
   @ApiOperation(value="干燥机-通过id查询", notes="干燥机-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) {
   public Result<DryEquipmentVo> queryById(@RequestParam(name="id",required=true) String id) {
      DryEquipment dryEquipment = dryEquipmentService.getById(id);
      dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName());
      DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(dryEquipment, DryEquipmentVo.class);
      DryEqpType dryEqpType = dryEqpTypeService.getById(dryEquipment.getType());
      dryEquipmentVo.setType(dryEqpType.getName());
      dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
      dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());
      dryEquipmentVo.setPowerConsumption(dryEqpType.getPowerConsumption());
      if(dryEquipment==null) {
         return Result.error("未找到对应数据");
      }
      return Result.OK(dryEquipment);
      return Result.OK(dryEquipmentVo);
   }

    /**