Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao

zouyu

6 天以前 1402b12c5238a979364eac9d30ed1f25fbc14a49

 src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java

@@ -1,6 +1,8 @@
package com.ruoyi.device.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
@@ -22,6 +24,7 @@

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -38,12 +41,20 @@

    @Override
    public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {

        return deviceLedgerMapper.queryPage(page, deviceLedger);
        IPage<DeviceLedgerDto> deviceLedgerDtoIPage = deviceLedgerMapper.queryPage(page, deviceLedger);
        deviceLedgerDtoIPage.getRecords().forEach(c -> {
            c.setStatus("1".equals(c.getStatus()) ? "正常" : "停用");
        });
        return deviceLedgerDtoIPage;
    }

    @Override
    public AjaxResult saveDeviceLedger(DeviceLedger deviceLedger) {
        LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
        deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceName,deviceLedger.getDeviceName());
        if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
            return AjaxResult.error("设备型号已存在");
        }
        boolean save = this.save(deviceLedger);
        if (save){
            return AjaxResult.success();