From 4b27dd367eae2f24958c6bb857fb6959dcdb7a4a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 13 六月 2025 18:04:46 +0800
Subject: [PATCH] 报表提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java
index c6324fb..b760a20 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
@@ -15,7 +17,9 @@
import org.jeecg.modules.eam.service.IFaultIntervalTimeService;
import org.jeecg.modules.eam.service.IRepairOrderService;
import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,6 +51,8 @@
private IRepairOrderService repairOrderService;
@Autowired
private ISysDepartService departService;
+ @Autowired
+ private ISysUserService sysUserService;
@Override
public List<FaultIntervalTime> getMTBF(Map<String, String> query) throws ParseException {
@@ -92,7 +98,7 @@
if(equipmentReportRepair.getFaultTime() != null && equipmentReportRepair.getFaultTime().compareTo(endDate) < 0 && equipmentReportRepair.getFaultTime().compareTo(startDate) > 0){
//2銆侀獙鏀舵椂闂村湪鏌ヨ鏃堕棿娈靛唴
if(equipmentReportRepair.getAcceptTime() != null && equipmentReportRepair.getAcceptTime().compareTo(endDate) < 0){
- equipmentFaultTime = equipmentFaultTime.add(new BigDecimal(equipmentReportRepair.getFaultHour()));
+ equipmentFaultTime = equipmentFaultTime.add(equipmentReportRepair.getFaultHour());
count++;
//3銆侀獙鏀舵椂闂村ぇ浜庢煡璇㈢粨鏉熸椂闂�
}else {
@@ -189,4 +195,44 @@
}
return faultIntervalTimeList;
}
+
+
+ @Override
+ public List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params) {
+ return this.baseMapper.getEquipmentMTBF(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getMTBFTotalAvailableTime(Map<String, Object> params) {
+ return this.baseMapper.getMTBFTotalAvailableTime(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getEquipmentList(Map<String, Object> params) {
+// LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+// SysUser sysUser = sysUserService.getById(user.getId());
+// String areaId = sysUser.getAreaId();
+// List<String> workCenterIds = null;
+// if(StringUtils.isNotBlank(areaId)){
+// String[] split = areaId.split(",");
+// workCenterIds = Arrays.asList(split);
+// params.put("workCenterIds",workCenterIds);
+// }
+ return this.baseMapper.getEquipmentList(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCenterEquipmentMTBF(Map<String, Object> params) {
+ return this.baseMapper.getCenterEquipmentMTBF(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCenterMTBFTotalAvailableTime(Map<String, Object> params) {
+ return this.baseMapper.getCenterMTBFTotalAvailableTime(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getWorkCenterList(Map<String, Object> params) {
+ return this.baseMapper.getWorkCenterList(params);
+ }
}
--
Gitblit v1.9.3