From 8ebcdd4e909f923aa751783d6a1a5f86a36e5e5a Mon Sep 17 00:00:00 2001 From: Hy Date: Tue, 8 Jun 2021 09:38:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/toolbox/rest/ToolboxRestController.java | 7 +++---- .../src/test/java/org/jeecg/Test.java | 2 ++ 2 files changed, 5 insertions(+), 4 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 6de11be..af4c85d 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,12 +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){ @@ -168,8 +168,7 @@ public class ToolboxRestController { /** * @description: 设置设备蓝牙名称 - * @param equipmentNum - * @param bluetoothName + * @param jsonObject * @return: java.lang.Boolean * @author huangyu * @date: 2021/6/7 16:14 diff --git a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/Test.java b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/Test.java index 4bd1d97..52b39f2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/Test.java +++ b/jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/Test.java @@ -35,6 +35,8 @@ public class Test { // System.out.println("D1 = " + indexD1 + "D2 = " + indexD2 + "D3 = " + indexD3 + "01 = " + index01 + "02 = " + index02); // String D1 = str.substring(indexD1,indexD2); // String D2 = str.substring(indexD2,indexD3); + + // String D3 = str.substring(indexD3,index01); // String msg01 = str.substring(index01,index02); // String msg02 = str.substring(index02); -- Gitee