From b522443e53cff373c77acc0dfb3d2d9cbc6f5ed0 Mon Sep 17 00:00:00 2001 From: guochaojie Date: Tue, 2 Jul 2024 17:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RecycleDeviceController.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java index 2be8259..f27d1f1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceController.java @@ -1,6 +1,7 @@ package jnpf.controller; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -17,8 +18,6 @@ import jnpf.service.*; import jnpf.util.*; import jnpf.utils.CustomerMqttClient; import lombok.extern.slf4j.Slf4j; -import oracle.jdbc.proxy.annotation.Post; -import org.eclipse.paho.mqttv5.client.MqttClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -283,5 +282,21 @@ public class RecycleDeviceController { return ActionResult.success("命令已发送！"); } + //获取设备 + @PostMapping("/getDeviceListOption") + @Operation(summary = "获取设备清单下拉框") + public ActionResult getDeviceListOption() { + UserInfo userInfo = userProvider.get(); + Boolean isAdministrator = userInfo.getIsAdministrator(); + String organizeId = userInfo.getOrganizeId(); + QueryWrapper wrapper = new QueryWrapper<>(); + LambdaQueryWrapper lambda = wrapper.lambda(); + if(!isAdministrator){ + lambda.eq(RecycleDeviceEntity::getBeLongCompanyId,organizeId); + } + List list = recycleDeviceService.list(lambda); + return ActionResult.success(list); + } + }