Lius
2025-01-22 1a075513907e055a4a5e0affe1f2a2832734de7e
故障停机和维修时长维护功能
已添加14个文件
839 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDownTime.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcRepairInfo.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDownTimeMapper.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcRepairInfoMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDownTimeMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcRepairInfoMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDownTimeVo.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcRepairInfoVo.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,176 @@
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;
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.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcDownTime;
import org.jeecg.modules.mdc.service.IMdcDownTimeService;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
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: 2025-01-22
 */
@Slf4j
@Api(tags = "设备故障停机时长表")
@RestController
@RequestMapping("/mdc/mdcDownTime")
public class MdcDownTimeController extends JeecgController<MdcDownTime, IMdcDownTimeService> {
    @Resource
    private IMdcDownTimeService mdcDownTimeService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcDownTimeVo
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "设备故障停机时长表-分页列表查询")
    @ApiOperation(value = "设备故障停机时长表-分页列表查询", notes = "设备故障停机时长表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcDownTimeVo mdcDownTimeVo,
                                   @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<MdcDownTime> page = new Page<MdcDownTime>(pageNo, pageSize);
        IPage<MdcDownTime> pageList = mdcDownTimeService.pageList(userId, page, mdcDownTimeVo, req);
        return Result.OK(pageList);
    }
    /**
     * æ·»åŠ 
     *
     * @param mdcDownTimeVo
     * @return
     */
    @AutoLog(value = "设备故障停机时长表-添加")
    @ApiOperation(value = "设备故障停机时长表-添加", notes = "设备故障停机时长表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcDownTimeVo mdcDownTimeVo) {
        if (StringUtils.isBlank(mdcDownTimeVo.getEquipmentIds())) {
            return Result.error("未选择设备,请排查!");
        }
        boolean result = mdcDownTimeService.addDownTime(mdcDownTimeVo);
        if (!result) {
            return Result.error("添加失败!");
        }
        return Result.OK("添加成功!");
    }
    /**
     * ç¼–辑
     *
     * @param mdcDownTime
     * @return
     */
    @AutoLog(value = "设备故障停机时长表-编辑")
    @ApiOperation(value = "设备故障停机时长表-编辑", notes = "设备故障停机时长表-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcDownTime mdcDownTime) {
        mdcDownTimeService.updateById(mdcDownTime);
        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) {
        mdcDownTimeService.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.mdcDownTimeService.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) {
        MdcDownTime mdcDownTime = mdcDownTimeService.getById(id);
        return Result.OK(mdcDownTime);
    }
    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcDownTime
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcDownTime mdcDownTime) {
        return super.exportXls(request, mdcDownTime, MdcDownTime.class, "设备故障停机时长表");
    }
    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MdcDownTime.class);
    }
    /**
     * è®¡ç®—MTBF
     *
     * @return
     */
    @AutoLog(value = "设备故障停机时长表-计算MTBF")
    @ApiOperation(value = "设备故障停机时长表-计算MTBF", notes = "设备故障停机时长表-计算MTBF")
    @PostMapping(value = "/computeMtbf")
    public Result<?> computeMtbf() {
        return Result.OK("计算成功!");
    }
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,163 @@
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;
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.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcRepairInfo;
import org.jeecg.modules.mdc.service.IMdcRepairInfoService;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
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: 2025-01-22
 */
@Slf4j
@Api(tags = "设备维修时长表")
@RestController
@RequestMapping("/mdc/mdcRepairInfo")
public class MdcRepairInfoController extends JeecgController<MdcRepairInfo, IMdcRepairInfoService> {
    @Resource
    private IMdcRepairInfoService mdcRepairInfoService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param mdcRepairInfoVo
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "设备维修时长表-分页列表查询")
    @ApiOperation(value = "设备维修时长表-分页列表查询", notes = "设备维修时长表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcRepairInfoVo mdcRepairInfoVo,
                                   @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<MdcRepairInfo> page = new Page<MdcRepairInfo>(pageNo, pageSize);
        IPage<MdcRepairInfo> pageList = mdcRepairInfoService.pageList(userId, page, mdcRepairInfoVo, req);
        return Result.OK(pageList);
    }
    /**
     * æ·»åŠ 
     *
     * @param mdcRepairInfoVo
     * @return
     */
    @AutoLog(value = "设备维修时长表-添加")
    @ApiOperation(value = "设备维修时长表-添加", notes = "设备维修时长表-添加")
    @PostMapping(value = "/add")
    public Result<?> add(@RequestBody MdcRepairInfoVo mdcRepairInfoVo) {
        if (StringUtils.isBlank(mdcRepairInfoVo.getEquipmentIds())) {
            return Result.error("未选择设备,请排查!");
        }
        boolean result = mdcRepairInfoService.addRepair(mdcRepairInfoVo);
        if (!result) {
            return Result.error("添加失败!");
        }
        return Result.OK("添加成功!");
    }
    /**
     * ç¼–辑
     *
     * @param mdcRepairInfo
     * @return
     */
    @AutoLog(value = "设备维修时长表-编辑")
    @ApiOperation(value = "设备维修时长表-编辑", notes = "设备维修时长表-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcRepairInfo mdcRepairInfo) {
        mdcRepairInfoService.updateById(mdcRepairInfo);
        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) {
        mdcRepairInfoService.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.mdcRepairInfoService.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) {
        MdcRepairInfo mdcRepairInfo = mdcRepairInfoService.getById(id);
        return Result.OK(mdcRepairInfo);
    }
    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param mdcRepairInfo
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, MdcRepairInfo mdcRepairInfo) {
        return super.exportXls(request, mdcRepairInfo, MdcRepairInfo.class, "设备维修时长表");
    }
    /**
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, MdcRepairInfo.class);
    }
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDownTime.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
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: 2025-01-22
 */
@Data
@TableName("mdc_down_time")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_down_time对象", description = "设备故障停机时长表")
public class MdcDownTime extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = -3997182721419590527L;
    /**
     * è®¾å¤‡ç¼–号
     */
    @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 downLong;
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcRepairInfo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
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: 2025-01-22
 */
@Data
@TableName("mdc_repair_info")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "mdc_repair_info对象", description = "设备维修时长表")
public class MdcRepairInfo extends JeecgEntity implements Serializable {
    private static final long serialVersionUID = -3713968527082564762L;
    /**
     * è®¾å¤‡ç¼–号
     */
    @Excel(name = "设备编号", width = 15)
    @ApiModelProperty(value = "设备编号")
    private java.lang.String equipmentId;
    /**
     * æ—¥æœŸ
     */
    @Excel(name = "日期", width = 15)
    @ApiModelProperty(value = "日期")
    private java.lang.String theDate;
    /**
     * ç»´ä¿®æ—¶é•¿(min)
     */
    @Excel(name = "维修时长(min)", width = 15)
    @ApiModelProperty(value = "维修时长(min)")
    private java.lang.Integer repairLong;
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDownTimeMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
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.MdcDownTime;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
/**
 * @Description: è®¾å¤‡æ•…障停机时长表
 * @Author: Lius
 * @Date: 2025-01-22
 */
public interface MdcDownTimeMapper extends BaseMapper<MdcDownTime> {
    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param mdcDownTimeVo
     * @return
     */
    IPage<MdcDownTime> pageList(Page<MdcDownTime> page, @Param("mdcDownTimeVo") MdcDownTimeVo mdcDownTimeVo);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcRepairInfoMapper.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.MdcRepairInfo;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
/**
 * @Description: è®¾å¤‡ç»´ä¿®æ—¶é•¿è¡¨
 * @Author: Lius
 * @Date: 2025-01-22
 */
public interface MdcRepairInfoMapper extends BaseMapper<MdcRepairInfo> {
    /**
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param mdcRepairInfoVo
     * @return
     */
    IPage<MdcRepairInfo> pageList(Page<MdcRepairInfo> page, @Param("mdcRepairInfoVo") MdcRepairInfoVo mdcRepairInfoVo);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDownTimeMapper.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.MdcDownTimeMapper">
    <!--分页列表-->
    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcDownTime">
        SELECT
            *
        FROM
            mdc_down_time
        <where>
            <if test="mdcDownTimeVo.equipmentId != null and mdcDownTimeVo.equipmentId != ''">
                AND equipment_id = #{ mdcDownTimeVo.equipmentId }
            </if>
            <if test="mdcDownTimeVo.startTime != null and mdcDownTimeVo.startTime != ''">
                AND the_date &gt;= #{ mdcDownTimeVo.startTime }
            </if>
            <if test="mdcDownTimeVo.endTime != null and mdcDownTimeVo.endTime != ''">
                AND the_date &lt;= #{mdcDownTimeVo.endTime }
            </if>
            <if test="mdcDownTimeVo.equipmentIdList != null and mdcDownTimeVo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                <foreach collection="mdcDownTimeVo.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/MdcRepairInfoMapper.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.MdcRepairInfoMapper">
    <!--分页列表-->
    <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcRepairInfo">
        SELECT
            *
        FROM
            mdc_repair_info
        <where>
            <if test="mdcRepairInfoVo.equipmentId != null and mdcRepairInfoVo.equipmentId != ''">
                AND equipment_id = #{ mdcRepairInfoVo.equipmentId }
            </if>
            <if test="mdcRepairInfoVo.startTime != null and mdcRepairInfoVo.startTime != ''">
                AND the_date &gt;= #{ mdcRepairInfoVo.startTime }
            </if>
            <if test="mdcRepairInfoVo.endTime != null and mdcRepairInfoVo.endTime != ''">
                AND the_date &lt;= #{mdcRepairInfoVo.endTime }
            </if>
            <if test="mdcRepairInfoVo.equipmentIdList != null and mdcRepairInfoVo.equipmentIdList.size() > 0 ">
                AND equipment_id IN
                <foreach collection="mdcRepairInfoVo.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/IMdcDownTimeService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
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.MdcDownTime;
import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
import javax.servlet.http.HttpServletRequest;
/**
 * @Description: è®¾å¤‡æ•…障停机时长表
 * @Author: Lius
 * @Date: 2025-01-22
 */
public interface IMdcDownTimeService extends IService<MdcDownTime> {
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param userId
     * @param page
     * @param mdcDownTimeVo
     * @param req
     * @return
     */
    IPage<MdcDownTime> pageList(String userId, Page<MdcDownTime> page, MdcDownTimeVo mdcDownTimeVo, HttpServletRequest req);
    /**
     * æ·»åŠ 
     *
     * @param mdcDownTimeVo
     * @return
     */
    boolean addDownTime(MdcDownTimeVo mdcDownTimeVo);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
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.MdcRepairInfo;
import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
import javax.servlet.http.HttpServletRequest;
/**
 * @Description: è®¾å¤‡ç»´ä¿®æ—¶é•¿è¡¨
 * @Author: Lius
 * @Date: 2025-01-22
 */
public interface IMdcRepairInfoService extends IService<MdcRepairInfo> {
    /**
     * åˆ†é¡µåˆ—表
     *
     * @param userId
     * @param page
     * @param mdcRepairInfoVo
     * @param req
     * @return
     */
    IPage<MdcRepairInfo> pageList(String userId, Page<MdcRepairInfo> page, MdcRepairInfoVo mdcRepairInfoVo, HttpServletRequest req);
    /**
     * æ·»åŠ 
     *
     * @param mdcRepairInfoVo
     * @return
     */
    boolean addRepair(MdcRepairInfoVo mdcRepairInfoVo);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package org.jeecg.modules.mdc.service.impl;
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.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.vo.MdcDownTimeVo;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
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: 2025-01-22
 */
@Service
public class MdcDownTimeServiceImpl extends ServiceImpl<MdcDownTimeMapper, MdcDownTime> implements IMdcDownTimeService {
    @Resource
    private IMdcEquipmentService mdcEquipmentService;
    @Override
    public IPage<MdcDownTime> pageList(String userId, Page<MdcDownTime> page, MdcDownTimeVo mdcDownTimeVo, HttpServletRequest req) {
        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;
        }
        return this.baseMapper.pageList(page, mdcDownTimeVo);
    }
    /**
     * æ·»åŠ 
     *
     * @param mdcDownTimeVo
     * @return
     */
    @Override
    public boolean addDownTime(MdcDownTimeVo mdcDownTimeVo) {
        String[] equipmentIdList = mdcDownTimeVo.getEquipmentIds().split(",");
        List<MdcDownTime> downTimeList = new ArrayList<>();
        for (String equipmentId : equipmentIdList) {
            MdcDownTime mdcDownTime = new MdcDownTime();
            BeanUtils.copyProperties(mdcDownTimeVo, mdcDownTime);
            mdcDownTime.setEquipmentId(equipmentId);
            downTimeList.add(mdcDownTime);
        }
        this.saveBatch(downTimeList);
        return true;
    }
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package org.jeecg.modules.mdc.service.impl;
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.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.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
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: 2025-01-22
 */
@Service
public class MdcRepairInfoServiceImpl extends ServiceImpl<MdcRepairInfoMapper, MdcRepairInfo> implements IMdcRepairInfoService {
    @Resource
    private IMdcEquipmentService mdcEquipmentService;
    /**
     * åˆ†é¡µåˆ—表
     *
     * @param userId
     * @param page
     * @param mdcRepairInfoVo
     * @param req
     * @return
     */
    @Override
    public IPage<MdcRepairInfo> pageList(String userId, Page<MdcRepairInfo> page, MdcRepairInfoVo mdcRepairInfoVo, HttpServletRequest req) {
        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;
        }
        return this.baseMapper.pageList(page, mdcRepairInfoVo);
    }
    /**
     * æ·»åŠ 
     *
     * @param mdcRepairInfoVo
     * @return
     */
    @Override
    public boolean addRepair(MdcRepairInfoVo mdcRepairInfoVo) {
        String[] equipmentIdList = mdcRepairInfoVo.getEquipmentIds().split(",");
        List<MdcRepairInfo> repairInfoList = new ArrayList<>();
        for (String equipmentId : equipmentIdList) {
            MdcRepairInfo mdcRepairInfo = new MdcRepairInfo();
            BeanUtils.copyProperties(mdcRepairInfoVo, mdcRepairInfo);
            mdcRepairInfo.setEquipmentId(equipmentId);
            repairInfoList.add(mdcRepairInfo);
        }
        this.saveBatch(repairInfoList);
        return true;
    }
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDownTimeVo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package org.jeecg.modules.mdc.vo;
import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcDownTime;
import java.util.List;
/**
 * @author Lius
 * @date 2025/1/22 10:00
 */
@Data
public class MdcDownTimeVo extends MdcDownTime {
    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/MdcRepairInfoVo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package org.jeecg.modules.mdc.vo;
import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcRepairInfo;
import java.util.List;
/**
 * @author Lius
 * @date 2025/1/22 10:14
 */
@Data
public class MdcRepairInfoVo extends MdcRepairInfo {
    private String startTime;
    private String endTime;
    private String parentId;
    private String typeTree;
    private List<String> equipmentIdList;
    private String equipmentIds;
}