From d1e65a28fc73b543b8f34fe118712573682ff2fc Mon Sep 17 00:00:00 2001 From: vince <757871790@qq.com> Date: 星期三, 17 一月 2024 02:54:28 +0800 Subject: [PATCH] 优化吴家协议 --- src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 255 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 228 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java index 4cca0c6..b21e3ff 100644 --- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java +++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java @@ -1,59 +1,93 @@ package com.fzzy.gateway.hx2023.service; import com.alibaba.fastjson2.JSONObject; -import com.fzzy.api.data.GatewayProtocol; import com.fzzy.api.data.PushProtocol; -import com.fzzy.gateway.api.DeviceReportService; +import com.fzzy.async.fzzy40.entity.Fz40Grain; +import com.fzzy.data.ConfigData; +import com.fzzy.gateway.api.GatewayDeviceReportService; +import com.fzzy.gateway.data.BaseReqData; +import com.fzzy.gateway.data.BaseResp; import com.fzzy.gateway.entity.GatewayDevice; import com.fzzy.gateway.hx2023.ScConstant; -import com.fzzy.gateway.hx2023.data.WebSocketPacket; -import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader; -import com.fzzy.gateway.hx2023.data.WeightInfo; -import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport; +import com.fzzy.gateway.hx2023.data.*; +import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService; +import com.fzzy.mqtt.MqttGatewayService; +import jdk.nashorn.internal.runtime.regexp.joni.Config; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.DateFormatUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Slf4j @Component -public class DeviceReportServiceImpl implements DeviceReportService { - +public class DeviceReportServiceImpl implements GatewayDeviceReportService { @Resource - private WebSocketDeviceReport webSocketDeviceReport; + private KafkaDeviceReportService kafkaDeviceReportService; + @Resource + private MqttGatewayService publishService; + @Resource + private ConfigData configData; @Override - public String getProvinceProtocol() { + public String getProtocol() { return PushProtocol.GATEWAY_SC_2023.getCode(); } @Override - public String report2GatewayBySn(double weigh, GatewayDevice device) { + public BaseResp reportGrainData(BaseReqData reqData) { - if (null == device) { - log.error("-----------娌℃湁鑾峰彇鍒拌澶囬厤缃俊鎭�-----"); - return "ERROR:娌℃湁鑾峰彇鍒拌澶囬厤缃俊鎭�"; + String topic = ScConstant.TOPIC_REPORT; + topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId()); + + //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ�� + if (configData.getActive().indexOf("dev") >= 0) { + + log.info("----------------------------鎺ㄩ�丮QTT绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------"); + log.info("-----TOPIC-----{}", topic); + log.info("-----Message-----{}", reqData.getData()); + + return new BaseResp(); } - //浣跨敤WEBSOCKET杩斿洖 - if (GatewayProtocol.GATE_WEBSOCKET.equals(device.getPushProtocol())) { + publishService.publishMqttWithTopic(reqData.getData(), topic); + + log.info("----------------------------鎺ㄩ�丮QTT绮儏淇℃伅---------------------------"); + log.info("-----TOPIC-----{}", topic); + log.info("-----Message-----{}", reqData.getData()); + + return new BaseResp(); + } + + @Override + public BaseResp reportWeightData(BaseReqData reqData) { + + String topic = ScConstant.TOPIC_MESSAGE_REPORT; + + topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId()); + + if (null == reqData.getData()) { + GatewayDevice device = reqData.getDevice(); WebSocketPacket packet = new WebSocketPacket(); - //productId鐨勫�煎湪webSocket鎵ц鍙戦�佹柟娉曚腑琛ュ厖 WebSocketPacketHeader header = new WebSocketPacketHeader(); header.setDeviceName(device.getDeviceName()); + header.setProductId(device.getProductId()); packet.setHeaders(header); packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY); packet.setDeviceId(device.getDeviceId()); //璁剧疆淇℃伅涓讳綋 WeightInfo weightInfo = new WeightInfo(); - weightInfo.setGrossWeight(weigh); - weightInfo.setNetWeight(weigh); - weightInfo.setNetWeight(weigh); - + weightInfo.setGrossWeight(reqData.getWeight()); + weightInfo.setNetWeight(reqData.getWeight()); + weightInfo.setNetWeight(reqData.getWeight()); + weightInfo.setWeightUnit("KG"); JSONObject jsonObject = new JSONObject(); jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo)); @@ -61,14 +95,181 @@ packet.setTimestamp(System.currentTimeMillis()); - - webSocketDeviceReport.sendByPacket(packet); + reqData.setData(JSONObject.toJSONString(packet)); } - if (GatewayProtocol.GATE_MQTT.equals(device.getPushProtocol())) { - //TODO ---->>>鍚庢湡娣诲姞鏀寔 - } + publishService.publishMqttWithTopic(reqData.getData(), topic); - return null; + log.info("----------------------------鎺ㄩ�丮QTT鍦扮淇℃伅---------------------------"); + log.info("-----TOPIC-----{}", topic); + log.info("-----Message-----{}", reqData.getData()); + return new BaseResp(); } + + @Override + public BaseResp reportLprData(BaseReqData reqData) { + String topic = ScConstant.TOPIC_MESSAGE_REPORT; + topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId()); + + GatewayDevice device = reqData.getDevice(); + + if (StringUtils.isEmpty(reqData.getData())) { + WebSocketPacket packet = new WebSocketPacket(); + WebSocketPacketHeader header = new WebSocketPacketHeader(); + header.setDeviceName(reqData.getDeviceName()); + header.setProductId(reqData.getProductId()); + + packet.setHeaders(header); + packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY); + packet.setDeviceId(reqData.getDeviceId()); + packet.setMessageId(System.currentTimeMillis() + ""); + //璁剧疆淇℃伅涓讳綋 + LprData lpr = new LprData(); + lpr.setDeviceId(reqData.getDeviceId()); + lpr.setCarNumber(reqData.getCarNumber()); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("carNumber", reqData.getCarNumber()); + jsonObject.put("position", device.getPosition()); + packet.setProperties(jsonObject); + packet.setTimestamp(System.currentTimeMillis()); + + reqData.setData(JSONObject.toJSONString(packet)); + } + + publishService.publishMqttWithTopic(reqData.getData(), topic); + + log.info("----------------------------鎺ㄩ�丮QTT杞︾墝璇嗗埆淇℃伅---------------------------"); + log.info("-----TOPIC-----{}", topic); + log.info("-----Message-----{}", reqData.getData()); + return new BaseResp(); + } + + @Override + public BaseResp reportGrainDataByHand(BaseReqData reqData) { + String topic = ScConstant.TOPIC_ZLJ_GRAIN_TEMPERATURE; + + //濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ�� + if (configData.getActive().indexOf("dev") >= 0) { + + log.info("----------------------------鎺ㄩ�並AFKA绮儏淇℃伅锛屾敞锛氳皟璇曟ā寮忎笉鎺ㄩ��---------------------------"); + log.info("-----TOPIC-----{}", topic); + log.info("-----Message-----{}", reqData.getData()); + + return new BaseResp(); + } + + kafkaDeviceReportService.publishWithTopic(reqData.getData(), topic); + return new BaseResp(); + } + + @Override + public BaseResp grainData2GatewayApiInfo(Fz40Grain grainData, GatewayDevice device) { + + BaseResp resp = new BaseResp(); + + KafaGrainData result = new KafaGrainData(); + + result.setMessageId(ScConstant.getMessageId()); + result.setMessgeId(result.getMessageId()); + result.setDeviceID(device.getDeviceId()); + result.setAvgTemperature(grainData.getTempAve() + ""); + result.setMinTemperature(grainData.getTempMin() + ""); + result.setMaxTemperature(grainData.getTempMax() + ""); + result.setCollectTime(DateFormatUtils.format(grainData.getReceiveDate(), "yyyy-MM-dd HH:mm:ss")); + + //灞�-琛�-鍒� + String[] attrCable = grainData.getCable().split("-"); + if (StringUtils.isNotEmpty(grainData.getCableCir())) { + return grainData2GatewayApiInfo2(grainData, device); + } + + //灞傝鍒� + int cableZ = Integer.valueOf(attrCable[0]); + int cableY = Integer.valueOf(attrCable[1]); + int cableX = Integer.valueOf(attrCable[2]); + + //娓╁害闆嗗悎 + String[] attr = grainData.getPoints().split(","); + + //鏍瑰彿 + int cableNum = 1, position = 0; + String curTemp; + List<KafkaGrainDataDetail1> temperature = new ArrayList<>(); + + int x = 0, y = 0, z = 0; + for (int i = 0; i < attr.length; i++) { + position = i; + z = i % cableZ + 1; + x = i / (cableZ * cableY); + y = x * (cableZ * cableY); + y = (i - y) / cableZ; + // 鍊掕浆X杞� + x = cableX - 1 - x; + //鏍瑰彿 + cableNum = (i / cableZ) + 1; + curTemp = attr[i]; + + + //濡傛灉鏄紓甯稿��,鎵ц璋冩暣鏁版嵁 TODO + if (Double.valueOf(curTemp) < -99.9) { + + curTemp = grainData.getTempAve() + ""; + + } else { + //鍒ゆ柇鏈�澶� + if (curTemp.equals(result.getMaxTemperature())) { + result.setMaxX(x + ""); + result.setMaxY(y + ""); + result.setMaxZ(position + ""); + } + //鍒ゆ柇鏈�灏� + if (curTemp.equals(result.getMinTemperature())) { + result.setMinX(x + ""); + result.setMinY(y + ""); + result.setMinZ(position + ""); + } + } + + temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + "")); + } + + //绮俯淇℃伅 + JSONObject trhInfo = new JSONObject(); + // TRHInfo trhInfo = new TRHInfo(); + trhInfo.put("temperature", temperature); + + + //浠撴俯搴︿俊鎭� + KafkaGrainTH grainTH = new KafkaGrainTH(); + grainTH.setHumidity(grainData.getHumidityIn() + ""); + grainTH.setTemperature(grainData.getTempIn() + ""); + grainTH.setAirHumidity(grainData.getHumidityOut() + ""); + grainTH.setAirTemperature(grainData.getTempOut() + ""); + + List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>(); + temperatureAndhumidity.add(grainTH); + + trhInfo.put("temperatureAndhumidity", temperatureAndhumidity); + //trhInfo.put("temperatureAndhumidity",grainTH); + + JSONObject params = new JSONObject(); + params.put("TRHInfo", trhInfo); + + result.setParams(params); + + + //resp.setObj(result); + + resp.setData(JSONObject.toJSONString(result)); + + return resp; + } + + private BaseResp grainData2GatewayApiInfo2(Fz40Grain grainData, GatewayDevice device) { + BaseResp resp = new BaseResp(); + resp.setCode(BaseResp.CODE_500); + resp.setMsg("绛掍粨瑙f瀽鏆傛湭瀹炵幇"); + return resp; + } + } -- Gitblit v1.9.3