干燥机配套车间生产管理系统/云平台服务端
zhuguifei
5 天以前 1f04768f05d4a68f0f16456b7934f729dea9fb83
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
@@ -12,11 +12,15 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.bean.BeanUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.constant.CommonCacheConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.common.CacheConstants;
@@ -105,6 +109,11 @@
      //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
      if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
         dryEquipment.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
         //fix: shiro排除的接口无法从jwt获取tenantId
         String tenantId = TokenUtils.getTenantIdByRequest(req);
         if(StringUtils.isNotEmpty(tenantId)){
            dryEquipment.setTenantId(Integer.parseInt(tenantId));
         }
      }
      //------------------------------------------------------------------------------------------------
      QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());
@@ -118,9 +127,17 @@
       queryWrapper.orderByAsc("code");
       List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
       List<DryEquipmentVo> equipmentVos = new ArrayList<>();
       if(eqps == null){
          return equipmentVos;
       }
       eqps.stream().forEach(item -> {
          DryEquipmentVo dryEquipmentVo = BeanUtil.toBean(item, DryEquipmentVo.class);
          DryEqpType dryEqpType = dryEqpTypeService.getById(item.getType());
          if(dryEqpType == null){
             equipmentVos.add(dryEquipmentVo);
             return;
          }
          dryEquipmentVo.setType(dryEqpType.getName());
          dryEquipmentVo.setDryEfficiency(dryEqpType.getDryEfficiency());
          dryEquipmentVo.setSteamConsumption(dryEqpType.getSteamConsumption());