|
|
@@ -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")){
|