Merge remote-tracking branch 'origin/master'

zhangherong

2025-03-18 e88c6ac544e52359c7eabc94edef7bb1e133c7e2

Merge remote-tracking branch 'origin/master'

 lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -602,5 +602,10 @@
     */
    Integer DOWNTIME_STATUS_0 = 0;
    Integer DOWNTIME_STATUS_1 = 1;
    /**
     * åœæœºç±»åž‹   0(计划停机) 1 (非计划停机)
     */
    String CLOSE_TYPE_0 = "0";
    String CLOSE_TYPE_1 = "1";

}

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

@@ -13,6 +13,7 @@
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.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
import org.jeecg.modules.mdc.service.IMdcDowntimeService;
@@ -57,8 +58,8 @@
                                   HttpServletRequest req) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        Page<MdcDowntime> page = new Page<MdcDowntime>(pageNo, pageSize);
        IPage<MdcDowntime> pageList = mdcDowntimeService.pageList(userId, page, mdcDowntimeVo, req);
        Page<MdcDowntimeDto> page = new Page<MdcDowntimeDto>(pageNo, pageSize);
        IPage<MdcDowntimeDto> pageList = mdcDowntimeService.pageList(userId, page, mdcDowntimeVo, req);
        return Result.OK(pageList);
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,100 @@
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.MdcOeeComputeVo;
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);
    }

    /**
     * è®¡ç®—OEE
     *
     * @return
     */
    @AutoLog(value = "OEE表-计算OEE")
    @ApiOperation(value = "OEE表-计算OEE", notes = "OEE表-计算OEE")
    @PostMapping(value = "/computeOee")
    public Result<?> computeOee(@RequestBody MdcOeeComputeVo mdcOeeComputeVo) {
        mdcOeeInfoService.computeOee(mdcOeeComputeVo);
        return Result.OK("计算成功！");
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,163 @@
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.commons.lang.StringUtils;
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.MdcPartProcessInfo;
import org.jeecg.modules.mdc.service.IMdcPartProcessInfoService;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
@Slf4j
@Api(tags = "零件加工数据表")
@RestController
@RequestMapping("/mdc/mdcPartProcessInfo")
public class MdcPartProcessInfoController extends JeecgController<MdcPartProcessInfo, IMdcPartProcessInfoService> {

    @Resource
    private IMdcPartProcessInfoService mdcPartProcessInfoService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcPartProcessInfo
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "零件加工数据表-分页列表查询")
    @ApiOperation(value = "零件加工数据表-分页列表查询", notes = "零件加工数据表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcPartProcessInfoVo mdcPartProcessInfo,
                                   @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<MdcPartProcessInfo> page = new Page<MdcPartProcessInfo>(pageNo, pageSize);
        IPage<MdcPartProcessInfo> pageList = mdcPartProcessInfoService.pageList(userId, page, mdcPartProcessInfo, req);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param mdcPartProcessInfo
     * @return
     */
    @AutoLog(value = "零件加工数据表-添加")
    @ApiOperation(value = "零件加工数据表-添加", notes = "零件加工数据表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcPartProcessInfoVo mdcPartProcessInfo) {
        if (StringUtils.isBlank(mdcPartProcessInfo.getEquipmentIds())) {
            return Result.error("未选择设备，请排查！");
        }
        boolean result = mdcPartProcessInfoService.addPartProcess(mdcPartProcessInfo);
        if (!result) {
            return Result.error("添加失败！");
        }
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param mdcPartProcessInfo
     * @return
     */
    @AutoLog(value = "零件加工数据表-编辑")
    @ApiOperation(value = "零件加工数据表-编辑", notes = "零件加工数据表-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcPartProcessInfo mdcPartProcessInfo) {
        mdcPartProcessInfoService.updateById(mdcPartProcessInfo);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "零件加工数据表-通过id删除")
    @ApiOperation(value = "零件加工数据表-通过id删除", notes = "零件加工数据表-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        mdcPartProcessInfoService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "零件加工数据表-批量删除")
    @ApiOperation(value = "零件加工数据表-批量删除", notes = "零件加工数据表-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.mdcPartProcessInfoService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @AutoLog(value = "零件加工数据表-通过id查询")
    @ApiOperation(value = "零件加工数据表-通过id查询", notes = "零件加工数据表-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        MdcPartProcessInfo mdcPartProcessInfo = mdcPartProcessInfoService.getById(id);
        return Result.OK(mdcPartProcessInfo);
    }

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

    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MdcPartProcessInfo.class);
    }

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcDowntimeDto.java

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

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

/**
 * @Author: Lius
 * @CreateTime: 2025-03-17
 * @Description: å¾…机停机原因
 */
@Data
public class MdcDowntimeDto extends MdcDowntime {
    private Integer downtimeType;
    private String downtimeDescription;

}

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

@@ -62,7 +62,6 @@
     */
    @Excel(name = "停机原因id", width = 15)
    @ApiModelProperty(value = "停机原因id")
    @Dict(dictTable = "mdc_downtime_reason",dicCode = "id",dicText = "downtime_type")
    private String reasonId;
    /**
     * çŠ¶æ€ï¼ˆ0未上报，1已上报）

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,114 @@
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 {

    private static final long serialVersionUID = -1029070983514140912L;

    /**
     * è®¾å¤‡ç¼–号
     */
    @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/entity/MdcPartProcessInfo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
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;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
@Data
@TableName("mdc_part_process_info")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_part_process_info对象", description = "零件加工数据表")
public class MdcPartProcessInfo extends JeecgEntity implements Serializable {

    private static final long serialVersionUID = -5287766951707976335L;

    /**
     * æ—¥æœŸ
     */
    @Excel(name = "日期", width = 15)
    @ApiModelProperty(value = "日期")
    private String theDate;
    /**
     * è®¾å¤‡ç¼–号
     */
    @Excel(name = "设备编号", width = 20)
    @ApiModelProperty(value = "设备编号")
    private String equipmentId;
    /**
     * é›¶ä»¶å·
     */
    @Excel(name = "零件号", width = 20)
    @ApiModelProperty(value = "零件号")
    private String partId;
    /**
     * æ ‡å‡†åŠ å·¥æ—¶é•¿ï¼ˆmin）
     */
    @Excel(name = "标准加工时长（min）", width = 20)
    @ApiModelProperty(value = "标准加工时长（min）")
    private Integer standardProcessLong;
    /**
     * åŠ å·¥é›¶ä»¶æ•°é‡
     */
    @Excel(name = "加工零件数量", width = 15)
    @ApiModelProperty(value = "加工零件数量")
    private Integer processCount;
    /**
     * åˆæ ¼é›¶ä»¶æ•°é‡
     */
    @Excel(name = "合格零件数量", width = 15)
    @ApiModelProperty(value = "合格零件数量")
    private Integer passCount;
    /**
     * åŠ å·¥æ€»æ—¶é•¿(min)
     */
    @Excel(name = "加工总时长(min)", width = 18)
    @ApiModelProperty(value = "加工总时长(min)")
    private Integer totalProcessLong;

}

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

@@ -4,8 +4,11 @@
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.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
import org.jeecg.modules.mdc.vo.MdcDowntimeVo;

import java.util.List;

/**
 * @Description: å¾…机停机表
@@ -14,5 +17,7 @@
 */
public interface MdcDowntimeMapper extends BaseMapper<MdcDowntime> {

    IPage<MdcDowntime> pageList(Page<MdcDowntime> page, @Param("mdcDowntimeVo") MdcDowntimeVo mdcDowntimeVo);
    IPage<MdcDowntimeDto> pageList(Page<MdcDowntimeDto> page, @Param("mdcDowntimeVo") MdcDowntimeVo mdcDowntimeVo);

    List<MdcDowntime> findPlanTimeDuration(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate, @Param("closeType") String closeType);
}

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

@@ -16,4 +16,13 @@
     * èŽ·å–设备最新日期的运行数据
     */
    MdcEquipmentStatisticalInfo getMaxStaticsData(@Param("equipmentId") String equipmentId);

    /**
     * æŸ¥è¯¢è®¾å¤‡è¿è¡Œæ—¶é—´
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectProcessLong(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);
}

 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/MdcPartProcessInfoMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
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.MdcPartProcessInfo;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
public interface MdcPartProcessInfoMapper extends BaseMapper<MdcPartProcessInfo> {

    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param mdcPartProcessInfo
     * @return
     */
    IPage<MdcPartProcessInfo> pageList(Page<MdcPartProcessInfo> page, @Param("mdcPartProcessInfo") MdcPartProcessInfoVo mdcPartProcessInfo);

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥æ—¶é—´
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectTotalProcessLong(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥æ•°é‡
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectTotalProcessCount(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥åˆæ ¼æ•°é‡
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectTotalPassCount(@Param("equipmentId") String equipmentId, @Param("validDate") String validDate);
}

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

@@ -2,25 +2,42 @@
<!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.MdcDowntimeMapper">

    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcDowntime">
        SELECT * FROM mdc_downtime
    <select id="pageList" resultType="org.jeecg.modules.mdc.dto.MdcDowntimeDto">
        SELECT
            t1.* ,
            t2.downtime_type downtimeType,
            t2.downtime_description downtimeDescription
        FROM mdc_downtime t1 LEFT JOIN mdc_downtime_reason t2 ON t1.reason_id = t2.id
        <where>
            <if test="mdcDowntimeVo.equipmentId != null and mdcDowntimeVo.equipmentId != ''">
                AND equipment_id = #{ mdcDowntimeVo.equipmentId }
                AND t1.equipment_id = #{ mdcDowntimeVo.equipmentId }
            </if>
            <if test="mdcDowntimeVo.equipmentName != null and mdcDowntimeVo.equipmentName != ''">
                AND equipment_name = #{ mdcDowntimeVo.equipmentName }
                AND t1.equipment_name = #{ mdcDowntimeVo.equipmentName }
            </if>
            <if test="mdcDowntimeVo.startTime != null and mdcDowntimeVo.startTime != '' and mdcDowntimeVo.endTime != null and mdcDowntimeVo.endTime != ''">
                AND the_date BETWEEN #{ mdcDowntimeVo.startTime } AND #{ mdcDowntimeVo.endTime }
                AND t1.the_date BETWEEN #{ mdcDowntimeVo.startTime } AND #{ mdcDowntimeVo.endTime }
            </if>
            <if test="mdcDowntimeVo.equipmentIdList != null and mdcDowntimeVo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                AND t1.equipment_id IN
                <foreach collection="mdcDowntimeVo.equipmentIdList" item="equipmentId" index="index" open="(" close=")" separator=",">
                    #{ equipmentId }
                </foreach>
            </if>
        </where>
        ORDER BY create_time DESC
        ORDER BY t1.create_time DESC
    </select>

    <select id="findPlanTimeDuration" resultType="org.jeecg.modules.mdc.entity.MdcDowntime">
        SELECT
            t1.*
        FROM
            mdc_downtime t1
                LEFT JOIN mdc_downtime_reason t2 ON t1.reason_id = t2.id
        WHERE
            t1.status = 1
            AND t1.equipment_id = #{equipmentId}
            AND t2.downtime_type = #{closeType}
            AND t1.the_date = #{validDate}
    </select>
</mapper>

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

@@ -276,6 +276,7 @@
        WHERE
            t1.id = #{ id }
    </select>

    <select id="queryByProductionIdAndType" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
        SELECT
        me.*

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

@@ -7,4 +7,9 @@
    <select id="getMaxStaticsData" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo">
        SELECT TOP 1 * FROM mdc_equipment_statistical_info WHERE equipment_id = #{equipmentId} ORDER BY the_date DESC
    </select>

    <!--查询设备运行时间-->
    <select id="selectProcessLong" resultType="java.lang.Integer">
        SELECT TOP 1 process_long FROM mdc_equipment_statistical_info WHERE equipment_id = #{equipmentId} AND the_date = #{validDate}
    </select>
</mapper>

 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/mapper/xml/MdcPartProcessInfoMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
<?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.MdcPartProcessInfoMapper">

    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcPartProcessInfo">
        SELECT
            *
        FROM
            mdc_part_process_info
        <where>
            <if test="mdcPartProcessInfo.equipmentId != null and mdcPartProcessInfo.equipmentId != ''">
                AND equipment_id = #{ mdcPartProcessInfo.equipmentId }
            </if>
            <if test="mdcPartProcessInfo.partId != null and mdcPartProcessInfo.partId != ''">
                AND part_id = #{ mdcPartProcessInfo.partId }
            </if>
            <if test="mdcPartProcessInfo.theDate != null and mdcPartProcessInfo.theDate != ''">
                AND the_date LIKE CONCAT('%',#{ mdcPartProcessInfo.theDate },'%')
            </if>
            <if test="mdcPartProcessInfo.startTime != null and mdcPartProcessInfo.startTime != ''">
                AND the_date &gt;= #{ mdcPartProcessInfo.startTime }
            </if>
            <if test="mdcPartProcessInfo.endTime != null and mdcPartProcessInfo.endTime != ''">
                AND the_date &lt;= #{mdcPartProcessInfo.endTime }
            </if>
            <if test="mdcPartProcessInfo.equipmentIdList != null and mdcPartProcessInfo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                <foreach collection="mdcPartProcessInfo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
            </if>
        </where>
        ORDER BY the_date DESC, equipment_id ASC
    </select>

    <!--查询设备某天总加工时间-->
    <select id="selectTotalProcessLong" resultType="java.lang.Integer">
        SELECT sum(total_process_long) FROM mdc_part_process_info WHERE equipment_id = #{equipmentId} AND the_date = #{validDate}
    </select>

    <!--查询设备某天总加工数量-->
    <select id="selectTotalProcessCount" resultType="java.lang.Integer">
        SELECT sum(process_count) FROM mdc_part_process_info WHERE equipment_id = #{equipmentId} AND the_date = #{validDate}
    </select>

    <!--查询设备某天总加工合格数量-->
    <select id="selectTotalPassCount" resultType="java.lang.Integer">
        SELECT sum(pass_count) FROM mdc_part_process_info WHERE equipment_id = #{equipmentId} AND the_date = #{validDate}
    </select>

</mapper>

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

@@ -3,6 +3,7 @@
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.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
import org.jeecg.modules.mdc.vo.MdcDowntimeVo;

@@ -24,5 +25,14 @@
     * @param req
     * @return
     */
    IPage<MdcDowntime> pageList(String userId, Page<MdcDowntime> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req);
    IPage<MdcDowntimeDto> pageList(String userId, Page<MdcDowntimeDto> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req);

    /**
     *  æŸ¥è¯¢åœæœºæ—¶é•¿
     * @param equipmentId
     * @param validDate
     * @param closeType
     * @return
     */
    Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType);
}

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

@@ -17,4 +17,13 @@
     * @param dateTime
     */
    void runningAllEquipmentStatisticalProcess(String dateTime);

    /**
     * æŸ¥è¯¢è®¾å¤‡è¿è¡Œæ—¶é—´
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectProcessLong(String equipmentId, String validDate);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
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.MdcOeeComputeVo;
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);

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

    /**
     * è®¡ç®—OEE
     *
     * @param mdcOeeComputeVo
     */
    void computeOee(MdcOeeComputeVo mdcOeeComputeVo);

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
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.MdcPartProcessInfo;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
public interface IMdcPartProcessInfoService extends IService<MdcPartProcessInfo> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param userId
     * @param page
     * @param mdcPartProcessInfo
     * @param req
     * @return
     */
    IPage<MdcPartProcessInfo> pageList(String userId, Page<MdcPartProcessInfo> page, MdcPartProcessInfoVo mdcPartProcessInfo, HttpServletRequest req);

    /**
     * æ·»åŠ 
     *
     * @param mdcPartProcessInfo
     * @return
     */
    boolean addPartProcess(MdcPartProcessInfoVo mdcPartProcessInfo);

    /**
     * å¯¼å‡º
     *
     * @param userId
     * @param mdcPartProcessInfo
     * @return
     */
    ModelAndView exportXls(String userId, MdcPartProcessInfoVo mdcPartProcessInfo);

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥æ—¶é—´
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectTotalProcessLong(String equipmentId, String validDate);

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥æ•°é‡
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectTotalProcessCount(String equipmentId, String validDate);

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥åˆæ ¼æ•°é‡
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    Integer selectTotalPassCount(String equipmentId, String validDate);
}

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

@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
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.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
import org.springframework.stereotype.Service;

@@ -38,7 +40,7 @@
     * @return
     */
    @Override
    public IPage<MdcDowntime> pageList(String userId, Page<MdcDowntime> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req) {
    public IPage<MdcDowntimeDto> pageList(String userId, Page<MdcDowntimeDto> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req) {
        // èŽ·å–设备ID列表
        List<String> equipmentIds = getEquipmentIds(userId, mdcDowntimeVo);

@@ -54,6 +56,18 @@
        return this.baseMapper.pageList(page, mdcDowntimeVo);
    }

    @Override
    public Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType) {
        int result = 0;
        List<MdcDowntime> mdcDowntimeList = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
        if (mdcDowntimeList != null && !mdcDowntimeList.isEmpty()) {
            for (MdcDowntime mdcDowntime : mdcDowntimeList) {
                result = DateUtils.differentMinutes(mdcDowntime.getStartDate(), mdcDowntime.getEndDate()) + result;
            }
        }
        return result;
    }

    private List<String> getEquipmentIds(String userId, MdcDowntimeVo mdcDowntimeVo) {
        if (StringUtils.isNotEmpty(mdcDowntimeVo.getEquipmentId())) {
            return Collections.singletonList(mdcDowntimeVo.getEquipmentId());

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

@@ -14,6 +14,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;

/**
@@ -299,4 +300,21 @@
        }
        return equipmentStatisticalInfos;
    }

    /**
     * æŸ¥è¯¢è®¾å¤‡è¿è¡Œæ—¶é—´
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    @Override
    public Integer selectProcessLong(String equipmentId, String validDate) {
        Integer processLong = this.baseMapper.selectProcessLong(equipmentId, validDate);
        if (processLong == null) {
            return 0;
        } else {
            return Integer.parseInt(new BigDecimal(processLong).divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP).toString());
        }
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,246 @@
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.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.mapper.MdcOeeInfoMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
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.transaction.annotation.Transactional;
import org.springframework.web.servlet.ModelAndView;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
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;

    @Resource
    private IMdcDowntimeService mdcDowntimeService;

    @Resource
    private IMdcPartProcessInfoService mdcPartProcessInfoService;

    @Resource
    private IMdcEquipmentStatisticalInfoService mdcEquipmentStatisticalInfoService;

    /**
     * åˆ†é¡µåˆ—表
     *
     * @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 mdcOeeComputeVo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void computeOee(MdcOeeComputeVo mdcOeeComputeVo) {
        List<MdcOeeInfo> result = new ArrayList<>();
        String startDate = mdcOeeComputeVo.getStartDate();
        String endDate = mdcOeeComputeVo.getEndDate();
        List<String> dateList = DateUtils.getDatesStringList(DateUtils.getShortDate(startDate), DateUtils.getShortDate(endDate));
        if (!dateList.isEmpty()) {
            //获取设备列表
            List<MdcEquipment> equipmentList = mdcEquipmentService.list();

            for (String validDate : dateList) {
                try {
                    this.remove(new LambdaQueryWrapper<MdcOeeInfo>().eq(MdcOeeInfo::getTheDate, validDate));
                } catch (Exception e) {
                    log.error("参数格式不对", e);
                }
                for (MdcEquipment mdcEquipment : equipmentList) {
                    String equipmentId = mdcEquipment.getEquipmentId();
                    MdcOeeInfo mdcOeeInfo = new MdcOeeInfo();
                    // è®¾å¤‡ç¼–号
                    mdcOeeInfo.setEquipmentId(equipmentId);
                    // è®¡ç®—日期
                    mdcOeeInfo.setTheDate(validDate);
                    // å·¥ä½œæ—¥åŽ†æ—¶é—´(min) --- æŒ‰æ¯å¤©24小时算
                    mdcOeeInfo.setCalendarLong(1440);
                    // è®¡åˆ’停机时间(min) --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天总时长
                    Integer planCloseLong = mdcDowntimeService.findPlanTimeDuration(equipmentId, validDate, CommonConstant.CLOSE_TYPE_0);
                    mdcOeeInfo.setPlanCloseLong(planCloseLong);
                    // è´Ÿè·æ—¶é—´(min) --- æ—¥åŽ†å·¥ä½œæ—¶é—´-计划停机时间
                    Integer loadLong = mdcOeeInfo.getCalendarLong() - planCloseLong;
                    mdcOeeInfo.setLoadLong(loadLong);
                    // éžè®¡åˆ’停机时间(min) --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天总时长
                    Integer noPlanCloseLong = mdcDowntimeService.findPlanTimeDuration(equipmentId, validDate, CommonConstant.CLOSE_TYPE_1);
                    mdcOeeInfo.setNoplanCloseLong(noPlanCloseLong);
                    // å¼€åŠ¨æ—¶é—´(min) --- è´Ÿè·æ—¶é—´-非计划停机时间
                    int actuateLong = loadLong - noPlanCloseLong;
                    mdcOeeInfo.setActuateLong(actuateLong);
                    // æ—¶é—´å¼€åŠ¨çŽ‡ --- å¼€åŠ¨æ—¶é—´/负荷时间
                    BigDecimal timeActuationRate = new BigDecimal(actuateLong).divide(new BigDecimal(loadLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    mdcOeeInfo.setTimeActuationRate(timeActuationRate);
                    // æœ‰æ•ˆè¿è¡Œæ—¶é—´ --- æŒ‰éœ€æ±‚维护零件加工总时长||系统主轴负载时间
                    Integer effectiveRunLong = 0;
                    Integer totalProcessLong = mdcPartProcessInfoService.selectTotalProcessLong(equipmentId, validDate);
                    if (totalProcessLong == 0) {
                        //查询设备运行时间
                        effectiveRunLong = mdcEquipmentStatisticalInfoService.selectProcessLong(equipmentId, validDate.replace("-", ""));
                    } else {
                        effectiveRunLong = totalProcessLong;
                    }
                    mdcOeeInfo.setEffectiveRunLong(effectiveRunLong);
                    // æ€§èƒ½å¼€åŠ¨çŽ‡ --- æœ‰æ•ˆè¿è¡Œæ—¶é—´/开动时间
                    BigDecimal performanceRate = BigDecimal.ZERO;
                    if (effectiveRunLong != 0 && actuateLong != 0) {
                        performanceRate = new BigDecimal(effectiveRunLong).divide(new BigDecimal(actuateLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setPerformanceRate(performanceRate);
                    // åŠ å·¥é›¶ä»¶æ•°é‡ --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天
                    Integer processCount = mdcPartProcessInfoService.selectTotalProcessCount(equipmentId, validDate);
                    mdcOeeInfo.setProcessCount(processCount);
                    // åˆæ ¼é›¶ä»¶æ•°é‡ --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天
                    Integer passCount = mdcPartProcessInfoService.selectTotalPassCount(equipmentId, validDate);
                    mdcOeeInfo.setPassCount(passCount);
                    // åˆæ ¼çŽ‡ --- åˆæ ¼æ•°/加工数
                    BigDecimal passRate = BigDecimal.ZERO;
                    if (processCount != 0 && passCount != 0) {
                        passRate = new BigDecimal(passCount).divide(new BigDecimal(processCount), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setPassRate(passRate);
                    // OEE --- æ—¶é—´å¼€åŠ¨çŽ‡ * æ€§èƒ½å¼€åŠ¨çŽ‡ * ä¸€æ¬¡åˆæ ¼çŽ‡
                    BigDecimal oee = BigDecimal.ZERO;
                    if (!timeActuationRate.equals(BigDecimal.ZERO) && !performanceRate.equals(BigDecimal.ZERO) && !passRate.equals(BigDecimal.ZERO)) {
                        oee = timeActuationRate.multiply(performanceRate).multiply(passRate).divide(new BigDecimal("10000"), 4, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setOee(oee);
                    result.add(mdcOeeInfo);
                }
            }
        }
        super.saveBatch(result);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,204 @@
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.MdcPartProcessInfo;
import org.jeecg.modules.mdc.mapper.MdcPartProcessInfoMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcPartProcessInfoService;
import org.jeecg.modules.mdc.vo.MdcPartProcessInfoVo;
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;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
 * @Description: é›¶ä»¶åŠ å·¥æ•°æ®è¡¨
 * @Author: lius
 * @Date: 2024-12-11
 */
@Service
public class MdcPartProcessInfoServiceImpl extends ServiceImpl<MdcPartProcessInfoMapper, MdcPartProcessInfo> implements IMdcPartProcessInfoService {

    @Resource
    private IMdcEquipmentService mdcEquipmentService;

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

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

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

    @Override
    public boolean addPartProcess(MdcPartProcessInfoVo mdcPartProcessInfo) {
        String[] equipmentIdList = mdcPartProcessInfo.getEquipmentIds().split(",");
        List<MdcPartProcessInfo> partProcessInfoList = new ArrayList<>();
        for (String equipmentId : equipmentIdList) {
            MdcPartProcessInfo mppi = new MdcPartProcessInfo();
            BeanUtils.copyProperties(mdcPartProcessInfo, mppi);
            mppi.setEquipmentId(equipmentId);
            partProcessInfoList.add(mppi);
        }
        this.saveBatch(partProcessInfoList);
        return true;
    }

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

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

        if (mdcPartProcessInfo.getEquipmentIdList() == null || mdcPartProcessInfo.getEquipmentIdList().isEmpty()) {
            return null;
        } else {
            queryWrapper.in(MdcPartProcessInfo::getEquipmentId, mdcPartProcessInfo.getEquipmentIdList());
        }
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getEquipmentId())) {
            queryWrapper.eq(MdcPartProcessInfo::getEquipmentId, mdcPartProcessInfo.getEquipmentId());
        }
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getPartId())) {
            queryWrapper.eq(MdcPartProcessInfo::getPartId, mdcPartProcessInfo.getPartId());
        }
        if (StringUtils.isNotEmpty(mdcPartProcessInfo.getStartTime()) && StringUtils.isNotEmpty(mdcPartProcessInfo.getEndTime())) {
            queryWrapper.between(MdcPartProcessInfo::getTheDate, mdcPartProcessInfo.getStartTime(), mdcPartProcessInfo.getEndTime());
        }
        queryWrapper.orderByDesc(MdcPartProcessInfo::getTheDate).orderByDesc(MdcPartProcessInfo::getEquipmentId);
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<MdcPartProcessInfo> mdcPartProcessInfos = this.baseMapper.selectList(queryWrapper);
        // å¯¼å‡ºæ–‡ä»¶åç§°
        mv.addObject(NormalExcelConstants.FILE_NAME, "零件加工数据列表");
        mv.addObject(NormalExcelConstants.CLASS, MdcPartProcessInfo.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, mdcPartProcessInfos);
        return mv;
    }

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥æ—¶é—´
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    @Override
    public Integer selectTotalProcessLong(String equipmentId, String validDate) {
        Integer totalProcessLong = this.baseMapper.selectTotalProcessLong(equipmentId, validDate);
        if (totalProcessLong == null) {
            return 0;
        } else {
            return totalProcessLong;
        }
    }

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥æ•°é‡
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    @Override
    public Integer selectTotalProcessCount(String equipmentId, String validDate) {
        Integer totalProcessCount = this.baseMapper.selectTotalProcessCount(equipmentId, validDate);
        if (totalProcessCount == null) {
            return 0;
        } else {
            return totalProcessCount;
        }
    }

    /**
     * æŸ¥è¯¢è®¾å¤‡æŸå¤©æ€»åŠ å·¥åˆæ ¼æ•°é‡
     *
     * @param equipmentId
     * @param validDate
     * @return
     */
    @Override
    public Integer selectTotalPassCount(String equipmentId, String validDate) {
        Integer totalPassCount = this.baseMapper.selectTotalPassCount(equipmentId, validDate);
        if (totalPassCount == null) {
            return 0;
        } else {
            return totalPassCount;
        }
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java

@@ -4,6 +4,7 @@
import io.swagger.models.auth.In;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -83,6 +84,13 @@
    }

    /**
     * @return èŽ·å–两个date的时间差，结果为分钟
     */
    public static Integer differentMinutes(Date startDate, Date endDate) {
        return new BigDecimal(endDate.getTime() - startDate.getTime()).divide(new BigDecimal("60000"), 0, RoundingMode.HALF_UP).intValue();
    }

    /**
     * @return è¿”回传入时间的0点0分0秒
     */
    public static Date getTodayZero(Date d) {

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

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

import lombok.Data;

/**
 * @author Lius
 * @date 2025/1/20 14:41
 */
@Data
public class MdcOeeComputeVo {
    private String startDate;
    private String endDate;
}

 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;
}

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

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

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

import java.util.List;

/**
 * @author Lius
 * @date 2024/12/11 15:47
 */
@Data
public class MdcPartProcessInfoVo extends MdcPartProcessInfo {
    private String startTime;
    private String endTime;
    private String parentId;
    private String typeTree;
    private List<String> equipmentIdList;
    private String equipmentIds;
}