Oee列表接口

Lius

2024-12-12 ace4b2924c5af8f8fb080e17aedc2bcbf9474da5

Oee列表接口

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package org.jeecg.modules.mdc.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

/**
 * @Description: OEE表
 * @Author: lius
 * @Date: 2024-12-12
 */
@Slf4j
@Api(tags = "OEE表")
@RestController
@RequestMapping("/mdc/mdcOeeInfo")
public class MdcOeeInfoController extends JeecgController<MdcOeeInfo, IMdcOeeInfoService> {

    @Resource
    private IMdcOeeInfoService mdcOeeInfoService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcOeeInfoVo
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "OEE表-分页列表查询")
    @ApiOperation(value = "OEE表-分页列表查询", notes = "OEE表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcOeeInfoVo mdcOeeInfoVo,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        Page<MdcOeeInfo> page = new Page<MdcOeeInfo>(pageNo, pageSize);
        IPage<MdcOeeInfo> pageList = mdcOeeInfoService.pageList(userId, page, mdcOeeInfoVo, req);
        return Result.OK(pageList);
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "OEE表-通过id查询")
    @ApiOperation(value = "OEE表-通过id查询", notes = "OEE表-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        MdcOeeInfo mdcOeeInfo = mdcOeeInfoService.getById(id);
        return Result.OK(mdcOeeInfo);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcOeeInfoVo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcOeeInfoVo mdcOeeInfoVo) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        return mdcOeeInfoService.exportXls(userId, mdcOeeInfoVo);
    }

}

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

@@ -1,6 +1,5 @@
package org.jeecg.modules.mdc.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -11,7 +10,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcPartProcessInfo;
import org.jeecg.modules.mdc.service.IMdcPartProcessInfoService;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOeeInfo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,112 @@
package org.jeecg.modules.mdc.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * @Description: OEE表
 * @Author: lius
 * @Date: 2024-12-12
 */
@Data
@TableName("mdc_oee_info")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_oee_info对象", description = "OEE表")
public class MdcOeeInfo extends JeecgEntity implements Serializable {

    /**
     * è®¾å¤‡ç¼–号
     */
    @Excel(name = "设备编号", width = 15)
    @ApiModelProperty(value = "设备编号")
    private String equipmentId;
    /**
     * æ—¥æœŸ
     */
    @Excel(name = "日期", width = 15)
    @ApiModelProperty(value = "日期")
    private String theDate;
    /**
     * å·¥ä½œæ—¥åŽ†æ—¶é—´(min)
     */
    @Excel(name = "工作日历时间(min)", width = 15)
    @ApiModelProperty(value = "工作日历时间(min)")
    private Integer calendarLong;
    /**
     * è®¡åˆ’停机时间(min)
     */
    @Excel(name = "计划停机时间(min)", width = 15)
    @ApiModelProperty(value = "计划停机时间(min)")
    private Integer planCloseLong;
    /**
     * è´Ÿè·æ—¶é—´(min)
     */
    @Excel(name = "负荷时间(min)", width = 15)
    @ApiModelProperty(value = "负荷时间(min)")
    private Integer loadLong;
    /**
     * éžè®¡åˆ’停机时间(min)
     */
    @Excel(name = "非计划停机时间(min)", width = 15)
    @ApiModelProperty(value = "非计划停机时间(min)")
    private Integer noplanCloseLong;
    /**
     * å¼€åŠ¨æ—¶é—´(min)
     */
    @Excel(name = "开动时间(min)", width = 15)
    @ApiModelProperty(value = "开动时间(min)")
    private Integer actuateLong;
    /**
     * æ—¶é—´å¼€åŠ¨çŽ‡
     */
    @Excel(name = "时间开动率", width = 15)
    @ApiModelProperty(value = "时间开动率")
    private BigDecimal timeActuationRate;
    /**
     * æœ‰æ•ˆè¿è¡Œæ—¶é—´
     */
    @Excel(name = "有效运行时间", width = 15)
    @ApiModelProperty(value = "有效运行时间")
    private Integer effectiveRunLong;
    /**
     * æ€§èƒ½å¼€åŠ¨çŽ‡
     */
    @Excel(name = "性能开动率", width = 15)
    @ApiModelProperty(value = "性能开动率")
    private BigDecimal performanceRate;
    /**
     * åŠ å·¥é›¶ä»¶æ•°é‡
     */
    @Excel(name = "加工零件数量", width = 15)
    @ApiModelProperty(value = "加工零件数量")
    private Integer processCount;
    /**
     * åˆæ ¼é›¶ä»¶æ•°é‡
     */
    @Excel(name = "合格零件数量", width = 15)
    @ApiModelProperty(value = "合格零件数量")
    private Integer passCount;
    /**
     * åˆæ ¼çŽ‡
     */
    @Excel(name = "合格率", width = 15)
    @ApiModelProperty(value = "合格率")
    private BigDecimal passRate;
    /**
     * OEE
     */
    @Excel(name = "OEE", width = 15)
    @ApiModelProperty(value = "OEE")
    private BigDecimal oee;

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOEEJob.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
package org.jeecg.modules.mdc.job;

import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
import org.jeecg.modules.mdc.util.ThrowableUtil;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecg.modules.quartz.entity.SysQuartzLog;
import org.jeecg.modules.quartz.service.IQuartzJobService;
import org.jeecg.modules.quartz.service.ISysQuartzLogService;
import org.jeecg.modules.system.service.ISysAnnouncementService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
 * @Description: å®šæ—¶è®¡ç®—设备综合效率OEE任务
 * @author Lius
 * @date 2024/12/11 16:21
 */
@Slf4j
public class RunningOEEJob implements Job {

    /**
     * è‹¥å‚数变量名修改 QuartzJobController中也需对应修改  æ—¶é—´ï¼š yyyyMMdd ä¾‹ï¼š 20230414
     */
    private String parameter;

    public void setParameter(String parameter) {
        this.parameter = parameter;
    }

    @Resource
    private IQuartzJobService quartzJobService;

    @Resource
    private ISysAnnouncementService sysAnnouncementService;

    @Resource
    private ISysQuartzLogService sysQuartzLogService;

    @Resource
    private IMdcOeeInfoService mdcOeeInfoService;

    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        SysQuartzLog quartzLog = new SysQuartzLog();
        quartzLog.setCreateTime(new Date());
        List<QuartzJob> byJobClassName = this.quartzJobService.findByJobClassName(this.getClass().getName());
        if (byJobClassName != null && !byJobClassName.isEmpty()) {
            quartzLog.setJobId(byJobClassName.get(0).getId());
        }
        quartzLog.setParams(this.parameter);
        log.info("定时计算设备综合效率OEE任务 RunningOEEJob start!  æ—¶é—´:" + DateUtils.now(), this.parameter);
        long startTime = System.currentTimeMillis();
        try {
            mdcOeeInfoService.runningComputeOee(this.parameter);
            quartzLog.setIsSuccess(0);
        } catch (Exception e) {
            quartzLog.setIsSuccess(-1);
            quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
            // å‘送消息通知
            sysAnnouncementService.jobSendMessage("定时计算设备综合效率OEE任务", quartzLog.getExceptionDetail());
        }
        long endTime = System.currentTimeMillis();
        quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
        sysQuartzLogService.save(quartzLog);
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcOeeInfoMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package org.jeecg.modules.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;

/**
 * @Description: OEE表
 * @Author: lius
 * @Date: 2024-12-12
 */
public interface MdcOeeInfoMapper extends BaseMapper<MdcOeeInfo> {

    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param mdcOeeInfoVo
     * @return
     */
    IPage<MdcOeeInfo> pageList(Page<MdcOeeInfo> page, @Param("mdcOeeInfoVo") MdcOeeInfoVo mdcOeeInfoVo);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOeeInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcOeeInfoMapper">

    <!--分页列表-->
    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcOeeInfo">
        SELECT
            *
        FROM
            mdc_oee_info
        <where>
            <if test="mdcOeeInfoVo.equipmentId != null and mdcOeeInfoVo.equipmentId != ''">
                AND equipment_id = #{ mdcOeeInfoVo.equipmentId }
            </if>
            <if test="mdcOeeInfoVo.startTime != null and mdcOeeInfoVo.startTime != ''">
                AND the_date &gt;= #{ mdcOeeInfoVo.startTime }
            </if>
            <if test="mdcOeeInfoVo.endTime != null and mdcOeeInfoVo.endTime != ''">
                AND the_date &lt;= #{mdcOeeInfoVo.endTime }
            </if>
            <if test="mdcOeeInfoVo.equipmentIdList != null and mdcOeeInfoVo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                <foreach collection="mdcOeeInfoVo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
            </if>
        </where>
        ORDER BY the_date DESC, equipment_id ASC
    </select>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package org.jeecg.modules.mdc.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: OEE表
 * @Author: lius
 * @Date: 2024-12-12
 */
public interface IMdcOeeInfoService extends IService<MdcOeeInfo> {

    /**
     * åˆ†é¡µåˆ—表
     *
     * @param userId
     * @param page
     * @param mdcOeeInfoVo
     * @param req
     * @return
     */
    IPage<MdcOeeInfo> pageList(String userId, Page<MdcOeeInfo> page, MdcOeeInfoVo mdcOeeInfoVo, HttpServletRequest req);

    /**
     * è®¡ç®—oee
     *
     * @param dateTime
     */
    void runningComputeOee(String dateTime);

    /**
     * å¯¼å‡º
     *
     * @param userId
     * @param mdcOeeInfoVo
     * @return
     */
    ModelAndView exportXls(String userId, MdcOeeInfoVo mdcOeeInfoVo);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,149 @@
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.MdcOeeInfo;
import org.jeecg.modules.mdc.mapper.MdcOeeInfoMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
 * @Description: OEE表
 * @Author: lius
 * @Date: 2024-12-12
 */
@Service
public class MdcOeeInfoServiceImpl extends ServiceImpl<MdcOeeInfoMapper, MdcOeeInfo> implements IMdcOeeInfoService {

    @Resource
    private IMdcEquipmentService mdcEquipmentService;

    /**
     * åˆ†é¡µåˆ—表
     * @param userId
     * @param page
     * @param mdcOeeInfoVo
     * @param req
     * @return
     */
    @Override
    public IPage<MdcOeeInfo> pageList(String userId, Page<MdcOeeInfo> page, MdcOeeInfoVo mdcOeeInfoVo, HttpServletRequest req) {
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcOeeInfoVo.getParentId()) && StringUtils.isEmpty(mdcOeeInfoVo.getEquipmentId())) {
            if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcOeeInfoVo.getParentId());
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcOeeInfoVo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcOeeInfoVo.getEquipmentId())) {
            //单台设备信息
            mdcOeeInfoVo.setEquipmentIdList(Collections.singletonList(mdcOeeInfoVo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            if ("2".equals(mdcOeeInfoVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }

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

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

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

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

        if (mdcOeeInfoVo.getEquipmentIdList() == null || mdcOeeInfoVo.getEquipmentIdList().isEmpty()) {
            return null;
        } else {
            queryWrapper.in(MdcOeeInfo::getEquipmentId, mdcOeeInfoVo.getEquipmentIdList());
        }
        if (StringUtils.isNotEmpty(mdcOeeInfoVo.getEquipmentId())) {
            queryWrapper.eq(MdcOeeInfo::getEquipmentId, mdcOeeInfoVo.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcOeeInfoVo.getStartTime()) && StringUtils.isNotEmpty(mdcOeeInfoVo.getEndTime())) {
            queryWrapper.between(MdcOeeInfo::getTheDate, mdcOeeInfoVo.getStartTime(), mdcOeeInfoVo.getEndTime());
        }
        queryWrapper.orderByDesc(MdcOeeInfo::getTheDate).orderByDesc(MdcOeeInfo::getEquipmentId);
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<MdcOeeInfo> mdcOeeInfos = this.baseMapper.selectList(queryWrapper);
        // å¯¼å‡ºæ–‡ä»¶åç§°
        mv.addObject(NormalExcelConstants.FILE_NAME,  "OEE数据列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcOeeInfo.class);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("OEE数据列表数据", "导出人:" + user.getRealname(), "OEE数据"));
        //update-end---author:wangshuai ---date:20211227  for：[JTC-116]导出人写死了------------
        mv.addObject(NormalExcelConstants.DATA_LIST, mdcOeeInfos);
        return mv;
    }

    /**
     * è®¡ç®—oee
     * @param dateTime
     */
    @Override
    public void runningComputeOee(String dateTime) {

    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeInfoVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package org.jeecg.modules.mdc.vo;

import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;

import java.util.List;

/**
 * @author Lius
 * @date 2024/12/12 10:14
 */
@Data
public class MdcOeeInfoVo extends MdcOeeInfo {
    private String startTime;
    private String endTime;
    private String parentId;
    private String typeTree;
    private List<String> equipmentIdList;
    private String equipmentIds;
}