From 4676c3c00f3e56ed65c149f4dd2c2697e0f1890c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 07 十月 2023 09:58:23 +0800
Subject: [PATCH] 优化温湿度数据同步
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index c065fac..d5b1b13 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -8,14 +8,11 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
-import com.fzzy.api.utils.AESUtils;
-import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.MyMD5Util;
-import com.fzzy.api.utils.RedisUtil;
+import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.push.whhpjl.dto.WhjlReqDto;
import com.fzzy.push.whhpjl.dto.WhjlRespDto;
-import com.fzzy.whjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -88,12 +85,24 @@
apiLogRep.save(apiLog);
return responseDto;
}
+
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String)redisUtil.get(key);
+ if(StringUtils.isEmpty(orderId)){
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
WhjlReqDto reqData = new WhjlReqDto();
reqData.setId(ContextUtil.getUUID());
reqData.setUid(conf.getKqdm());
- //TODO 鎸囦护id寰呯‘璁�
- reqData.setOrderid("");
+ //鎸囦护ID
+ reqData.setOrderid(orderId);
reqData.setAppcode(conf.getUserName());
reqData.setTimestamp(ContextUtil.getCurTimeMillis());
List<Object> list = (List<Object>)data;
--
Gitblit v1.9.3