Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
xy
2024-10-23 18:43:54 +08:00
parent d090fd4fc0
commit b49b40aa8b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
View File

@@ -629,7 +629,7 @@ public class MqttMessageHandler {
log.info("装置收到系统上传的文件"); log.info("装置收到系统上传的文件");
FileRedisDto fileRedisDto = new FileRedisDto(); FileRedisDto fileRedisDto = new FileRedisDto();
fileRedisDto.setCode(fileDto.getCode()); fileRedisDto.setCode(fileDto.getCode());
redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD,fileRedisDto,10L); redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD.concat(nDid).concat(String.valueOf(fileDto.getMid())),fileRedisDto,10L);
redisUtil.saveByKeyWithExpire("uploading","uploading",20L); redisUtil.saveByKeyWithExpire("uploading","uploading",20L);
break; break;
case 4660: case 4660:

10
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -173,7 +173,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
length = length - cap; length = length - cap;
//判断是否重发 //判断是否重发
sendNextStep(logDto,path,file,bytes.length,lsBytes,(i-1)*cap,version,id,i,hexString,false); sendNextStep(logDto,path,file,bytes.length,lsBytes,(i-1)*cap,version,id,i,hexString,false);
FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.UPLOAD); FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(i)));
//重发之后判断继续循环还是跳出循环 //重发之后判断继续循环还是跳出循环
if (!Objects.isNull(fileRedisDto) && !Objects.equals(fileRedisDto.getCode(),200)) { if (!Objects.isNull(fileRedisDto) && !Objects.equals(fileRedisDto.getCode(),200)) {
redisUtil.delete("uploading"); redisUtil.delete("uploading");
@@ -246,20 +246,20 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
if (result) { if (result) {
Thread.sleep(10000); Thread.sleep(10000);
} else { } else {
Thread.sleep(2000); Thread.sleep(1000);
} }
FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.UPLOAD); FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(mid)));
if (Objects.isNull(fileRedisDto)) { if (Objects.isNull(fileRedisDto)) {
FileRedisDto fileRedis = new FileRedisDto(); FileRedisDto fileRedis = new FileRedisDto();
fileRedis.setCode(400); fileRedis.setCode(400);
redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD,fileRedis,10L); redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(mid)),fileRedis,10L);
} else { } else {
if (Objects.equals(fileRedisDto.getCode(),200)) { if (Objects.equals(fileRedisDto.getCode(),200)) {
break; break;
} else { } else {
FileRedisDto fileRedis = new FileRedisDto(); FileRedisDto fileRedis = new FileRedisDto();
fileRedis.setCode(400); fileRedis.setCode(400);
redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD,fileRedis,10L); redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(mid)),fileRedis,10L);
ReqAndResDto.Req req = getPojo(mid,path,file,length,bytes,offset,fileCheck); ReqAndResDto.Req req = getPojo(mid,path,file,length,bytes,offset,fileCheck);
publisher.send("/Pfm/DevFileCmd/" + version + "/" + id, new Gson().toJson(req), 1, false); publisher.send("/Pfm/DevFileCmd/" + version + "/" + id, new Gson().toJson(req), 1, false);
logDto.setOperate(id + "系统上送文件,装置响应失败，重新发送，这是第" + (i+1) + "次"); logDto.setOperate(id + "系统上送文件,装置响应失败，重新发送，这是第" + (i+1) + "次");