Просмотр исходного кода

新增 一张图智慧物联 获取测报灯列表接口

zhaiyifei 8 месяцев назад
Родитель
Сommit
fe432e16ee

+ 2 - 4
src/main/java/com/yunfeiyun/agmp/iotm/device/pest/controller/IotDeviceCbdController.java

@@ -17,6 +17,7 @@ import com.yunfeiyun.agmp.iot.common.enums.EnumDevRecogType;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.util.dev.DevOperateUtil;
+import com.yunfeiyun.agmp.iot.common.util.dev.DevTypeUtil;
 import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
@@ -105,10 +106,7 @@ public class IotDeviceCbdController extends BaseController {
     public TableDataInfo list(HttpServletRequest request, IotDeviceListReqVo reqVo) {
         String reqUri = request.getRequestURI();
         log.info("【{}】【测报灯】【列表】客户id {}", LogCore.getSeq(), getCustomerId());
-        String[] devTypeList = new String[]{
-                IotDeviceDictConst.TYPE_YF_GKCBD, IotDeviceDictConst.TYPE_YF_SDCBD, IotDeviceDictConst.TYPE_YF_CBD,
-                IotDeviceDictConst.TYPE_YF_XCT
-        };
+        String[] devTypeList = DevTypeUtil.getAllCbdypes();
         if(reqUri.endsWith("/gk/list")){
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_GKCBD};
         }else if(reqUri.endsWith("/sd/list")){

+ 9 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotScreenController.java

@@ -136,4 +136,13 @@ public class IotScreenController extends BaseController {
         return getDataTable(iIotScreenService.warnList(iotWarnlog));
     }
 
+    /**
+     * 获取测报灯设备列表接口
+     */
+    @GetMapping("/device/cbd/list")
+    public TableDataInfo cbdList(IotDeviceListReqVo reqVo) {
+        startPage();
+        return getDataTable(iIotScreenService.cbdList(reqVo));
+    }
+
 }

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotScreenService.java

@@ -30,4 +30,6 @@ public interface IIotScreenService {
     public IotDevicelasteddata qxszDataLatest(String devBid);
 
     public List<IotWarnlogResVo> warnList(IotWarnlogReqVo iotWarnlog);
+
+    public List<IotDeviceListResVo> cbdList(IotDeviceListReqVo reqVo);
 }

+ 7 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotScreenServiceImpl.java

@@ -152,4 +152,11 @@ public class IotScreenServiceImpl implements IIotScreenService {
         return iIotWarnlogService.selectIotWarnlogResVoList(iotWarnlog);
     }
 
+    @Override
+    public List<IotDeviceListResVo> cbdList(IotDeviceListReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
+        reqVo.setDevtypeBidList(Arrays.asList(DevTypeUtil.getAllCbdypes()));
+        return iIotDeviceService.selectIotDeviceListByType(reqVo);
+    }
+
 }