|
|
@@ -14,7 +14,7 @@ import com.yunfeiyun.agmp.iot.common.domain.*;
|
|
|
import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
|
|
|
import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
|
|
|
import com.yunfeiyun.agmp.iot.common.service.MongoService;
|
|
|
-import com.yunfeiyun.agmp.iot.common.util.dev.QxzTypeUtil;
|
|
|
+import com.yunfeiyun.agmp.iot.common.util.dev.DevTypeUtil;
|
|
|
import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
|
|
|
import com.yunfeiyun.agmp.iots.device.domain.WarnTestReq;
|
|
|
import com.yunfeiyun.agmp.iots.device.mapper.IotDeviceMapper;
|
|
|
@@ -632,7 +632,7 @@ public class TestController {
|
|
|
throw new IotBizException(IotErrorCode.FAILURE.getCode(), "设备不存在");
|
|
|
}
|
|
|
String devtypeBid = iotDevice.getDevtypeBid();
|
|
|
- if (QxzTypeUtil.isYfCommQxz(devtypeBid)) {
|
|
|
+ if (DevTypeUtil.isYfCommQxz(devtypeBid)) {
|
|
|
YfQxzDeviceImpl yfQxzDevice = (YfQxzDeviceImpl) iYfQxzDevice;
|
|
|
String devUpdateddate = DateUtils.dateTimeNow();
|
|
|
yfQxzDevice.processData(iotDevice, data, devUpdateddate);
|
|
|
@@ -644,9 +644,9 @@ public class TestController {
|
|
|
|
|
|
public Class getTableClass(String devtypeBid) {
|
|
|
Class tableClass = null;
|
|
|
- if (QxzTypeUtil.isXphYfQxSq(devtypeBid)) {
|
|
|
+ if (DevTypeUtil.isXphYfQxSq(devtypeBid)) {
|
|
|
tableClass = IotXphYfqxzdata.class;
|
|
|
- } else if (QxzTypeUtil.isYfQxSq(devtypeBid)) {
|
|
|
+ } else if (DevTypeUtil.isYfQxSq(devtypeBid)) {
|
|
|
tableClass = IotYfqxzdata.class;
|
|
|
}
|
|
|
// else if (devtypeBid.equals(IotDeviceDictConst.TYPE_ADZN_GSSQ)) {
|
|
|
@@ -682,7 +682,7 @@ public class TestController {
|
|
|
|
|
|
String devtypeBid = iotDevice.getDevtypeBid();
|
|
|
String devBid = iotDevice.getDevBid();
|
|
|
- if (QxzTypeUtil.isYfCommQxz(devtypeBid)) {
|
|
|
+ if (DevTypeUtil.isYfCommQxz(devtypeBid)) {
|
|
|
Class tableClass = getTableClass(devtypeBid);
|
|
|
if (tableClass == null) {
|
|
|
throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "设备类型不存在");
|
