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

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotScreenController.java

@@ -323,4 +323,13 @@ public class IotScreenController extends BaseController {
         return AjaxResult.success(iIotScreenService.ybqEnvChartList(reqVo));
     }
 
+    /**
+     * 获取设备信息详细信息
+     */
+    @GetMapping(value = "/device/info/{devBid}")
+    public AjaxResult getInfo(@PathVariable("devBid") String devBid)
+    {
+        return success(iIotScreenService.devInfo(devBid));
+    }
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/resvo/IotHomeDeviceListResVo.java

@@ -49,4 +49,8 @@ public class IotHomeDeviceListResVo {
     private String devLatalign;
 
 
+    private String address;
+
+    private String devUpdateddate;
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/resvo/IotScreenDeviceListResVo.java

@@ -55,4 +55,9 @@ public class IotScreenDeviceListResVo {
     private String devtypePreview;
 
     private String devtypeMapicon;
+
+    private String address;
+
+    private String devUpdateddate;
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotScreenService.java

@@ -160,4 +160,11 @@ public interface IIotScreenService {
      * @return
      */
     public List<IotYbqEnvData> ybqEnvChartList(IotYbqdataReqVo reqVo);
+
+    /**
+     * 获取设备详情信息
+     * @param reqVo
+     * @return
+     */
+    public IotDeviceListResVo devInfo(String devBid);
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotHomeServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceGeoLocation;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
@@ -108,15 +109,29 @@ public class IotHomeServiceImpl implements IIotHomeService {
         List<IotHomeDeviceListResVo> dataList = mongoService.aggregate(IotDeviceGeoLocation.class, aggregation, IotHomeDeviceListResVo.class);
         List<IotHomeDeviceListResVo> resultList = new ArrayList<>();
         for(IotHomeDeviceListResVo item : dataList) {
-            IotDevice deviceInfo = deviceMap.get(item.getDevBid());
+            IotDeviceListResVo deviceInfo = deviceMap.get(item.getDevBid());
             if(deviceInfo == null){
                 continue;
             }
+            String address = "";
+            try{
+                address = deviceInfo.getDevProvince() + deviceInfo.getDevCity() + deviceInfo.getDevDistrict();
+            }catch (Exception e){
+            }
+            if(StringUtils.isEmpty(address)){
+                try{
+                    address = deviceInfo.getDevProvincealign() + deviceInfo.getDevCityalign() + deviceInfo.getDevDistrictalign();
+                }catch (Exception e){
+                }
+            }
+
+            item.setAddress(address);
             item.setDevStatus(deviceInfo.getDevStatus());
             item.setDevCode(deviceInfo.getDevCode());
             item.setDevName(deviceInfo.getDevName());
             item.setDevLngalign(BigDecimalUtil.toString(deviceInfo.getDevLngalign()));
             item.setDevLatalign(BigDecimalUtil.toString(deviceInfo.getDevLatalign()));
+            item.setDevUpdateddate(deviceInfo.getDevUpdateddate());
             resultList.add(item);
         }
         return resultList;

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotScreenServiceImpl.java

@@ -685,5 +685,22 @@ public class IotScreenServiceImpl implements IIotScreenService {
         return iotYbqEnvDataService.selectIotYbqEnvStatList(reqVo);
     }
 
+    /**
+     * 获取设备详情信息
+     *
+     * @param devBid@return
+     */
+    @Override
+    public IotDeviceListResVo devInfo(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(), "设备不存在");
+        }
+        return dataList.get(0);
+    }
+
 
 }