From 724f8ec3bbcf9da50f304f57d8bc9a60ad75ad0a Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 18:29:32 +0800
Subject: [PATCH] 修改计算百分比位置
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 133 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 110 insertions(+), 23 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index dfc744c..00ce4ee 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -14,25 +14,23 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
-import org.jeecg.modules.eam.tree.FindsEquipmentEamCenterUtil;
-import org.jeecg.modules.system.entity.BaseFactory;
-import org.jeecg.modules.system.entity.BaseFactoryUser;
-import org.jeecg.modules.system.service.IBaseFactoryService;
-import org.jeecg.modules.system.service.IBaseFactoryUserService;
-import org.jeecg.modules.eam.constant.AssetStatusEnum;
-import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
-import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
-import org.jeecg.modules.eam.constant.EquipmentRepairStatus;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.dto.EchartsDto;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.tree.FindsEquipmentEamCenterUtil;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +38,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -167,9 +168,11 @@
List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
- List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
- List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
queryWrapper.in("e.factory_org_code", factoryCode);
+ }else {
+ return page;
}
}
//鏌ヨ鏉′欢杩囨护
@@ -187,7 +190,7 @@
queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus());
}
if (StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())) {
- queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus());
+ queryWrapper.like("ext.technology_status", eamEquipment.getTechnologyStatus());
}
if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
@@ -202,6 +205,12 @@
}
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
+ }
+ if (StringUtils.isNotBlank(eamEquipment.getFactoryOrgCode())) {
+ queryWrapper.like("e.factory_org_code", eamEquipment.getFactoryOrgCode());
+ }
+ if (StringUtils.isNotBlank(eamEquipment.getRepairDepartOrgCode())) {
+ queryWrapper.like("e.repair_depart_org_code", eamEquipment.getRepairDepartOrgCode());
}
if (StringUtils.isNotBlank(eamEquipment.getId())) {
queryWrapper.eq("e.id", eamEquipment.getId());
@@ -230,7 +239,7 @@
}
@Override
- public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) {
+ public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id, String factoryOrgCode) {
if (StringUtils.isNotBlank(id)) {
EamEquipment eamEquipment = eamEquipmentMapper.selectById(id);
if (eamEquipment != null) {
@@ -255,17 +264,22 @@
List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
- List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
- List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
queryWrapper.in("e.factory_org_code", factoryCode);
+ } else {
+ return Collections.emptyList();
}
}
if (StringUtils.isNotBlank(keyword)) {
- queryWrapper.like("equipment_code", keyword);
- queryWrapper.or().like("equipment_name", keyword);
+ queryWrapper.like("e.equipment_code", keyword);
+ queryWrapper.or().like("e.equipment_name", keyword);
}
- queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ if(StringUtils.isNotBlank(factoryOrgCode)){
+ queryWrapper.likeRight("e.factory_org_code", factoryOrgCode);
+ }
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) {
List<EquipmentSearchResult> resultList = new ArrayList<>();
@@ -288,7 +302,7 @@
if (sysUser == null) {
return null;
}
- if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
queryWrapper.in("equipment_code", equipArr);
@@ -298,7 +312,7 @@
list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
- Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toSet());
+ Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
queryWrapper.in("factory_org_code", factoryCodeList);
} else {
return null;
@@ -334,9 +348,11 @@
List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
- List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
- List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
queryWrapper.in("e.factory_org_code", factoryCode);
+ }else {
+ return Collections.emptyList();
}
}
@@ -355,7 +371,7 @@
queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus());
}
if (StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())) {
- queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus());
+ queryWrapper.like("ext.technology_status", eamEquipment.getTechnologyStatus());
}
if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
@@ -395,6 +411,77 @@
return eamEquipmentMapper.queryList(queryWrapper);
}
+ @Override
+ public List<EamEquipment> selectTechnicalEquipmentList() {
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
+ queryWrapper.ne("ext.technology_status", TechnologyStatusEnum.PROHIBITED.name());
+ queryWrapper.isNotNull("ext.technology_check_period");
+ queryWrapper.isNotNull("ext.next_technology_check");
+ return this.getBaseMapper().selectTechnicalEquipmentList(queryWrapper);
+ }
+
+ @Override
+ public List<EamEquipment> selectThreeMaintenanceEquipmentList() {
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
+ queryWrapper.ne("ext.maintenance_status", MaintenanceStatusEnum.PROHIBITED.name());
+ queryWrapper.isNotNull("ext.third_maintenance_period");
+ queryWrapper.isNotNull("ext.next_third_maintenance");
+ return this.getBaseMapper().selectThreeMaintenanceEquipmentList(queryWrapper);
+ }
+
+ /**
+ * 璁惧绠＄悊棣栭〉-鎶�鏈姸鎬�
+ * @return
+ */
+ @Override
+ public List<EchartsDto> echartsList(){
+ List<EchartsDto> echartsDtoList = new ArrayList<>();
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return echartsDtoList;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+ if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCode);
+ }else {
+ return echartsDtoList;
+ }
+ }
+ List<String> ids=this.baseMapper.queryList(queryWrapper).stream().map(EamEquipment::getId).collect(Collectors.toList());
+ echartsDtoList= this.baseMapper.echartsList(ids);
+ // 鐩存帴浣跨敤for寰幆澶勭悊鏁版嵁
+ for (EchartsDto dto : echartsDtoList) {
+ if (dto.getTotal() != null && !"0".equals(dto.getTotal())) {
+ try {
+ int value = Integer.parseInt(dto.getValue());
+ int total = Integer.parseInt(dto.getTotal());
+ double percentage = (value * 100.0) / total;
+ DecimalFormat df = new DecimalFormat("0.00");
+ dto.setPercentage(df.format(percentage) + "%");
+ } catch (NumberFormatException e) {
+ dto.setPercentage("0.00%");
+ }
+ } else {
+ dto.setPercentage("0.00%");
+ }
+ }
+ return echartsDtoList;
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3