|
@@ -2,6 +2,7 @@ package com.huimv.eartag.service.impl;
|
|
|
|
|
|
import com.huimv.eartag.service.IClientDataPacketService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
/**
|
|
@@ -15,120 +16,49 @@ import org.springframework.stereotype.Service;
|
|
|
@Service
|
|
|
@Slf4j
|
|
|
public class ClientDataPacketServiceImpl implements IClientDataPacketService {
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ReceivePackageSerivce receivePackageSerivce;
|
|
|
+ @Autowired
|
|
|
+ private SendPackageService sendPackageService;
|
|
|
+
|
|
|
@Override
|
|
|
public String parseClientSendPacket(String clientMessageTxt) {
|
|
|
- if(clientMessageTxt == null || clientMessageTxt.isEmpty()){
|
|
|
+ if (clientMessageTxt == null || clientMessageTxt.isEmpty()) {
|
|
|
|
|
|
}
|
|
|
String matcher = "[+]";
|
|
|
// String matcher = "\\+";
|
|
|
- String[] clientMessageArray = clientMessageTxt.split(matcher);
|
|
|
+ String[] clientMessageArray = clientMessageTxt.split(matcher);
|
|
|
String cmd = clientMessageArray[2];
|
|
|
- System.out.println("cmd>>"+cmd);
|
|
|
- log.info("命令>>"+cmd);
|
|
|
+ System.out.println("cmd>>" + cmd);
|
|
|
+ log.info("命令>>" + cmd);
|
|
|
StringBuilder echoResultSb = new StringBuilder();
|
|
|
// 校验后边再做;
|
|
|
- if(Integer.parseInt(cmd) == 1){
|
|
|
+ if (Integer.parseInt(cmd) == 1) {
|
|
|
// 绑定序列号返回的设备id
|
|
|
// echoResultSb.append("hm").append("+");
|
|
|
// return "hm+1+0+设备id+000+8+end";
|
|
|
- return _handleGetDeviceId(clientMessageArray);
|
|
|
- }else if(Integer.parseInt(cmd) == 2){
|
|
|
+ return sendPackageService.getDeviceId(clientMessageArray);
|
|
|
+ } else if (Integer.parseInt(cmd) == 2) {
|
|
|
// 处理获取服务器时间
|
|
|
- return _handleGetServerDateTime(clientMessageArray);
|
|
|
- }else if(Integer.parseInt(cmd) == 3){
|
|
|
+ return sendPackageService.getServerDateTime(clientMessageArray);
|
|
|
+ } else if (Integer.parseInt(cmd) == 3) {
|
|
|
// 处理心跳包
|
|
|
- return _handleGetHeartbeatBag(clientMessageArray);
|
|
|
- }else if(Integer.parseInt(cmd) == 4){
|
|
|
+ return sendPackageService.getHeartbeatBag(clientMessageArray);
|
|
|
+ } else if (Integer.parseInt(cmd) == 4) {
|
|
|
// 处理温度上传
|
|
|
- return _handleEartagTemperature(clientMessageArray);
|
|
|
- }else if(Integer.parseInt(cmd) == 5){
|
|
|
+ return receivePackageSerivce.handleEartagTemperature(clientMessageArray);
|
|
|
+ } else if (Integer.parseInt(cmd) == 5) {
|
|
|
// 处理湿度上传
|
|
|
- return _handleEartagDampness(clientMessageArray);
|
|
|
- }else if(Integer.parseInt(cmd) == 6){
|
|
|
+ return receivePackageSerivce.handleEartagDampness(clientMessageArray);
|
|
|
+ } else if (Integer.parseInt(cmd) == 6) {
|
|
|
// 处理耳标数据
|
|
|
- return _handleEartagData(clientMessageArray);
|
|
|
- }else{
|
|
|
- log.error("出错:当前命令cmd>>["+cmd+"]未做任何处理.");
|
|
|
+ return receivePackageSerivce.handleEartagData(clientMessageArray);
|
|
|
+ } else {
|
|
|
+ log.error("出错:当前命令cmd>>[" + cmd + "]未做任何处理.");
|
|
|
+ return null;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- private String _handleEartagData(String[] clientMessageArray) {
|
|
|
-
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * @Method : _handleEartagDampness
|
|
|
- * @Description :
|
|
|
- * @Params : [clientMessageArray]
|
|
|
- * @Return : java.lang.String
|
|
|
- *
|
|
|
- * @Author : ZhuoNing
|
|
|
- * @Date : 2021/1/15
|
|
|
- * @Time : 17:47
|
|
|
- */
|
|
|
- private String _handleEartagDampness(String[] clientMessageArray) {
|
|
|
- return null;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * @Method : _handleEartagTemperature
|
|
|
- * @Description : 处理耳标温度
|
|
|
- * @Params : [clientMessageArray]
|
|
|
- * @Return : java.lang.String
|
|
|
- *
|
|
|
- * @Author : ZhuoNing
|
|
|
- * @Date : 2021/1/15
|
|
|
- * @Time : 17:46
|
|
|
- */
|
|
|
- private String _handleEartagTemperature(String[] clientMessageArray) {
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * @Method : _handleGetDeviceId
|
|
|
- * @Description : 获取设备id
|
|
|
- * @Params : [clientMessageArray]
|
|
|
- * @Return : java.lang.String
|
|
|
- *
|
|
|
- * @Author : ZhuoNing
|
|
|
- * @Date : 2021/1/15
|
|
|
- * @Time : 17:41
|
|
|
- */
|
|
|
- private String _handleGetDeviceId(String[] clientMessageArray) {
|
|
|
-
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * @Method : _handleGetHeartbeatBag
|
|
|
- * @Description :
|
|
|
- * @Params : [clientMessageArray]
|
|
|
- * @Return : java.lang.String
|
|
|
- *
|
|
|
- * @Author : ZhuoNing
|
|
|
- * @Date : 2021/1/15
|
|
|
- * @Time : 17:38
|
|
|
- */
|
|
|
- private String _handleGetHeartbeatBag(String[] clientMessageArray) {
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * @Method : _handleGetServerDateTime
|
|
|
- * @Description :
|
|
|
- * @Params : [clientMessageArray]
|
|
|
- * @Return : java.lang.String
|
|
|
- *
|
|
|
- * @Author : ZhuoNing
|
|
|
- * @Date : 2021/1/15
|
|
|
- * @Time : 17:38
|
|
|
- */
|
|
|
- private String _handleGetServerDateTime(String[] clientMessageArray) {
|
|
|
- return null;
|
|
|
- }
|
|
|
}
|