|
@@ -9,15 +9,12 @@ import com.fjhx.iot.constants.RedisConstant;
|
|
|
import com.fjhx.iot.entity.tda.dto.EbcDto;
|
|
|
import com.fjhx.iot.entity.tda.dto.TdaDeviceDto;
|
|
|
import com.fjhx.iot.entity.tda.dto.TdaDeviceSelectDto;
|
|
|
-import com.fjhx.iot.entity.tda.po.TdaApplication;
|
|
|
import com.fjhx.iot.entity.tda.po.TdaDevice;
|
|
|
-import com.fjhx.iot.entity.tda.po.TdaProduct;
|
|
|
import com.fjhx.iot.entity.tda.vo.TdaDeviceVo;
|
|
|
import com.fjhx.iot.mapper.tda.TdaDeviceMapper;
|
|
|
import com.fjhx.iot.service.tda.TdaApplicationService;
|
|
|
import com.fjhx.iot.service.tda.TdaDeviceService;
|
|
|
import com.fjhx.iot.service.tda.TdaProductService;
|
|
|
-import com.fjhx.iot.utils.IoTDAUtil;
|
|
|
import com.ruoyi.common.core.redis.RedisCache;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import com.ruoyi.common.utils.wrapper.SqlField;
|
|
@@ -144,11 +141,11 @@ public class TdaDeviceServiceImpl extends ServiceImpl<TdaDeviceMapper, TdaDevice
|
|
|
@Override
|
|
|
public void delete(Long id) {
|
|
|
|
|
|
- TdaDevice tdaDevice = getById(id);
|
|
|
- TdaProduct tdaProduct = tdaProductService.getById(tdaDevice.getTdaProductId());
|
|
|
- TdaApplication tdaApplication = tdaApplicationService.getById(tdaProduct.getTdaApplicationId());
|
|
|
-
|
|
|
- IoTDAUtil.deleteDevice(tdaApplication.getTdaConfigId(), tdaDevice.getDeviceId());
|
|
|
+// TdaDevice tdaDevice = getById(id);
|
|
|
+// TdaProduct tdaProduct = tdaProductService.getById(tdaDevice.getTdaProductId());
|
|
|
+// TdaApplication tdaApplication = tdaApplicationService.getById(tdaProduct.getTdaApplicationId());
|
|
|
+//
|
|
|
+// IoTDAUtil.deleteDevice(tdaApplication.getTdaConfigId(), tdaDevice.getDeviceId());
|
|
|
|
|
|
this.removeById(id);
|
|
|
}
|