diff --git a/pom.xml b/pom.xml index c12e608..ab068ee 100644 --- a/pom.xml +++ b/pom.xml @@ -123,11 +123,11 @@ 4.5.14 - + com.google.zxing diff --git a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java index 259a3e7..af26a13 100644 --- a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java +++ b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.ArrayList; +import java.util.Map; @Mapper public interface CustomerFormViewMapper { @@ -21,4 +22,6 @@ public interface CustomerFormViewMapper { ArrayList getAppsByGroupId(@Param("groupid") String id); CustomerFormView getCustomerFormViewByCfid(String cfid); + + Map getAppNameAndGroupNameByCfid(@Param("cfid")String cfid); } 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 a98f274..7fc753d 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 @@ -8,6 +8,9 @@ import java.util.LinkedHashMap; public class QrCodeDetailsResponseEntity { //二维码图片 private String bufferedImage; + private String groupName; + private String appName; + private String formName; //要显示在表格中的字段map private LinkedHashMap fieldsMap; @@ -26,4 +29,28 @@ public class QrCodeDetailsResponseEntity { public void setFieldsMap(LinkedHashMap fieldsMap) { this.fieldsMap = fieldsMap; } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public String getFormName() { + return formName; + } + + public void setFormName(String formName) { + this.formName = formName; + } } diff --git a/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java b/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java index dc3c162..90b5f3b 100644 --- a/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java +++ b/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java @@ -4,9 +4,12 @@ import com.hxgk.lowcode.model.entity.CustomerFormGroup; import com.hxgk.lowcode.model.entity.CustomerFormView; import java.util.ArrayList; +import java.util.Map; public interface CustomerFormViewService { ArrayList getAppsByGroupId(CustomerFormGroup item); CustomerFormView getCustomerFormViewByCfid(String cfid); + + Map getAppNameAndGroupNameByCfid(String cfid); } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java index 16ccd83..0008e83 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Map; @Service @@ -26,4 +27,9 @@ public class CustomerFormViewServiceImpl implements CustomerFormViewService { CustomerFormView customerFormView = customerFormViewMapper.getCustomerFormViewByCfid(cfid); return customerFormView; } + + @Override + public Map getAppNameAndGroupNameByCfid(String cfid) { + return customerFormViewMapper.getAppNameAndGroupNameByCfid(cfid); + } } 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 b5d566a..de3609f 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java @@ -43,7 +43,7 @@ public class QrCodeServiceImpl implements QrCodeService { CustomerFormView c = customerFormViewService.getCustomerFormViewByCfid(cfid); //上线修改 qrCodeStr = prefixout+"id="+c.getCfid()+"&key="+c.getGroupid()+"&formid="+c.getId()+"&formKey="+c.getSignCode()+"&title="+c.getName()+"&state="+c.getStates(); - System.out.println(qrCodeStr); + //System.out.println(qrCodeStr); try { BufferedImage bufferedImage = qrCodeUtil.getQRCodeImage(qrCodeStr, "生成的二维码"); String base64 = qrCodeUtil.bufferedImageToBase64(bufferedImage); @@ -70,6 +70,9 @@ public class QrCodeServiceImpl implements QrCodeService { ArrayList qrCodeShowFields = new ArrayList<>(); Object qrCodePrintStyle = settings.get("qrCodePrintStyle"); String qrCodePrintStyleStr = ""; + //查询分组,App,表名信息 + String formName = (String) settings.get("formName"); + Map appAndGroupNameMap = customerFormViewService.getAppNameAndGroupNameByCfid(cfid); if(qrCodePrintStyle==null){ qrCodePrintStyle = (Object) "1"; } @@ -104,10 +107,14 @@ public class QrCodeServiceImpl implements QrCodeService { LinkedHashMap map = fieldRecordMapper.getQrCodeTableFields(dbFormName,stringArrayList,id); map = convertMap(map); currentFieldsMap = mergeMaps(fieldsAndCommentsResult, map); - System.out.println(1); + currentFieldsMap.put("qrCodeBase64","二维码"+"!@#@!"+currentBase64); + } qrCodeDetailsResponseEntity.setBufferedImage(currentBase64); qrCodeDetailsResponseEntity.setFieldsMap(currentFieldsMap); + qrCodeDetailsResponseEntity.setGroupName((String)appAndGroupNameMap.get("groupName")); + qrCodeDetailsResponseEntity.setAppName((String)appAndGroupNameMap.get("appName")); + qrCodeDetailsResponseEntity.setFormName(formName); result.put(id,qrCodeDetailsResponseEntity); } }else{ @@ -125,7 +132,9 @@ public class QrCodeServiceImpl implements QrCodeService { //LinkedHashMap currentFieldsMap = new LinkedHashMap<>(); qrCodeDetailsResponseEntity.setBufferedImage(currentBase64); - //qrCodeDetailsResponseEntity.setFieldsMap(currentFieldsMap); + qrCodeDetailsResponseEntity.setGroupName((String)appAndGroupNameMap.get("groupName")); + qrCodeDetailsResponseEntity.setAppName((String)appAndGroupNameMap.get("appName")); + qrCodeDetailsResponseEntity.setFormName(formName); result.put(id,qrCodeDetailsResponseEntity); } } diff --git a/src/main/resources/mapper/CustomerFormvViewMapper.xml b/src/main/resources/mapper/CustomerFormvViewMapper.xml index e1ba409..d30f7ae 100644 --- a/src/main/resources/mapper/CustomerFormvViewMapper.xml +++ b/src/main/resources/mapper/CustomerFormvViewMapper.xml @@ -57,4 +57,34 @@ and status = 1 and states = 1 + + \ No newline at end of file