mdc修改

Lius

2023-12-18 44c1da90d18396b4c78c588571e71eaa8e49c8d6

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java

@@ -1,19 +1,24 @@
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.lang.StringUtils;
import org.jeecg.modules.mdc.dto.MdcProcessCountDto;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcProcessCountMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.TimeFieldUtils;
import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;
import org.jeecg.modules.mdc.vo.MdcProcessCountVo;
import org.jeecg.modules.mdc.vo.MdcShiftDateVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -47,7 +52,8 @@
    @Transactional(rollbackFor = {Exception.class})
    public void runningProcessCount() {
        // 获取所有设备
        List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2140244"));
        //List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2240074"));
        List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list();
        List<MdcProcessCount> result = new ArrayList<>();
        for (MdcEquipment mdcEquipment : mdcEquipmentList) {
            List<MdcProcessCount> mdcProcessCountList = processCount(mdcEquipment);
@@ -58,6 +64,49 @@
        if (!result.isEmpty()) {
            this.saveBatch(result);
        }
    }

    /**
     * 分页查询
     *
     * @param userId
     * @param page
     * @param mdcProcessCountVo
     * @param req
     * @return
     */
    @Override
    public IPage<MdcProcessCountDto> pageList(String userId, Page<MdcProcessCountDto> page, MdcProcessCountVo mdcProcessCountVo, HttpServletRequest req) {
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcProcessCountVo.getParentId()) && StringUtils.isEmpty(mdcProcessCountVo.getEquipmentId())) {
            if ("2".equals(mdcProcessCountVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcProcessCountVo.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcProcessCountVo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcProcessCountVo.getEquipmentId())) {
            //单台设备信息
            mdcProcessCountVo.setMdcSectionIds(Collections.singletonList(mdcProcessCountVo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcProcessCountVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        if (mdcProcessCountVo.getMdcSectionIds() == null || mdcProcessCountVo.getMdcSectionIds().isEmpty()) {
            mdcProcessCountVo.setMdcSectionIds(equipmentIds);
        }

        if (mdcProcessCountVo.getMdcSectionIds() == null || mdcProcessCountVo.getMdcSectionIds().isEmpty()) {
            return null;
        }
        return this.baseMapper.pageList(page, mdcProcessCountVo);
    }

    @Transactional(readOnly = true)
@@ -90,7 +139,7 @@
        }
        // 获取设备班次信息
        Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(mdcEquipment.getEquipmentId(), stringDates);
        if (listMap.isEmpty()) {
        if (listMap == null || listMap.isEmpty()) {
            listMap = new HashMap<>();
        }
        List<MdcProcessCount> resultList = new ArrayList<>();
@@ -146,27 +195,32 @@
                                    mdcProcessCount.setStartTime(startDate);
                                }
                                if ("FANUC".equals(mdcEquipment.getDriveType())) {
                                    // 法兰克设备根据ProductCount字段判断
                                    String productCount = mdcEquipmentDtoList.get(0).get("ProductCount").toString();
                                    for (int i = 0; i < mdcEquipmentDtoList.size(); i++) {
                                        if (!productCount.equals(mdcEquipmentDtoList.get(i).get("ProductCount").toString())) {
                                            productCount = mdcEquipmentDtoList.get(i).get("ProductCount").toString();
                                            if (mdcEquipmentDtoList.get(i - 1).get("CollectTime") != null) {
                                                mdcProcessCount.setEndTime(DateUtils.toDate(mdcEquipmentDtoList.get(i - 1).get("CollectTime").toString(), DateUtils.STR_DATE_TIME));
                                                mdcProcessCount.setDuration(TimeFieldUtils.duration(mdcProcessCount.getStartTime(), mdcProcessCount.getEndTime()));
                                                mdcProcessCount.setSequenceNumber(mdcEquipmentDtoList.get(i - 1).get("Sequencenumber").toString());
                                                resultList.add(mdcProcessCount);
                                                if (TimeFieldUtils.duration(mdcProcessCount.getEndTime(), mdcEquipmentRunningSection.getEndTime()) > 60) {
                                                    //mdcProcessCount.setStartTime(mdcProcessCount.getEndTime());
                                                    startDate = mdcProcessCount.getEndTime();
                                                } else if (j + 1 < equipmentRunningSectionList.size()) {
                                                    //mdcProcessCount.setStartTime(equipmentRunningSectionList.get(j + 1).getStartTime());
                                                    startDate = equipmentRunningSectionList.get(j + 1).getStartTime();
                                                } else {
                                                    startDate = null;
                                    try {
                                        // 法兰克设备根据ProductCount字段判断
                                        String productCount = mdcEquipmentDtoList.get(0).get("ProductCount").toString();
                                        for (int i = 0; i < mdcEquipmentDtoList.size(); i++) {
                                            if (!productCount.equals(mdcEquipmentDtoList.get(i).get("ProductCount").toString())) {
                                                productCount = mdcEquipmentDtoList.get(i).get("ProductCount").toString();
                                                if (mdcEquipmentDtoList.get(i - 1).get("CollectTime") != null) {
                                                    mdcProcessCount.setEndTime(DateUtils.toDate(mdcEquipmentDtoList.get(i - 1).get("CollectTime").toString(), DateUtils.STR_DATE_TIME));
                                                    mdcProcessCount.setDuration(TimeFieldUtils.duration(mdcProcessCount.getStartTime(), mdcProcessCount.getEndTime()));
                                                    mdcProcessCount.setSequenceNumber(mdcEquipmentDtoList.get(i - 1).get("Sequencenumber").toString());
                                                    resultList.add(mdcProcessCount);
                                                    if (TimeFieldUtils.duration(mdcProcessCount.getEndTime(), mdcEquipmentRunningSection.getEndTime()) > 60) {
                                                        //mdcProcessCount.setStartTime(mdcProcessCount.getEndTime());
                                                        startDate = mdcProcessCount.getEndTime();
                                                    } else if (j + 1 < equipmentRunningSectionList.size()) {
                                                        //mdcProcessCount.setStartTime(equipmentRunningSectionList.get(j + 1).getStartTime());
                                                        startDate = equipmentRunningSectionList.get(j + 1).getStartTime();
                                                    } else {
                                                        startDate = null;
                                                    }
                                                }
                                            }
                                        }
                                    } catch (Exception e) {
                                        log.error("计算加工工件算法失败！设备编号：" + mdcEquipment.getEquipmentId(), e);
                                        //System.out.println("计算加工工件算法失败！设备编号：" + mdcEquipment.getEquipmentId());
                                    }
                                }
                            }