From 45f273a2bdef5db34da34a1ac72ee26da5452c8d Mon Sep 17 00:00:00 2001
From: yb <1113799@qq.com>
Date: 星期四, 11 九月 2025 11:00:22 +0800
Subject: [PATCH] 倍率统计服务bug调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/EquipmentMagnificationJob.java | 7 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationBeilvVo.java | 18 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentMagnificationService.java | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationVo.java | 17 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java | 194 ++++++++++++++++++++++++++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationEquipmentVo.java | 30 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 25 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java | 11 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java | 17 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 7
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationVo.java | 22 +++
11 files changed, 339 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
index 58091ab..39b9f53 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
@@ -13,6 +13,7 @@
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.service.IMdcEquipmentMagnificationService;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
+import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -52,6 +53,7 @@
+
/**
* 瀵煎嚭excel
*
@@ -64,4 +66,19 @@
String userId = user.getId();
return service.exportXls(userId, magnificationVo);
}
+
+ /**
+ * 鍊嶇巼鎶ヨ〃
+ * @param magnificationVo
+ * @return
+ */
+ @AutoLog(value = "鍊嶇巼鎶ヨ〃")
+ @ApiOperation(value = "鍊嶇巼鎶ヨ〃", notes = "鍊嶇巼鎶ヨ〃")
+ @RequestMapping(value = "/beilvList")
+ public MdcMagnificationVo beilvList(MdcEquipmentMagnificationVo magnificationVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ MdcMagnificationVo vo = service.beilvsList(magnificationVo,userId);
+ return vo;
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java
index b24447d..71c9293 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java
@@ -23,4 +23,15 @@
@Excel(name = "鏃ユ湡", width = 15)
private String theDate;
+
+ public MdcEquipmentMagnificationDto(String theDate, BigDecimal spindlebeilv, BigDecimal feedbeilv) {
+ this.theDate = theDate;
+ this.spindlebeilv = spindlebeilv;
+ this.feedbeilv = feedbeilv;
+ }
+
+ public MdcEquipmentMagnificationDto() {
+
+ }
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/EquipmentMagnificationJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/EquipmentMagnificationJob.java
index 292fd2a..05b10d3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/EquipmentMagnificationJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/EquipmentMagnificationJob.java
@@ -18,7 +18,11 @@
import java.util.List;
@Slf4j
public class EquipmentMagnificationJob implements Job {
+ private String parameter;
+ public void setParameter(String parameter) {
+ this.parameter = parameter;
+ }
@Resource
private IMdcEquipmentMagnificationService mdcEquipmentMagnificationService;
@@ -39,10 +43,11 @@
if (byJobClassName != null && !byJobClassName.isEmpty()) {
quartzLog.setJobId(byJobClassName.get(0).getId());
}
+ quartzLog.setParams(this.parameter);
log.info("鍊嶇巼缁熻 EquipmentMagnificationJob start! 鏃堕棿:" + DateUtils.now());
long startTime = System.currentTimeMillis();
try {
- mdcEquipmentMagnificationService.savesEquipmentMagnifications();
+ mdcEquipmentMagnificationService.savesEquipmentMagnifications(this.parameter);
quartzLog.setIsSuccess(0);
} catch (Exception e) {
quartzLog.setIsSuccess(-1);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentMagnificationService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentMagnificationService.java
index 2d06f20..ad1ef27 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentMagnificationService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentMagnificationService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcEquipmentMagnification;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
+import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -12,7 +13,7 @@
/**
* 缁熻 鎶ヨ〃鏁版嵁
*/
- void savesEquipmentMagnifications();
+ void savesEquipmentMagnifications(String dateTime);
IPage<MdcEquipmentMagnification> pageList(String userId, MdcEquipmentMagnificationVo magnificationVo, Integer pageNo, Integer pageSize, HttpServletRequest req);
@@ -26,4 +27,7 @@
* @return
*/
ModelAndView exportXls(String userId, MdcEquipmentMagnificationVo magnificationVo);
+
+
+ MdcMagnificationVo beilvsList(MdcEquipmentMagnificationVo magnificationVo,String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index d6775c8..32929ea 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -9,10 +9,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
-import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
-import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
-import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
-import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import org.jeecg.modules.mdc.vo.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -174,6 +171,8 @@
List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo);
+ List<String> listEquipmentMagnificationId(MdcEquipmentMagnificationVo vo);
+
/**
* 鍒楄〃鏌ヨ
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java
index 9b873b5..8ce35e0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java
@@ -1,20 +1,25 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.apache.shiro.SecurityUtils;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.mdc.dto.MdcEquipmentMagnificationDto;
-import org.jeecg.modules.mdc.entity.Equipment;
-import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
-import org.jeecg.modules.mdc.entity.MdcEquipmentMagnification;
-import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection;
+import org.jeecg.modules.mdc.dto.*;
+import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMagnificationMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
+import org.jeecg.modules.mdc.vo.MdcMagnificationEquipmentVo;
+import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
+import org.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -38,17 +43,33 @@
private IMdcEquipmentRunningSectionService mdcEquipmentRunningSectionService;
@Resource
private IMdcEquipmentService mdcEquipmentService;
+ @Resource
+ private ISysDepartService sysDepartService;
+ @Resource
+ private IMdcProductionService mdcProductionService;
+
private static String spindlebeilv = "涓昏酱鍊嶇巼";
private static String feedbeilv = "杩涚粰鍊嶇巼";
@Override
- public void savesEquipmentMagnifications() {
+ public void savesEquipmentMagnifications(String dateTime) {
List<MdcEquipmentMagnification> magnifications = new ArrayList<>();
//涓昏酱鍊嶇巼
//杩涚粰鍊嶇巼
/* Equipment e = equipmentService.getById("12345678");
List<Equipment> equipmentList = new ArrayList<>();
equipmentList.add(e);*/
+ if (org.apache.commons.lang.StringUtils.isNotBlank(dateTime)) {
+ try {
+ Date initDate = DateUtils.toDate(dateTime, "yyyyMMdd");
+ String date = DateUtils.format(initDate,DateUtils.STR_DATE);
+ if (initDate != null) {
+ this.remove(new LambdaQueryWrapper<MdcEquipmentMagnification>().eq(MdcEquipmentMagnification::getTheDate, date));
+ }
+ } catch (Exception ee) {
+ log.error("鍙傛暟鏍煎紡涓嶅", ee);
+ }
+ }
List<Equipment> equipmentList = equipmentService.list();
Map<String,List<MdcDriveTypeParamConfig>> map = new HashMap<>();
Date now = DateUtils.plusTime(DateUtils.getNow(), -1);
@@ -57,7 +78,7 @@
//鏌ヨ鏈�鍚庝竴鏉¤褰�
MdcEquipmentMagnification mdcMagnification = super.baseMapper.getMaxStaticsData(equipment.getEquipmentid());
if (mdcMagnification == null) {
- start = DateUtils.plusTime(DateUtils.getNow(), -5);
+ start = DateUtils.plusTime(DateUtils.getNow(), -20);
} else {
start = DateUtils.toDate(mdcMagnification.getTheDate(),DateUtils.STR_DATE );
if (now.toString().equals(start.toString())) {
@@ -181,6 +202,161 @@
return mv;
}
+ @Override
+ public MdcMagnificationVo beilvsList(MdcEquipmentMagnificationVo vo, String userId) {
+ List<MdcMagnificationEquipmentVo> mdcMagnificationVos = new ArrayList<>();
+ MdcMagnificationVo result = new MdcMagnificationVo();
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(vo.getParentId()) && StringUtils.isEmpty(vo.getEquipmentId())) {
+ if ("2".equals(vo.getTypeTree())) {
+ // 閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, vo.getParentId());
+ } else {
+ // 浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, vo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(vo.getEquipmentId())) {
+ // 鍗曞彴璁惧淇℃伅
+ vo.setEquipmentIdList(Collections.singletonList(vo.getEquipmentId()));
+ } else {
+ // 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(vo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
+ vo.setEquipmentIdList(equipmentIds);
+ }
+
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<String> dates = DateUtils.getDatesStringList(DateUtils.getShortDate(vo.getStartTime()), DateUtils.getShortDate(vo.getEndTime()));
+ result.setDates(dates);
+
+ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
+ result.setMdcMagnificationVos(mdcMagnificationVos);
+ } else {
+ List<String> equipmentIdList = mdcEquipmentService.listEquipmentMagnificationId(vo);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ vo.setEquipmentIdList(equipmentIdList);
+ } else {
+ result.setMdcMagnificationVos(mdcMagnificationVos);
+ return result;
+ }
+ // 鏌ヨ鍒╃敤鐜囨暟鎹�
+ List<MdcEquipmentMagnificationDto> magnificationDtos = super.baseMapper.list(vo);
+ // 灏佽缁撴灉
+ if ("2".equals(vo.getTypeTree())) {
+ } else {
+ // 浜х嚎灞傜骇
+ List<MdcEquProDto> equipmentList = mdcEquipmentService.findEquProList(vo.getEquipmentIdList());
+ // 鏌ヨ鎵�鏈変骇绾夸俊鎭�
+ List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(MdcProduction::getProductionOrder));
+ for (MdcEquProDto mdcEquProDto : equipmentList) {
+ MdcMagnificationEquipmentVo mdcMgVo = new MdcMagnificationEquipmentVo();
+ mdcMgVo.setEquipmentId(mdcEquProDto.getEquipmentId());
+ mdcMgVo.setEquipmentName(mdcEquProDto.getEquipmentName());
+ mdcMgVo.setEquipmentType(mdcEquProDto.getEquipmentType());
+ switch (mdcEquProDto.getOrgType()) {
+ case "1":
+ mdcMgVo.setLevel1(mdcEquProDto.getProductionName());
+ break;
+ case "2":
+ mdcMgVo.setLevel2(mdcEquProDto.getProductionName());
+ break;
+ case "3":
+ mdcMgVo.setLevel3(mdcEquProDto.getProductionName());
+ break;
+ default:
+ }
+ MdcProduction mdcProduction = productionList.stream().filter(production -> production.getId().equals(mdcEquProDto.getParentId())).findAny().orElse(null);
+ if (mdcProduction != null) {
+ switch (mdcProduction.getOrgType()) {
+ case "1":
+ mdcMgVo.setLevel1(mdcProduction.getProductionName());
+ break;
+ case "2":
+ mdcMgVo.setLevel2(mdcProduction.getProductionName());
+ break;
+ case "3":
+ mdcMgVo.setLevel3(mdcProduction.getProductionName());
+ break;
+ default:
+ }
+ if (StringUtils.isNotEmpty(mdcProduction.getParentId())) {
+ productionList.stream().filter(production -> production.getId().equals(mdcProduction.getParentId())).findAny().ifPresent(production1 -> {
+ switch (production1.getOrgType()) {
+ case "1":
+ mdcMgVo.setLevel1(production1.getProductionName());
+ break;
+ case "2":
+ mdcMgVo.setLevel2(production1.getProductionName());
+ break;
+ case "3":
+ mdcMgVo.setLevel3(production1.getProductionName());
+ break;
+ default:
+ }
+ });
+ }
+ }
+ List<MdcEquipmentMagnificationDto> list = new ArrayList<>();
+ MdcEquipmentMagnificationDto mdcMagnificationDto = new MdcEquipmentMagnificationDto();
+ mdcMagnificationDto.setTheDate("骞冲潎鍊�");
+ for (String date : dates) {
+ list.add(this.setDataList(magnificationDtos, date, mdcEquProDto.getEquipmentId(),mdcMagnificationDto));
+ }
+ mdcMagnificationDto.setFeedbeilv(mdcMagnificationDto.getFeedbeilv().divide(new BigDecimal(dates.size()),2, RoundingMode.HALF_UP));
+ mdcMagnificationDto.setSpindlebeilv(mdcMagnificationDto.getSpindlebeilv().divide(new BigDecimal(dates.size()),2, RoundingMode.HALF_UP));
+ list.add(mdcMagnificationDto);
+ mdcMgVo.setMdcBeilvVoList(list);
+ mdcMagnificationVos.add(mdcMgVo);
+ }
+ }
+ result.setMdcMagnificationVos(mdcMagnificationVos);
+ }
+ // 娣诲姞鍚堣鍊煎拰骞冲潎鍊�
+
+ result.getDates().add("骞冲潎鍊�");
+ MdcMagnificationEquipmentVo avg = new MdcMagnificationEquipmentVo();
+ avg.setLevel1("骞冲潎鍊�");
+ avg.setLevel2("骞冲潎鍊�");
+ avg.setLevel3("骞冲潎鍊�");
+ avg.setEquipmentId("骞冲潎鍊�");
+ avg.setEquipmentName("骞冲潎鍊�");
+ avg.setEquipmentType("骞冲潎鍊�");
+ //璁＄畻骞冲潎鍊�
+ avg.setMdcBeilvVoList(null);
+ result.getMdcMagnificationVos().add(avg);
+ return result;
+ }
+
+ private MdcEquipmentMagnificationDto setDataList(List<MdcEquipmentMagnificationDto> list,String date,String equipmentId,MdcEquipmentMagnificationDto mdcMagnificationDto) {
+ MdcEquipmentMagnificationDto result = new MdcEquipmentMagnificationDto();
+ if (list != null && list.size() > 0) {
+ for (MdcEquipmentMagnificationDto mdcEquipmentMagnificationDto : list) {
+ if (date.equals(mdcEquipmentMagnificationDto.getTheDate()) && mdcEquipmentMagnificationDto.getEquipmentId().equals(equipmentId)) {
+ result.setEquipmentId(equipmentId);
+ result.setSpindlebeilv(mdcEquipmentMagnificationDto.getSpindlebeilv());
+ result.setFeedbeilv(mdcEquipmentMagnificationDto.getFeedbeilv());
+ }
+ }
+ } else {
+ result.setTheDate(date);
+ result.setFeedbeilv(new BigDecimal(0));
+ result.setEquipmentId(equipmentId);
+ result.setSpindlebeilv(new BigDecimal(0));
+ return result;
+ }
+ mdcMagnificationDto.setFeedbeilv(mdcMagnificationDto.getFeedbeilv().add(result.getFeedbeilv()));
+ mdcMagnificationDto.setSpindlebeilv(mdcMagnificationDto.getSpindlebeilv().add(result.getSpindlebeilv()));
+ return result;
+ }
+
+
private MdcEquipmentMagnification selectMagnification(String equipmentId,String date,String drivetype,List<MdcDriveTypeParamConfig> list) {
Date startTime = DateUtils.plusTime(DateUtils.getShortDate(date), 0);
Date endTime = DateUtils.plusTime(DateUtils.getShortDate(date), 1);
@@ -224,14 +400,14 @@
info.setSpindlebeilvValue(bigDecimal);
info.setSpindlebeilvNumber(numberSizeList);
if (bigDecimal.compareTo(BigDecimal.ZERO) >0 && new BigDecimal(numberSizeList).compareTo(BigDecimal.ZERO) > 0) {
- info.setSpindlebeilv(bigDecimal.divide(new BigDecimal(numberSizeList),4, RoundingMode.HALF_UP));
+ info.setSpindlebeilv(bigDecimal.divide(new BigDecimal(numberSizeList),2, RoundingMode.HALF_UP));
}
}
if (config.getChineseName().equals(feedbeilv)) {
info.setFeedbeilvValue(bigDecimal);
info.setFeedbeilvNumber(numberSizeList);
if (bigDecimal.compareTo(BigDecimal.ZERO) >0 && new BigDecimal(numberSizeList).compareTo(BigDecimal.ZERO) > 0) {
- info.setFeedbeilv(bigDecimal.divide(new BigDecimal(numberSizeList),4, RoundingMode.HALF_UP));
+ info.setFeedbeilv(bigDecimal.divide(new BigDecimal(numberSizeList),2, RoundingMode.HALF_UP));
}
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index cae42ff..b7969c3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -761,6 +761,31 @@
}
@Override
+ public List<String> listEquipmentMagnificationId(MdcEquipmentMagnificationVo vo) {
+ LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) {
+ queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
+ }
+ if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
+ queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDriveType())) {
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
+ }
+ if (StringUtils.isNotBlank(vo.getAttribute())) {
+ queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
+ }
+ List<MdcEquipment> list = super.list(queryWrapper);
+ return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
+ }
+
+ @Override
public IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req) {
if (StringUtils.isNotBlank(mdcEquipment.getProductionName())) {
// 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationBeilvVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationBeilvVo.java
new file mode 100644
index 0000000..1b9e72a
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationBeilvVo.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.mdc.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MdcEquipmentMagnificationBeilvVo {
+
+ private BigDecimal spindlebeilv = new BigDecimal(0);
+ //杩涚粰鍊嶇巼骞冲潎鍊�
+ private BigDecimal feedbeilv = new BigDecimal(0);
+ //鏈夋晥鏃ユ湡
+ @ApiModelProperty(value = "鏈夋晥鏃ユ湡")
+ private String theDate;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationVo.java
index 6bef224..6900ada 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationVo.java
@@ -31,4 +31,26 @@
* 璁惧ids
*/
private List<String> equipmentIdList;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String equipmentType;
+
+ /**
+ * 椹卞姩绫诲瀷
+ */
+ private String driveType;
+ /**
+ * 璁惧绾у埆
+ */
+ private String deviceLevel;
+ /**
+ * 璁惧绉嶇被
+ */
+ private String deviceCategory;
+ /**
+ * 璁惧灞炴��
+ */
+ private String attribute;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationEquipmentVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationEquipmentVo.java
new file mode 100644
index 0000000..115b41c
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationEquipmentVo.java
@@ -0,0 +1,30 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.dto.MdcEquipmentMagnificationDto;
+
+import java.util.List;
+
+@Data
+public class MdcMagnificationEquipmentVo {
+ private String level1;
+
+ private String level2;
+
+ private String level3;
+
+ /**
+ * 璁惧缂栫爜
+ */
+ private String equipmentId;
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String equipmentName;
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String equipmentType;
+
+ private List<MdcEquipmentMagnificationDto> mdcBeilvVoList;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationVo.java
new file mode 100644
index 0000000..ea0364b
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationVo.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MdcMagnificationVo {
+
+
+ /**
+ * 鍊嶇巼鏁版嵁
+ */
+ private List<MdcMagnificationEquipmentVo> mdcMagnificationVos;
+
+ private List<String> dates;
+}
--
Gitblit v1.9.3