Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcUtilizationRateServiceImpl.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mdc.dto.MdcUtilizationRateDto;
import org.jeecg.modules.mdc.entity.MdcUtilizationRate;
import org.jeecg.modules.mdc.mapper.MdcUtilizationRateMapper;
import org.jeecg.modules.mdc.service.IMdcUtilizationRateService;
@@ -13,6 +14,7 @@

import javax.servlet.http.HttpServletRequest;
import java.sql.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@@ -28,7 +30,7 @@
        //创建查询器
        QueryWrapper<MdcUtilizationRate> queryWrapper = new QueryWrapper();
        //检查HTTP请求体中是否存在名为驱动类型的参数,存在则true,获取第一个数据使用模糊查询添加到到查询器中
        if (req.getParameterMap().containsKey("rateParameterCategory")){
        if (req.getParameterMap().containsKey("rateParameterCategory")) {
            String rateParameterCategory = req.getParameterMap().get("rateParameterCategory")[0];
            queryWrapper.like(StringUtils.isNotBlank(rateParameterCategory), "rate_parameter_category", rateParameterCategory);
        }
@@ -61,6 +63,7 @@

    /**
     * 根据类型查询利用率层级
     *
     * @param type
     * @return
     */
@@ -68,4 +71,31 @@
    public List<MdcUtilizationRate> listByType(String type) {
        return this.baseMapper.selectList(new LambdaQueryWrapper<MdcUtilizationRate>().eq(MdcUtilizationRate::getRateParameterType, type));
    }

    /**
     * 根据类型获取颜色标签
     *
     * @param type
     * @return
     */
    @Override
    public List<MdcUtilizationRateDto> getByType(String type) {
        List<MdcUtilizationRateDto> result = new ArrayList<>();
        List<MdcUtilizationRate> list = this.list(new LambdaQueryWrapper<MdcUtilizationRate>().eq(MdcUtilizationRate::getRateParameterType, type).orderByAsc(MdcUtilizationRate::getRateParameterLevel));
        for (MdcUtilizationRate mdcUtilizationRate : list) {
            MdcUtilizationRateDto mdcUtilizationRateDto = new MdcUtilizationRateDto();
            mdcUtilizationRateDto.setColor(mdcUtilizationRate.getRateParameterColor());
            String title;
            if (mdcUtilizationRate.getMinimumRange() == 0) {
                title = mdcUtilizationRate.getRateParameterCategory() + " < " + mdcUtilizationRate.getMaximumRange() + "%";
            } else if (mdcUtilizationRate.getMaximumRange() == 100){
                title = mdcUtilizationRate.getRateParameterCategory() + ">= " + mdcUtilizationRate.getMinimumRange() + "%";
            } else {
                title = mdcUtilizationRate.getMinimumRange() + "% <= " + mdcUtilizationRate.getRateParameterCategory() + " < " + mdcUtilizationRate.getMaximumRange() + "%";
            }
            mdcUtilizationRateDto.setTitle(title);
            result.add(mdcUtilizationRateDto);
        }
        return result;
    }
}