From b1c572949997a5d82d9b609163ff280a1c49627d Mon Sep 17 00:00:00 2001 From: vince <757871790@qq.com> Date: 星期五, 26 四月 2024 14:09:45 +0800 Subject: [PATCH] 粮情协议优化 --- src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java b/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java index fd4ded3..c33df4c 100644 --- a/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java +++ b/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java @@ -1,13 +1,15 @@ package com.fzzy.gateway.api; +import com.fzzy.async.fzzy40.entity.Fz40Grain; import com.fzzy.gateway.data.BaseReqData; import com.fzzy.gateway.data.BaseResp; import com.fzzy.gateway.entity.GatewayDevice; +import com.fzzy.gateway.hx2023.data.GrainData; import com.fzzy.gateway.hx2023.data.KafaGrainData; /** - * 涓婃姤鎺ュ彛 + * 璁惧鏁版嵁涓婃姤 */ public interface GatewayDeviceReportService { @@ -18,25 +20,40 @@ */ String getProtocol(); - - /** - * 閫氳繃璁惧搴忓垪鍙疯繑鍥炵粨鏋滀俊鎭� - * - * @param weigh - * @param device 璁惧搴忓垪鍙� - */ - String report2GatewayBySn(double weigh, GatewayDevice device); - - /** * 鎺ㄩ�佺伯鎯呬俊鎭� + * * @param reqData */ BaseResp reportGrainData(BaseReqData reqData); + + + BaseResp reportGrainDataByKafka(BaseReqData reqData); BaseResp reportWeightData(BaseReqData reqData); BaseResp reportLprData(BaseReqData reqData); - BaseResp reportGrainDataByKafka(BaseReqData reqData); + BaseResp reportGrainDataByHand(BaseReqData reqData); + + + + /** + * 绮儏涓氬姟鏁版嵁杞崲涓猴紝褰撳墠缃戝叧闇�瑕佺殑鎶ユ枃 + * + * @param grainData 绗笁涓蒋浠剁伯鎯呮暟鎹姤鏂� + * @param gatewayDevice 缃戝叧涓澶囬厤缃俊鎭� + * @return + */ + BaseResp grainData2GatewayApiInfo(Fz40Grain grainData, GatewayDevice gatewayDevice); + + + /** + * 绮儏涓氬姟鏁版嵁杞崲涓猴紝褰撳墠缃戝叧闇�瑕佺殑鎶ユ枃 + * @param grainData 绗笁涓蒋浠剁伯鎯呮暟鎹姤鏂� + * @param gatewayDevice 缃戝叧涓澶囬厤缃俊鎭� + * @return + */ + + BaseResp grainData2GatewayApiInfoKafka(GrainData grainData, GatewayDevice device); } -- Gitblit v1.9.3