From 73a2d7f1c9806b11e203d2f886875150b61174e0 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 2 Dec 2025 20:48:25 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=8D=97=E6=AD=A7nc65=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/common/core/domain/dto/nc/Ysbill.java | 18 ++++ .../common/core/domain/dto/nc/Ysbillhead.java | 86 +++++++++++++++++ .../common/core/domain/dto/nc/Ysbodys.java | 15 +++ .../mhd/common/core/domain/dto/nc/Ysitem.java | 85 +++++++++++++++++ .../core/domain/dto/nc/Ysufinterface.java | 48 ++++++++++ .../com/mhd/common/core/domain/po/UserPo.java | 6 ++ .../userAggregate/entity/UserEntity.java | 6 ++ .../entity/UserShipperEntity.java | 3 + .../repository/po/UserShipperPo.java | 3 + .../userAggregate/repository/todo/UserDO.java | 6 ++ .../repository/todo/UserShipperDO.java | 3 + .../user/interfaces/dto/addDTO/UserDTO.java | 6 ++ .../interfaces/dto/addDTO/UserShipperDTO.java | 3 + mhd_finance/pom.xml | 12 +++ .../src/main/java/com/linke/finance/Test.java | 88 ++++++++++++++++++ .../ReconciliationApplicationService.java | 5 + .../facade/IReconciliationService.java | 2 + .../persistence/ReconciliationImpl.java | 93 +++++++++++++++++++ .../service/ReconciliationDomainService.java | 5 + .../reconciliation/ReconciliationApi.java | 12 +++ sql/20251106_user.sql | 10 +- 21 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbill.java create mode 100644 mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbillhead.java create mode 100644 mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbodys.java create mode 100644 mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java create mode 100644 mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysufinterface.java create mode 100644 mhd_finance/src/main/java/com/linke/finance/Test.java diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbill.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbill.java new file mode 100644 index 000000000..ab69b16ac --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbill.java @@ -0,0 +1,18 @@ +package com.mhd.common.core.domain.dto.nc; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.xml.bind.annotation.*; + +@Data +@XmlRootElement(name = "bill") +@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略 +@XmlType(propOrder = {"billhead"}) +public class Ysbill { + @XmlAttribute(name = "id") + private String id; + + @XmlElement(name = "billhead") + private Ysbillhead billhead; +} diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbillhead.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbillhead.java new file mode 100644 index 000000000..544dd24a0 --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbillhead.java @@ -0,0 +1,86 @@ +package com.mhd.common.core.domain.dto.nc; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.xml.bind.annotation.*; + +@Data +@XmlRootElement(name = "billhead") +@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略 +@XmlType(propOrder = {"pk_group","pk_org","sett_org","creationtime","creator","pk_billtype","pk_tradetype","billyear" +,"billclass","isinit","syscode","billdate","billno","src_syscode","billstatus","billmaker","def28","def29","def59","pk_busitype","billperiod","effectstatus","bodys"}) +public class Ysbillhead { + @ApiModelProperty( "") + private String pk_group; + + @ApiModelProperty( "") + private String pk_org; + + @ApiModelProperty( "") + private String sett_org; + + + @ApiModelProperty( "") + private String creationtime; + + @ApiModelProperty( "") + private String creator; + + @ApiModelProperty( "") + private String pk_billtype; + + @ApiModelProperty( "") + private String pk_tradetype; + + @ApiModelProperty( "") + private String billclass; + + @ApiModelProperty( "") + private String isinit; + + + @ApiModelProperty( "") + private String syscode; + + @ApiModelProperty( "") + private String billdate; + + @ApiModelProperty( "") + private String billno; + + @ApiModelProperty( "") + private String src_syscode; + + @ApiModelProperty( "") + private String billstatus; + + + @ApiModelProperty( "") + private String billmaker; + + @ApiModelProperty( "") + private String def28; + + @ApiModelProperty( "") + private String def29; + + @ApiModelProperty( "") + private String def59; + + + @ApiModelProperty( "") + private String pk_busitype; + + @ApiModelProperty( "") + private String billyear; + + @ApiModelProperty( "") + private String billperiod; + + @ApiModelProperty( "") + private String effectstatus; + + @XmlElement(name = "bodys") + private Ysbodys bodys; +} diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbodys.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbodys.java new file mode 100644 index 000000000..9addaa057 --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbodys.java @@ -0,0 +1,15 @@ +package com.mhd.common.core.domain.dto.nc; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.xml.bind.annotation.*; + +@Data +@XmlRootElement(name = "bodys") +@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略 +@XmlType(propOrder = {"item"}) +public class Ysbodys { + @XmlElement(name = "item") + private Ysitem item; +} diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java new file mode 100644 index 000000000..e26a3bda0 --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java @@ -0,0 +1,85 @@ +package com.mhd.common.core.domain.dto.nc; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +@Data +@XmlRootElement(name = "item") +public class Ysitem { + @ApiModelProperty( "") + private String pk_deptid; + @ApiModelProperty( "") + private String so_deptid; + + @ApiModelProperty( "") + private String pk_psndoc; + + @ApiModelProperty( "") + private String customer; + + + @ApiModelProperty( "") + private String objtype; + + @ApiModelProperty( "") + private String direction; + + @ApiModelProperty( "") + private String scomment; + + @ApiModelProperty( "") + private String pk_currtype; + + @ApiModelProperty( "") + private String taxrate; + + @ApiModelProperty( "") + private String quantity_de; + + @ApiModelProperty( "") + private String money_de; + + + @ApiModelProperty( "") + private String money_bal; + + @ApiModelProperty( "") + private String notax_de; + + @ApiModelProperty( "") + private String tax_de; + + @ApiModelProperty( "") + private String local_tax_de; + + @ApiModelProperty( "") + private String price; + + @ApiModelProperty( "") + private String taxprice; + + @ApiModelProperty( "") + private String invoiceno; + + @ApiModelProperty( "") + private String recaccount; + + + @ApiModelProperty( "") + private String prepay; + + @ApiModelProperty( "") + private String subjcode; + + @ApiModelProperty( "") + private String def65; + + @ApiModelProperty( "") + private String def75; + + +} diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysufinterface.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysufinterface.java new file mode 100644 index 000000000..c719ec283 --- /dev/null +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysufinterface.java @@ -0,0 +1,48 @@ +package com.mhd.common.core.domain.dto.nc; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.xml.bind.annotation.*; + +@Data +@XmlRootElement(name = "ufinterface") +@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略 +@XmlType(propOrder = {"bill"}) +public class Ysufinterface { + @XmlAttribute(name = "account") + + private String account; + @XmlAttribute(name = "billtype") + + private String billtype; + @XmlAttribute(name = "businessunitcode") + + private String businessunitcode; + @XmlAttribute(name = "filename") + + private String filename; + @XmlAttribute(name = "groupcode") + + private String groupcode; + @XmlAttribute(name = "isexchange") + + private String isexchange; + @XmlAttribute(name = "orgcode") + + private String orgcode; + @XmlAttribute(name = "receiver") + + private String receiver; + @XmlAttribute(name = "replace") + + private String replace; + @XmlAttribute(name = "roottag") + + private String roottag; + @XmlAttribute(name = "sender") + + private String sender; + @XmlElement(name = "bill") + private com.mhd.common.core.domain.dto.nc.Ysbill bill; +} diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java index 2a8aa00be..740d08242 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java @@ -214,4 +214,10 @@ public class UserPo { @ApiModelProperty(name = "有效期管理 0-否 1-是") private Integer validityPeriodManagement; + + @ApiModelProperty(name = "业务员nc编码") + private String salespersonNcCode; + + @ApiModelProperty(name = "制单员nc编码") + private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java index f1c3a8680..bc5581aed 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java @@ -159,4 +159,10 @@ public class UserEntity extends BaseVOEntity { @ApiModelProperty(name = "有效期管理 0-否 1-是") private Integer validityPeriodManagement; + + @ApiModelProperty(name = "业务员nc编码") + private String salespersonNcCode; + + @ApiModelProperty(name = "制单员nc编码") + private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java index 2686c8709..eeacaaadd 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java @@ -191,4 +191,7 @@ public class UserShipperEntity extends BaseVOEntity { private BigDecimal authorizedUsedAmount; private String remark; + + @ApiModelProperty(name = "客户nc编码") + private String customerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java index 43fed56e1..d25de5e24 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java @@ -254,4 +254,7 @@ public class UserShipperPo implements Serializable { @ApiModelProperty(value = "备注") private String remark; + + @ApiModelProperty(name = "客户nc编码") + private String customerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java index 27c48932d..6015ff20d 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java @@ -248,4 +248,10 @@ public class UserDO extends BaseVOEntity { @ApiModelProperty(name = "有效期管理 0-否 1-是") private Integer validityPeriodManagement; + + @ApiModelProperty(name = "业务员nc编码") + private String salespersonNcCode; + + @ApiModelProperty(name = "制单员nc编码") + private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java index 05e48478a..5557c5a95 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java @@ -225,4 +225,7 @@ public class UserShipperDO extends UserDO { private Integer freightNode; private String remark; + + @ApiModelProperty(name = "客户nc编码") + private String customerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java index 35e973a0e..31b0bd748 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java @@ -235,4 +235,10 @@ public class UserDTO extends BaseVOEntity { @ApiModelProperty(name = "有效期管理 0-否 1-是") private Integer validityPeriodManagement; + + @ApiModelProperty(name = "业务员nc编码") + private String salespersonNcCode; + + @ApiModelProperty(name = "制单员nc编码") + private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java index 455c3e5e8..20b19ea1c 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java @@ -191,4 +191,7 @@ public class UserShipperDTO extends UserDTO { @ApiModelProperty(name = "备注信息") private String remark; + @ApiModelProperty(name = "客户nc编码") + private String customerNcCode; + } diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index b9135a0cc..6a3e54185 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -139,6 +139,18 @@ alibaba-dingtalk-service-sdk 2.0.0 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.1 + + diff --git a/mhd_finance/src/main/java/com/linke/finance/Test.java b/mhd_finance/src/main/java/com/linke/finance/Test.java new file mode 100644 index 000000000..bdf5191fd --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/Test.java @@ -0,0 +1,88 @@ +package com.linke.finance; + +import com.mhd.common.core.domain.dto.nc.*; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import java.io.StringWriter; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class Test { + public static void main(String[] args) { + Date date = new Date(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateString = sdf.format(date); + Ysitem item=new Ysitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setPk_psndoc("111"); + item.setCustomer("11111"); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment("南歧"); + item.setPk_currtype("HKD"); + item.setTaxrate("1"); + item.setQuantity_de("0"); + item.setMoney_de("1000.00"); + item.setMoney_bal("1000.00"); + item.setNotax_de("按税率计算"); + Ysbodys bodys=new Ysbodys(); + bodys.setItem(item); + Ysbillhead billhead=new Ysbillhead(); + billhead.setPk_group("CNK"); + billhead.setPk_org("NG0401"); + billhead.setSett_org("NG0401"); + billhead.setCreationtime(dateString); + billhead.setCreator("xiangna"); + billhead.setPk_billtype("F0"); + billhead.setPk_tradetype("D0"); + billhead.setBillclass("ys"); + billhead.setIsinit("N"); + billhead.setBilldate(dateString); + billhead.setSyscode("0"); + billhead.setBillno("1111111"); + billhead.setDef59("1111111"); + billhead.setSrc_syscode("0"); + billhead.setBillstatus("0"); + billhead.setBillmaker("xiangna"); + billhead.setPk_busitype(""); + billhead.setBillyear("2025"); + billhead.setBillperiod("12"); + billhead.setEffectstatus("0"); + billhead.setDef28("nqyw"); + billhead.setDef29("11111111"); + billhead.setBodys(bodys); + Ysbill bill=new Ysbill(); + bill.setId("1111"); + bill.setBillhead(billhead); + Ysufinterface ufinterface=new Ysufinterface(); + ufinterface.setAccount("NKNC"); + ufinterface.setBilltype("F0"); + ufinterface.setBusinessunitcode(""); + ufinterface.setFilename(""); + ufinterface.setIsexchange("Y"); + ufinterface.setOrgcode("NG0401"); + ufinterface.setReceiver("NG0401"); + ufinterface.setReplace("Y"); + ufinterface.setRoottag(""); + ufinterface.setSender("nqyw"); + ufinterface.setBill(bill); + JAXBContext jaxbContext = null; + //String xmlString =""; + try { + jaxbContext = JAXBContext.newInstance(Ysufinterface.class); + Marshaller marshaller = jaxbContext.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); // 格式化输出，可选 + StringWriter sw = new StringWriter(); + marshaller.marshal(ufinterface, sw); + String xmlString = sw.toString(); // 这是要发送的XML字符串 + System.out.println(xmlString); + } catch (JAXBException e) { + e.printStackTrace(); + } + + } +} diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java index 73d1d838f..0976b0c2d 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java @@ -610,6 +610,11 @@ public class ReconciliationApplicationService { return reconciliationDomainService.workflowProcessInstances(businessDocumentDetaliIds); } + public boolean synchronousNc(String businessDocumentDetaliIds) + { + return reconciliationDomainService.synchronousNc(businessDocumentDetaliIds); + } + public int editIsInvoice(String innerNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber) { return reconciliationDomainService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java index 73825c436..853cbe6a6 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java @@ -62,5 +62,7 @@ public interface IReconciliationService extends IService public StartProcessInstanceResponse workflowProcessInstances(String businessDocumentDetaliIds); + public boolean synchronousNc(String businessDocumentDetaliIds); + public int editIsInvoice(String innerNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber); } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index f783fea52..eee9d9d59 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -20,6 +20,7 @@ import com.linke.finance.domain.reconciliation.repository.facade.IReconciliation import com.linke.finance.domain.reconciliation.repository.mapper.ReconciliationMapper; import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO; import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO; +import com.mhd.common.core.domain.dto.nc.*; import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.core.domain.thirdparty.dingtalk.DetailsDTO; import com.mhd.common.core.domain.thirdparty.dingtalk.FormComponentValuesDTO; @@ -35,6 +36,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import java.io.StringWriter; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -354,4 +359,92 @@ public class ReconciliationImpl extends ServiceImpl Date: Fri, 5 Dec 2025 10:47:46 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-modules/mhd-system/pom.xml | 7 +- .../resources/mapper/basic/SysCityMapper.xml | 6 +- .../mapper/basic/SysCountyMapper.xml | 8 +- .../mapper/basic/SysProvinceMapper.xml | 18 ++-- .../mapper/basic/UserFormConfigInterface.xml | 2 +- .../addressBook/UserFormConfigInterface.xml | 4 +- .../MaterialBaseInfoMapper.xml | 2 +- .../MaterialClassifyMapper.xml | 8 +- .../StorageLocationGroupMapper.xml | 2 +- .../resources/mapper/system/SysMenuMapper.xml | 12 +-- .../system/SysTenantManagementMapper.xml | 2 +- mhd-user-center/pom.xml | 7 +- .../resources/mapper/CustomAuthRoleMapper.xml | 4 +- .../resources/mapper/CustomAuthUserMapper.xml | 4 +- .../mapper/DriverCurrentPositionMapper.xml | 8 +- .../mapper/DriverVehicleBindMapper.xml | 8 +- .../mapper/MotorcadeDriverMapper.xml | 4 +- .../main/resources/mapper/MotorcadeMapper.xml | 12 +-- .../mapper/MotorcadeRecordMapper.xml | 4 +- .../src/main/resources/mapper/RoleMapper.xml | 16 ++-- .../main/resources/mapper/RoleMenuMapper.xml | 4 +- .../mapper/UserDataPermissionMapper.xml | 4 +- .../mapper/UserDriverEnterpriseMapper.xml | 4 +- .../resources/mapper/UserDriverMapper.xml | 82 +++++++++---------- .../src/main/resources/mapper/UserMapper.xml | 32 ++++---- .../main/resources/mapper/UserMenuMapper.xml | 4 +- .../main/resources/mapper/UserRoleMapper.xml | 6 +- .../resources/mapper/UserShipperMapper.xml | 22 ++--- mhd_finance/pom.xml | 7 +- .../accountManage/AccountCashWalletMapper.xml | 4 +- .../BusinessDocumentMapper.xml | 4 +- .../BusinessDocumentDetaliMapper.xml | 2 +- .../mapper/loanManage/LoanManageMapper.xml | 2 +- mhd_product/pom.xml | 7 +- .../mapper/appMenu/AppMenuMapper.xml | 6 +- .../AppUserMenuSettingsMapper.xml | 2 +- .../CustomAuthOrganizationMapper.xml | 2 +- .../main/resources/mapper/menu/MenuMapper.xml | 20 ++--- .../mapper/modules/ModulesMenuMapper.xml | 2 +- .../organization/OrganizationMapper.xml | 59 ++++++++----- .../organization/OrganizationMenuMapper.xml | 2 +- .../mapper/product/ProductDetailsMapper.xml | 2 +- .../mapper/product/ProductMenuMapper.xml | 2 +- .../mapper/product/SysProductMapper.xml | 14 ++-- .../mapper/tenants/SysTenantsMapper.xml | 12 +-- .../mapper/tenants/TenantsMenuMapper.xml | 2 +- .../mapper/tenants/TenantsProductMapper.xml | 2 +- mhd_thrid_party/pom.xml | 7 +- mhd_transport/pom.xml | 7 +- 49 files changed, 254 insertions(+), 209 deletions(-) diff --git a/mhd-modules/mhd-system/pom.xml b/mhd-modules/mhd-system/pom.xml index 28390c606..923472867 100644 --- a/mhd-modules/mhd-system/pom.xml +++ b/mhd-modules/mhd-system/pom.xml @@ -54,9 +54,14 @@ - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml index 91f01d07c..284040ffe 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml @@ -17,7 +17,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_city` a + FROM sys_city a WHERE a.del_flag = 1 @@ -43,7 +43,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_city` a + FROM sys_city a WHERE a.del_flag = 1 @@ -71,7 +71,7 @@ city_name, city_remark FROM - `sys_city` + sys_city WHERE province_code = #{values} ORDER BY diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml index 90cb542f0..deec9ee50 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml @@ -17,7 +17,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_county` a + FROM sys_county a WHERE a.del_flag = 1 @@ -43,7 +43,7 @@ a.update_by_name, a.del_flag FROM - `sys_county` a + sys_county a WHERE a.del_flag = 1 @@ -68,7 +68,7 @@ city_code, county_name, county_remark - FROM `sys_county` + FROM sys_county WHERE city_code = #{values} ORDER BY county_code_new DESC LIMIT 1 @@ -113,7 +113,7 @@ a.county_name as countyName, CONCAT( c.province_name, b.city_name, a.county_name ) AS provinceCityCountyName FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code WHERE diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml index 6868c63fa..cfb0ac7cd 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml @@ -15,7 +15,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_province` a + FROM sys_province a WHERE a.del_flag = 1 @@ -41,7 +41,7 @@ a.update_by, a.update_by_name, a.del_flag - FROM `sys_province` a + FROM sys_province a WHERE a.del_flag = 1 @@ -75,7 +75,7 @@ c.update_by_name, c.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code UNION @@ -94,7 +94,7 @@ b.update_by_name, b.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code UNION @@ -113,7 +113,7 @@ a.update_by_name, a.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code ) a @@ -147,7 +147,7 @@ c.update_by_name, c.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code @@ -178,7 +178,7 @@ b.update_by_name, b.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code WHERE @@ -208,7 +208,7 @@ a.update_by_name, a.del_flag FROM - `sys_county` a + sys_county a LEFT JOIN sys_city b ON a.city_code = b.city_code LEFT JOIN sys_province c ON b.province_code = c.province_code WHERE @@ -245,7 +245,7 @@ province_name, province_remark FROM - `sys_province` + sys_province ORDER BY province_code DESC LIMIT 1 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml index da7d67cf7..394836c26 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT a.* FROM - `basic_agreement` a + basic_agreement a WHERE a.del_flag = 1 diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml index 910d27788..fa1c98742 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ab1.latitude AS receive_doorplate, ab1.address_plot AS receive_addressPlot FROM - `common_route` cr + common_route cr LEFT JOIN address_book ab ON ab.address_book_id = cr.send_address_id and ab.user_id = #{userId} @@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.doorplate, b.remark FROM - `manifest_throught` m + manifest_throught m LEFT JOIN address_book b ON m.address_book_id = b.address_book_id diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml index 23b958989..67845fb2f 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and material_base_info_id in (SELECT DISTINCT material_base_info_id - FROM `test_szwl_wms`.material_inventory + FROM test_szwl_wms.material_inventory WHERE allocation_quantity > 0 AND del_flag = 1) diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml index a14aaf78b..31a7e19b6 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select material_classify_id, organization_id, organization_name, top_organization_id, code, `name`, `level`, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify + select material_classify_id, organization_id, organization_name, top_organization_id, code, name, level, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify @@ -47,10 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and code = #{code} - and `name` like concat('%', #{name}, '%') + and name like concat('%', #{name}, '%') - and `level` = #{level} + and level = #{level} and parent_code = #{parentCode} @@ -93,6 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE FIND_IN_SET(#{parentCode}, code_path) > 0 - ORDER BY `level` ASC + ORDER BY level ASC \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml index 618e0690c..52ca90bf2 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by_name like concat('%', #{updateByName}, '%') - and `number` = #{number} + and number = #{number} and remark like concat('%',#{remark},'%') diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml index b90bf0cf4..d84fdfae9 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -29,7 +29,7 @@ - select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time + select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time from sys_menu @@ -54,13 +54,13 @@ DELETE FROM - `custom_auth_role` a + custom_auth_role a WHERE a.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml b/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml index 9b257e4fc..243a15427 100644 --- a/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.update_by, a.update_by_name FROM - `custom_auth_user` a + custom_auth_user a WHERE a.del_flag = 1 @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DELETE - FROM `role` a + FROM role a WHERE a.del_flag = 1 and a.organization_id = #{value} @@ -167,9 +167,9 @@ DELETE FROM - `role_menu` a + role_menu a WHERE a.del_flag = 1 and a.role_id = #{roleId} diff --git a/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml index d96b2d2aa..9b8599b67 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.user_data_personal_status, a.user_data_organization_status FROM - `user_data_permission` a + user_data_permission a SELECT a.driver_id - FROM `user_driver` a + FROM user_driver a WHERE a.del_flag = 1 AND a.user_id = #{values} @@ -323,9 +323,9 @@ SELECT u.user_name FROM - `user_driver` a + user_driver a LEFT JOIN - `user` u + user u ON u.user_id = a.user_id AND u.del_flag = 1 WHERE a.del_flag = 1 @@ -344,8 +344,8 @@ resultType = "java.lang.Integer"> select count(1) from ( select b.user_id - from user b - left join (select user_id, GROUP_CONCAT(r.role_name separator '&') roleName + from "USER" b + left join (select user_id, WM_CONCAT(r.role_name separator '&') roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 where r.del_flag = 1 @@ -412,8 +412,8 @@ b.user_area_address, b.user_remark, dvb.vehicle_license_plate_number - FROM `user_driver` a - LEFT JOIN `user` b ON a.user_id = b.user_id + FROM user_driver a + LEFT JOIN "USER" b ON a.user_id = b.user_id LEFT JOIN driver_vehicle_bind dvb ON dvb.driver_bind_id = b.user_id AND dvb.del_flag = 1 AND default_flag = 1 WHERE a.del_flag = 1 AND b.del_flag = 1 @@ -459,8 +459,8 @@ a.user_id, a.driver_fill FROM - `user_driver` a - LEFT JOIN `user` b ON a.user_id = b.user_id + user_driver a + LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1 WHERE a.del_flag = 1 @@ -523,8 +523,8 @@ b.user_name, b.user_account FROM - `user_driver` a - LEFT JOIN `user` b ON a.user_id = b.user_id AND b.del_flag = 1 + user_driver a + LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1 WHERE a.del_flag = 1 AND a.driver_id IN @@ -720,7 +720,7 @@ SELECT m.motorcade_header_id, md.user_id, - GROUP_CONCAT( c.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, + WM_CONCAT( c.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, u.user_phone, u.user_name, u.avatar, @@ -732,7 +732,7 @@ AND c.del_flag = 1 LEFT JOIN user_driver ud ON md.user_id = ud.user_id AND ud.del_flag = 1 - LEFT JOIN `user` u ON ud.user_id = u.user_id + LEFT JOIN "USER" u ON ud.user_id = u.user_id LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 @@ -754,7 +754,7 @@ SELECT vehicle_id FROM - `driver_vehicle_bind` + driver_vehicle_bind WHERE del_flag = 1 and driver_id = #{values} @@ -767,9 +767,9 @@ u.user_name, u.user_auth_status FROM - `user_driver` d + user_driver d LEFT JOIN - `user` u + user u ON d.user_id = u.user_id LEFT JOIN driver_vehicle_bind b @@ -818,11 +818,11 @@ r.roleCode FROM user_driver ud - LEFT JOIN `user` u ON ud.user_id = u.user_id + LEFT JOIN "USER" u ON ud.user_id = u.user_id AND u.del_flag = 1 LEFT JOIN (SELECT user_id, - GROUP_CONCAT( DISTINCT r.role_code SEPARATOR '&' ) roleCode + WM_CONCAT( DISTINCT r.role_code SEPARATOR '&' ) roleCode FROM role r LEFT JOIN user_role ur ON r.role_id = ur.role_id @@ -856,7 +856,7 @@ FROM user_driver d LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1 - LEFT JOIN `user` u ON d.user_id = u.user_id + LEFT JOIN "USER" u ON d.user_id = u.user_id LEFT JOIN user_driver_enterprise ude ON d.user_driver_enterprise_id = ude.user_driver_enterprise_id LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1 LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id @@ -884,7 +884,7 @@ FROM user_driver d LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1 - LEFT JOIN `user` u ON d.user_id = u.user_id + LEFT JOIN "USER" u ON d.user_id = u.user_id LEFT JOIN user_driver_enterprise ude ON d.user_driver_enterprise_id = ude.user_driver_enterprise_id LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1 LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id @@ -912,7 +912,7 @@ FROM user_driver d LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1 - LEFT JOIN `user` u ON d.user_id = u.user_id + LEFT JOIN "USER" u ON d.user_id = u.user_id LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1 LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id WHERE @@ -950,7 +950,7 @@ u.user_account, ude.user_driver_enterprise_id, ude.driver_enterprise_name - from user u + from "USER" u left join user_driver ud on ud.user_id = u.user_id and u.del_flag = 1 left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1 @@ -991,7 +991,7 @@ u.user_auth_status userAuthStatus, u.user_birthday userBirthday, concat(ude.driver_captain_fill,'') driverCaptainFill - from user u + from "USER" u left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1 where u.del_flag = 1 and ude.driver_captain_fill = 3 @@ -1010,7 +1010,7 @@ dvb.vehicle_type_name, ud.driver_fill from user_driver ud - left join user u on ud.user_id = u.user_id + left join "USER" u on ud.user_id = u.user_id left join driver_vehicle_bind dvb on ud.user_id = dvb.driver_bind_id and dvb.del_flag = 1 and dvb.default_flag = 1 where ud.del_flag = 1 and u.del_flag = 1 @@ -1035,9 +1035,9 @@ SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name - FROM `user` u - LEFT JOIN `user_shipper` b ON u.user_id = b.user_id - left join (select user_id, GROUP_CONCAT(r.role_name separator '&') roleName + FROM "USER" u + LEFT JOIN user_shipper b ON u.user_id = b.user_id + left join (select user_id, WM_CONCAT(r.role_name separator '&') roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 where r.del_flag = 1 @@ -738,9 +738,9 @@ SELECT user_shipper.shipper_enterprise_name FROM - `user` u + user u INNER JOIN - `user_shipper` ON u.user_id = user_shipper.user_id + user_shipper ON u.user_id = user_shipper.user_id WHERE u.del_flag = 1 AND user_shipper.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml index 9df5985c9..132ff3d9f 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml @@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.user_id, a.menu_id FROM - `user_menu` a + user_menu a SELECT @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id - from user u + from "USER" u left join user_role ur on u.user_id = ur.user_id and ur.del_flag = 1 left join role r on r.role_id = ur.role_id and r.del_flag = 1 diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 161f62379..763420d00 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -65,8 +65,8 @@ a.esign_auth_status, a.esign_enterprise_status, a.esign_seal_auth_id - FROM `user_shipper` a - LEFT JOIN `user` b ON a.user_id = b.user_id + FROM user_shipper a + LEFT JOIN "USER" b ON a.user_id = b.user_id WHERE a.del_flag = 1 AND b.del_flag = 1 @@ -140,9 +140,9 @@ a.user_auth_status, b.original_receipt_flag, b.freight_node - FROM `user` a - LEFT JOIN `user_shipper` b ON a.user_id = b.user_id - left join (select user_id, GROUP_CONCAT(r.role_name separator '&') roleName + FROM "USER" a + LEFT JOIN user_shipper b ON a.user_id = b.user_id + left join (select user_id, WM_CONCAT(r.role_name separator '&') roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 where r.del_flag = 1 @@ -186,15 +186,15 @@ SELECT b.shipper_id, a.user_id, - GROUP_CONCAT(r.role_code) AS roleCode, + WM_CONCAT(r.role_code) AS roleCode, b.shipper_fill, b.shipper_enterprise_fill, a.business_type FROM - `user` a - LEFT JOIN `user_shipper` b ON b.user_id = a.user_id + user a + LEFT JOIN user_shipper b ON b.user_id = a.user_id LEFT JOIN user_role ur ON b.user_id = ur.user_id - LEFT JOIN `role` r ON ur.role_id = r.role_id + LEFT JOIN role r ON ur.role_id = r.role_id AND r.del_flag = 1 WHERE a.del_flag = 1 @@ -346,8 +346,8 @@ select sum(case when us.shipper_fill = 2 then 1 end) + - sum(case when us.shipper_enterprise_fill = 2 then 1 end) as `count` - from user u + sum(case when us.shipper_enterprise_fill = 2 then 1 end) as count + from "USER" u left join user_shipper us on u.user_id = us.user_id u.del_flag = 1 diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index b9135a0cc..1731dad91 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -73,9 +73,14 @@ com.mhd mhd-common-redis - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml b/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml index 672a7f4ef..8b38b8d55 100644 --- a/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml +++ b/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml @@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml b/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml index 31a715484..abddc0176 100644 --- a/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.app_menu_id, a.app_id, me.modules_id from app_menu a - left join `sys_menu` me ON me.menu_id = a.menu_id + left join sys_menu me ON me.menu_id = a.menu_id where a.del_Flag = 1 and me.del_Flag = 1 @@ -91,8 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" me.menu_show, me.menu_perms from app_menu a - left join `app_config` co ON co.app_id = a.app_id - left join `sys_menu` me ON me.menu_id = a.menu_id + left join app_config co ON co.app_id = a.app_id + left join sys_menu me ON me.menu_id = a.menu_id where a.del_flag = 1 and me.del_flag = 1 diff --git a/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml b/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml index 2a25cec46..df01bddfd 100644 --- a/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml +++ b/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" me.menu_show, me.menu_perms from app_user_menu_settings a - left join `sys_menu` me ON me.menu_id = a.menu_id + left join sys_menu me ON me.menu_id = a.menu_id where a.del_flag = 1 and me.del_flag = 1 diff --git a/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml b/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml index d4811b8a0..0a1b4db45 100644 --- a/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml +++ b/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, del_flag FROM - `custom_auth_organization` + custom_auth_organization diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml index a3fd6cb14..2add4a301 100644 --- a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml +++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml @@ -96,9 +96,9 @@ o1.interbank_number, o1.template_seal FROM - `sys_organization` o1 + sys_organization o1 LEFT JOIN - `sys_organization` o2 + sys_organization o2 ON o1.parent_organization_id = o2.organization_id @@ -120,7 +120,7 @@ - AND o1.organization_id NOT IN ( SELECT organization_id FROM `sys_organization_correlation` WHERE organization_id = #{organizationId} ) + AND o1.organization_id NOT IN ( SELECT organization_id FROM sys_organization_correlation WHERE organization_id = #{organizationId} ) order by o1.create_time desc @@ -134,7 +134,7 @@ SELECT organization_id FROM - `sys_organization` + sys_organization where tenants_id = #{value} and del_flag = 1 and organization_state = 1 @@ -148,9 +148,9 @@ b.tenants_simple_name, b.user_id FROM - `sys_organization` a - LEFT JOIN `sys_tenants` b ON a.tenants_id = b.tenants_id AND b.del_flag = 1 - LEFT JOIN `tenants_domain_name` c ON b.tenants_id = c.tenants_id AND c.del_flag = 1 + sys_organization a + LEFT JOIN sys_tenants b ON a.tenants_id = b.tenants_id AND b.del_flag = 1 + LEFT JOIN tenants_domain_name c ON b.tenants_id = c.tenants_id AND c.del_flag = 1 WHERE a.del_flag = 1 AND (b.tenants_domain_name = #{value} @@ -216,7 +216,7 @@ SELECT organization_id FROM - `sys_organization` + sys_organization where del_flag = 1 @@ -225,7 +225,7 @@ SELECT organization_id FROM - `sys_organization` + sys_organization where del_flag = 1 AND parent_organization_id in @@ -234,19 +234,29 @@ diff --git a/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml b/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml index 49559df7e..0fa9f1693 100644 --- a/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml +++ b/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spd.update_by, spd.del_flag FROM - `sys_product_details` spd + sys_product_details spd LEFT JOIN sys_modules sm ON spd.modules_id = sm.modules_id AND sm.del_flag = 1 diff --git a/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml b/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml index 828ab0ad9..631e6e0c1 100644 --- a/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, del_flag FROM - `product_menu` + product_menu diff --git a/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml b/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml index e968b8b4b..7b506ffb5 100644 --- a/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml +++ b/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.product_icon, p.product_photo FROM - `tenants_product` p + tenants_product p LEFT JOIN sys_product po ON po.product_id = p.product_id diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index ed64ff6c6..7d5c8bdc4 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -80,9 +80,14 @@ seata-spring-boot-starter - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 3bbe00014..64c31ee4d 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -74,9 +74,14 @@ mhd-common-redis - + + + com.dameng + DmJdbcDriver18 + 8.1.1.193 From 8ea6aa7e8f66617a94dbff74466e516a8396074e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 5 Dec 2025 16:41:05 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/basic/SysProvinceMapper.xml | 4 ++-- .../domain/motorcade/repository/mapper/MotorcadeMapper.java | 2 +- .../motorcade/repository/mapper/MotorcadeRecordMapper.java | 2 +- .../repository/mapper/CustomAuthUserMapper.java | 2 +- .../repository/mapper/DriverVehicleBindMapper.java | 2 +- .../domain/userAggregate/repository/mapper/UserMapper.java | 4 ++-- .../src/main/resources/mapper/MotorcadeMapper.xml | 2 +- mhd-user-center/src/main/resources/mapper/RoleMapper.xml | 2 +- .../src/main/resources/mapper/UserDriverMapper.xml | 4 ++-- mhd-user-center/src/main/resources/mapper/UserMapper.xml | 2 +- .../src/main/resources/mapper/UserShipperMapper.xml | 2 +- .../product/domain/menu/repository/mapper/MenuMapper.java | 2 +- mhd_product/src/main/resources/mapper/menu/MenuMapper.xml | 2 +- .../src/main/resources/mapper/inventory/InventoryMapper.xml | 6 +++--- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml index cfb0ac7cd..abb06f115 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml @@ -62,7 +62,7 @@ SELECT a.* FROM (SELECT c.province_id as areaId, - "" as parentAreaCode, + '' as parentAreaCode, c.province_code AS areaCode, c.province_code AS areaCodeNew, c.province_name AS areaName, @@ -134,7 +134,7 @@ resultType="com.mhd.basic.domain.areaAggregate.repository.po.SysAreaPO"> SELECT c.province_id as areaId, - "" as parentAreaCode, + '' as parentAreaCode, c.province_code AS areaCode, c.province_code AS areaCodeNew, c.province_name AS areaName, diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeMapper.java index f6bb37d06..5a526c034 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeMapper.java @@ -56,6 +56,6 @@ public interface MotorcadeMapper extends BaseMapper List fleetInviteDriverList(@Param("motorcadeDriverDO") MotorcadeDriverDO motorcadeDriverDO); - @Select("SELECT m.* FROM `motorcade_driver` md LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 AND m.del_flag = 1 AND md.user_id = #{userId} AND m.motorcade_header_id != #{userId}") + @Select("SELECT m.* FROM motorcade_driver md LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 AND m.del_flag = 1 AND md.user_id = #{userId} AND m.motorcade_header_id != #{userId}") List getAllOtherMotorcade(@Param("userId") Long userId); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeRecordMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeRecordMapper.java index 6cb5ebae3..1f52406d4 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeRecordMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeRecordMapper.java @@ -37,6 +37,6 @@ public interface MotorcadeRecordMapper extends BaseMapper */ List invitationRecordListPC(@Param("motorcadeRecordDo")MotorcadeRecordDO motorcadeRecordDo); - @Select("SELECT * FROM `motorcade_record` WHERE del_flag = 1 AND motorcade_id IN (SELECT motorcade_id FROM motorcade WHERE del_flag = 1 and motorcade_header_id = #{userId})") + @Select("SELECT * FROM motorcade_record WHERE del_flag = 1 AND motorcade_id IN (SELECT motorcade_id FROM motorcade WHERE del_flag = 1 and motorcade_header_id = #{userId})") List getByMotorHeaderId(@Param("userId") Long userId); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/roleAggregate/repository/mapper/CustomAuthUserMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/roleAggregate/repository/mapper/CustomAuthUserMapper.java index 6a576804a..76b01c3c5 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/roleAggregate/repository/mapper/CustomAuthUserMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/roleAggregate/repository/mapper/CustomAuthUserMapper.java @@ -12,7 +12,7 @@ import java.util.List; public interface CustomAuthUserMapper extends BaseMapper { List getCustomAuthByRoleOrUserId(CustomAuthDO customAuthDO); - @Select("SELECT * FROM `custom_auth_role` WHERE role_id IN (SELECT role_id FROM user_role WHERE user_id = #{userId})") + @Select("SELECT * FROM custom_auth_role WHERE role_id IN (SELECT role_id FROM user_role WHERE user_id = #{userId})") List getCustomAuthByRole(@Param("userId") Long userId); void deleteCustomAuthUserByUserId(CustomAuthDO customAuthDO); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/DriverVehicleBindMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/DriverVehicleBindMapper.java index f9e9ac256..fe3c432ba 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/DriverVehicleBindMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/DriverVehicleBindMapper.java @@ -37,6 +37,6 @@ public interface DriverVehicleBindMapper extends BaseMapper */ List queryVehicleBindInfo(@Param("driverVehicleBindDo") DriverVehicleBindDo driverVehicleBindDo); - @Select("SELECT count(driver_vehicle_bind_id) FROM `driver_vehicle_bind` WHERE (user_id = #{userId} OR driver_bind_id = #{userId}) AND del_flag = 1 ") + @Select("SELECT count(driver_vehicle_bind_id) FROM driver_vehicle_bind WHERE (user_id = #{userId} OR driver_bind_id = #{userId}) AND del_flag = 1 ") Integer selectByUserId(@Param("userId") Long userId); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java index e6c9930db..a020e9cf0 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java @@ -51,7 +51,7 @@ public interface UserMapper extends BaseMapper { List getAllDriverByOrganization(@Param("topOrganizationId") Long topOrganizationId); - @Select("SELECT COUNT(*) FROM `user` WHERE del_flag = 1 AND create_by = #{userId} AND user_id != #{userId}") + @Select("SELECT COUNT(*) FROM \"USER\" WHERE del_flag = 1 AND create_by = #{userId} AND user_id != #{userId}") Integer selectCreatByUserId(@Param("userId") Long userId); @@ -64,7 +64,7 @@ public interface UserMapper extends BaseMapper { */ List selectAppUserListByRoleCode(UserDO userDO); - @Select("SELECT * FROM `user` WHERE del_flag = 1 AND organization_id = #{organizationId} AND user_account_type = 3 limit 1") + @Select("SELECT * FROM \"USER\" WHERE del_flag = 1 AND organization_id = #{organizationId} AND user_account_type = 3 limit 1") UserEntity selectByTopOrganizationId(@Param("organizationId") Long organizationId); diff --git a/mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml b/mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml index 50d87fdd0..ab80b2354 100644 --- a/mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml @@ -335,7 +335,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join "USER" u on ud.user_id = u.user_id LEFT JOIN (SELECT user_id, - WM_CONCAT( DISTINCT r.role_code SEPARATOR '&' ) roleCode + LISTAGG(DISTINCT r.role_code, '&') WITHIN GROUP(ORDER BY r.role_code) AS roleCode FROM role r LEFT JOIN user_role ur ON r.role_id = ur.role_id diff --git a/mhd-user-center/src/main/resources/mapper/RoleMapper.xml b/mhd-user-center/src/main/resources/mapper/RoleMapper.xml index feb90f553..73acbe86b 100644 --- a/mhd-user-center/src/main/resources/mapper/RoleMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/RoleMapper.xml @@ -167,7 +167,7 @@ + + diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index 6a3e54185..0be92c65a 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -150,6 +150,12 @@ jaxb-runtime 2.3.1 + + com.aliyun + aliyun-http-apache + 0.2.9-beta + compile + diff --git a/mhd_finance/src/main/java/com/linke/finance/Test.java b/mhd_finance/src/main/java/com/linke/finance/Test.java index bdf5191fd..75cf9be71 100644 --- a/mhd_finance/src/main/java/com/linke/finance/Test.java +++ b/mhd_finance/src/main/java/com/linke/finance/Test.java @@ -11,7 +11,10 @@ import java.util.Date; public class Test { public static void main(String[] args) { - Date date = new Date(); + //ys(); + //sk(); + } +/* public static void ys(){Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String dateString = sdf.format(date); Ysitem item=new Ysitem(); @@ -35,8 +38,8 @@ public class Test { billhead.setPk_org("NG0401"); billhead.setSett_org("NG0401"); billhead.setCreationtime(dateString); - billhead.setCreator("xiangna"); billhead.setPk_billtype("F0"); + billhead.setCreator("xiangna"); billhead.setPk_tradetype("D0"); billhead.setBillclass("ys"); billhead.setIsinit("N"); @@ -83,6 +86,78 @@ public class Test { } catch (JAXBException e) { e.printStackTrace(); } + }; - } + public static void sk(){Date date = new Date(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateString = sdf.format(date); + SKitem item=new SKitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setCheckdirection("ar"); + item.setPk_psndoc("111"); + item.setCustomer("25849"); + item.setPurchaseorder("sk96321"); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment("新永鸿工业气体有限公司"); + item.setPk_currtype("CMY"); + item.setMoney_cr("1000.00"); + item.setMoney_bal("1000.00"); + SKbodys bodys=new SKbodys(); + bodys.setItem(item); + SKbillhead billhead=new SKbillhead(); + billhead.setPk_group("CNK"); + billhead.setPk_org("NG0401"); + billhead.setSett_org("NG0401"); + billhead.setCreationtime(dateString); + billhead.setPk_billtype("F2"); + billhead.setCreator("zhanghongming"); + billhead.setPk_tradetype("D2"); + billhead.setBillclass("sk"); + billhead.setBilldate(dateString); + billhead.setSyscode("0"); + billhead.setBillno(""); + billhead.setDef59("1111111"); + billhead.setSrc_syscode("0"); + billhead.setBillstatus("0"); + billhead.setBillmaker("zhanghongming"); + billhead.setPk_busitype(""); + billhead.setBillyear("2025"); + billhead.setBillperiod("12"); + billhead.setEffectstatus("0"); + billhead.setDef28("nqyw"); + billhead.setDef29("11111111"); + billhead.setBodys(bodys); + SKbill bill=new SKbill(); + bill.setId("1111"); + bill.setBillhead(billhead); + SKufinterface ufinterface=new SKufinterface(); + ufinterface.setAccount("NKNC"); + ufinterface.setBilltype("F2"); + ufinterface.setBusinessunitcode(""); + ufinterface.setFilename(""); + ufinterface.setIsexchange("Y"); + ufinterface.setOrgcode("NG0401"); + ufinterface.setReceiver("NG0401"); + ufinterface.setReplace("Y"); + ufinterface.setRoottag(""); + ufinterface.setSender("nqyw"); + ufinterface.setBill(bill); + JAXBContext jaxbContext = null; + //String xmlString =""; + try { + jaxbContext = JAXBContext.newInstance(SKufinterface.class); + Marshaller marshaller = jaxbContext.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); // 格式化输出，可选 + StringWriter sw = new StringWriter(); + marshaller.marshal(ufinterface, sw); + String xmlString = sw.toString(); // 这是要发送的XML字符串 + System.out.println(xmlString); + } catch (JAXBException e) { + e.printStackTrace(); + } + };*/ } + diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/ncLog/NcLogApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/ncLog/NcLogApplicationService.java new file mode 100644 index 000000000..3e1128a98 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/ncLog/NcLogApplicationService.java @@ -0,0 +1,72 @@ +package com.linke.finance.application.server.ncLog; + +import com.linke.finance.domain.ncLog.repository.po.NcLogPO; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; +import com.linke.finance.domain.ncLog.service.NcLogDomainService; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +/** + * 【请填写功能名称】ApplicationService + * + * @author gen + * @date 2025-12-04 + */ +@Service +@Slf4j +public class NcLogApplicationService { + @Autowired + private NcLogDomainService ncLogDomainService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + + public List queryList(NcLogDO ncLogDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1){ + ncLogDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + } + return ncLogDomainService.queryList(ncLogDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(NcLogDO ncLogDO) { + + return ncLogDomainService.insert(ncLogDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(NcLogDO ncLogDO) { + return ncLogDomainService.update(ncLogDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public boolean delete(Long[] ncLogIds) { + return ncLogDomainService.delete(ncLogIds); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public NcLogPO getInfo(Long ncLogId) + { + return ncLogDomainService.getInfo(ncLogId); + } + + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java index 0976b0c2d..3ef7020f6 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java @@ -614,6 +614,10 @@ public class ReconciliationApplicationService { { return reconciliationDomainService.synchronousNc(businessDocumentDetaliIds); } + public boolean synchronousNcSK(String businessDocumentDetaliIds) + { + return reconciliationDomainService.synchronousNcSK(businessDocumentDetaliIds); + } public int editIsInvoice(String innerNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber) { diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java index 823802eca..0112b0265 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.List; /** * 收款单ApplicationService - * + * * @author gen * @date 2025-04-28 */ @@ -136,5 +136,8 @@ public class TmsReceiptApplicationService { } return true; } - + public boolean synchronousNc(String businessDocumentDetaliIds) + { + return tmsReceiptDomainService.synchronousNc(businessDocumentDetaliIds); + } } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/entity/NcLog.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/entity/NcLog.java new file mode 100644 index 000000000..accb53dae --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/entity/NcLog.java @@ -0,0 +1,58 @@ +package com.linke.finance.domain.ncLog.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.mhd.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; +import java.math.BigDecimal; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + + +/** + * 【请填写功能名称】对象 nc_log + * + * @author gen + * @date 2025-12-04 + */ + +@Data +public class NcLog extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("nc日志id") + @TableId(type = IdType.AUTO) + private Long ncLogId; + + @ApiModelProperty("类型 0-应收单 1-收款单") + @Excel(name = "类型 0-应收单 1-收款单") + private Long type; + + @ApiModelProperty("数据源id") + @Excel(name = "数据源id") + private Long orderId; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String requestBody; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String responeBody; + + @ApiModelProperty("组织ID") + @Excel(name = "组织ID") + private Long organizationId; + + @ApiModelProperty("一级组织ID") + @Excel(name = "一级组织ID") + private Long topOrganizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/facade/INcLogService.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/facade/INcLogService.java new file mode 100644 index 000000000..8ba0f4021 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/facade/INcLogService.java @@ -0,0 +1,43 @@ +package com.linke.finance.domain.ncLog.repository.facade; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.linke.finance.domain.ncLog.entity.NcLog; +import com.linke.finance.domain.ncLog.repository.po.NcLogPO; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; + +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author gen + * @date 2025-12-04 + */ +public interface INcLogService extends IService +{ + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(NcLogDO ncLogDO); + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(NcLogDO ncLogDO); + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(NcLogDO ncLogDO); + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ncLogIds); + + + /** + * 查询【请填写功能名称】 + */ + public NcLogPO getInfo(Long ncLogId); +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/mapper/NcLogMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/mapper/NcLogMapper.java new file mode 100644 index 000000000..068aef010 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/mapper/NcLogMapper.java @@ -0,0 +1,22 @@ +package com.linke.finance.domain.ncLog.repository.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.linke.finance.domain.ncLog.entity.NcLog; +import com.linke.finance.domain.ncLog.repository.po.NcLogPO; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; +import org.apache.ibatis.annotations.Param; +/** + * 【请填写功能名称】Mapper接口 + * + * @author gen + * @date 2025-12-04 + */ +public interface NcLogMapper extends BaseMapper +{ + /** + * 查询【请填写功能名称】列表 + */ + public List queryList(NcLogDO ncLogDO); + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/persistence/NcLogImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/persistence/NcLogImpl.java new file mode 100644 index 000000000..73aa36773 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/persistence/NcLogImpl.java @@ -0,0 +1,81 @@ +package com.linke.finance.domain.ncLog.repository.persistence; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.linke.finance.domain.ncLog.entity.NcLog; +import com.linke.finance.domain.ncLog.repository.facade.INcLogService; +import com.linke.finance.domain.ncLog.repository.mapper.NcLogMapper; +import com.linke.finance.domain.ncLog.repository.po.NcLogPO; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author gen + * @date 2025-12-04 + */ +@Service +public class NcLogImpl extends ServiceImpl implements INcLogService{ + @Autowired + private NcLogMapper ncLogMapper; + + /** + * 查询【请填写功能名称】列表 + */ + @Override + public List queryList(NcLogDO ncLogDO) + { + return ncLogMapper.queryList(ncLogDO); + } + + /** + * 新增【请填写功能名称】 + */ + @Override + public Boolean insert(NcLogDO ncLogDO) { + NcLog ncLog = new NcLog(); + BeanUtils.copyProperties(ncLogDO,ncLog); + return this.save(ncLog); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public Boolean update(NcLogDO ncLogDO) { + NcLog ncLog = new NcLog(); + BeanUtils.copyProperties(ncLogDO,ncLog); + return this.updateById(ncLog); + } + + /** + * 批量删除【请填写功能名称】 + */ + @Override + public Boolean delete(Long[] ncLogIds ) { + List list = new ArrayList<>(); + for (Long id : ncLogIds) { + NcLog ncLog = new NcLog(); + ncLog.setNcLogId(id); + ncLog.setDelFlag(2); + list.add(ncLog); + } + return this.updateBatchById(list); + } + + /** + * 修改【请填写功能名称】 + */ + @Override + public NcLogPO getInfo(Long ncLogId) { + NcLog ncLog = this.getById(ncLogId); + NcLogPO ncLogPO = new NcLogPO(); + BeanUtils.copyProperties(ncLog,ncLogPO); + return ncLogPO; + } +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/po/NcLogPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/po/NcLogPO.java new file mode 100644 index 000000000..a1fbac7da --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/po/NcLogPO.java @@ -0,0 +1,58 @@ +package com.linke.finance.domain.ncLog.repository.po; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import com.mhd.common.core.web.domain.BaseVOEntity; + + +/** + * 【请填写功能名称】对象 nc_log + * + * @author gen + * @date 2025-12-04 + */ + +@Data +@ApiModel(value = "【请填写功能名称】对象", description = "【请填写功能名称】响应对象") +public class NcLogPO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("nc日志id") + private Long ncLogId; + + @ApiModelProperty("类型 0-应收单 1-收款单") + @Excel(name = "类型 0-应收单 1-收款单") + private Long type; + + @ApiModelProperty("数据源id") + @Excel(name = "数据源id") + private Long orderId; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String requestBody; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String responeBody; + + @ApiModelProperty("组织ID") + @Excel(name = "组织ID") + private Long organizationId; + + @ApiModelProperty("一级组织ID") + @Excel(name = "一级组织ID") + private Long topOrganizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/todo/NcLogDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/todo/NcLogDO.java new file mode 100644 index 000000000..d4da79faa --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/repository/todo/NcLogDO.java @@ -0,0 +1,61 @@ +package com.linke.finance.domain.ncLog.repository.todo; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + + +/** + * 【请填写功能名称】对象 nc_log + * + * @author gen + * @date 2025-12-04 + */ + +@Data +public class NcLogDO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("nc日志id") + private Long ncLogId; + + @ApiModelProperty("类型 0-应收单 1-收款单") + @Excel(name = "类型 0-应收单 1-收款单") + private Long type; + + @ApiModelProperty("数据源id") + @Excel(name = "数据源id") + private Long orderId; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String requestBody; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String responeBody; + + @ApiModelProperty("组织ID") + @Excel(name = "组织ID") + private Long organizationId; + + @ApiModelProperty("一级组织ID") + @Excel(name = "一级组织ID") + private Long topOrganizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/service/NcLogDomainService.java b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/service/NcLogDomainService.java new file mode 100644 index 000000000..f3a2be46d --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/domain/ncLog/service/NcLogDomainService.java @@ -0,0 +1,64 @@ +package com.linke.finance.domain.ncLog.service; + +import com.linke.finance.domain.ncLog.repository.facade.INcLogService; +import com.linke.finance.domain.ncLog.repository.po.NcLogPO; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +/** + * 【请填写功能名称】 + * + * @author gen + * @date 2025-12-04 + */ +@Service +@Slf4j +public class NcLogDomainService { + + @Autowired + private INcLogService ncLogService; + + + /** + * 分页查询【请填写功能名称】列表 + */ + public List queryList(NcLogDO ncLogDO) { + return ncLogService.queryList(ncLogDO); + } + + + /** + * 新增【请填写功能名称】 + */ + public Boolean insert(NcLogDO ncLogDO) { + + return ncLogService.insert(ncLogDO); + } + + /** + * 修改【请填写功能名称】 + */ + public Boolean update(NcLogDO ncLogDO) { + return ncLogService.update(ncLogDO); + } + + /** + * 批量删除【请填写功能名称】 + */ + public Boolean delete(Long[] ncLogIds) { + return ncLogService.delete(ncLogIds); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + public NcLogPO getInfo(Long ncLogId) + { + return ncLogService.getInfo(ncLogId); + } + + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java index a344ce473..b22224d46 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java @@ -218,4 +218,28 @@ public class Reconciliation extends BaseVOEntity{ @ApiModelProperty(value = "申请发票单号") private String applyNumber; + + @ApiModelProperty("nc同步状态 0-未同步 1-已同步") + private Integer synchronousStatus; + + + @ApiModelProperty(value = "nc同步时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date synchronousTime; + + @ApiModelProperty(value = "nc唯一标识") + private String ncId; + + @ApiModelProperty("nc同步状态 0-未同步 1-已同步") + private Integer skSynchronousStatus; + + + @ApiModelProperty(value = "nc同步时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date skSynchronousTime; + + @ApiModelProperty(value = "nc唯一标识") + private String skNcId; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java index 853cbe6a6..ae967d14b 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/facade/IReconciliationService.java @@ -64,5 +64,7 @@ public interface IReconciliationService extends IService public boolean synchronousNc(String businessDocumentDetaliIds); + public boolean synchronousNcSK(String businessDocumentDetaliIds); + public int editIsInvoice(String innerNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber); } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index eee9d9d59..70a1477aa 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -14,14 +14,20 @@ import com.linke.finance.domain.approvalDocument.repository.mapper.ApprovalDocum import com.linke.finance.domain.approvalDocument.service.ApprovalDocumentDomainService; import com.linke.finance.domain.businessDocument.entity.BusinessDocument; import com.linke.finance.domain.businessDocumentDetali.entity.BusinessDocumentDetali; +import com.linke.finance.domain.ncLog.entity.NcLog; +import com.linke.finance.domain.ncLog.repository.mapper.NcLogMapper; import com.linke.finance.domain.reconciliation.entity.Reconciliation; import com.linke.finance.domain.reconciliation.entity.ReconciliationBusinessDocument; import com.linke.finance.domain.reconciliation.repository.facade.IReconciliationService; import com.linke.finance.domain.reconciliation.repository.mapper.ReconciliationMapper; import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO; import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO; +import com.mhd.common.core.domain.dto.ReconciliationDTO; import com.mhd.common.core.domain.dto.nc.*; +import com.mhd.common.core.domain.entity.R; +import com.mhd.common.core.domain.entity.TmsOrder; import com.mhd.common.core.domain.po.UserPo; +import com.mhd.common.core.domain.po.UserShipperPo; import com.mhd.common.core.domain.thirdparty.dingtalk.DetailsDTO; import com.mhd.common.core.domain.thirdparty.dingtalk.FormComponentValuesDTO; import com.mhd.common.core.domain.thirdparty.dingtalk.WorkflowProcessInstancesDTO; @@ -31,7 +37,14 @@ import com.mhd.common.core.utils.StringUtils; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.UserServiceFeign; +import com.mhd.system.api.WlhyServiceFeign; import com.mhd.system.api.model.LoginUser; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,8 +52,10 @@ import org.springframework.stereotype.Service; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; +import java.io.IOException; import java.io.StringWriter; import java.math.BigDecimal; +import java.sql.NClob; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -58,15 +73,22 @@ import java.util.Map; public class ReconciliationImpl extends ServiceImpl implements IReconciliationService{ @Autowired private ReconciliationMapper reconciliationMapper; + + @Autowired + private NcLogMapper ncLogMapper; @Autowired private UserServiceFeign userServiceFeign; @Autowired private ThirdPartyServiceFeign thirdPartyServiceFeign; + @Autowired + private WlhyServiceFeign wlhyServiceFeign; + @Autowired private ApprovalDocumentMapper approvalDocumentMapper; @Autowired private ApprovalDocumentDomainService approvalDocumentDomainService; + private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK"; /** * 查询对账单列表 */ @@ -364,42 +386,67 @@ public class ReconciliationImpl extends ServiceImpl ysitemList=new ArrayList(); + ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); + reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); + R> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); + if(result.getCode()==200){ + List list=result.getData(); + if(ObjectUtil.isNotNull(list)){ + for(TmsOrder tmsOrder:list){ + AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); + if(ajaxResult.get("code").equals("200")){ + UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data"); + Ysitem item=new Ysitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setPk_psndoc(userPo.getSalespersonNcCode()); + item.setCustomer(userShipperPo.getCustomerNcCode()); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment(userShipperPo.getShipperEnterpriseName()); + item.setPk_currtype("CNY"); + item.setPurchaseorder(tmsOrder.getGoodsNumber()); + item.setTaxrate("0"); + item.setQuantity_de("0"); + item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setNotax_de(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setLocal_tax_de(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setTax_de(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight())); + item.setDef75("T10"); + item.setInvoiceno(""); + ysitemList.add(item); + } + + } + } + } Ysbodys bodys=new Ysbodys(); - bodys.setItem(item); + bodys.setItem(ysitemList); Ysbillhead billhead=new Ysbillhead(); billhead.setPk_group("CNK"); billhead.setPk_org("NG0401"); billhead.setSett_org("NG0401"); billhead.setCreationtime(dateString); - billhead.setCreator("zhanghongming"); + billhead.setCreator(userPo.getDocumentPreparerNcCode()); billhead.setPk_billtype("F0"); billhead.setPk_tradetype("D0"); billhead.setBillclass("ys"); @@ -410,7 +457,7 @@ public class ReconciliationImpl extends ServiceImpl ysitemList=new ArrayList(); + ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); + reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); + R> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); + if(result.getCode()==200){ + List list=result.getData(); + if(ObjectUtil.isNotNull(list)){ + for(TmsOrder tmsOrder:list){ + AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); + if(ajaxResult.get("code").equals("200")){ + UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data"); + SKitem item=new SKitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setCheckdirection("ar"); + item.setPk_psndoc(userPo.getSalespersonNcCode()); + item.setCustomer(userShipperPo.getCustomerNcCode()); + item.setPurchaseorder(tmsOrder.getGoodsNumber()); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment(userShipperPo.getShipperEnterpriseName()); + item.setPk_currtype("CNY"); + item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); + item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); + ysitemList.add(item); + } + + } + } + } + SKbodys bodys=new SKbodys(); + bodys.setItem(ysitemList); + SKbillhead billhead=new SKbillhead(); + billhead.setPk_group("CNK"); + billhead.setPk_org("NG0401"); + billhead.setSett_org("NG0401"); + billhead.setCreationtime(dateString); + billhead.setPk_billtype("F2"); + billhead.setCreator(userPo.getDocumentPreparerNcCode()); + billhead.setPk_tradetype("D2"); + billhead.setBillclass("sk"); + billhead.setBilldate(dateString); + billhead.setSyscode("0"); + billhead.setBillno(""); + billhead.setDef59(reconciliation.getInnerNumber()); + billhead.setSrc_syscode("0"); + billhead.setBillstatus("0"); + billhead.setBillmaker(userPo.getDocumentPreparerNcCode()); + billhead.setPk_busitype(""); + billhead.setBillyear(sdf1.format(date)); + billhead.setBillperiod(sdf2.format(date)); + billhead.setEffectstatus("0"); + billhead.setDef28("nqyw"); + billhead.setDef29(reconciliation.getInnerNumber()); + billhead.setBodys(bodys); + SKbill bill=new SKbill(); + bill.setId("sk"+String.valueOf(reconciliation.getReconciliationId())); + bill.setBillhead(billhead); + SKufinterface ufinterface=new SKufinterface(); + ufinterface.setAccount("NKNC"); + ufinterface.setBilltype("F2"); + ufinterface.setBusinessunitcode(""); + ufinterface.setFilename(""); + ufinterface.setIsexchange("Y"); + ufinterface.setOrgcode("NG0401"); + ufinterface.setReceiver("NG0401"); + ufinterface.setReplace("Y"); + ufinterface.setRoottag(""); + ufinterface.setSender("nqyw"); + ufinterface.setBill(bill); + JAXBContext jaxbContext = null; + //String xmlString =""; + jaxbContext = JAXBContext.newInstance(SKufinterface.class); + Marshaller marshaller = jaxbContext.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); // 格式化输出，可选 + StringWriter sw = new StringWriter(); + marshaller.marshal(ufinterface, sw); + String xmlString = sw.toString(); // 这是要发送的XML字符串 + System.out.println(xmlString); + NcLog ncLog=new NcLog(); + ncLog.setOrderId(reconciliation.getReconciliationId()); + ncLog.setRequestBody(xmlString); + ncLog.setResponeBody(""); + ncLog.setType(1L); + ncLog.setOrganizationId(reconciliation.getOrganizationId()); + ncLog.setOrganizationName(reconciliation.getOrganizationName()); + ncLog.setTopOrganizationId(reconciliation.getTopOrganizationId()); + ncLogMapper.insert(ncLog); + reconciliation.setSkSynchronousStatus(1); + reconciliation.setSkSynchronousTime(new Date()); + reconciliation.setSkNcId("sk"+String.valueOf(reconciliation.getReconciliationId())); + reconciliationMapper.updateById(reconciliation); } catch (JAXBException e) { e.printStackTrace(); } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/service/ReconciliationDomainService.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/service/ReconciliationDomainService.java index 4c634be01..bacf2746d 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/service/ReconciliationDomainService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/service/ReconciliationDomainService.java @@ -162,6 +162,11 @@ public class ReconciliationDomainService { return reconciliationService.synchronousNc(businessDocumentDetaliIds); } + public boolean synchronousNcSK(String businessDocumentDetaliIds) + { + return reconciliationService.synchronousNcSK(businessDocumentDetaliIds); + } + public int editIsInvoice(String innerNumber, Integer isInvoice, String invoiceId, String invoiceMakeTime,String applyNumber) { return reconciliationService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java index a8f16d04b..0576f0343 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java @@ -9,11 +9,12 @@ import java.math.BigDecimal; import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 收款单对象 tms_receipt - * + * * @author gen * @date 2025-04-28 */ @@ -97,4 +98,13 @@ public class TmsReceipt extends BaseVOEntity{ private Integer delFlag; + @ApiModelProperty("nc同步状态 0-未同步 1-已同步") + private Integer synchronousStatus; + + + @ApiModelProperty(value = "nc同步时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date synchronousTime; + } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/facade/ITmsReceiptService.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/facade/ITmsReceiptService.java index 7d94df467..03b324a2e 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/facade/ITmsReceiptService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/facade/ITmsReceiptService.java @@ -9,7 +9,7 @@ import java.util.List; /** * 收款单Service接口 - * + * * @author gen * @date 2025-04-28 */ @@ -42,4 +42,6 @@ public interface ITmsReceiptService extends IService public TmsReceiptPO getInfo(Long id); public int updateAssignableAmount(TmsReceiptPO receiptPo); + + public boolean synchronousNc(String businessDocumentDetaliIds); } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/persistence/TmsReceiptImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/persistence/TmsReceiptImpl.java index 330081468..078d6e979 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/persistence/TmsReceiptImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/persistence/TmsReceiptImpl.java @@ -1,23 +1,35 @@ package com.linke.finance.domain.tmsReceipt.repository.persistence; +import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.linke.finance.domain.ncLog.entity.NcLog; +import com.linke.finance.domain.ncLog.repository.mapper.NcLogMapper; import com.linke.finance.domain.reconciliation.entity.Reconciliation; import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt; import com.linke.finance.domain.tmsReceipt.repository.facade.ITmsReceiptService; import com.linke.finance.domain.tmsReceipt.repository.mapper.TmsReceiptMapper; import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO; import com.linke.finance.domain.tmsReceipt.repository.todo.TmsReceiptDO; +import com.mhd.common.core.domain.dto.nc.*; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import java.io.StringWriter; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** * 收款单Service业务层处理 - * + * * @author gen * @date 2025-04-28 */ @@ -26,6 +38,9 @@ public class TmsReceiptImpl extends ServiceImpl im @Autowired private TmsReceiptMapper tmsReceiptMapper; + @Autowired + private NcLogMapper ncLogMapper; + /** * 查询收款单列表 */ @@ -88,4 +103,105 @@ public class TmsReceiptImpl extends ServiceImpl im .set(TmsReceipt::getAssignmentStatus, receiptPo.getAssignmentStatus()) .eq(TmsReceipt::getId, receiptPo.getId())); } + + @Override + public boolean synchronousNc(String businessDocumentDetaliIds) { + String [] businessDocumentDetaliIdArray=businessDocumentDetaliIds.split(","); + LoginUser loginUser= SecurityUtils.getLoginUser(); + for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){ + TmsReceipt tmsReceipt = this.getById(businessDocumentDetaliId); + /* if(reconciliation.getSynchronousStatus()==1){ + throw new ServiceException("该记录已同步，不需要再次同步"); + } + if(reconciliation.getIsInvoice()!=2){ + throw new ServiceException("该记录还未开票，不允许同步"); + }*/ + try { + Date date = tmsReceipt.getCreateTime(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy"); + SimpleDateFormat sdf2 = new SimpleDateFormat("MM"); + String dateString = sdf.format(date); + List ysitemList=new ArrayList(); + SKitem item=new SKitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setCheckdirection("ar"); + item.setPk_psndoc("111"); + item.setCustomer("25849"); + item.setPurchaseorder(tmsReceipt.getReceivePaymentNumber()); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment("新永鸿工业气体有限公司"); + item.setPk_currtype("CMY"); + item.setMoney_cr(String.valueOf(tmsReceipt.getReceivePaymentAmount())); + item.setMoney_bal(String.valueOf(tmsReceipt.getReceivePaymentAmount())); + SKbodys bodys=new SKbodys(); + bodys.setItem(ysitemList); + SKbillhead billhead=new SKbillhead(); + billhead.setPk_group("CNK"); + billhead.setPk_org("NG0401"); + billhead.setSett_org("NG0401"); + billhead.setCreationtime(dateString); + billhead.setPk_billtype("F2"); + billhead.setCreator("zhanghongming"); + billhead.setPk_tradetype("D2"); + billhead.setBillclass("sk"); + billhead.setBilldate(dateString); + billhead.setSyscode("0"); + billhead.setBillno(""); + billhead.setDef59(tmsReceipt.getReceivePaymentNumber()); + billhead.setSrc_syscode("0"); + billhead.setBillstatus("0"); + billhead.setBillmaker("zhanghongming"); + billhead.setPk_busitype(""); + billhead.setBillyear("2025"); + billhead.setBillperiod("12"); + billhead.setEffectstatus("0"); + billhead.setDef28("nqyw"); + billhead.setDef29(tmsReceipt.getReceivePaymentNumber()); + billhead.setBodys(bodys); + SKbill bill=new SKbill(); + bill.setId(String.valueOf(tmsReceipt.getId())); + bill.setBillhead(billhead); + SKufinterface ufinterface=new SKufinterface(); + ufinterface.setAccount("NKNC"); + ufinterface.setBilltype("F2"); + ufinterface.setBusinessunitcode(""); + ufinterface.setFilename(""); + ufinterface.setIsexchange("Y"); + ufinterface.setOrgcode("NG0401"); + ufinterface.setReceiver("NG0401"); + ufinterface.setReplace("Y"); + ufinterface.setRoottag(""); + ufinterface.setSender("nqyw"); + ufinterface.setBill(bill); + JAXBContext jaxbContext = null; + //String xmlString =""; + jaxbContext = JAXBContext.newInstance(SKufinterface.class); + Marshaller marshaller = jaxbContext.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); // 格式化输出，可选 + StringWriter sw = new StringWriter(); + marshaller.marshal(ufinterface, sw); + String xmlString = sw.toString(); // 这是要发送的XML字符串 + System.out.println(xmlString); + NcLog ncLog=new NcLog(); + ncLog.setOrderId(tmsReceipt.getOrganizationId()); + ncLog.setRequestBody(xmlString); + ncLog.setResponeBody(""); + ncLog.setType(0L); + ncLog.setOrganizationId(tmsReceipt.getOrganizationId()); + ncLog.setOrganizationName(tmsReceipt.getOrganizationName()); + ncLog.setTopOrganizationId(tmsReceipt.getTopOrganizationId()); + ncLogMapper.insert(ncLog); + tmsReceipt.setSynchronousStatus(1); + tmsReceipt.setSynchronousTime(new Date()); + tmsReceiptMapper.updateById(tmsReceipt); + } catch (JAXBException e) { + e.printStackTrace(); + } + } + return true; + } } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/service/TmsReceiptDomainService.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/service/TmsReceiptDomainService.java index be675eb10..e2e78dff1 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/service/TmsReceiptDomainService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/service/TmsReceiptDomainService.java @@ -30,7 +30,7 @@ import java.util.Date; import java.util.List; /** * 收款单 - * + * * @author gen * @date 2025-04-28 */ @@ -285,4 +285,10 @@ public class TmsReceiptDomainService { public int updateAssignableAmount(TmsReceiptPO receiptPo) { return tmsReceiptService.updateAssignableAmount(receiptPo); } + + + public boolean synchronousNc(String businessDocumentDetaliIds) + { + return tmsReceiptService.synchronousNc(businessDocumentDetaliIds); + } } diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/ncLog/NcLogAssembler.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/ncLog/NcLogAssembler.java new file mode 100644 index 000000000..de67548ec --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/ncLog/NcLogAssembler.java @@ -0,0 +1,65 @@ +package com.linke.finance.interfaces.assemble.ncLog; + +import cn.hutool.core.util.ObjectUtil; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; +import com.linke.finance.interfaces.dto.ncLog.NcLogDTO; +import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException; +import com.mhd.common.core.exception.digitalLogisticsException.UserError; +import com.mhd.common.core.utils.bean.BeanUtils; +import com.mhd.common.core.utils.IgnoreNullUtil; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 【请填写功能名称】Assembler + * + * @author gen + * @date 2025-12-04 + */ +@Component +public class NcLogAssembler { + + /** + * 转换实体 + */ + public NcLogDO toDO(NcLogDTO ncLogDTO) { + NcLogDO ncLogDO = new NcLogDO(); + // 拷贝 + BeanUtils.copyProperties(ncLogDTO, ncLogDO, IgnoreNullUtil.getNullPropertyNames(ncLogDTO)); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + String userName = loginUser.getUsername(); + // 获取登录人id + Long userId = loginUser.getUserid(); + if(ncLogDTO.getNcLogId() != null){ + if(userId != null){ + ncLogDO.setUpdateBy(userId); + }else { + ncLogDO.setUpdateBy(new Long("0")); + } + ncLogDO.setUpdateByName(userName); + ncLogDO.setUpdateTime(new Date()); + + }else { + if(userId != null){ + ncLogDO.setCreateBy(userId); + ncLogDO.setUpdateBy(userId); + }else { + ncLogDO.setCreateBy(new Long("0")); + ncLogDO.setUpdateBy(new Long("0")); + } + ncLogDO.setCreateByName(userName); + ncLogDO.setUpdateByName(userName); + ncLogDO.setCreateTime(new Date()); + ncLogDO.setUpdateTime(new Date()); + ncLogDO.setDelFlag(1); + } + return ncLogDO; + } + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ncLog/NcLogDTO.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ncLog/NcLogDTO.java new file mode 100644 index 000000000..24f97a785 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ncLog/NcLogDTO.java @@ -0,0 +1,61 @@ +package com.linke.finance.interfaces.dto.ncLog; + +import com.mhd.common.core.annotation.Excel; +import lombok.Data; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModelProperty; +import com.mhd.common.core.web.domain.BaseVOEntity; + +import java.util.List; + +/** + * 【请填写功能名称】对象 nc_log + * + * @author gen + * @date 2025-12-04 + */ + +@Data +public class NcLogDTO extends BaseVOEntity{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty("nc日志id") + private Long ncLogId; + + @ApiModelProperty("类型 0-应收单 1-收款单") + @Excel(name = "类型 0-应收单 1-收款单") + private Long type; + + @ApiModelProperty("数据源id") + @Excel(name = "数据源id") + private Long orderId; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String requestBody; + + @ApiModelProperty("请求报文") + @Excel(name = "请求报文") + private String responeBody; + + @ApiModelProperty("组织ID") + @Excel(name = "组织ID") + private Long organizationId; + + @ApiModelProperty("一级组织ID") + @Excel(name = "一级组织ID") + private Long topOrganizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + + @ApiModelProperty(name = "组织ID集合") + private List organizationIdList; + + @ApiModelProperty(name = "权限菜单ID") + private Long permissionMenuId; +} diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/ncLog/NcLogApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/ncLog/NcLogApi.java new file mode 100644 index 000000000..ea0afc9d4 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/ncLog/NcLogApi.java @@ -0,0 +1,99 @@ +package com.linke.finance.interfaces.facade.ncLog; + +import java.util.List; + +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.linke.finance.interfaces.dto.ncLog.NcLogDTO; +import com.linke.finance.domain.ncLog.repository.todo.NcLogDO; +import com.linke.finance.domain.ncLog.repository.po.NcLogPO; +import com.linke.finance.application.server.ncLog.NcLogApplicationService; +import com.linke.finance.interfaces.assemble.ncLog.NcLogAssembler; +import javax.annotation.Resource; +import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.common.core.web.page.TableDataInfo; + +/** + * 【请填写功能名称】Api + * + * @author gen + * @date 2025-12-04 + */ +@RestController +@RequestMapping("/ncLogApi") +public class NcLogApi extends BaseController{ + @Autowired + private NcLogApplicationService ncLogApplicationService; + + @Resource + private NcLogAssembler ncLogAssembler; + + /** + * 分页查询【请填写功能名称】列表 + */ + @ApiOperation("查询【请填写功能名称】列表") + @GetMapping("/list") + public TableDataInfo list(NcLogDTO ncLogDTO) + { + //转换实体 + NcLogDO ncLogDO = ncLogAssembler.toDO(ncLogDTO); + startPage(); + List list = ncLogApplicationService.queryList(ncLogDO); + return getDataTable(list); + } + + /** + * 编辑【请填写功能名称】 + */ + @ApiOperation("编辑【请填写功能名称】") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody NcLogDTO ncLogDTO) + { + //转换实体 + NcLogDO ncLogDO = ncLogAssembler.toDO(ncLogDTO); + if(ncLogDTO.getNcLogId() != null){ + return toAjax(ncLogApplicationService.update(ncLogDO)); + }else { + return toAjax(ncLogApplicationService.insert(ncLogDO)); + } + } + + /** + * 批量删除【请填写功能名称】 + */ + @ApiOperation("批量删除【请填写功能名称】") + @DeleteMapping("/deleteByIds/{ncLogIds}") + public AjaxResult delete(@PathVariable Long[] ncLogIds) + { + return toAjax(ncLogApplicationService.delete(ncLogIds)); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + @ApiOperation("获取【请填写功能名称】") + @GetMapping(value = "/getInfo/{ncLogId}") + public AjaxResult getInfo(@PathVariable("ncLogId") Long ncLogId) + { + return AjaxResult.success(ncLogApplicationService.getInfo(ncLogId)); + } + + + + + + + + + + + +} diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java index f36b88590..143ed1ad2 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java @@ -265,14 +265,25 @@ public class ReconciliationApi extends BaseController{ } /** - * 应收账单同步用户nc65 + * 应收账单应收单同步用户nc65 */ - @Log(title = "应收账单同步用户nc65", description = "应收账单同步用户nc65", businessType = BusinessType.OTHER) - @ApiOperation("应收账单同步用户nc65") + @Log(title = "应收账单应收单同步用户nc65", description = "应收账单应收单同步用户nc65", businessType = BusinessType.OTHER) + @ApiOperation("应收账单应收单同步用户nc65") @GetMapping(value = "/synchronousNc") public AjaxResult synchronousNc(@RequestParam(name="reconciliationId") String reconciliationId) { return AjaxResult.success(reconciliationApplicationService.synchronousNc(reconciliationId)); } + /** + * 应收账单收款单同步用户nc65 + */ + @Log(title = "应收账单收款单同步用户nc65", description = "应收账单收款单同步用户nc65", businessType = BusinessType.OTHER) + @ApiOperation("应收账单收款单同步用户nc65") + @GetMapping(value = "/synchronousNcSK") + public AjaxResult synchronousNcSK(@RequestParam(name="reconciliationId") String reconciliationId) + { + return AjaxResult.success(reconciliationApplicationService.synchronousNcSK(reconciliationId)); + } + } diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java index a6724e3aa..f0c0ce333 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java @@ -22,7 +22,7 @@ import com.mhd.common.core.web.page.TableDataInfo; /** * 收款单Api - * + * * @author gen * @date 2025-04-28 */ @@ -117,11 +117,20 @@ public class TmsReceiptApi extends BaseController{ } - + + /** + * 收款单同步用友nc65 + */ + @Log(title = "收款单同步用友nc65", description = "收款单同步用友nc65", businessType = BusinessType.OTHER) + @ApiOperation("收款单同步用友nc65") + @GetMapping(value = "/synchronousNc") + public AjaxResult synchronousNc(@RequestParam(name="ids") String ids) + { + return AjaxResult.success(tmsReceiptApplicationService.synchronousNc(ids)); + } - diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index f2ad08751..cb609f6e6 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -18,11 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 #server-addr: mhd-nacos:8848 + server-addr: 116.204.23.92:8848 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 + server-addr: 116.204.23.92:8848 # 线上测试环境配置 容器名+端口号 #server-addr: mhd-nacos:8848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 diff --git a/mhd_finance/src/main/resources/mapper/ncLog/NcLogMapper.xml b/mhd_finance/src/main/resources/mapper/ncLog/NcLogMapper.xml new file mode 100644 index 000000000..cbd048fe2 --- /dev/null +++ b/mhd_finance/src/main/resources/mapper/ncLog/NcLogMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + select nc_log_id, type, order_id, request_body, respone_body, del_flag, organization_id, top_organization_id, organization_name from nc_log + + + + + + and type = #{type} + + + and order_id = #{orderId} + + + and request_body = #{requestBody} + + + and respone_body = #{responeBody} + + + and organization_id = #{organizationId} + + + and top_organization_id = #{topOrganizationId} + + + and organization_name like concat('%', #{organizationName}, '%') + + + + + + diff --git a/sql/20251106_user.sql b/sql/20251106_user.sql index 7f54bab2b..1e564d568 100644 --- a/sql/20251106_user.sql +++ b/sql/20251106_user.sql @@ -2,7 +2,7 @@ alter table user ADD COLUMN `validity_period_management` int DEFAULT 0 COMMENT =====================================截止2025-11-14 正式数据库已同步完成================================ - +------nc对接20251128 alter table user ADD COLUMN `salesperson_nc_code` varchar(255) DEFAULT NULL COMMENT '业务员nc编码'; diff --git a/sql/20251107_finance.sql b/sql/20251107_finance.sql index 7d9688a2a..28ca311f4 100644 --- a/sql/20251107_finance.sql +++ b/sql/20251107_finance.sql @@ -14,3 +14,39 @@ alter table business_document_detali ADD COLUMN `fuel_card_number` varchar(255) DEFAULT NULL COMMENT '油卡号'; =====================================截止2025-11-14 正式数据库已同步完成================================ + + +------20251205ncd对接--- +alter table reconciliation ADD COLUMN `synchronous_status` int (1) DEFAULT 0 COMMENT 'nc应收单同步状态 0-未同步 1-已同步'; + +alter table reconciliation ADD COLUMN `synchronous_time` datetime DEFAULT null COMMENT 'nc应收单同步时间'; +alter table reconciliation ADD COLUMN `nc_id` varchar (255) DEFAULT null COMMENT 'nc应收单的唯一标识'; + +alter table reconciliation ADD COLUMN `sk_synchronous_status` int (1) DEFAULT 0 COMMENT 'nc同步状态 0-未同步 1-已同步'; + +alter table reconciliation ADD COLUMN `sk_synchronous_time` datetime DEFAULT null COMMENT 'nc同步时间'; + + +alter table reconciliation ADD COLUMN `sk_nc_id` varchar (255) DEFAULT null COMMENT 'nc的唯一标识'; +alter table tms_receipt ADD COLUMN `synchronous_status` int (1) DEFAULT 0 COMMENT 'nc应收单同步状态 0-未同步 1-已同步'; + +alter table tms_receipt ADD COLUMN `synchronous_time` datetime DEFAULT null COMMENT 'nc应收单同步时间'; +alter table tms_receipt ADD COLUMN `nc_id` varchar (255) DEFAULT null COMMENT 'nc应收单的唯一标识'; + +CREATE TABLE `nc_log` ( + `nc_log_id` bigint NOT NULL AUTO_INCREMENT COMMENT 'nc日志id', + `type` int DEFAULT '0' COMMENT '类型 0-应收单 1-收款单', + `order_id` int DEFAULT '0' COMMENT '数据源id', + `request_body` text COLLATE utf8mb4_general_ci COMMENT '请求报文', + `respone_body` text COLLATE utf8mb4_general_ci COMMENT '请求报文', + `del_flag` int DEFAULT '1' COMMENT '删除标记：0-无状态，1-正常，2-已删除', + `organization_id` bigint DEFAULT NULL COMMENT '组织ID', + `top_organization_id` bigint DEFAULT NULL COMMENT '一级组织ID', + `organization_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '组织名称', + PRIMARY KEY (`nc_log_id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + + + + + From c8a0e27172f86a8b1aa21dca2ec658d05385c33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 5 Dec 2025 18:21:41 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-user-center/src/main/resources/mapper/UserMapper.xml | 4 ++-- .../src/main/resources/mapper/UserShipperMapper.xml | 2 +- .../warehouse/material/command/CreateMaterialCommand.java | 2 ++ .../warehouse/material/command/UpdateMaterialCommand.java | 2 ++ .../warehouse/material/query/MaterialQueryCommand.java | 2 ++ .../application/service/warehouse/material/vo/MaterialVO.java | 2 ++ .../transport/domain/warehouse/material/model/Material.java | 3 +++ .../warehouse/material/persistence/MaterialDO.java | 1 + 8 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index 098490850..a8fbb1a71 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -716,7 +716,7 @@ SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name FROM "USER" u LEFT JOIN user_shipper b ON u.user_id = b.user_id - left join (select user_id, LISTAGG(r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName + left join (select user_id, LISTAGG(r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 where r.del_flag = 1 @@ -738,7 +738,7 @@ SELECT user_shipper.shipper_enterprise_name FROM - user u + "USER" u INNER JOIN user_shipper ON u.user_id = user_shipper.user_id WHERE diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 40bcc7c6f..611671e9d 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -142,7 +142,7 @@ b.freight_node FROM "USER" a LEFT JOIN user_shipper b ON a.user_id = b.user_id - left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName + left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 where r.del_flag = 1 diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java index a62fbdef3..0aaa4c32c 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java @@ -1,5 +1,6 @@ package com.linke.transport.application.service.warehouse.material.command; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; @@ -25,6 +26,7 @@ public class CreateMaterialCommand { private String name; @ApiModelProperty(value = "物料型号") + @TableField("\"MODEL\"") // 字段名转义 private String model; @NotBlank(message = "物料单位不能为空") diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java index 6100b5e86..3f237a7e6 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java @@ -1,5 +1,6 @@ package com.linke.transport.application.service.warehouse.material.command; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; @@ -24,6 +25,7 @@ public class UpdateMaterialCommand { @ApiModelProperty(value = "物料名称") private String name; @ApiModelProperty(value = "物料型号") + @TableField("\"MODEL\"") // 字段名转义 private String model; @ApiModelProperty(value = "物料单位") private String unit; diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java index 6d5bfb356..1f46b11f5 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java @@ -1,5 +1,6 @@ package com.linke.transport.application.service.warehouse.material.query; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,6 +17,7 @@ public class MaterialQueryCommand { @ApiModelProperty(name = "名称") private String name; @ApiModelProperty(name = "型号") + @TableField("\"MODEL\"") // 字段名转义 private String model; @ApiModelProperty("物料编码") private String materialCode; diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java index 528a9129e..b75b9d5c0 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java @@ -1,5 +1,6 @@ package com.linke.transport.application.service.warehouse.material.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; @@ -24,6 +25,7 @@ public class MaterialVO{ @ApiModelProperty("名称") private String name; @ApiModelProperty("型号") + @TableField("\"MODEL\"") // 字段名转义 private String model; @ApiModelProperty("单位") private String unit; diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java index 33397422d..329986365 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java +++ b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java @@ -1,5 +1,6 @@ package com.linke.transport.domain.warehouse.material.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.linke.transport.domain.warehouse.material.MaterialCodeGenerator; import com.linke.transport.domain.warehouse.material.exception.MaterialDomainException; import com.mhd.common.core.utils.StringUtils; @@ -20,8 +21,10 @@ public class Material { private Long ownerId; private String category; private String name; + @TableField("\"MODEL\"") // 字段名转义 private String model; private String unit; + @TableField("\"VALUE\"") // 字段名转义 private BigDecimal value; private boolean codeManaged; private String remark; diff --git a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java index ae350ed08..64f500bac 100644 --- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java +++ b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java @@ -21,6 +21,7 @@ public class MaterialDO { private Long ownerId; private String category; private String name; + @TableField("\"MODEL\"") // 字段名转义 private String model; private String unit; private BigDecimal value; From 4e2ceb01f769a9472f036af1ae502a80a0ac63fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 5 Dec 2025 20:32:54 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/OrganizationMapper.xml | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml index 2add4a301..a07ba8746 100644 --- a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml +++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml @@ -260,32 +260,40 @@ + resultType="com.mhd.common.core.domain.po.UserShipperPo"> and b.user_id = #{value} group by b.user_id diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index ce0d48350..8884ae06a 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -388,14 +388,39 @@ public class ReconciliationImpl extends ServiceImpl ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber()); if(ajaxResult1.getCode()==200){ TmsTransportNote tmsTransportNote= ajaxResult1.getData(); - date=tmsTransportNote.getPaperReceiptTime(); - dateString = sdf.format(date); + if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){ + date=tmsTransportNote.getConfirmReceiptTime(); + dateString = sdf.format(date); + }else{ + throw new ServiceException("运单还没签收， 先签收"); + } + } + if(null==reconciliation.getSettlementPartyId()){ + throw new ServiceException("没有结算方，请核对"); } AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); - if(ajaxResult.get("code").equals("200")){ - UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data"); + if(ajaxResult.get("code").toString().equals("200")){ + Object userShipperPo= ajaxResult.get("data"); + JSONObject jsonObject = new JSONObject((Map) userShipperPo); + if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){ + throw new ServiceException("请先维护客户编码"); + } Ysitem item=new Ysitem(); item.setSo_deptid("NG040104"); item.setPk_deptid("NG040104"); item.setPk_psndoc(userPo.getSalespersonNcCode()); - item.setCustomer(userShipperPo.getCustomerNcCode()); + item.setCustomer(jsonObject.get("customerNcCode").toString()); item.setObjtype("0"); item.setDirection("1"); - item.setScomment(userShipperPo.getShipperEnterpriseName()); + item.setScomment(jsonObject.get("shipperEnterpriseName").toString()); item.setPk_currtype("CNY"); item.setPurchaseorder(tmsOrder.getGoodsNumber()); item.setTaxrate("0"); @@ -458,6 +494,8 @@ public class ReconciliationImpl extends ServiceImpl list=result.getData(); if(ObjectUtil.isNotNull(list)){ for(TmsOrder tmsOrder:list){ + if(null==reconciliation.getSettlementPartyId()){ + throw new ServiceException("没有结算方，请核对"); + } AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); - if(ajaxResult.get("code").equals("200")){ - UserShipperPo userShipperPo= (UserShipperPo) ajaxResult.get("data"); + if(ajaxResult.get("code").toString().equals("200")){ + Object userShipperPo= ajaxResult.get("data"); + JSONObject jsonObject = new JSONObject((Map) userShipperPo); + if(org.apache.commons.lang.StringUtils.isBlank(jsonObject.get("customerNcCode").toString())){ + throw new ServiceException("请先维护客户编码"); + } SKitem item=new SKitem(); item.setSo_deptid("NG040104"); item.setPk_deptid("NG040104"); item.setCheckdirection("ar"); item.setPk_psndoc(userPo.getSalespersonNcCode()); - item.setCustomer(userShipperPo.getCustomerNcCode()); + item.setCustomer(jsonObject.get("customerNcCode").toString()); item.setPurchaseorder(tmsOrder.getGoodsNumber()); item.setObjtype("0"); item.setDirection("1"); - item.setScomment(userShipperPo.getShipperEnterpriseName()); + item.setScomment(jsonObject.get("shipperEnterpriseName").toString()); item.setPk_currtype("CNY"); item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); @@ -650,6 +723,25 @@ public class ReconciliationImpl extends ServiceImpl Date: Sat, 6 Dec 2025 22:17:12 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserShipperMapper.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index 2a08dadf1..b2a532019 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -139,14 +139,10 @@ b.monthly_settlement_flag, a.user_auth_status, b.original_receipt_flag, - b.freight_node - FROM "USER" a - LEFT JOIN user_shipper b ON a.user_id = b.user_id - left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName b.freight_node,b.customer_nc_code - FROM `user` a + FROM "USER" a LEFT JOIN `user_shipper` b ON a.user_id = b.user_id - left join (select user_id, GROUP_CONCAT(r.role_name separator '&') roleName + left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 where r.del_flag = 1 From 990f145846a6918b54161e871ed2cf65118d9954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 6 Dec 2025 22:22:54 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserMapper.xml | 12 ++++++------ .../src/main/resources/mapper/UserShipperMapper.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index 52c100a30..de766a4fd 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -96,7 +96,7 @@ FROM user_shipper s LEFT JOIN - user u + "user" u ON u.user_id = s.user_id and u.top_organization_id = #{topOrganizationId} @@ -117,7 +117,7 @@ FROM user_shipper s LEFT JOIN - user u + "user" u ON u.user_id = s.user_id and u.del_flag = 1 s.del_flag = 1 and s.shipper_fill = 3 @@ -411,7 +411,7 @@ a.user_account, a.avatar FROM - user a + "user" a WHERE a.del_flag = 1 @@ -658,7 +658,7 @@ us.shipper_enterprise_name, us.shipper_type FROM - user u + "user" u LEFT JOIN user_shipper us ON u.user_id = us.user_id WHERE u.del_flag = 1 @@ -676,7 +676,7 @@ ude.driver_enterprise_name, ude.driver_type FROM - user u + "user" u LEFT JOIN user_driver_enterprise ude ON u.user_id = ude.user_id WHERE u.del_flag = 1 @@ -700,7 +700,7 @@ a.user_account, a.avatar FROM - user a + "user" a WHERE a.del_flag = 1 and a.top_organization_id = #{topOrganizationId} diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index b2a532019..e4e8b23d7 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -191,7 +191,7 @@ b.shipper_enterprise_fill, a.business_type FROM - user a + "user" a LEFT JOIN user_shipper b ON b.user_id = a.user_id LEFT JOIN user_role ur ON b.user_id = ur.user_id LEFT JOIN role r ON ur.role_id = r.role_id From 8a4423db5f845b4d69c8ed00eef5862aef73aece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 8 Dec 2025 15:02:50 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index e4e8b23d7..c89277bb2 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -141,7 +141,7 @@ b.original_receipt_flag, b.freight_node,b.customer_nc_code FROM "USER" a - LEFT JOIN `user_shipper` b ON a.user_id = b.user_id + LEFT JOIN user_shipper b ON a.user_id = b.user_id left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName from role r left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1 From c58b3cc689b07b18859a8bc6c75ad1c8b50172da Mon Sep 17 00:00:00 2001 From: "LAPTOP-DREK3SC6\\86186" <577364224@qq.com> Date: Mon, 8 Dec 2025 23:46:19 +0800 Subject: [PATCH 14/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/Dockerfile | 3 +- mhd-auth/pom.xml | 14 +++ mhd-auth/src/main/resources/bootstrap.yml | 8 +- mhd-gateway/Dockerfile | 2 +- mhd-gateway/pom.xml | 14 +++ mhd-gateway/src/main/resources/bootstrap.yml | 10 +- mhd-modules/mhd-system/Dockerfile | 2 +- mhd-modules/mhd-system/pom.xml | 15 +++ .../src/main/resources/bootstrap.yml | 8 +- mhd-user-center/Dockerfile | 7 +- mhd-user-center/pom.xml | 14 +++ .../src/main/resources/bootstrap.yml | 8 +- mhd_finance/Dockerfile | 2 +- mhd_finance/pom.xml | 13 +++ mhd_finance/src/main/resources/bootstrap.yml | 10 +- mhd_product/Dockerfile | 2 +- mhd_product/pom.xml | 14 +++ mhd_product/src/main/resources/bootstrap.yml | 8 +- mhd_thrid_party/Dockerfile | 2 +- mhd_thrid_party/pom.xml | 14 ++- .../src/main/resources/bootstrap.yml | 8 +- mhd_transport/Dockerfile | 2 +- mhd_transport/pom.xml | 13 +++ .../src/main/resources/bootstrap.yml | 2 + pom.xml | 109 +++++++++++++++++- 25 files changed, 259 insertions(+), 45 deletions(-) diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index ab8325a42..d29ce88f5 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 @@ -15,3 +15,4 @@ ADD mhd-auth.jar mhd-auth.jar EXPOSE 9200 # 运行jar包 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-auth.jar"] + diff --git a/mhd-auth/pom.xml b/mhd-auth/pom.xml index 9961823e0..ce1606edc 100644 --- a/mhd-auth/pom.xml +++ b/mhd-auth/pom.xml @@ -85,4 +85,18 @@ + + + mhd-auth + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 9e60f8ac2..ddb64b1d3 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -12,13 +12,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 9c79e4652..8b870933c 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-gateway/pom.xml b/mhd-gateway/pom.xml index 6cda48c31..b066a4359 100644 --- a/mhd-gateway/pom.xml +++ b/mhd-gateway/pom.xml @@ -127,4 +127,18 @@ + + + mhd-gateway + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index e858447d1..d1a88efe4 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -13,13 +13,15 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-modules/mhd-system/Dockerfile b/mhd-modules/mhd-system/Dockerfile index 3098d7b9f..e301ffd5a 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-modules/mhd-system/pom.xml b/mhd-modules/mhd-system/pom.xml index 923472867..b58151899 100644 --- a/mhd-modules/mhd-system/pom.xml +++ b/mhd-modules/mhd-system/pom.xml @@ -148,4 +148,19 @@ + + + + mhd-modules-system + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 351d1a52d..16293438f 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -13,13 +13,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index 2716ebcb4..ac5ee8857 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -1,14 +1,9 @@ # 基础镜像 -FROM kdvolder/jdk8 -# author -MAINTAINER manhuoda +FROM arm64v8/openjdk:8-jre-slim #指定东八区时区 ENV TZ Asia/Shanghai #指定utf-8编码格 ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" -# VOLUME 指定了临时文件目录为/tmp。 -# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp -VOLUME /tmp #将当前jar 复制到容器根目录下 ADD mhd-user-center.jar mhd-user-center.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 diff --git a/mhd-user-center/pom.xml b/mhd-user-center/pom.xml index 25dd0c35e..a606b42ed 100644 --- a/mhd-user-center/pom.xml +++ b/mhd-user-center/pom.xml @@ -174,4 +174,18 @@ + + + + mhd-user-center + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 611627ee0..f26ae0f15 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,13 +20,13 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 73e7eef62..6797e4d46 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index b9e4a2be6..37138e56b 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -182,4 +182,17 @@ + + + mhd_finance + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index cb609f6e6..97e774c85 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,13 +20,13 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 config: # server-addr: 127.0.0.1:8848 - server-addr: 116.204.23.92:8848 - # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 116.204.23.92:8848 +# 线上测试环境配置 容器名+端口号 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index b1e41baab..2fc20258b 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index 3fde65335..e665e0a44 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -149,4 +149,18 @@ + + + mhd_product + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index a3958fb96..1a8021d1d 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 5f30e1148..6ba77d29c 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index 7d5c8bdc4..a4341ca80 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -277,5 +277,17 @@ - + + + mhd_thrid_party + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index 2a05ef307..a922ae813 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index 7c47729ae..f9ddb4a01 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 64c31ee4d..328497119 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -155,4 +155,17 @@ + + + mhd_transport + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 45d645557..464240e6c 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -20,10 +20,12 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 +# server-addr: 10.33.0.129:6010r server-addr: 10.33.0.129:6010 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 +# server-addr: 10.33.0.129:6010 server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties diff --git a/pom.xml b/pom.xml index 8ab45146d..1762d51d6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,13 @@ 2.13.2 3.16.2 2.7.3 + + + 3.13.0 + 3.3.1 + 3.3.1 + 1.4.13 + @@ -286,7 +293,7 @@ - + @@ -334,6 +341,104 @@ + + + + src/main/resources + true + + + + + src/test/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.maven.compiler.version} + + ${java.version} + ${java.version} + utf-8 + + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.maven.resources.version} + + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.maven.source.version} + + + attach-sources + verify + + jar-no-fork + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + package + + repackage + + + + + true + + + + com.spotify + dockerfile-maven-plugin + ${plugin.maven.dockerfile.version} + + + default + + build + + + + + dtyb/${project.build.finalName} + ${project.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-resources-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + + From 099caba531ecc78ec7d08968718326e4491d79ba Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 09:25:01 +0800 Subject: [PATCH 15/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1762d51d6..8b78d0b90 100644 --- a/pom.xml +++ b/pom.xml @@ -45,10 +45,27 @@ 2.7.3 - 3.13.0 - 3.3.1 - 3.3.1 + 3.12.0 + 3.1.0 + 3.1.0 1.4.13 + + 3.2.12 + 2023.0.3 + 2023.0.1.2 + + + 3.5.6 + 2.1.0 + + + 4.5.14 + 3.0.5 + 1.78 + 4.4.0 + 2.16.0 + 8.5.2 + 1.0.23 From 409af3c4ce0fa38e988f8cfa3c2bc04a1c9cab1f Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 11:17:54 +0800 Subject: [PATCH 16/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/pom.xml | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mhd-gateway/pom.xml b/mhd-gateway/pom.xml index b066a4359..1b3843d1e 100644 --- a/mhd-gateway/pom.xml +++ b/mhd-gateway/pom.xml @@ -141,4 +141,6 @@ + + diff --git a/pom.xml b/pom.xml index 8b78d0b90..4193cf29a 100644 --- a/pom.xml +++ b/pom.xml @@ -424,7 +424,7 @@ com.spotify dockerfile-maven-plugin - ${plugin.maven.dockerfile.version} + 1.4.10 default From f63a48783e0b60f15c7fd50a1a9860fc5c91d40c Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 11:54:45 +0800 Subject: [PATCH 17/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/Dockerfile | 2 +- mhd-gateway/Dockerfile | 2 +- mhd-modules/mhd-system/Dockerfile | 2 +- mhd-user-center/Dockerfile | 2 +- mhd_finance/Dockerfile | 2 +- mhd_product/Dockerfile | 2 +- mhd_thrid_party/Dockerfile | 2 +- mhd_transport/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index d29ce88f5..dfd187992 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd-auth.jar mhd-auth.jar +ADD target/mhd-auth.jar mhd-auth.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 9200 # 运行jar包 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 8b870933c..53cd095ef 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd-gateway.jar mhd-gateway.jar +ADD target/mhd-gateway.jar mhd-gateway.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8088 # 运行jar包 diff --git a/mhd-modules/mhd-system/Dockerfile b/mhd-modules/mhd-system/Dockerfile index e301ffd5a..5810caf70 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前jar 复制到容器根目录下 -ADD mhd-modules-system.jar mhd-modules-system.jar +ADD target/mhd-modules-system.jar mhd-modules-system.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 9201 # 运行jar包 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index ac5ee8857..5c8ff51bd 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -5,7 +5,7 @@ ENV TZ Asia/Shanghai #指定utf-8编码格 ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" #将当前jar 复制到容器根目录下 -ADD mhd-user-center.jar mhd-user-center.jar +ADD target/mhd-user-center.jar mhd-user-center.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8007 # 运行jar包 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 6797e4d46..86bc68b06 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_product.jar 复制到容器根目录下 -ADD mhd_finance.jar mhd_finance.jar +ADD target/mhd_finance.jar mhd_finance.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8011 # 运行jar包 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index 2fc20258b..2ba8ab865 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_product.jar 复制到容器根目录下 -ADD mhd_product.jar mhd_product.jar +ADD target/mhd_product.jar mhd_product.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8005 # 运行jar包 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 6ba77d29c..18ecd46fb 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_thrid_party.jar 复制到容器根目录下 -ADD mhd_thrid_party.jar mhd_thrid_party.jar +ADD target/mhd_thrid_party.jar mhd_thrid_party.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8012 # 运行jar包 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index f9ddb4a01..c56ce4ecd 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp VOLUME /tmp #将当前mhd_transport.jar 复制到容器根目录下 -ADD mhd_transport.jar mhd_transport.jar +ADD target/mhd_transport.jar mhd_transport.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 EXPOSE 8006 # 运行jar包 From 737f61ca4832202cda774668ddb42a49f886fe35 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 12:06:01 +0800 Subject: [PATCH 18/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4193cf29a..7fc1fac97 100644 --- a/pom.xml +++ b/pom.xml @@ -434,7 +434,7 @@ - dtyb/${project.build.finalName} + ${project.build.finalName} ${project.version} From 9153b6a4981e6b1db76174d0a81b382241bb8d94 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 16:14:22 +0800 Subject: [PATCH 19/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/Dockerfile | 2 +- mhd-gateway/Dockerfile | 2 +- mhd-user-center/Dockerfile | 2 +- mhd_finance/Dockerfile | 2 +- mhd_product/Dockerfile | 2 +- mhd_thrid_party/Dockerfile | 2 +- mhd_transport/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index dfd187992..2257eeeda 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 53cd095ef..0f2e5a40b 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index 5c8ff51bd..cb2123c58 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 #指定东八区时区 ENV TZ Asia/Shanghai #指定utf-8编码格 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 86bc68b06..3deb94377 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index 2ba8ab865..52eb11569 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 18ecd46fb..c67a76cd1 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index c56ce4ecd..84f389e73 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM arm64v8/openjdk:8-jre-slim +FROM arm64v8/openjdk:8 # author MAINTAINER manhuoda #指定东八区时区 From 5b02024f4cb3f10ea40c564ef660a57c12c832b5 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 17:36:49 +0800 Subject: [PATCH 20/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 0f2e5a40b..b2ac8bd14 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,15 @@ # 基础镜像 FROM arm64v8/openjdk:8 + +RUN apt-get update && \ + apt-get install -y \ + libfreetype6 \ + fontconfig \ + libfontconfig1 \ + libxrender1 \ + libxtst6 \ + libxi6 \ + && rm -rf /var/lib/apt/lists/* # author MAINTAINER manhuoda #指定东八区时区 From 2a393ceb2c811a80a0d2fcff755410433335bdf0 Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Tue, 9 Dec 2025 18:29:09 +0800 Subject: [PATCH 21/24] =?UTF-8?q?arm=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-gateway/Dockerfile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index b2ac8bd14..0f2e5a40b 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,15 +1,5 @@ # 基础镜像 FROM arm64v8/openjdk:8 - -RUN apt-get update && \ - apt-get install -y \ - libfreetype6 \ - fontconfig \ - libfontconfig1 \ - libxrender1 \ - libxtst6 \ - libxi6 \ - && rm -rf /var/lib/apt/lists/* # author MAINTAINER manhuoda #指定东八区时区 From ab1472ff50ade2f5296366938fbdd7e954ba96b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 9 Dec 2025 18:43:00 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F=E6=84=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../resources/mapper/UserDriverMapper.xml | 12 ++-- .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../verification/VerificationMapper.xml | 1 - .../domain/config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../product/domain/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../main/resources/mapper/menu/MenuMapper.xml | 4 +- .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/utils/CamelCaseUtils.java | 54 ++++++++++++++++++ .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ 15 files changed, 674 insertions(+), 9 deletions(-) create mode 100644 mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java create mode 100644 mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/util/CamelCaseUtils.java create mode 100644 mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java create mode 100644 mhd-user-center/src/main/java/com/mhd/user/infrastructure/util/CamelCaseUtils.java create mode 100644 mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java create mode 100644 mhd_finance/src/main/java/com/linke/finance/infrastructure/util/CamelCaseUtils.java create mode 100644 mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java create mode 100644 mhd_product/src/main/java/com/linke/product/domain/util/CamelCaseUtils.java create mode 100644 mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java create mode 100644 mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/utils/CamelCaseUtils.java create mode 100644 mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java create mode 100644 mhd_transport/src/main/java/com/linke/transport/infrastructure/util/CamelCaseUtils.java diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java new file mode 100644 index 000000000..ba41cf91d --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/config/CamelCaseMapPlugin.java @@ -0,0 +1,57 @@ +package com.mhd.basic.infrastructure.config; + +import com.mhd.basic.infrastructure.util.CamelCaseUtils; +import org.apache.ibatis.executor.resultset.ResultSetHandler; +import org.apache.ibatis.plugin.*; +import org.springframework.stereotype.Component; + +import java.sql.Statement; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +/** + * MyBatis插件：拦截Map类型结果，转换Key为驼峰 + */ +@Intercepts({@Signature( + type = ResultSetHandler.class, + method = "handleResultSets", + args = {Statement.class} +)}) +@Component +public class CamelCaseMapPlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + // 执行原方法获取结果 + Object result = invocation.proceed(); + // 处理结果：如果是List且元素是Map，转换Key + if (result instanceof List) { + List> list = (List>) result; + for (int i = 0; i < list.size(); i++) { + Object item = list.get(i); + if (item instanceof Map) { + @SuppressWarnings("unchecked") + Map map = (Map) item; + // 转换Key为驼峰 + list.set(i, CamelCaseUtils.convertMapKeyToCamel(map)); + } + } + } + return result; + } + + @Override + public Object plugin(Object target) { + // 只拦截ResultSetHandler类型 + if (target instanceof ResultSetHandler) { + return Plugin.wrap(target, this); + } + return target; + } + + @Override + public void setProperties(Properties properties) { + // 可配置参数，此处无需处理 + } +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/util/CamelCaseUtils.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/util/CamelCaseUtils.java new file mode 100644 index 000000000..63f799bad --- /dev/null +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/infrastructure/util/CamelCaseUtils.java @@ -0,0 +1,54 @@ +package com.mhd.basic.infrastructure.util; + +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 字符串工具类扩展：下划线/大写转驼峰 + */ +public class CamelCaseUtils { + + /** + * 大写下划线转驼峰（如：USER_NAME → userName） + */ + public static String toCamelCase(String str) { + if (StringUtils.isBlank(str)) { + return str; + } + // 先转小写，再处理下划线 + str = str.toLowerCase(); + StringBuilder sb = new StringBuilder(); + boolean nextUpperCase = false; + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (c == '_') { + nextUpperCase = true; + } else { + if (nextUpperCase) { + sb.append(Character.toUpperCase(c)); + nextUpperCase = false; + } else { + sb.append(c); + } + } + } + return sb.toString(); + } + + /** + * 批量转换Map的Key为驼峰 + */ + public static Map convertMapKeyToCamel(Map map) { + if (map == null || map.isEmpty()) { + return map; + } + Map newMap = new HashMap<>(map.size()); + for (Map.Entry entry : map.entrySet()) { + String camelKey = toCamelCase(entry.getKey()); + newMap.put(camelKey, entry.getValue()); + } + return newMap; + } +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java b/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java new file mode 100644 index 000000000..fd6b3fc2c --- /dev/null +++ b/mhd-user-center/src/main/java/com/mhd/user/infrastructure/config/CamelCaseMapPlugin.java @@ -0,0 +1,57 @@ +package com.mhd.user.infrastructure.config; + +import com.mhd.user.infrastructure.util.CamelCaseUtils; +import org.apache.ibatis.executor.resultset.ResultSetHandler; +import org.apache.ibatis.plugin.*; +import org.springframework.stereotype.Component; + +import java.sql.Statement; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +/** + * MyBatis插件：拦截Map类型结果，转换Key为驼峰 + */ +@Intercepts({@Signature( + type = ResultSetHandler.class, + method = "handleResultSets", + args = {Statement.class} +)}) +@Component +public class CamelCaseMapPlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + // 执行原方法获取结果 + Object result = invocation.proceed(); + // 处理结果：如果是List且元素是Map，转换Key + if (result instanceof List) { + List> list = (List>) result; + for (int i = 0; i < list.size(); i++) { + Object item = list.get(i); + if (item instanceof Map) { + @SuppressWarnings("unchecked") + Map map = (Map) item; + // 转换Key为驼峰 + list.set(i, CamelCaseUtils.convertMapKeyToCamel(map)); + } + } + } + return result; + } + + @Override + public Object plugin(Object target) { + // 只拦截ResultSetHandler类型 + if (target instanceof ResultSetHandler) { + return Plugin.wrap(target, this); + } + return target; + } + + @Override + public void setProperties(Properties properties) { + // 可配置参数，此处无需处理 + } +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/infrastructure/util/CamelCaseUtils.java b/mhd-user-center/src/main/java/com/mhd/user/infrastructure/util/CamelCaseUtils.java new file mode 100644 index 000000000..e10b3ad75 --- /dev/null +++ b/mhd-user-center/src/main/java/com/mhd/user/infrastructure/util/CamelCaseUtils.java @@ -0,0 +1,54 @@ +package com.mhd.user.infrastructure.util; + +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 字符串工具类扩展：下划线/大写转驼峰 + */ +public class CamelCaseUtils { + + /** + * 大写下划线转驼峰（如：USER_NAME → userName） + */ + public static String toCamelCase(String str) { + if (StringUtils.isBlank(str)) { + return str; + } + // 先转小写，再处理下划线 + str = str.toLowerCase(); + StringBuilder sb = new StringBuilder(); + boolean nextUpperCase = false; + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (c == '_') { + nextUpperCase = true; + } else { + if (nextUpperCase) { + sb.append(Character.toUpperCase(c)); + nextUpperCase = false; + } else { + sb.append(c); + } + } + } + return sb.toString(); + } + + /** + * 批量转换Map的Key为驼峰 + */ + public static Map convertMapKeyToCamel(Map map) { + if (map == null || map.isEmpty()) { + return map; + } + Map newMap = new HashMap<>(map.size()); + for (Map.Entry entry : map.entrySet()) { + String camelKey = toCamelCase(entry.getKey()); + newMap.put(camelKey, entry.getValue()); + } + return newMap; + } +} \ No newline at end of file diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index 3dbef0abf..80e2c2aea 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -107,7 +107,7 @@ a.driver_license_back_url, a.driver_license_number, a.driver_license_long, - a.driver_work_license_authority_code, + cast(a.driver_work_license_authority_code as BIGINT) as driver_work_license_authority_code, a.driver_work_license_authority_name, a.driver_work_license_number, a.driver_work_license_type_id, @@ -189,7 +189,7 @@ WM_CONCAT(DISTINCT dvb.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, WM_CONCAT(DISTINCT m.motorcade_name ) AS driverTeamName FROM - "user" b + "USER" b LEFT JOIN ( SELECT user_id, @@ -325,7 +325,7 @@ FROM user_driver a LEFT JOIN - "user" u + "USER" u ON u.user_id = a.user_id AND u.del_flag = 1 WHERE a.del_flag = 1 @@ -769,7 +769,7 @@ FROM user_driver d LEFT JOIN - "user" u + "USER" u ON d.user_id = u.user_id LEFT JOIN driver_vehicle_bind b @@ -1105,7 +1105,7 @@ ude.driver_enterprise_fill, ud.driver_captain_fill FROM - "user" b + "USER" b LEFT JOIN user_driver a ON a.user_id = b.user_id LEFT JOIN user_driver_enterprise ude ON b.user_id = ude.user_id AND ude.driver_type = 1 @@ -1137,7 +1137,7 @@ a.user_id, a.create_by FROM - "user" u + "USER" u LEFT JOIN user_driver a ON u.user_id = a.user_id LEFT JOIN motorcade_driver md ON a.user_id = md.user_id LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id diff --git a/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java b/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java new file mode 100644 index 000000000..524382f43 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/infrastructure/config/CamelCaseMapPlugin.java @@ -0,0 +1,57 @@ +package com.linke.finance.infrastructure.config; + +import com.linke.finance.infrastructure.util.CamelCaseUtils; +import org.apache.ibatis.executor.resultset.ResultSetHandler; +import org.apache.ibatis.plugin.*; +import org.springframework.stereotype.Component; + +import java.sql.Statement; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +/** + * MyBatis插件：拦截Map类型结果，转换Key为驼峰 + */ +@Intercepts({@Signature( + type = ResultSetHandler.class, + method = "handleResultSets", + args = {Statement.class} +)}) +@Component +public class CamelCaseMapPlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + // 执行原方法获取结果 + Object result = invocation.proceed(); + // 处理结果：如果是List且元素是Map，转换Key + if (result instanceof List) { + List> list = (List>) result; + for (int i = 0; i < list.size(); i++) { + Object item = list.get(i); + if (item instanceof Map) { + @SuppressWarnings("unchecked") + Map map = (Map) item; + // 转换Key为驼峰 + list.set(i, CamelCaseUtils.convertMapKeyToCamel(map)); + } + } + } + return result; + } + + @Override + public Object plugin(Object target) { + // 只拦截ResultSetHandler类型 + if (target instanceof ResultSetHandler) { + return Plugin.wrap(target, this); + } + return target; + } + + @Override + public void setProperties(Properties properties) { + // 可配置参数，此处无需处理 + } +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/infrastructure/util/CamelCaseUtils.java b/mhd_finance/src/main/java/com/linke/finance/infrastructure/util/CamelCaseUtils.java new file mode 100644 index 000000000..c344f2535 --- /dev/null +++ b/mhd_finance/src/main/java/com/linke/finance/infrastructure/util/CamelCaseUtils.java @@ -0,0 +1,54 @@ +package com.linke.finance.infrastructure.util; + +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 字符串工具类扩展：下划线/大写转驼峰 + */ +public class CamelCaseUtils { + + /** + * 大写下划线转驼峰（如：USER_NAME → userName） + */ + public static String toCamelCase(String str) { + if (StringUtils.isBlank(str)) { + return str; + } + // 先转小写，再处理下划线 + str = str.toLowerCase(); + StringBuilder sb = new StringBuilder(); + boolean nextUpperCase = false; + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (c == '_') { + nextUpperCase = true; + } else { + if (nextUpperCase) { + sb.append(Character.toUpperCase(c)); + nextUpperCase = false; + } else { + sb.append(c); + } + } + } + return sb.toString(); + } + + /** + * 批量转换Map的Key为驼峰 + */ + public static Map convertMapKeyToCamel(Map map) { + if (map == null || map.isEmpty()) { + return map; + } + Map newMap = new HashMap<>(map.size()); + for (Map.Entry entry : map.entrySet()) { + String camelKey = toCamelCase(entry.getKey()); + newMap.put(camelKey, entry.getValue()); + } + return newMap; + } +} \ No newline at end of file diff --git a/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml b/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml index fcee7e895..62b204034 100644 --- a/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml +++ b/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml @@ -1110,7 +1110,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.verification_money, a.first_subject_name, a.second_subject_name, - a.verification_money, a.create_by_name, b.create_by_name record_create_by_name, a.verification_status diff --git a/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java b/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java new file mode 100644 index 000000000..c00d8d9f1 --- /dev/null +++ b/mhd_product/src/main/java/com/linke/product/domain/config/CamelCaseMapPlugin.java @@ -0,0 +1,57 @@ +package com.linke.product.domain.config; + +import com.linke.product.domain.util.CamelCaseUtils; +import org.apache.ibatis.executor.resultset.ResultSetHandler; +import org.apache.ibatis.plugin.*; +import org.springframework.stereotype.Component; + +import java.sql.Statement; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +/** + * MyBatis插件：拦截Map类型结果，转换Key为驼峰 + */ +@Intercepts({@Signature( + type = ResultSetHandler.class, + method = "handleResultSets", + args = {Statement.class} +)}) +@Component +public class CamelCaseMapPlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + // 执行原方法获取结果 + Object result = invocation.proceed(); + // 处理结果：如果是List且元素是Map，转换Key + if (result instanceof List) { + List> list = (List>) result; + for (int i = 0; i < list.size(); i++) { + Object item = list.get(i); + if (item instanceof Map) { + @SuppressWarnings("unchecked") + Map map = (Map) item; + // 转换Key为驼峰 + list.set(i, CamelCaseUtils.convertMapKeyToCamel(map)); + } + } + } + return result; + } + + @Override + public Object plugin(Object target) { + // 只拦截ResultSetHandler类型 + if (target instanceof ResultSetHandler) { + return Plugin.wrap(target, this); + } + return target; + } + + @Override + public void setProperties(Properties properties) { + // 可配置参数，此处无需处理 + } +} \ No newline at end of file diff --git a/mhd_product/src/main/java/com/linke/product/domain/util/CamelCaseUtils.java b/mhd_product/src/main/java/com/linke/product/domain/util/CamelCaseUtils.java new file mode 100644 index 000000000..64768e1fe --- /dev/null +++ b/mhd_product/src/main/java/com/linke/product/domain/util/CamelCaseUtils.java @@ -0,0 +1,54 @@ +package com.linke.product.domain.util; + +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 字符串工具类扩展：下划线/大写转驼峰 + */ +public class CamelCaseUtils { + + /** + * 大写下划线转驼峰（如：USER_NAME → userName） + */ + public static String toCamelCase(String str) { + if (StringUtils.isBlank(str)) { + return str; + } + // 先转小写，再处理下划线 + str = str.toLowerCase(); + StringBuilder sb = new StringBuilder(); + boolean nextUpperCase = false; + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (c == '_') { + nextUpperCase = true; + } else { + if (nextUpperCase) { + sb.append(Character.toUpperCase(c)); + nextUpperCase = false; + } else { + sb.append(c); + } + } + } + return sb.toString(); + } + + /** + * 批量转换Map的Key为驼峰 + */ + public static Map convertMapKeyToCamel(Map map) { + if (map == null || map.isEmpty()) { + return map; + } + Map newMap = new HashMap<>(map.size()); + for (Map.Entry entry : map.entrySet()) { + String camelKey = toCamelCase(entry.getKey()); + newMap.put(camelKey, entry.getValue()); + } + return newMap; + } +} \ No newline at end of file diff --git a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml index a41bf6c67..2e49952ab 100644 --- a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml +++ b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml @@ -273,8 +273,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"