~admin/igds-v4.git

ÎÄ¼þÃû´Ó igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java ÐÞ¸Ä
			@@ -1,4 +1,4 @@
			package com.ld.igds.protocol.beibo.grain.analysis;
			package com.ld.igds.protocol.beibo.grainv1.analysis;

			import com.ld.igds.common.CoreCommonService;
			import com.ld.igds.common.CoreSerService;
			@@ -15,9 +15,9 @@
			import com.ld.igds.models.Grain;
			import com.ld.igds.order.ExeOrderService;
			import com.ld.igds.order.data.ExeRequest;
			import com.ld.igds.protocol.beibo.grain.builder.ReMessage;
			import com.ld.igds.protocol.beibo.grain.builder.ReMessageBuilder;
			import com.ld.igds.protocol.beibo.grain.util.BeiboGrainServerUtils;
			import com.ld.igds.protocol.beibo.grainv1.builder.ReMessage;
			import com.ld.igds.protocol.beibo.grainv1.builder.ReMessageBuilder;
			import com.ld.igds.protocol.beibo.grainv1.util.BeiboGrainServerUtils;
			import com.ld.igds.util.BytesUtil;
			import com.ld.igds.util.ContextUtil;
			import com.ld.igds.warn.WarnUtils;
			@@ -25,7 +25,6 @@
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;

			import java.util.*;

			/**
			@@ -52,7 +51,6 @@
			@Autowired
			private ExeOrderService exeOrderService;


			public static Map<String, Map<String, String>> contextMap = new HashMap<>();

			public static double ERROR_CHECK_TAG = -100.0;
			@@ -67,17 +65,17 @@
			/**
			* 00000000FFEB90FEAA 41 E821EC21EA21EC21ED21EC21E921E221E921E921E921EC21E921ED21F021E521E521E221E421E321E321E121DE21D721E021DD21DC21DF21FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
			*
			* @param result
			* @param hexStr
			*/
			public void analysis(String result) {
			public void analysis(String ip, int port, String hexStr) {

			log.info("åæº------->>å¹³å°ï¼ä¿¡æ¯æ¥æ={}", result);
			ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(result);
			ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);

			log.info("åæº------->>å¹³å°ï¼ä¿¡æ¯æ¥æ={}", reMessage);

			if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
			log.error("åæº------->>å¹³å°ï¼è§£æç²®æå¤±è´¥ï¼æ¥æèµ·å§ç¬¦={}éè¯¯ï¼ä¸è§£æ", reMessage.getStartStr());
			}


			//æ ¹æ®åæºå°åè·ååæºä¿¡æ¯
			DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), reMessage.getSerId());