From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcUtilizationRateServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcUtilizationRateServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcUtilizationRateServiceImpl.java
index 247a499..3695d73 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcUtilizationRateServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcUtilizationRateServiceImpl.java
@@ -1,10 +1,12 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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;
@@ -12,7 +14,9 @@
import javax.servlet.http.HttpServletRequest;
import java.sql.Array;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
/**
* @Description: 鐜囧弬鏁拌缃�
@@ -26,7 +30,7 @@
//鍒涘缓鏌ヨ鍣�
QueryWrapper<MdcUtilizationRate> queryWrapper = new QueryWrapper();
//妫�鏌TTP璇锋眰浣撲腑鏄惁瀛樺湪鍚嶄负椹卞姩绫诲瀷鐨勫弬鏁�,瀛樺湪鍒檛rue,鑾峰彇绗竴涓暟鎹娇鐢ㄦā绯婃煡璇㈡坊鍔犲埌鍒版煡璇㈠櫒涓�
- 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);
}
@@ -56,4 +60,42 @@
public Boolean deleteBatchUtilization(String ids) {
return this.removeByIds(Arrays.asList(ids.split(",")));
}
+
+ /**
+ * 鏍规嵁绫诲瀷鏌ヨ鍒╃敤鐜囧眰绾�
+ *
+ * @param type
+ * @return
+ */
+ @Override
+ 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;
+ }
}
--
Gitblit v1.9.3