From d8228730095cdcaccb40dd2dc290fc44779e340a Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期三, 13 十二月 2023 22:21:52 +0800
Subject: [PATCH] 滤芯寿命清单列表接口编写20231213wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
index 9140b65..c8513eb 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
@@ -1,16 +1,21 @@
package com.ruoyi.iot.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.iot.domain.Device;
+import com.ruoyi.iot.dto.DeviceFilterDto;
import com.ruoyi.iot.model.DeviceAllShortOutput;
import com.ruoyi.iot.model.DeviceRelateUserInput;
import com.ruoyi.iot.model.DeviceShortOutput;
+import com.ruoyi.iot.model.ThingsModels.ThingsModelValueItem;
import com.ruoyi.iot.mqtt.EmqxService;
import com.ruoyi.iot.service.IDeviceService;
import com.ruoyi.system.service.ISysUserService;
@@ -77,6 +82,46 @@
}
}
+ /**
+ * 鏌ヨ婊よ姱瀵垮懡娓呭崟鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('iot:device:list')")
+ @GetMapping("/cartridgeList")
+ @ApiOperation("婊よ姱瀵垮懡娓呭崟鍒楄〃")
+ public TableDataInfo selectCartridgeLifeList(Device device) throws Exception {
+ //鎶奷evice琛ㄤ腑姣忎竴鏉℃暟鎹殑things_model_value鐗╂ā鍨嬪�糺son瑙ｆ瀽涓篢hingsModelValueItem瀵硅薄
+ List<DeviceFilterDto> list = new ArrayList<>();
+ Long deviceId = 0L;
+ ThingsModelValueItem thingsModelValueItem = null;
+ //鏌ヨ鎵�鏈夌殑璁惧
+ List<Device> deviceList = deviceService.selectDeviceAll();
+ for (Device devices : deviceList) {
+ //鎷垮埌鐗╂ā鍨嬪��
+ String thingsModelValue = devices.getThingsModelValue();
+ deviceId = devices.getDeviceId();
+ if (thingsModelValue != null) {
+ //JSONObject.parseObject鏂规硶鐢ㄤ簬灏嗕竴涓狫SON瀛楃涓茶В鏋愪负涓�涓狫SONObject瀵硅薄
+ JSONObject jsonObject = JSONObject.parseObject(thingsModelValue);
+ //toJavaObject鏂规硶鏄敤浜庡皢JSON瀛楃涓茶浆鎹负Java瀵硅薄鐨勯潤鎬佹柟娉曘�傝繖涓柟娉曞彲浠ュ皢JSON鏍煎紡鐨勫瓧绗︿覆杞崲涓哄搴旂殑Java瀵硅薄銆�
+ thingsModelValueItem = jsonObject.toJavaObject(ThingsModelValueItem.class);
+ //鎷垮埌鐗╂ā鍨嬬殑id鈥斺�擣ilterA
+ String thingsModelId = thingsModelValueItem.getId();
+ //鎷垮埌鐗╂ā鍨媔d鏄疐ilterA鐨勫��
+ int thingsModelValues = Integer.parseInt(thingsModelValueItem.getValue());
+ if ("FilterA".equals(thingsModelId) && thingsModelValues <= 5 || "FilterB".equals(thingsModelId) && thingsModelValues <= 5 || "FilterC".equals(thingsModelId) && thingsModelValues <= 5 || "FilterD".equals(thingsModelId) && thingsModelValues <= 5) {
+ //鏍规嵁婊よ姱瀵垮懡A灏忎簬绛変簬5鐨勮澶噄d鍘绘煡璇㈣澶囦俊鎭�
+ Device deviceA = deviceService.selectDeviceByDeviceId(deviceId);
+ DeviceFilterDto deviceFilterDto = new DeviceFilterDto(deviceA.getDeviceId(), deviceA.getDeviceName(), deviceA.getDeviceOrder().getUserName(), deviceA.getDeviceOrder().getUserPhone(), thingsModelValues, null, null, null);
+ list.add(deviceFilterDto);
+ break;
+ }
+ } else {
+ return null;
+ }
+ }
+ startPage();
+ return getDataTable(list);
+ }
/**
* 鏌ヨ鏈垎閰嶆巿鏉冪爜璁惧鍒楄〃
--
Gitblit v1.8.0