From 45ede47aa7c16e76b7814ce7ce03e606e707c352 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Thu, 23 Jan 2025 10:46:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lowcode/controller/QrCodeController.java | 4 +- .../response/QrCodeDetailsResponseEntity.java | 9 ++++ .../service/impl/QrCodeServiceImpl.java | 41 +++++++++++++++++++ .../resources/mapper/FieldRecordMapper.xml | 6 +-- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hxgk/lowcode/controller/QrCodeController.java b/src/main/java/com/hxgk/lowcode/controller/QrCodeController.java index f7a1095..dcd5f78 100644 --- a/src/main/java/com/hxgk/lowcode/controller/QrCodeController.java +++ b/src/main/java/com/hxgk/lowcode/controller/QrCodeController.java @@ -27,7 +27,7 @@ public class QrCodeController { } - /*获取用户有权限的启用状态的表单列表树形结构*/ + @RequestMapping(value = "/QrCode/getQrCodeImgInside") public JsonData getCustomerFormList(@RequestHeader(value = "User-Key") String key, @RequestHeader(value = "User-Token") String token, @@ -42,7 +42,7 @@ public class QrCodeController { } - /*获取用户有权限的启用状态的表单列表树形结构*/ + @RequestMapping(value = "/QrCode/getDetailQrCodes") public JsonData getDetailQrCodes(@RequestHeader(value = "User-Key") String key, @RequestHeader(value = "User-Token") String token, diff --git a/src/main/java/com/hxgk/lowcode/model/entity/response/QrCodeDetailsResponseEntity.java b/src/main/java/com/hxgk/lowcode/model/entity/response/QrCodeDetailsResponseEntity.java index 7fc753d..e3bd800 100644 --- a/src/main/java/com/hxgk/lowcode/model/entity/response/QrCodeDetailsResponseEntity.java +++ b/src/main/java/com/hxgk/lowcode/model/entity/response/QrCodeDetailsResponseEntity.java @@ -11,6 +11,7 @@ public class QrCodeDetailsResponseEntity { private String groupName; private String appName; private String formName; + private String dataTitle; //要显示在表格中的字段map private LinkedHashMap fieldsMap; @@ -53,4 +54,12 @@ public class QrCodeDetailsResponseEntity { public void setFormName(String formName) { this.formName = formName; } + + public String getDataTitle() { + return dataTitle; + } + + public void setDataTitle(String dataTitle) { + this.dataTitle = dataTitle; + } } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java index 34e9e6f..88b1f4b 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java @@ -64,6 +64,14 @@ public class QrCodeServiceImpl implements QrCodeService { LinkedHashMap result = new LinkedHashMap(); QRCodeUtil qrCodeUtil = new QRCodeUtil(); String basicQrCodeStr = ""; + String toSelectName = (String)settings.get("name"); + ArrayList toSelectDataTitleList = (ArrayList) settings.get("dataTitle"); + ArrayList toSelectDataTitleList1 = new ArrayList<>(); + for (int i = 0; i < toSelectDataTitleList.size(); i++) { + String[] a = toSelectDataTitleList.get(i).split(":"); + System.out.println(a); + toSelectDataTitleList1.add(i, "`" + a[a.length-1] + "`"); + } //String basicQrCodeStr = "https://wab.hxgk.group/#/form_table/taskListPage? id=112&key=287135214646333440&formid=116&formKey=287145907965661184&title=t2&state=1"; String prefixLocal = "http://localhost:9998/#/form_table/taskListPage?"; String prefixout = "https://wab.hxgk.group/#/form_table/taskListPage?"; @@ -122,6 +130,11 @@ public class QrCodeServiceImpl implements QrCodeService { result.put(id,qrCodeDetailsResponseEntity); } }else{ + + List> dataTitleMapList = fieldRecordMapper.getDataTitlesByIds(toSelectName,toSelectDataTitleList1,ids); + + Integer b = dataTitleMapList.get(0).size(); + //非表格图片 for (String id:ids) { QrCodeDetailsResponseEntity qrCodeDetailsResponseEntity = new QrCodeDetailsResponseEntity(); String currentQrCodeStr = basicQrCodeStr+"&qrDetailId="+id; @@ -134,7 +147,19 @@ public class QrCodeServiceImpl implements QrCodeService { //当前id的二维码base64图片 String currentBase64 = qrCodeUtil.bufferedImageToBase64(currentBufferedImage); //LinkedHashMap currentFieldsMap = new LinkedHashMap<>(); + if(b>1){ + String dataTitle = ""; + for (TreeMap treeMap: dataTitleMapList) { + String cfdsa = String.valueOf(treeMap.get("value")); + if(cfdsa.equals(id)){ + dataTitle = process(treeMap,toSelectDataTitleList1); + } + } + qrCodeDetailsResponseEntity.setDataTitle(dataTitle); + }else{ + qrCodeDetailsResponseEntity.setDataTitle(id); + } qrCodeDetailsResponseEntity.setBufferedImage(currentBase64); qrCodeDetailsResponseEntity.setGroupName((String)appAndGroupNameMap.get("groupName")); qrCodeDetailsResponseEntity.setAppName((String)appAndGroupNameMap.get("appName")); @@ -224,5 +249,21 @@ public class QrCodeServiceImpl implements QrCodeService { } return b; } + public String process(TreeMap map, ArrayList list) { + StringBuilder result = new StringBuilder(); + for (String element : list) { + String key = element.substring(1, element.length() - 1); + if (!"value".equals(key)) { + Object value = map.get(key); + if (value != null) { + result.append(value).append(" "); + } + } + } + if (result.length() > 0) { + result.setLength(result.length() - 1); + } + return result.toString(); + } } diff --git a/src/main/resources/mapper/FieldRecordMapper.xml b/src/main/resources/mapper/FieldRecordMapper.xml index c6b7f26..8f48042 100644 --- a/src/main/resources/mapper/FieldRecordMapper.xml +++ b/src/main/resources/mapper/FieldRecordMapper.xml @@ -22,10 +22,10 @@