添加三级保养工作计划单生成规则

lyh

2 天以前 0d06048c5d560e301bf17fad476975c8ffffcb56

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,12 +16,15 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
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.entity.EamThirdMaintenanceWorkPlanSheet;
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.service.IEamThirdMaintenanceWorkPlanSheetService;
import org.jeecg.modules.eam.tree.FindsEquipmentEamCenterUtil;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
@@ -37,6 +41,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;

@@ -59,10 +66,14 @@
    private IBaseFactoryUserService baseFactoryUserService;
    @Autowired
    private IBaseFactoryService baseFactoryService;
    @Autowired
    private IEamThirdMaintenanceWorkPlanSheetService eamThirdMaintenanceWorkPlanSheetService;
    @Autowired
    private IEamEquipmentExtendService iEamEquipmentExtendService;

    @Override
    @Transactional(rollbackFor = Exception.class)
//    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment")
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment")
    public EamEquipment saveEquipment(EamEquipment eamEquipment) {
        if (eamEquipment == null) {
            return null;
@@ -79,6 +90,10 @@
        eamEquipmentExtend.setRepairStatus(EquipmentRepairStatus.NORMAL.name());
        equipmentExtendService.save(eamEquipmentExtend);

        // 处理三保保养计划（不再进行日期比较）
        eamThirdMaintenanceWorkPlanSheetService.createMaintenancePlan(eamEquipment, eamEquipment.getLatestThirdMaintenance());
        eamThirdMaintenanceWorkPlanSheetService.createMaintenancePlan(eamEquipment, eamEquipment.getNextThirdMaintenance());

        //插入设备履历   @EquipmentHistoryLog
        return eamEquipment;
    }
@@ -89,9 +104,34 @@
     */
    @Override
    public EamEquipment updateEquipment(EamEquipment eamEquipment){
        if (eamEquipment == null) {
            return null;
        if (eamEquipment == null) return null;

        if (eamEquipment.getNextThirdMaintenance() != null &&
                eamEquipment.getThirdMaintenancePeriod() != null) {

            org.jeecg.common.util.DateUtils.calculateMaintenanceDates(
                    eamEquipment.getNextThirdMaintenance(),
                    eamEquipment.getThirdMaintenancePeriod(),
                    newDate -> eamEquipment.setNextThirdMaintenance(newDate),
                    latestDate -> eamEquipment.setLatestThirdMaintenance(latestDate)
            );
        }

        // 获取旧数据
        EamEquipmentExtend old = iEamEquipmentExtendService.getById(eamEquipment.getId());
        if (old == null) return null;

        // 提取新旧日期避免重复访问
        Date newLatest = eamEquipment.getLatestThirdMaintenance();
        Date newNext = eamEquipment.getNextThirdMaintenance();
        Date oldLatest = old.getLatestThirdMaintenance();
        Date oldNext = old.getNextThirdMaintenance();

        // 处理保养日期变更
        eamThirdMaintenanceWorkPlanSheetService.processMaintenanceDateChange(eamEquipment, oldLatest, newLatest);
        eamThirdMaintenanceWorkPlanSheetService.processMaintenanceDateChange(eamEquipment, oldNext, newNext);

        // 更新主表和扩展表
        eamEquipmentMapper.updateById(eamEquipment);
        EamEquipmentExtend eamEquipmentExtend = new EamEquipmentExtend();
        BeanUtils.copyProperties(eamEquipment, eamEquipmentExtend);
@@ -155,21 +195,37 @@
        if (sysUser == null) {
            return page;
        }
        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 {
        if (StrUtil.isEmpty(eamEquipment.getProductionCode())){
            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 page;
                }
            }
        }else {
            //通过选择的车间过滤对应中心
            List<BaseFactory> baseFactoryList = baseFactoryService.list(new LambdaQueryWrapper<BaseFactory>()
                    .like(BaseFactory::getRemark, eamEquipment.getProductionCode()).eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
            if (CollectionUtils.isEmpty(baseFactoryList)) {
                return page;
            }
            //组装EAM数据
            Set<String> factoryCodes= new HashSet<>();
            baseFactoryList.forEach(baseFactory -> {
                List<BaseFactory> factoryList=baseFactoryService.queryFactoryByPid(baseFactory.getId());
                factoryCodes.addAll(factoryList.stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()));
            });
            queryWrapper.in("e.factory_org_code", factoryCodes);
        }
        //查询条件过滤
        if (eamEquipment != null) {
@@ -186,7 +242,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());
@@ -367,7 +423,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());
@@ -417,6 +473,99 @@
        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);
    }

    /**
     * 获取可生成二保工单的设备列表
     */
    @Override
    public List<EamEquipment> selectSecondMaintenanceEquipmentList(){
        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.next_second_maintenance");
        return this.getBaseMapper().selectSecondMaintenanceEquipmentList(queryWrapper);
    }

    /**
     * 设备管理首页-技术状态
     * @return
     */
    @Override
    public List<EchartsDto> echartsList(String productionCode){
        List<EchartsDto> echartsDtoList = new ArrayList<>();
        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
        if (StrUtil.isEmpty(productionCode)) {
            //用户数据权限
            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> factoryCodes= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                    queryWrapper.in("e.factory_org_code", factoryCodes);
                }else {
                    return echartsDtoList;
                }
            }
        }else {
            //通过选择的车间过滤对应中心
            List<BaseFactory> baseFactoryList = baseFactoryService.list(new LambdaQueryWrapper<BaseFactory>()
                    .like(BaseFactory::getRemark, productionCode).eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
            if (CollectionUtils.isEmpty(baseFactoryList)) {
                return echartsDtoList;
            }
            //组装EAM数据
            Set<String> factoryCodes= new HashSet<>();
            baseFactoryList.forEach(baseFactory -> {
                List<BaseFactory> factoryList=baseFactoryService.queryFactoryByPid(baseFactory.getId());
                factoryCodes.addAll(factoryList.stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()));
            });
            queryWrapper.in("e.factory_org_code", factoryCodes);
        }
        List<String> ids=this.baseMapper.queryList(queryWrapper).stream().map(EamEquipment::getId).collect(Collectors.toList());
        if (ids.isEmpty()) {
            return echartsDtoList;
        }
        echartsDtoList= this.baseMapper.echartsList(ids);
        if (!echartsDtoList.isEmpty()) {
            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（包含所有上级）
     */