From c37d097fb994c84294233d5eff8f5f6a86c66d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Mon, 18 Dec 2023 18:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BC=BA=E5=B0=91=E5=AE=9E?=
=?UTF-8?q?=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dxhy-admin/pom.xml | 8 +-
dxhy-base/pom.xml | 8 +-
dxhy-core/pom.xml | 8 +-
dxhy-customs/pom.xml | 8 +-
.../java/com/dxhy/erp/entity/FPEntity.java | 288 ++++++++++++++++++
.../main/java/com/dxhy/erp/entity/Goods.java | 129 ++++++++
.../java/com/dxhy/erp/entity/Receivers.java | 39 +++
.../erp/service/impl/DeclareServiceImpl.java | 1 -
.../java/com/dxhy/erp/utils/MyThread.java | 2 +-
dxhy-export-domestic/pom.xml | 8 +-
dxhy-extend/pom.xml | 8 +-
dxhy-gateway/pom.xml | 8 +-
dxhy-manage/pom.xml | 8 +-
dxhy-operation-flow/pom.xml | 8 +-
dxhy-passengerTicket/pom.xml | 8 +-
dxhy-portrait/pom.xml | 8 +-
16 files changed, 501 insertions(+), 46 deletions(-)
create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/FPEntity.java
create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/Goods.java
create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/Receivers.java
diff --git a/dxhy-admin/pom.xml b/dxhy-admin/pom.xml
index 22a6ced1..76a6087b 100644
--- a/dxhy-admin/pom.xml
+++ b/dxhy-admin/pom.xml
@@ -37,10 +37,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-base/pom.xml b/dxhy-base/pom.xml
index a399b918..a52051e9 100644
--- a/dxhy-base/pom.xml
+++ b/dxhy-base/pom.xml
@@ -58,10 +58,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
commons-fileupload
commons-fileupload
diff --git a/dxhy-core/pom.xml b/dxhy-core/pom.xml
index a4af582f..67d85ca0 100644
--- a/dxhy-core/pom.xml
+++ b/dxhy-core/pom.xml
@@ -46,10 +46,10 @@
com.google
guava
-
- com.dxhy
- pdf-parse
-
+
+
+
+
diff --git a/dxhy-customs/pom.xml b/dxhy-customs/pom.xml
index 400bed9a..28f74854 100644
--- a/dxhy-customs/pom.xml
+++ b/dxhy-customs/pom.xml
@@ -38,10 +38,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/FPEntity.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/FPEntity.java
new file mode 100644
index 00000000..d638551b
--- /dev/null
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/FPEntity.java
@@ -0,0 +1,288 @@
+package com.dxhy.erp.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FPEntity {
+ private String fpdm;
+ private String title;
+ private String fphm;
+ private String kprq;
+ private String jqbh;
+ private String jym;
+ private String passwordArea;
+ private String erWeiMaPicturePath;
+ private String erWeiMaData;
+ private ArrayList goodsList = new ArrayList();
+ private List detailGoodsList;
+ private String buyer_name;
+ private String buyer_nsrsbh;
+ private String buyer_addressPhoneNum;
+ private String buyer_khhandzh;
+ private String seller_name;
+ private String seller_nsrsbh;
+ private String seller_addressPhoneNum;
+ private String seller_khhandzh;
+ private String hjje;
+ private String hjse;
+ private String jshj;
+ private String bz;
+ private String personsInfo;
+ private String jxqz;
+ private Receivers receivers = new Receivers();
+
+ public FPEntity() {
+ }
+
+ public String getJxqz() {
+ return this.jxqz;
+ }
+
+ public String[] parseJxqz() {
+ if (this.jxqz != null && !"".equals(this.jxqz) && this.jxqz.length() >= 3) {
+ int index1 = this.jxqz.indexOf("CN=");
+ int index2_part1 = this.jxqz.indexOf("\"", index1);
+ int index2_part2 = this.jxqz.indexOf(",", index1);
+ int index2 = Math.min(index2_part1, index2_part2);
+ String cn1 = this.jxqz.substring(index1, index2);
+ int index3 = this.jxqz.indexOf("CN=", index2);
+ int index4_part1 = this.jxqz.indexOf("\"", index3);
+ int index4_part2 = this.jxqz.indexOf(",", index3);
+ if (index4_part1 == -1) {
+ index4_part1 = index4_part2;
+ }
+
+ if (index4_part2 == -1) {
+ index4_part2 = index4_part1;
+ }
+
+ int index4 = Math.min(index4_part1, index4_part2);
+ String cn2 = "";
+ if (index3 != -1) {
+ cn2 = this.jxqz.substring(index3, index4);
+ }
+
+ if (cn2.length() > 3) {
+ cn2 = cn2.substring(3);
+ }
+
+ if (cn1.length() > 3) {
+ cn1 = cn1.substring(3);
+ }
+
+ String[] jxqzArr = new String[]{"Ca:" + cn1, "Subject:" + cn2};
+ return jxqzArr;
+ } else {
+ return null;
+ }
+ }
+
+ public void setJxqz(String jxqz) {
+ this.jxqz = jxqz;
+ }
+
+ public String getFpdm() {
+ return this.fpdm;
+ }
+
+ public void setFpdm(String fpdm) {
+ this.fpdm = fpdm;
+ }
+
+ public String getTitle() {
+ return this.title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getFphm() {
+ return this.fphm;
+ }
+
+ public void setFphm(String fphm) {
+ this.fphm = fphm;
+ }
+
+ public String getKprq() {
+ return this.kprq;
+ }
+
+ public void setKprq(String kprq) {
+ this.kprq = kprq;
+ }
+
+ public String getJqbh() {
+ return this.jqbh;
+ }
+
+ public void setJqbh(String jqbh) {
+ this.jqbh = jqbh;
+ }
+
+ public String getJym() {
+ return this.jym;
+ }
+
+ public void setJym(String jym) {
+ this.jym = jym;
+ }
+
+ public ArrayList getGoodsList() {
+ return this.goodsList;
+ }
+
+ public void setGoodsList(ArrayList goodsList) {
+ this.goodsList = goodsList;
+ }
+
+ public String getBuyer_name() {
+ return this.buyer_name;
+ }
+
+ public List getDetailGoodsList() {
+ return this.detailGoodsList;
+ }
+
+ public void setDetailGoodsList(List detailGoodsList) {
+ this.detailGoodsList = detailGoodsList;
+ }
+
+ public void setBuyer_name(String buyerName) {
+ this.buyer_name = buyerName;
+ }
+
+ public String getBuyer_nsrsbh() {
+ return this.buyer_nsrsbh;
+ }
+
+ public void setBuyer_nsrsbh(String buyerNsrsbh) {
+ this.buyer_nsrsbh = buyerNsrsbh;
+ }
+
+ public String getBuyer_addressPhoneNum() {
+ return this.buyer_addressPhoneNum;
+ }
+
+ public void setBuyer_addressPhoneNum(String buyerAddressPhoneNum) {
+ this.buyer_addressPhoneNum = buyerAddressPhoneNum;
+ }
+
+ public String getBuyer_khhandzh() {
+ return this.buyer_khhandzh;
+ }
+
+ public void setBuyer_khhandzh(String buyerKhhandzh) {
+ this.buyer_khhandzh = buyerKhhandzh;
+ }
+
+ public String getSeller_name() {
+ return this.seller_name;
+ }
+
+ public void setSeller_name(String sellerName) {
+ this.seller_name = sellerName;
+ }
+
+ public String getSeller_nsrsbh() {
+ return this.seller_nsrsbh;
+ }
+
+ public void setSeller_nsrsbh(String sellerNsrsbh) {
+ this.seller_nsrsbh = sellerNsrsbh;
+ }
+
+ public String getSeller_addressPhoneNum() {
+ return this.seller_addressPhoneNum;
+ }
+
+ public void setSeller_addressPhoneNum(String sellerAddressPhoneNum) {
+ this.seller_addressPhoneNum = sellerAddressPhoneNum;
+ }
+
+ public String getSeller_khhandzh() {
+ return this.seller_khhandzh;
+ }
+
+ public void setSeller_khhandzh(String sellerKhhandzh) {
+ this.seller_khhandzh = sellerKhhandzh;
+ }
+
+ public String getPasswordArea() {
+ return this.passwordArea;
+ }
+
+ public void setPasswordArea(String passwordArea) {
+ this.passwordArea = passwordArea;
+ }
+
+ public String getHjje() {
+ return this.hjje;
+ }
+
+ public void setHjje(String hjje) {
+ this.hjje = hjje;
+ }
+
+ public String getHjse() {
+ return this.hjse;
+ }
+
+ public void setHjse(String hjse) {
+ this.hjse = hjse;
+ }
+
+ public String getJshj() {
+ return this.jshj;
+ }
+
+ public void setJshj(String jshj) {
+ this.jshj = jshj;
+ }
+
+ public String getBz() {
+ return this.bz;
+ }
+
+ public void setBz(String bz) {
+ this.bz = bz;
+ }
+
+ public String getPersonsInfo() {
+ return this.personsInfo;
+ }
+
+ public void setPersonsInfo(String personsInfo) {
+ this.personsInfo = personsInfo;
+ }
+
+ public String getErWeiMaPicturePath() {
+ return this.erWeiMaPicturePath;
+ }
+
+ public void setErWeiMaPicturePath(String erWeiMaPicturePath) {
+ this.erWeiMaPicturePath = erWeiMaPicturePath;
+ }
+
+ public String getErWeiMaData() {
+ return this.erWeiMaData;
+ }
+
+ public void setErWeiMaData(String erWeiMaData) {
+ this.erWeiMaData = erWeiMaData;
+ }
+
+ public Receivers getReceivers() {
+ return this.receivers;
+ }
+
+ public void setReceivers(Receivers receivers) {
+ this.receivers = receivers;
+ }
+
+ public String toString() {
+ return "FPEntity [fpdm=" + this.fpdm + ", title=" + this.title + ", fphm=" + this.fphm + ", kprq=" + this.kprq + ", jqbh=" + this.jqbh + ", jym=" + this.jym + ", passwordArea=" + this.passwordArea + ", erWeiMaPicturePath=" + this.erWeiMaPicturePath + ", erWeiMaData=" + this.erWeiMaData + ", goodsList=" + this.goodsList + ", detailGoodsList=" + this.detailGoodsList + ", buyer_name=" + this.buyer_name + ", buyer_nsrsbh=" + this.buyer_nsrsbh + ", buyer_addressPhoneNum=" + this.buyer_addressPhoneNum + ", buyer_khhandzh=" + this.buyer_khhandzh + ", seller_name=" + this.seller_name + ", seller_nsrsbh=" + this.seller_nsrsbh + ", seller_addressPhoneNum=" + this.seller_addressPhoneNum + ", seller_khhandzh=" + this.seller_khhandzh + ", hjje=" + this.hjje + ", hjse=" + this.hjse + ", jshj=" + this.jshj + ", bz=" + this.bz + ", personsInfo=" + this.personsInfo + ", jxqz=" + this.jxqz + ", receivers=" + this.receivers + "]";
+ }
+}
+
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/Goods.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/Goods.java
new file mode 100644
index 00000000..714e99d9
--- /dev/null
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/Goods.java
@@ -0,0 +1,129 @@
+package com.dxhy.erp.entity;
+
+public class Goods {
+ private String sortNum;
+ private String name;
+ private String type;
+ private String unit;
+ private String number;
+ private String price;
+ private String totalprice;
+ private String se;
+ private String sl;
+ private String cph;
+ private String txrqq;
+ private String lx;
+ private String txrqz;
+
+ public Goods() {
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return this.type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getUnit() {
+ return this.unit;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ public String getNumber() {
+ return this.number;
+ }
+
+ public void setNumber(String number) {
+ this.number = number;
+ }
+
+ public String getSortNum() {
+ return this.sortNum;
+ }
+
+ public void setSortNum(String sortNum) {
+ this.sortNum = sortNum;
+ }
+
+ public String getPrice() {
+ return this.price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+ public String getTotalprice() {
+ return this.totalprice;
+ }
+
+ public void setTotalprice(String totalprice) {
+ this.totalprice = totalprice;
+ }
+
+ public String getSe() {
+ return this.se;
+ }
+
+ public void setSe(String se) {
+ this.se = se;
+ }
+
+ public String getSl() {
+ return this.sl;
+ }
+
+ public void setSl(String sl) {
+ this.sl = sl;
+ }
+
+ public String toString() {
+ return "Goods [name=" + this.name + ", number=" + this.number + ", price=" + this.price + ", se=" + this.se + ", sl=" + this.sl + ", totalprice=" + this.totalprice + ", type=" + this.type + ", unit=" + this.unit + ", cph=" + this.cph + ", lx=" + this.lx + ", txrqq=" + this.txrqq + ", txrqz=" + this.txrqz + "]";
+ }
+
+ public String getCph() {
+ return this.cph;
+ }
+
+ public void setCph(String cph) {
+ this.cph = cph;
+ }
+
+ public String getTxrqq() {
+ return this.txrqq;
+ }
+
+ public void setTxrqq(String txrqq) {
+ this.txrqq = txrqq;
+ }
+
+ public String getTxrqz() {
+ return this.txrqz;
+ }
+
+ public void setTxrqz(String txrqz) {
+ this.txrqz = txrqz;
+ }
+
+ public String getLx() {
+ return this.lx;
+ }
+
+ public void setLx(String lx) {
+ this.lx = lx;
+ }
+}
+
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/Receivers.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/Receivers.java
new file mode 100644
index 00000000..1e4d6ec6
--- /dev/null
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/Receivers.java
@@ -0,0 +1,39 @@
+package com.dxhy.erp.entity;
+
+public class Receivers {
+ private String receiver;
+ private String check;
+ private String drawer;
+
+ public Receivers() {
+ }
+
+ public String getReceiver() {
+ return this.receiver;
+ }
+
+ public void setReceiver(String receiver) {
+ this.receiver = receiver;
+ }
+
+ public String getCheck() {
+ return this.check;
+ }
+
+ public void setCheck(String check) {
+ this.check = check;
+ }
+
+ public String getDrawer() {
+ return this.drawer;
+ }
+
+ public void setDrawer(String drawer) {
+ this.drawer = drawer;
+ }
+
+ public String toString() {
+ return "Receiver [receiver=" + this.receiver + ", check=" + this.check + ", drawer=" + this.drawer + "]";
+ }
+}
+
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/DeclareServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/DeclareServiceImpl.java
index d3d852b8..a50cc187 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/DeclareServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/DeclareServiceImpl.java
@@ -1,6 +1,5 @@
package com.dxhy.erp.service.impl;
-import com.aisinopdf.text.E;
import com.alibaba.fastjson.JSON;
import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java b/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java
index 56781421..728c2776 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/utils/MyThread.java
@@ -31,7 +31,7 @@ import com.dxhy.oss.model.FileModel;
import com.dxhy.oss.service.FileService;
import com.dxhy.pdf.entity.PdfInvoiceModel;
import com.dxhy.pdf.utils.PdfUtil;
-import com.ele.parse.entity.FPEntity;
+import com.dxhy.erp.entity.FPEntity;
import cn.hutool.core.codec.Base64;
import lombok.extern.slf4j.Slf4j;
diff --git a/dxhy-export-domestic/pom.xml b/dxhy-export-domestic/pom.xml
index cc062497..765f5f90 100644
--- a/dxhy-export-domestic/pom.xml
+++ b/dxhy-export-domestic/pom.xml
@@ -38,10 +38,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-extend/pom.xml b/dxhy-extend/pom.xml
index 8e4efe4a..28c31c77 100644
--- a/dxhy-extend/pom.xml
+++ b/dxhy-extend/pom.xml
@@ -38,10 +38,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-gateway/pom.xml b/dxhy-gateway/pom.xml
index 828d19a1..f9b8ef0f 100644
--- a/dxhy-gateway/pom.xml
+++ b/dxhy-gateway/pom.xml
@@ -55,10 +55,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-manage/pom.xml b/dxhy-manage/pom.xml
index 5945acc9..262917e2 100644
--- a/dxhy-manage/pom.xml
+++ b/dxhy-manage/pom.xml
@@ -37,10 +37,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-operation-flow/pom.xml b/dxhy-operation-flow/pom.xml
index 1fbde95d..15816576 100644
--- a/dxhy-operation-flow/pom.xml
+++ b/dxhy-operation-flow/pom.xml
@@ -140,10 +140,10 @@
com.google
guava
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-passengerTicket/pom.xml b/dxhy-passengerTicket/pom.xml
index 871a6706..8c138fac 100644
--- a/dxhy-passengerTicket/pom.xml
+++ b/dxhy-passengerTicket/pom.xml
@@ -38,10 +38,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress
diff --git a/dxhy-portrait/pom.xml b/dxhy-portrait/pom.xml
index d8a40f64..189770b1 100644
--- a/dxhy-portrait/pom.xml
+++ b/dxhy-portrait/pom.xml
@@ -38,10 +38,10 @@
org.apache.poi
poi-ooxml
-
- com.dxhy
- pdf-parse
-
+
+
+
+
org.apache.commons
commons-compress