#

Junjie

2024-06-12 25e8d4ca87b2438108adc192a73fad7fb5064118

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/DeviceController.java

@@ -1,15 +1,17 @@
package com.zy.asrs.wcs.system.controller;
package com.zy.asrs.wcs.rcs.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,6 +29,8 @@

    @Autowired
    private DeviceService deviceService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @PreAuthorize("hasAuthority('rcs:device:list')")
    @PostMapping("/device/page")
@@ -55,6 +59,7 @@
        if (!deviceService.save(device)) {
            return R.error("添加失败");
        }
        device.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        return R.ok("添加成功");
    }

@@ -87,7 +92,7 @@
            wrapper.like(Device::getDeviceNo, condition);
        }
        deviceService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getDeviceNo()))
                item -> vos.add(new KeyValVo(item.getId(), item.getDeviceNo() + "-" + item.getDevicePlc$()))
        );
        return R.ok().add(vos);
    }