refactor(controller): 将控制器响应结果统一为R类型并继承BaseController

liyong

6 天以前 9a30a3a8d3862a9b2ce898535b7cb51c3ddac816

 src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java

@@ -4,13 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.waterrecord.mapper.WaterRecordMapper;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -23,10 +23,10 @@
 */
@Service
@Slf4j
@RequiredArgsConstructor
public class WaterRecordServiceImpl extends ServiceImpl<WaterRecordMapper, WaterRecord> implements WaterRecordService {

    @Autowired
    private WaterRecordMapper waterRecordMapper;
    private final WaterRecordMapper waterRecordMapper;


    @Override
@@ -35,18 +35,18 @@
    }

    @Override
    public AjaxResult importData(MultipartFile file) {
    public R<?> importData(MultipartFile file) {
        try {
            ExcelUtil<WaterRecord> util = new ExcelUtil<WaterRecord>(WaterRecord.class);
            List<WaterRecord> 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("导入失败");
        }
    }
}