|
|
|
@ -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<RecycleDeviceEntity> wrapper = new QueryWrapper<>();
|
|
|
|
|
LambdaQueryWrapper<RecycleDeviceEntity> lambda = wrapper.lambda();
|
|
|
|
|
if(!isAdministrator){
|
|
|
|
|
lambda.eq(RecycleDeviceEntity::getBeLongCompanyId,organizeId);
|
|
|
|
|
}
|
|
|
|
|
List<RecycleDeviceEntity> list = recycleDeviceService.list(lambda);
|
|
|
|
|
return ActionResult.success(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|