停机管理批量日期添加

Lius

2 天以前 396d07038eba53b8438e65f9ce0e6139a017e478

停机管理批量日期添加

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -73,6 +74,9 @@
        if (StringUtils.isBlank(mdcDowntime.getEquipmentIds())) {
            return Result.error("未选择设备，请排查");
        }
        if (CollectionUtils.isEmpty(mdcDowntime.getDateList())) {
            return Result.error("未选择日期，请排查");
        }
        boolean flag = mdcDowntimeService.saveDowntime(mdcDowntime);
        return flag ? Result.ok("添加成功") : Result.error("添加失败");
    }
@@ -87,9 +91,6 @@
    @ApiOperation(value = "待机停机表-编辑", notes = "待机停机表-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody MdcDowntime mdcDowntime) {
//        if (mdcDowntime.getReasonId() != null) {
//            mdcDowntime.setStatus(CommonConstant.DOWNTIME_STATUS_1);
//        }
        mdcDowntimeService.updateById(mdcDowntime);
        return Result.OK("编辑成功!");
    }

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

@@ -2,19 +2,16 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * @Description: 待机停机表
@@ -71,4 +68,7 @@
    @TableField(exist = false)
    private String equipmentIds;

    @TableField(exist = false)
    private List<String> dateList;

}

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

@@ -7,20 +7,18 @@
import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
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.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
@@ -78,22 +76,25 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveDowntime(MdcDowntime mdcDowntime) {
        boolean result = false;
        String[] equipmentIds = mdcDowntime.getEquipmentIds().split(",");
        List<String> dateList = mdcDowntime.getDateList();
        List<MdcDowntime> mdcDowntimeList = new ArrayList<>();
        for (String equipmentId : equipmentIds) {
            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
            MdcDowntime downtime = new MdcDowntime();
            BeanUtils.copyProperties(mdcDowntime, downtime);
            downtime.setEquipmentId(mdcEquipment.getEquipmentId());
            downtime.setEquipmentName(mdcEquipment.getEquipmentName());
            boolean b = super.save(downtime);
            if (b) {
                result = true;
            for (String date : dateList) {
//                this.baseMapper.delete(new LambdaQueryWrapper<MdcDowntime>().eq(MdcDowntime::getTheDate, date).eq(MdcDowntime::getEquipmentId, equipmentId));
                MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
                MdcDowntime downtime = new MdcDowntime();
                BeanUtils.copyProperties(mdcDowntime, downtime);
                downtime.setEquipmentId(mdcEquipment.getEquipmentId());
                downtime.setEquipmentName(mdcEquipment.getEquipmentName());
                downtime.setTheDate(date);
                mdcDowntimeList.add(downtime);
            }
        }

        return result;
        this.saveBatch(mdcDowntimeList);
        return true;
    }

    private List<String> getEquipmentIds(String userId, MdcDowntimeVo mdcDowntimeVo) {