故障停机和维修时长维护功能

Lius

2025-01-22 32098219223b01253dc8d51cb077809fa43d50b6

故障停机和维修时长维护功能

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java

@@ -141,11 +141,13 @@
     * 导出excel
     *
     * @param request
     * @param mdcDownTime
     * @param mdcDownTimeVo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcDownTime mdcDownTime) {
        return super.exportXls(request, mdcDownTime, MdcDownTime.class, "设备故障停机时长表");
    public ModelAndView exportXls(HttpServletRequest request, MdcDownTimeVo mdcDownTimeVo) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        return mdcDownTimeService.exportXls(userId, mdcDownTimeVo);
    }

    /**

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java

@@ -141,11 +141,14 @@
     * 导出excel
     *
     * @param request
     * @param mdcRepairInfo
     * @param mdcRepairInfoVo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcRepairInfo mdcRepairInfo) {
        return super.exportXls(request, mdcRepairInfo, MdcRepairInfo.class, "设备维修时长表");
    public ModelAndView exportXls(HttpServletRequest request, MdcRepairInfoVo mdcRepairInfoVo) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        return mdcRepairInfoService.exportXls(userId, mdcRepairInfoVo);
//        return super.exportXls(request, mdcRepairInfo, MdcRepairInfo.class, "设备维修时长表");
    }

    /**

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcDownTime;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;

@@ -33,4 +34,13 @@
     * @return
     */
    boolean addDownTime(MdcDownTimeVo mdcDownTimeVo);

    /**
     * 导出
     *
     * @param userId
     * @param mdcDownTimeVo
     * @return
     */
    ModelAndView exportXls(String userId, MdcDownTimeVo mdcDownTimeVo);
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcRepairInfo;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;

@@ -34,4 +35,12 @@
     */
    boolean addRepair(MdcRepairInfoVo mdcRepairInfoVo);

    /**
     * 导出
     *
     * @param userId
     * @param mdcRepairInfoVo
     * @return
     */
    ModelAndView exportXls(String userId, MdcRepairInfoVo mdcRepairInfoVo);
}

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

@@ -1,16 +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.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcDownTime;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.mapper.MdcDownTimeMapper;
import org.jeecg.modules.mdc.service.IMdcDownTimeService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -83,4 +91,65 @@
        this.saveBatch(downTimeList);
        return true;
    }

    /**
     * 导出
     *
     * @param userId
     * @param mdcDownTimeVo
     * @return
     */
    @Override
    public ModelAndView exportXls(String userId, MdcDownTimeVo mdcDownTimeVo) {
        LambdaQueryWrapper<MdcDownTime> queryWrapper = new LambdaQueryWrapper<>();
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcDownTimeVo.getParentId()) && StringUtils.isEmpty(mdcDownTimeVo.getEquipmentId())) {
            if ("2".equals(mdcDownTimeVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDownTimeVo.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDownTimeVo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcDownTimeVo.getEquipmentId())) {
            //单台设备信息
            mdcDownTimeVo.setEquipmentIdList(Collections.singletonList(mdcDownTimeVo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcDownTimeVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }

        if (mdcDownTimeVo.getEquipmentIdList() == null || mdcDownTimeVo.getEquipmentIdList().isEmpty()) {
            mdcDownTimeVo.setEquipmentIdList(equipmentIds);
        }

        if (mdcDownTimeVo.getEquipmentIdList() == null || mdcDownTimeVo.getEquipmentIdList().isEmpty()) {
            return null;
        } else {
            queryWrapper.in(MdcDownTime::getEquipmentId, mdcDownTimeVo.getEquipmentIdList());
        }
        if (StringUtils.isNotEmpty(mdcDownTimeVo.getEquipmentId())) {
            queryWrapper.eq(MdcDownTime::getEquipmentId, mdcDownTimeVo.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcDownTimeVo.getStartTime()) && StringUtils.isNotEmpty(mdcDownTimeVo.getEndTime())) {
            queryWrapper.between(MdcDownTime::getTheDate, mdcDownTimeVo.getStartTime(), mdcDownTimeVo.getEndTime());
        }
        queryWrapper.orderByDesc(MdcDownTime::getTheDate).orderByDesc(MdcDownTime::getEquipmentId);
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<MdcDownTime> downTimes = this.baseMapper.selectList(queryWrapper);
        // 导出文件名称
        mv.addObject(NormalExcelConstants.FILE_NAME,  "设备故障停机时长列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcDownTime.class);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("设备故障停机时长表数据", "导出人:" + user.getRealname(), "设备故障停机时长数据"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, downTimes);
        return mv;
    }
}

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

@@ -102,7 +102,7 @@
     */
    @Override
    public ModelAndView exportXls(String userId, MdcOeeInfoVo mdcOeeInfoVo) {
        LambdaQueryWrapper<MdcOeeInfo> queryWrapper = new LambdaQueryWrapper();
        LambdaQueryWrapper<MdcOeeInfo> queryWrapper = new LambdaQueryWrapper<>();
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcOeeInfoVo.getParentId()) && StringUtils.isEmpty(mdcOeeInfoVo.getEquipmentId())) {
            if ("2".equals(mdcOeeInfoVo.getTypeTree())) {

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

@@ -1,17 +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.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcDownTime;
import org.jeecg.modules.mdc.entity.MdcRepairInfo;
import org.jeecg.modules.mdc.mapper.MdcRepairInfoMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcRepairInfoService;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -93,4 +100,65 @@
        this.saveBatch(repairInfoList);
        return true;
    }

    /**
     * 导出
     *
     * @param userId
     * @param mdcRepairInfoVo
     * @return
     */
    @Override
    public ModelAndView exportXls(String userId, MdcRepairInfoVo mdcRepairInfoVo) {
        LambdaQueryWrapper<MdcRepairInfo> queryWrapper = new LambdaQueryWrapper<>();
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcRepairInfoVo.getParentId()) && StringUtils.isEmpty(mdcRepairInfoVo.getEquipmentId())) {
            if ("2".equals(mdcRepairInfoVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcRepairInfoVo.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcRepairInfoVo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcRepairInfoVo.getEquipmentId())) {
            //单台设备信息
            mdcRepairInfoVo.setEquipmentIdList(Collections.singletonList(mdcRepairInfoVo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcRepairInfoVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }

        if (mdcRepairInfoVo.getEquipmentIdList() == null || mdcRepairInfoVo.getEquipmentIdList().isEmpty()) {
            mdcRepairInfoVo.setEquipmentIdList(equipmentIds);
        }

        if (mdcRepairInfoVo.getEquipmentIdList() == null || mdcRepairInfoVo.getEquipmentIdList().isEmpty()) {
            return null;
        } else {
            queryWrapper.in(MdcRepairInfo::getEquipmentId, mdcRepairInfoVo.getEquipmentIdList());
        }
        if (StringUtils.isNotEmpty(mdcRepairInfoVo.getEquipmentId())) {
            queryWrapper.eq(MdcRepairInfo::getEquipmentId, mdcRepairInfoVo.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcRepairInfoVo.getStartTime()) && StringUtils.isNotEmpty(mdcRepairInfoVo.getEndTime())) {
            queryWrapper.between(MdcRepairInfo::getTheDate, mdcRepairInfoVo.getStartTime(), mdcRepairInfoVo.getEndTime());
        }
        queryWrapper.orderByDesc(MdcRepairInfo::getTheDate).orderByDesc(MdcRepairInfo::getEquipmentId);
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<MdcRepairInfo> repairInfos = this.baseMapper.selectList(queryWrapper);
        // 导出文件名称
        mv.addObject(NormalExcelConstants.FILE_NAME,  "设备维修时长列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcRepairInfo.class);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("设备维修时长表数据", "导出人:" + user.getRealname(), "设备维修时长数据"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, repairInfos);
        return mv;
    }
}