Merge remote-tracking branch 'origin/hxsj' into hxsj

云

3 天以前 b701cf0331e91900bf8055009a745d4953a6c510

 src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java

@@ -3,13 +3,17 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.execl.DeviceLedgerExeclDto;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -82,6 +86,7 @@

    @PostMapping("import")
    @ApiModelProperty("导入设备台账")
    @Log(title = "设备台账导入", businessType = BusinessType.IMPORT)
    public AjaxResult importData(MultipartFile file) throws IOException {
        Boolean b = deviceLedgerService.importData(file);
        if (b) {
@@ -90,6 +95,14 @@
        return AjaxResult.error("导入失败");
    }

    @PostMapping("/downloadTemplate")
    @ApiModelProperty("下载导入模板")
    @Log(title = "设备台账导入", businessType = BusinessType.IMPORT)
    public void downloadTemplate(HttpServletResponse response) {
        ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
        util.importTemplateExcel(response, "设备台账模板");
    }


    @GetMapping("getDeviceLedger")
    @ApiModelProperty("获取设备台账")