diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FaceManage.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FaceManage.java index 51027d0..a6040e3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FaceManage.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FaceManage.java @@ -408,6 +408,13 @@ public final class FaceManage { Map parameter = new HashMap<>(); parameter.put("employeeNo", employeeNo); // 员工ID号 String strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchFaceInfoParam.json", parameter); + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++++++"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchFaceInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux----------------------"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/acs/SearchFaceInfoParam.json", parameter); + } //把string传递到Byte数组中,后续用.getPointer()方法传入指针地址中。 HCNetSDK.BYTE_ARRAY ptrInbuff = new HCNetSDK.BYTE_ARRAY(strInbuff.length()); System.arraycopy(strInbuff.getBytes(), 0, ptrInbuff.byValue, 0, strInbuff.length()); @@ -518,6 +525,13 @@ public final class FaceManage { Map parameter = new HashMap<>(); parameter.put("employeeNo", employeeNo); // 员工ID号 String strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchFaceInfoParam.json", parameter); + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++++++"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchFaceInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux----------------------"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/acs/SearchFaceInfoParam.json", parameter); + } //批量查询人脸图片json报文 /* String input = "{\n" + " \"searchResultPosition\":0,\n" + @@ -615,6 +629,13 @@ public final class FaceManage { Map parameter = new HashMap<>(); parameter.put("employeeNo", employeeNo); // 员工ID号 String deleteFaceJson = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/DeleteFaceInfoParam.json", parameter); + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++++++"); + deleteFaceJson = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/DeleteFaceInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux----------------------"); + deleteFaceJson = ConfigFileUtil.getReqBodyFromTemplate("/acs/DeleteFaceInfoParam.json", parameter); + } System.out.println("删除人脸图片参数:"+deleteFaceJson); String result= TransIsapi.put_isapi(userID,deleteFaceUrl,deleteFaceJson); System.out.println("删除人员结果:"+result); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/UserManage.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/UserManage.java index 759ee90..7289b1e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/UserManage.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/UserManage.java @@ -45,7 +45,14 @@ public class UserManage { parameter.put("name", userName); // 员工名称 parameter.put("enable", true); // 是否启用 parameter.put("doorNo", 1); // 门编号 - String input = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/AddUserInfoParam.json", parameter); + String input ; + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++++++"); + input = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/AddUserInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux----------------------"); + input = ConfigFileUtil.getReqBodyFromTemplate("/acs/AddUserInfoParam.json", parameter); + } System.out.println("下发人员参数:"+input); byte[] byInbuffer = input.getBytes("utf-8"); int iInBufLen = byInbuffer.length; @@ -156,7 +163,14 @@ public class UserManage { parameter.put("searchID", UUID.randomUUID()); // 查询idinsertCheckImg parameter.put("searchResultPosition", 1); parameter.put("maxResults", 10); // 最大查询数量 - String strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchUserInfoParam.json", parameter); + String strInbuff; + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin++++++++++++++++++++"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchUserInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux------------------"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/acs/SearchUserInfoParam.json", parameter); + } System.out.println("查询的json报文:" + strInbuff); //把string传递到Byte数组中,后续用.getPointer()方法传入指针地址中。 HCNetSDK.BYTE_ARRAY ptrInbuff = new HCNetSDK.BYTE_ARRAY(strInbuff.length()); @@ -231,16 +245,15 @@ public class UserManage { Map parameter = new HashMap<>(); parameter.put("mode", "byEmployeeNo"); // 删除方式, byEmployeeNo: 按员工ID号 parameter.put("employeeNo", employeeNo); // 员工ID号 - String deleteUserjson = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/DeleteUserInfoParam.json", parameter); + String deleteUserjson ; + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++"); + deleteUserjson = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/DeleteUserInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux------------------"); + deleteUserjson = ConfigFileUtil.getReqBodyFromTemplate("/acs/DeleteUserInfoParam.json", parameter); + } //删除所有人员 -// String deleteUserjson = "{\n" + -// "\t\"UserInfoDetail\": {\t\n" + -// "\t\t\"mode\": \"all\",\t\n" + -// "\t\t\"EmployeeNoList\": [\t\n" + -// "\t\t]\n" + -// "\n" + -// "\t}\n" + -// "}"; String deleteUserUrl = "PUT /ISAPI/AccessControl/UserInfoDetail/Delete?format=json"; String result = TransIsapi.put_isapi(userID, deleteUserUrl, deleteUserjson); System.out.println(result); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java index 3908493..f2504c1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java @@ -78,6 +78,13 @@ public class initServer implements CommandLineRunner { parameter.put("searchResultPosition", 0); parameter.put("maxResults", 10); // 最大查询数量 String strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchUserInfoParam.json", parameter); + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++++++"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchUserInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux----------------------"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/acs/SearchUserInfoParam.json", parameter); + } Map map=UserManage.getSearchUserInfo(lUserID,strInbuff); System.out.println("总数据=========="+(int)map.get("allcount")); int num=(int)map.get("num"); @@ -89,6 +96,13 @@ public class initServer implements CommandLineRunner { parameter2.put("searchResultPosition", k*10); parameter2.put("maxResults", 10); // 最大查询数量 String strInbuff2 = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchUserInfoParam.json", parameter2); + if(osSelect.isWindows()){ + System.err.println("deleteUserInfo : isWin+++++++++++++++++++++++"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/bonus-modules/bonus-smart-canteen/src/main/resources/conf/acs/SearchUserInfoParam.json", parameter); + }else{ + System.err.println("deleteUserInfo : isLinux----------------------"); + strInbuff = ConfigFileUtil.getReqBodyFromTemplate("/acs/SearchUserInfoParam.json", parameter); + } Map map2=UserManage.getSearchUserInfo(lUserID,strInbuff2); users.addAll((List)map2.get("data")); }