From 3282df03d374bdaa7e2ae18ab7175f30501f44ab Mon Sep 17 00:00:00 2001 From: xiongml Date: Mon, 7 Jun 2021 17:06:36 +0800 Subject: [PATCH 1/2] 'edit' --- .../demo/toolbox/rest/ToolboxRestController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 c552465..3146fe1 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 @@ -108,7 +108,11 @@ 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){ @@ -146,11 +150,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); -- Gitee From 5e7c3787e41324c1e737c499465dd9adab9ca759 Mon Sep 17 00:00:00 2001 From: xiongml Date: Tue, 8 Jun 2021 08:59:56 +0800 Subject: [PATCH 2/2] 'edit' --- .../modules/demo/toolbox/rest/ToolboxRestController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 1ce98b1..6de11be 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 @@ -111,10 +111,12 @@ public class ToolboxRestController { 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 = "06;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 str = "D3;1,2,3,4;5,6;D5,D6"; String res = ""; Map map = new HashMap(); if (aBoolean){ -- Gitee