将错误码和应用错误码统一为A8kEcode

pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.iflytop</groupId>
             <artifactId>uf</artifactId>
-            <version>0.0.63</version>
+            <version>0.0.64</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>

src/main/java/a8k/a8k_can_protocol/A8kPacket.java

@@ -35,17 +35,15 @@ public class A8kPacket {
 	public static final int PACKET_TYPE_ERROR_ACK = 2;
 	public static final int PACKET_TYPE_EVENT     = 3;
 
-	public static final int CMD_OVERTIME = 300;
+	public static final int CMD_OVERTIME = 100;
 
 	public A8kPacket(byte[] cmd) {
 		raw = new byte[cmd.length];
 		System.arraycopy(cmd, 0, raw, 0, cmd.length);
 	}
-
 	public void setPacketIndex(int packetIndex) {
-		ByteArray.setU16bit(raw, 0, packetIndex);
+		ByteArray.setU16bit(raw,0,packetIndex);
 	}
-
 	public int getPacketIndex() {
 		return ByteArray.readU16bit(raw, 0);
 	}
@@ -84,23 +82,23 @@ public class A8kPacket {
 
 		if (packetType == PACKET_TYPE_CMD) {
 			if (cmdIdInfo.cmdAttachType == CmdIdInfo.ATTACH_IS_INT32) {
-				ret = String.format("[CMD  ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
+				ret = String.format("[CMD  ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
 			} else {
-				ret = String.format("[CMD  ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
+				ret = String.format("[CMD  ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
 			}
 		} else if (packetType == PACKET_TYPE_ACK) {
 			if (cmdIdInfo.receiptAttachType == CmdIdInfo.ATTACH_IS_INT32) {
-				ret = String.format("[ACK  ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
+				ret = String.format("[ACK  ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
 			} else {
-				ret = String.format("[ACK  ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
+				ret = String.format("[ACK  ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
 			}
 		} else if (packetType == PACKET_TYPE_ERROR_ACK) {
-			ret = String.format("[EACK ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), A8kEcode.toString(getContentI32(0)));
+			ret = String.format("[EACK ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), A8kEcode.toString(getContentI32(0)));
 		} else if (packetType == PACKET_TYPE_EVENT) {
 			if (cmdIdInfo.cmdAttachType == CmdIdInfo.ATTACH_IS_INT32) {
-				ret = String.format("[EVENT] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
+				ret = String.format("[EVENT] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
 			} else {
-				ret = String.format("[EVENT] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
+				ret = String.format("[EVENT] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
 			}
 		} else {
 			ret = String.format("Unknown packet type: %d", packetType);

src/main/java/a8k/controller/SamplesPreProcessModuleCtrlController.java

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Map;
 @Controller
@@ -20,7 +22,8 @@ public class SamplesPreProcessModuleCtrlController extends UfApiControllerBase {
 
 	@PostMapping("/api/sample-pre-process-module-ctrl/execute-service-method")
 	@ResponseBody
-	public UfApiResponse executeServiceMethod( @RequestBody Map<String,Object> params ) throws NoSuchMethodException {
+	public UfApiResponse executeServiceMethod( @RequestBody Map<String,Object> params )
+	throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Object service = this.samplesPreProcessModuleCtrlService;
 		String methodName = (String)params.get("method");
 		List<Object> methodArgs = (List<Object>)params.get("params");

src/main/java/a8k/controller/TmpTestController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +34,8 @@ public class TmpTestController {
 
 	@PostMapping("/api/tmp-test/execute-service-method")
 	@ResponseBody
-	public String executeServiceMethod(@RequestBody Map<String, Object> params) throws NoSuchMethodException {
+	public String executeServiceMethod(@RequestBody Map<String, Object> params)
+	throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		Object       service    = this.motorTubeRackMoveCtrlService;
 		String       methodName = (String) params.get("method");
 		List<Object> methodArgs = (List<Object>) params.get("params");