新增 杀虫灯获取设备详情信息接口

src/main/java/com/yunfeiyun/agmp/iotm/device/bzy/controller/IotDeviceBzyController.java

@@ -100,6 +100,24 @@ public class IotDeviceBzyController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取设备信息详细信息
+     */
+    @GetMapping(value = "/info/{devBid}")
+    public AjaxResult getInfo(@PathVariable("devBid") String devBid)
+    {
+        IotDeviceListReqVo reqVo = new IotDeviceListReqVo();
+        reqVo.setDevBid(devBid);
+
+        List<IotDeviceListResVo> dataList = iIotDeviceService.selectIotDeviceListByType(reqVo);
+        if(dataList.isEmpty()){
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
+        }
+        dataList = iIotBzyService.setImgCount(dataList);
+        IotDeviceListResVo devInfo = dataList.get(0);
+        return success(devInfo);
+    }
+
     @GetMapping("/data/list")
     public TableDataInfo dataList(IotBzydataReqVo reqVo) {
         Map<String, Object> map = BeanUtil.beanToMap(reqVo);

src/main/java/com/yunfeiyun/agmp/iotm/device/scd/controller/IotDeviceScdController.java

@@ -115,6 +115,35 @@ public class IotDeviceScdController extends BaseController {
     }
 
     /**
+     * 获取设备信息详细信息
+     */
+    @GetMapping(value = "/info/{devBid}")
+    public AjaxResult getInfo(@PathVariable("devBid") String devBid)
+    {
+        IotDeviceListReqVo reqVo = new IotDeviceListReqVo();
+        reqVo.setDevBid(devBid);
+
+        List<IotDeviceListResVo> dataList = iIotDeviceService.selectIotDeviceListByType(reqVo);
+        if(dataList.isEmpty()){
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
+        }
+        IotDeviceListResVo devInfo = dataList.get(0);
+        IotYfScdDataVo iotYfScdDataVo = new IotYfScdDataVo();
+        IotDeviceconfig deviceconfig = iIotDeviceconfigService.selectIotDeviceConfigByDevBid(devBid);
+        if(deviceconfig != null) {
+            JSONObject devConfig = JSONObject.parseObject(deviceconfig.getDevcfgContext());
+            iotYfScdDataVo.setTimingTime(devConfig.getString("tt"));
+            iotYfScdDataVo.setClearTime(devConfig.getString("clt_t"));
+            iotYfScdDataVo.setTimingMode(devConfig.getString("ts"));
+            iotYfScdDataVo.setStartHour(devConfig.getString("st"));
+            iotYfScdDataVo.setEndHour(devConfig.getString("et"));
+            iotYfScdDataVo.setIntervalTime(devConfig.getString("dat_f"));
+        }
+        devInfo.setIotYfScdDataVo(iotYfScdDataVo);
+        return success(devInfo);
+    }
+
+    /**
      * 数据列表
      * @param reqVo
      * @return

src/main/java/com/yunfeiyun/agmp/iotm/device/ybq/controller/IotYbqController.java

@@ -5,15 +5,12 @@ import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.core.page.TableSupport;
-import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
-import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqEnvData;
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqPredictData;
-import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotYbqdataReqVo;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
@@ -30,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -64,6 +60,23 @@ public class IotYbqController extends BaseController {
     }
 
     /**
+     * 获取设备详情信息
+     *
+     * @param reqVo
+     * @return
+     */
+    @GetMapping("/device/info/{devBid}")
+    public AjaxResult getDeviceInfo(@PathVariable("devBid") String devBid) {
+        IotDeviceListReqVo reqVo = new IotDeviceListReqVo();
+        reqVo.setDevBid(devBid);
+        List<IotDeviceListResVo> iotDeviceListResVoList = iIotDeviceService.selectIotDeviceListByType(reqVo);
+        if(iotDeviceListResVoList.isEmpty()) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
+        }
+        return success(iotDeviceListResVoList.get(0));
+    }
+
+    /**
      * 小麦赤霉病
      *
      * @param reqVo