Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

5 小时以前 620bb4712a31791231c4381581f0f60088f079fe

 src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java

@@ -10,8 +10,7 @@
import com.ruoyi.equipmentenergyconsumption.mapper.EquipmentEnergyConsumptionMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -42,18 +41,18 @@
    }

    @Override
    public R<?> importData(MultipartFile file) {
    public AjaxResult importData(MultipartFile file) {
        try {
            ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
            List<EquipmentEnergyConsumption> userList = util.importExcel(file.getInputStream());
            if(CollectionUtils.isEmpty(userList)){
                return R.fail(HttpStatus.WARN, "模板错误或导入数据为空");
                return AjaxResult.warn("模板错误或导入数据为空");
            }
            this.saveOrUpdateBatch(userList);
            return R.ok(true);
            return AjaxResult.success(true);
        }catch (Exception e){
            e.printStackTrace();
            return R.fail("导入失败");
            return AjaxResult.error("导入失败");
        }
    }