diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java index 966d171f0ada5b6fa784fa4fd943af5fd3680369..6de11be85da55ff2438cdb1abafd99e0a5e34878 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java @@ -110,7 +110,13 @@ public class ToolboxRestController { //List allList = cabinetManageService.getAllList(); Boolean aBoolean = kitReader.StartCheckAuto("0000", 6); //String str = NewKitReader.toolKitSdkMsg; - String str = "01;82,01,01,00,FC550001,01,1,4205,00,00100000,15,15,0,0,0,0,0"; + //String str = "01;82,01,01,00,FC550001,01,1,4205,00,00100000,15,15,0,0,0,0,0"; + String str = "06;82,01,01,00,FC550001,01,1,4205,00,00100000,15,15,0,0,0,0,0"; + //直接显示 + //String str = "D1;1,2,3,4;5,6"; + //String str = "D2;1,2,3,4;5,6"; + //蓝牙配对 + //String str = "D3;1,2,3,4;5,6;D5,D6"; String res = ""; Map map = new HashMap(); if (aBoolean){ @@ -148,11 +154,11 @@ public class ToolboxRestController { break; case "01": res = Parsing.parsingCode(newMsg.split(",")); - map.put("01",res); + map.put("D01",res); break; case "06": res = Parsing.parsingCode(newMsg.split(",")); - map.put("D6",res); + map.put("D06",res); break; } System.out.println("res = " + res);