From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
index 486ad48..063a163 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
@@ -10,7 +10,8 @@
import com.ruoyi.equipmentenergyconsumption.mapper.EquipmentEnergyConsumptionMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.framework.web.domain.R;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -41,18 +42,18 @@
}
@Override
- public AjaxResult importData(MultipartFile file) {
+ public R<?> importData(MultipartFile file) {
try {
ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
List<EquipmentEnergyConsumption> userList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(userList)){
- return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return R.fail(HttpStatus.WARN, "妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
- return AjaxResult.success(true);
+ return R.ok(true);
}catch (Exception e){
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
}
--
Gitblit v1.9.3