diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java index 6998b0a..0124ef0 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java @@ -1,7 +1,5 @@ package com.njcn.access.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.github.tocrhz.mqtt.publisher.MqttPublisher; import com.njcn.access.api.CsTopicFeignClient; @@ -10,13 +8,11 @@ import com.njcn.access.enums.TypeEnum; import com.njcn.access.pojo.dto.AskDataDto; import com.njcn.access.pojo.dto.ControlDto; import com.njcn.access.pojo.dto.ReqAndResDto; -import com.njcn.access.pojo.dto.file.FileRedisDto; import com.njcn.access.service.AskDeviceDataService; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.redis.pojo.enums.AppRedisKey; import com.njcn.redis.utils.RedisUtil; -import com.njcn.zlevent.pojo.dto.FileStreamDto; import lombok.RequiredArgsConstructor; import net.sf.json.JSONObject; import org.slf4j.Logger; @@ -96,21 +92,6 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService { } ReqAndResDto.Req reqAndResParam = getAllPojo(mid,name); publisher.send("/Pfm/DevFileCmd/V1/"+nDid,new Gson().toJson(reqAndResParam),1,false); -// //这里使用简单的轮询,但建议考虑更高效的机制 -// for (int i = 0; i < 60; i++) { -// Thread.sleep(5000); -// Object object3 = redisUtil.getObjectByKey(AppRedisKey.FILE_PART.concat(name)); -// FileStreamDto dto = JSON.parseObject(JSON.toJSONString(object3), FileStreamDto.class); -// if (dto.getList().size() == dto.getTotal()) { -// result = true; -// String json = "{fileName:"+name+",allStep:"+dto.getTotal()+",nowStep:"+ dto.getTotal() +"}"; -// publisher.send("/Web/Progress/" + nDid, new Gson().toJson(json), 1, false); -// break; -// } else { -// String json = "{fileName:"+name+",allStep:"+dto.getTotal()+",nowStep:"+ (CollectionUtil.isEmpty(dto.getList())?0:dto.getList().size())+"}"; -// publisher.send("/Web/Progress/" + nDid, new Gson().toJson(json), 1, false); -// } -// } mid = mid + 1; if (mid > 10000) { mid = 1;