From a950417939e1819a7f898844a734c93ad1fcd5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Fri, 5 Dec 2025 21:42:06 +0800 Subject: [PATCH 01/27] =?UTF-8?q?12.5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-common/mhd-common-core/pom.xml | 2 +- .../core/domain/po/UserDriverListPo.java | 3 + .../entity/UserDriverEntity.java | 3 + .../repository/po/UserDriverPo.java | 3 + .../repository/todo/UserDriverDO.java | 3 + .../interfaces/dto/addDTO/UserDriverDTO.java | 3 + .../resources/mapper/UserDriverMapper.xml | 2 + mhd_finance/pom.xml | 2 +- mhd_finance/src/main/resources/bootstrap.yml | 8 ++ mhd_product/pom.xml | 2 +- mhd_thrid_party/pom.xml | 2 +- mhd_transport/pom.xml | 2 +- .../vehicle/VehicleApplicationService.java | 28 +++++++ .../command/CreateMaterialCommand.java | 6 ++ .../command/MaterialCommandService.java | 4 + .../command/UpdateMaterialCommand.java | 7 ++ .../material/query/MaterialQueryCommand.java | 5 ++ .../material/query/MaterialQueryService.java | 1 + .../warehouse/material/vo/MaterialVO.java | 6 ++ .../domain/vehicle/entity/Vehicle.java | 24 ++++++ .../repository/mapper/VehicleMapper.java | 2 + .../vehicle/repository/po/VehiclePo.java | 24 ++++++ .../warehouse/material/model/Material.java | 15 +++- .../repository/MaterialRepository.java | 2 +- .../material/persistence/MaterialDO.java | 2 + .../repository/MaterialRepositoryImpl.java | 3 +- .../interfaces/dto/vehicle/VehicleDto.java | 24 ++++++ .../interfaces/facade/vehicle/VehicleApi.java | 9 +++ .../facadeApi/warehouse/MaterialApi.java | 12 +++ .../mapper/vehicle/VehicleMapper.xml | 76 ++++++++++++++++++- pom.xml | 2 +- 31 files changed, 277 insertions(+), 10 deletions(-) diff --git a/mhd-common/mhd-common-core/pom.xml b/mhd-common/mhd-common-core/pom.xml index 20fd35e39..bc525d13e 100644 --- a/mhd-common/mhd-common-core/pom.xml +++ b/mhd-common/mhd-common-core/pom.xml @@ -156,7 +156,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java index b741fabcc..638bcf9ec 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java @@ -301,4 +301,7 @@ public class UserDriverListPo { @ApiModelProperty(value = "是否允许竞价(0-不允许竞价,1-允许参与竞价，2-允许查看竞价)") private Integer isDriverBidding; + @ApiModelProperty(value = "用户身份") + private Integer userIdentity; + } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java index bca216a2b..4f6970ad3 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java @@ -127,4 +127,7 @@ public class UserDriverEntity extends BaseVOEntity { @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; + + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java index 42e57bfcc..e2ea6d6d5 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java @@ -228,4 +228,7 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; + + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java index d2459735f..c8f32f36e 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java @@ -283,4 +283,7 @@ public class UserDriverDO extends UserDO { @ApiModelProperty(name = "车队名称") private String motorcadeName; + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; + } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java index 9c7e3e55c..3db40186d 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java @@ -308,4 +308,7 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "部门id") private String departmentId; + + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; } diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index db7a63911..cc39e3bf2 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -120,6 +120,7 @@ a.driver_work_license_front_url, a.work_certificate_back_img_url, b.create_time, + a.user_identity, b.create_by, b.create_by_name, b.update_time, @@ -262,6 +263,7 @@ a.driver_fill_auth_id, a.driver_fill_auth_name, a.driver_fill_auth_remark, + a.user_identity, b.user_id, b.top_organization_id, b.organization_id, diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index b9135a0cc..ffb4ff80c 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -87,7 +87,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index f2ad08751..8829a0a37 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -30,3 +30,11 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +redisson: + config: + singleServerConfig: + address: redis://116.204.89.187:4399 + connectTimeout: 10000 # 连接超时时间 + timeout: 10000 # 命令执行超时时间 + retryAttempts: 3 # 重试次数 + retryInterval: 1500 # 重试间隔 diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index 1ef00f678..9b0b07915 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -88,7 +88,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index ed64ff6c6..d4751f850 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -94,7 +94,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 3bbe00014..325a1dce5 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -88,7 +88,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java index 6f0c0f1ae..e2804fbfb 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java @@ -2920,4 +2920,32 @@ public class VehicleApplicationService { public void addVehicle(VehicleDto vehicleDto) { } + + /** + * + * @param vehicleDto + * @return + */ + public Integer updatePilotDriver(VehicleDto vehicleDto) { + if (vehicleDto.getVehicleId() == null) { + throw new IllegalArgumentException("车辆ID不能为空"); + } + + boolean hasPilot1 = StringUtils.hasText(vehicleDto.getPilot1()); + boolean hasPilot2 = StringUtils.hasText(vehicleDto.getPilot2()); + + // 两个都传了 + if (hasPilot1 && hasPilot2) { + throw new IllegalArgumentException("不可同时传入"); + } + // 两个都没传 + if (!hasPilot1 && !hasPilot2) { + throw new IllegalArgumentException("请选择副驾"); + } + + + // 更新 + return vehicleMapper.updatePilotDriver(vehicleDto); + + } } 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..b2d17df81 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 @@ -45,4 +45,10 @@ public class CreateMaterialCommand { @ApiModelProperty(value = "备注") private String remark; + + @ApiModelProperty(value = "物料体积") + private BigDecimal materialVolume; + + @ApiModelProperty(value = "物料内容") + private String materialContent; } diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java index ac2e81a09..1e74a0d94 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java @@ -36,6 +36,8 @@ public class MaterialCommandService { command.getValue(), command.getCodeManaged(), command.getWeight(), + command.getMaterialVolume(), + command.getMaterialContent(), command.getRemark(), codeGenerator ); @@ -57,6 +59,8 @@ public class MaterialCommandService { command.getValue(), command.getCodeManaged(), command.getWeight(), + command.getMaterialVolume(), + command.getMaterialContent(), command.getRemark() ); 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..d393e4118 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 @@ -38,4 +38,11 @@ public class UpdateMaterialCommand { private Boolean codeManaged; @ApiModelProperty(value = "备注") private String remark; + + + @ApiModelProperty(value = "物料体积") + private BigDecimal materialVolume; + + @ApiModelProperty(value = "物料内容") + private String materialContent; } 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..d1d28e9e5 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; @Data @ApiModel("查询参数") @@ -27,4 +28,8 @@ public class MaterialQueryCommand { private Long pageNo = 1L; @ApiModelProperty(name = "每页条数") private Long pageSize = 10L; + @ApiModelProperty(value = "物料体积") + private BigDecimal materialVolume; + @ApiModelProperty(value = "物料内容") + private String materialContent; } diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java index cd6dd8705..094cc328d 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java @@ -28,6 +28,7 @@ public class MaterialQueryService { param.getMaterialCode(), param.getCodeManaged(), param.getRemark(), + param.getMaterialContent(), param.getPageNo(), param.getPageSize() ).convert(MaterialConverter :: convertToVO); 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..c77c8d87b 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 @@ -36,6 +36,12 @@ public class MaterialVO{ @ApiModelProperty("备注") private String remark; + @ApiModelProperty(value = "物料体积") + private BigDecimal materialVolume; + + @ApiModelProperty(value = "物料内容") + private String materialContent; + @ApiModelProperty("创建时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java index 12d8fc9d9..a28a1ff20 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java +++ b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java @@ -322,5 +322,29 @@ public class Vehicle extends BaseVOEntity implements Serializable @DateTimeFormat(pattern="yyyy-MM-dd") private Date insuranceValidityPeriod; + @ApiModelProperty(value = "副驾1") + private String pilot1; + + @ApiModelProperty(value = "副驾1的Id") + private String pilot1Id; + + @ApiModelProperty(value = "副驾2") + private String pilot2; + + @ApiModelProperty(value = "副驾2的Id") + private String pilot2Id; + + @ApiModelProperty(value = "跨境车牌") + private String crossPlate; + + @ApiModelProperty(value = "保险") + private String insurance; + + @ApiModelProperty(value = "签证本") + private String visa; + + @ApiModelProperty(value = "车辆主体") + private Integer vehicleBody; + } diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java index 1baf1ecbb..67b09d066 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java +++ b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java @@ -122,4 +122,6 @@ public interface VehicleMapper extends BaseMapper * APP绑定车辆我的车辆列表查询 */ List driverBindMyCarList(@Param("driverVehicleBindDto") DriverVehicleBindDto driverVehicleBindDto); + + Integer updatePilotDriver(VehicleDto vehicleDto); } diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java index 286444a39..43b627ef7 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java +++ b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java @@ -425,4 +425,28 @@ public class VehiclePo extends BaseVOEntity implements Serializable @DateTimeFormat(pattern="yyyy-MM-dd") private Date insuranceValidityPeriod; + + @ApiModelProperty(value = "副驾1") + private String pilot1; + + @ApiModelProperty(value = "副驾1的Id") + private String pilot1Id; + + @ApiModelProperty(value = "副驾2") + private String pilot2; + + @ApiModelProperty(value = "副驾2的Id") + private String pilot2Id; + + @ApiModelProperty(value = "跨境车牌") + private String crossPlate; + + @ApiModelProperty(value = "保险") + private String insurance; + + @ApiModelProperty(value = "签证本") + private String visa; + + @ApiModelProperty(value = "车辆主体") + private Integer vehicleBody; } 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..151deb94f 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 @@ -26,9 +26,12 @@ public class Material { private boolean codeManaged; private String remark; private BigDecimal weight; + private BigDecimal materialVolume; + private String materialContent; private LocalDateTime createTime; private LocalDateTime updateTime; + // 私有构造方法 private Material(Long ownerId, String shipper, @@ -39,6 +42,8 @@ public class Material { BigDecimal value, boolean codeManaged, BigDecimal weight, + BigDecimal materialVolume, + String materialContent, String remark) { validateRequiredFields( category, name, unit); this.ownerId = ownerId; @@ -51,6 +56,8 @@ public class Material { this.codeManaged = codeManaged; this.remark = remark; this.weight = weight; + this.materialVolume = materialVolume; + this.materialContent = materialContent; this.createTime = LocalDateTime.now(); this.updateTime = LocalDateTime.now(); } @@ -66,10 +73,12 @@ public class Material { BigDecimal value, boolean codeManaged, BigDecimal weight, + BigDecimal materialVolume, + String materialContent, String remark, MaterialCodeGenerator codeGenerator) { Material material = new Material(ownerId, shipper, category, name, model, - unit, value, codeManaged, weight,remark + unit, value, codeManaged, weight, materialVolume, materialContent, remark ); material.materialCode = codeGenerator.generate(); return material; @@ -83,6 +92,8 @@ public class Material { BigDecimal value, boolean codeManaged, BigDecimal weight, + BigDecimal materialVolume, + String materialContent, String remark) { this.ownerId = ownerId; this.shipper = shipper; @@ -91,6 +102,8 @@ public class Material { this.model = model; this.unit = unit; this.weight = weight; + this.materialVolume = materialVolume; + this.materialContent = materialContent; this.value = validateValue(value); this.codeManaged = codeManaged; this.remark = remark; diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java index bb0799a0b..8ab55359d 100644 --- a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java +++ b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java @@ -56,7 +56,7 @@ public interface MaterialRepository { * @param size 每页大小 * @return 分页的物料数据 */ - IPage search(String shipper, String category, String name,String model,String materialCode,Boolean codeManaged,String remark, + IPage search(String shipper, String category, String name,String model,String materialCode,Boolean codeManaged,String remark,String materialContent, Long current, Long size); /** 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..7e999f70e 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 @@ -32,4 +32,6 @@ public class MaterialDO { @TableLogic @TableField("is_deleted") private Boolean deleted; + private BigDecimal materialVolume; + private String materialContent; } diff --git a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java index eb4053c48..f7a21ece1 100644 --- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java +++ b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java @@ -58,7 +58,7 @@ public class MaterialRepositoryImpl implements MaterialRepository { } @Override - public IPage search(String shipper, String category, String name, String model,String materialCode,Boolean codeManaged,String remark, + public IPage search(String shipper, String category, String name, String model,String materialCode,Boolean codeManaged,String remark,String materialContent, Long current, Long size) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() .eq(StringUtils.isNotBlank(shipper), MaterialDO :: getShipper, shipper) @@ -68,6 +68,7 @@ public class MaterialRepositoryImpl implements MaterialRepository { .like(StringUtils.isNotBlank(materialCode), MaterialDO :: getMaterialCode, materialCode) .eq(null!=codeManaged, MaterialDO :: getCodeManaged, codeManaged) .like(StringUtils.isNotBlank(remark), MaterialDO :: getRemark, remark) + .like(StringUtils.isNotBlank(materialContent), MaterialDO :: getMaterialContent, materialContent) .orderByDesc(MaterialDO :: getCreateTime); return materialMapper.selectPage(new Page<>(current, size), wrapper) diff --git a/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java b/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java index 5ffc6b528..fb308686f 100644 --- a/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java +++ b/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java @@ -413,4 +413,28 @@ public class VehicleDto extends BaseVOEntity implements Serializable @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date insuranceValidityPeriod; + + @ApiModelProperty(value = "副驾1") + private String pilot1; + + @ApiModelProperty(value = "副驾1的Id") + private String pilot1Id; + + @ApiModelProperty(value = "副驾2") + private String pilot2; + + @ApiModelProperty(value = "副驾2的Id") + private String pilot2Id; + + @ApiModelProperty(value = "跨境车牌") + private String crossPlate; + + @ApiModelProperty(value = "保险") + private String insurance; + + @ApiModelProperty(value = "签证本") + private String visa; + + @ApiModelProperty(value = "车辆主体") + private Integer vehicleBody; } diff --git a/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java b/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java index a78106b4f..47692c3c7 100644 --- a/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java +++ b/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java @@ -65,6 +65,15 @@ public class VehicleApi extends BaseController return getDataTable(list); } + /** + * 车辆绑定副驾 + */ + @Log(title = "车辆管理-车辆绑定副驾", description = "车辆绑定副驾", businessType = BusinessType.UPDATE) + @PostMapping("/bindVehicle") + public R bindVehicle(@RequestBody VehicleDto vehicleDto){ + return R.ok(vehicleApplicationService.updatePilotDriver(vehicleDto)); + } + /** * 查询未绑定车辆列表 */ diff --git a/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java b/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java index fd1ccf5ab..d629c421a 100644 --- a/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java +++ b/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java @@ -102,4 +102,16 @@ public class MaterialApi { public R getMaterial(@PathVariable Long id) { return R.ok(queryService.getMaterialDetail(id)); } + + /** + * 获取订单选择货物详情(包含体积和物料内容) + * + * @param id 物料ID + * @return 物料详情,包含体积和物料内容字段 + */ + @GetMapping("/forOrderSelection") + @Log(title = "物料管理(PC)", description = "TMS-订单选择货物详情", businessType = BusinessType.OTHER) + public R getMaterialsForOrderSelection(@RequestParam(name = "id") Long id) { + return R.ok(queryService.getMaterialDetail(id)); + } } diff --git a/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml b/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml index f028755ee..fb19f15c6 100644 --- a/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml +++ b/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml @@ -113,9 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT - * + * FROM vehicle + + + + + + + insert into receiving_account + + account_name, + account_information, + del_flag, + create_time, + update_time, + + + #{accountName}, + #{accountInformation}, + #{delFlag}, + #{createTime}, + #{updateTime}, + + + + + insert into receiving_account (account_name, account_information, del_flag, create_time, update_time) + values + + ( + #{item.accountName}, + #{item.accountInformation}, + #{item.delFlag}, + #{item.createTime}, + #{item.updateTime} + ) + + + + + update receiving_account + set del_flag = 2, + update_time = now() + where id = #{id} + + + + update receiving_account + set del_flag = 2, + update_time = now() + where del_flag = 1 + + From afc49be45facab3316fbf091f218263133a310d6 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, 12 Dec 2025 10:16:18 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8E=BB=E9=99=A4;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/inBoundOrder/InboundOrderService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java index 727d49692..957360478 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java @@ -104,11 +104,11 @@ public class InboundOrderService extends ServiceImpl Date: Fri, 12 Dec 2025 10:16:50 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=88=86=E6=94=AF=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd-auth/src/main/resources/bootstrap.yml | 8 ++++---- mhd-gateway/src/main/resources/bootstrap.yml | 8 ++++---- mhd-modules/mhd-system/src/main/resources/bootstrap.yml | 8 ++++---- mhd-user-center/src/main/resources/bootstrap.yml | 8 ++++---- mhd_finance/src/main/resources/bootstrap.yml | 8 ++++---- mhd_product/src/main/resources/bootstrap.yml | 8 ++++---- mhd_thrid_party/src/main/resources/bootstrap.yml | 8 ++++---- mhd_transport/src/main/resources/bootstrap.yml | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index ddb64b1d3..4ad3efaa9 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: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - 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/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index d1a88efe4..d1265f2c7 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.102.192.5:6848 - server-addr: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.102.192.5:6848 - 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/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 16293438f..10198d980 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: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - 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/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index f26ae0f15..9597fac7e 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -18,14 +18,14 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 # server-addr: 116.204.23.92:8848 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + # 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/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index 63466298a..f858ead66 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -18,15 +18,15 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 # 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: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index 1a8021d1d..71ba80796 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: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - 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/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index a922ae813..ea3251aeb 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: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - 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/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 464240e6c..45877b89b 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -18,15 +18,15 @@ spring: cloud: nacos: discovery: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 # server-addr: 10.33.0.129:6010r - server-addr: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 config: -# server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.33.0.129:6010 + # server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 From a18fd9d59b94bc5c8b0303b262718edfe9fecc2d Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Sat, 13 Dec 2025 15:04:36 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E6=89=AB=E6=8F=8F?= =?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/java/minio/MinIoUploadService.java | 10 ++++------ .../monitor/config/WebSecurityConfigurer.java | 15 ++++++++++++++- .../ApprovalDocumentApplicationService.java | 10 +++++++++- .../approvalDocument/ApprovalDocumentApi.java | 15 +++++++++++++-- mhd_product/pom.xml | 11 +++++++++++ .../service/menu/MenuApplicationService.java | 4 +++- mhd_transport/pom.xml | 11 ----------- 7 files changed, 54 insertions(+), 22 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java index 9517886e2..02b44f326 100644 --- a/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java +++ b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java @@ -4,6 +4,7 @@ import com.aliyun.oss.ServiceException; import io.minio.MinioClient; import io.minio.PutObjectArgs; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.util.UriUtils; @@ -15,19 +16,16 @@ import java.util.Date; import java.util.List; import java.util.UUID; +@Service public class MinIoUploadService { - @Autowired + private MinioClient minioClient; + private static String bucket="ngwl"; private static String host="http://10.102.192.5:6000"; private static String accessKey="minioadmin"; private static String secretKey="gmminioadmin"; - /** - * minio 工具客户端 - */ - private static MinioClient minioClient1 = null; - private static String FILE_URL; /** * 上传到minio diff --git a/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java b/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java index 6c1a72247..27fbabc66 100644 --- a/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java +++ b/mhd-visual/mhd-monitor/src/main/java/com/mhd/modules/monitor/config/WebSecurityConfigurer.java @@ -1,6 +1,7 @@ package com.mhd.modules.monitor.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; +import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -9,7 +10,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * 监控权限配置 - * + * * @author mhd */ @EnableWebSecurity @@ -32,11 +33,23 @@ public class WebSecurityConfigurer return httpSecurity .headers().frameOptions().disable() .and().authorizeRequests() + .antMatchers("/actuator/health", "/actuator/info").permitAll() //扫描漏洞添加 + .antMatchers("/actuator/**").authenticated() //扫描漏洞添加 .antMatchers(adminContextPath + "/assets/**" , adminContextPath + "/login" , adminContextPath + "/actuator/**" , adminContextPath + "/instances/**" ).permitAll() + // 管理端点需要认证 + .antMatchers("/actuator/**").hasRole("ADMIN")//扫描漏洞添加 + .antMatchers("/admin/**").hasRole("ADMIN")//扫描漏洞添加 + .antMatchers("/actuator/env").hasRole("plat_admin") // 仅允许ADMIN角色访问/env端点 //扫描漏洞添加 + // 允许公开访问的端点 + .requestMatchers(EndpointRequest.to("health", "info", "prometheus"))//扫描漏洞添加 + .permitAll() + // 敏感端点需要管理员权限 + .requestMatchers(EndpointRequest.to("env", "configprops", "beans", "mappings"))//扫描漏洞添加 + .hasRole("ADMIN") .anyRequest().authenticated() .and() .formLogin().loginPage(adminContextPath + "/login") diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java index 3845124ab..d3c528489 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/approvalDocument/ApprovalDocumentApplicationService.java @@ -7,11 +7,15 @@ import com.linke.finance.domain.approvalDocument.repository.todo.ApprovalDocumen import com.linke.finance.domain.approvalDocument.repository.todo.WorkflowProcessInstancesByIdDO; import com.linke.finance.domain.approvalDocument.service.ApprovalDocumentDomainService; import com.linke.finance.interfaces.vo.ApprovalStatsVO; +import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; +import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.rmi.ServerException; import java.util.List; /** * 审批单据ApplicationService @@ -30,8 +34,12 @@ public class ApprovalDocumentApplicationService { * 分页查询审批单据列表 */ - public List queryList(ApprovalDocumentDO approvalDocumentDO) { + public List queryList(ApprovalDocumentDO approvalDocumentDO) throws Exception{ LoginUser loginUser = SecurityUtils.getLoginUser(); + UserPo userPo=loginUser.getUserPo(); + if(!userPo.getRoleCode().equals("plat_admin")){ + throw new ServerException("您没有权限访问"); + } if (loginUser != null){ Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); if (topOrganizationId != null && topOrganizationId != 1){ diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java index 081beca9c..21cd4481a 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java @@ -7,6 +7,8 @@ import com.linke.finance.interfaces.dto.approvalDocument.DingDingHuiDiaoDTO; import com.linke.finance.interfaces.vo.ApprovalStatsVO; import com.linke.finance.until.DingCallbackCrypto; import com.mhd.common.core.domain.entity.R; + +import java.rmi.ServerException; import java.util.List; import java.util.Map; @@ -56,8 +58,17 @@ public class ApprovalDocumentApi extends BaseController{ //转换实体 ApprovalDocumentDO approvalDocumentDO = approvalDocumentAssembler.toDO(approvalDocumentDTO); startPage(); - List list = approvalDocumentApplicationService.queryList(approvalDocumentDO); - return getDataTable(list); + List list = null; + try { + list = approvalDocumentApplicationService.queryList(approvalDocumentDO); + return getDataTable(list); + } catch (ServerException e) { + e.printStackTrace(); + return null; + } catch (Exception e) { + e.printStackTrace(); + return null; + } } /** diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index e665e0a44..3363300a9 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -129,6 +129,17 @@ com.mhd mhd-common-log + + io.minio + minio + 8.4.3 + + + com.squareup.okhttp3 + okhttp + 4.8.1 + compile + diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index 4ccea8aeb..e48ecd148 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java @@ -46,6 +46,7 @@ import lombok.extern.slf4j.Slf4j; import minio.MinIoUploadService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -97,9 +98,10 @@ public class MenuApplicationService { private SpecialServiceFeign logisticsServiceFeign; @Resource private MenuUtils menuUtils; - @Autowired + @Autowired(required = false) private MinIoUploadService minIoUploadService; + /** * 查询菜单集合 * diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 33822d0e4..82166bd0b 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -101,17 +101,6 @@ org.springframework.cloud spring-cloud-starter-sleuth - - io.minio - minio - 8.4.3 - - - com.squareup.okhttp3 - okhttp - 4.8.1 - compile - From 8affee1409ff68d440ae437b34399209f4a3bbdd Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Sat, 13 Dec 2025 15:06:42 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/ReconciliationImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 8884ae06a..c42df3c88 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 @@ -469,9 +469,11 @@ public class ReconciliationImpl extends ServiceImpl Date: Sat, 13 Dec 2025 17:26:17 +0800 Subject: [PATCH 08/27] =?UTF-8?q?nc=E4=B8=8A=E4=BC=A0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=A0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/TmsOrder.java | 18 +++ .../persistence/ReconciliationImpl.java | 136 ++++++++++-------- 2 files changed, 94 insertions(+), 60 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java index c8bcfc4e1..a9f7009b7 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java @@ -522,4 +522,22 @@ public class TmsOrder implements Serializable { @ApiModelProperty(value = "付款方名称") private String payer; + + @ApiModelProperty("客户编码nc") + private String customsCodeNc; + + @ApiModelProperty("制单人编码nc") + private String makerCodeNc; + + @ApiModelProperty("业务员编码nc") + private String salesmanCodeNc; + + @ApiModelProperty("税率") + private BigDecimal taxRate; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + + @ApiModelProperty("合同编号") + private String contractNo; } 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 c42df3c88..ab85f2826 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 @@ -404,12 +404,6 @@ public class ReconciliationImpl extends ServiceImpl> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); + String makerCodeNc=""; if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ @@ -448,38 +443,50 @@ public class ReconciliationImpl extends ServiceImpl ysitemList=new ArrayList(); ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); + if(null==reconciliation.getSettlementPartyId()){ + throw new ServiceException("没有结算方，请核对"); + } + String makerCodeNc=""; R> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ for(TmsOrder tmsOrder:list){ - if(null==reconciliation.getSettlementPartyId()){ - throw new ServiceException("没有结算方，请核对"); + if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) { + throw new ServiceException("请先维护业务员编码"); } - AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); + if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) { + throw new ServiceException("请先维护制单员编码"); + } + if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) { + throw new ServiceException("请先维护制单员编码"); + } + + + SKitem item=new SKitem(); + item.setSo_deptid("NG040104"); + item.setPk_deptid("NG040104"); + item.setCheckdirection("ar"); + item.setPk_psndoc(tmsOrder.getSalesmanCodeNc()); + item.setCustomer(tmsOrder.getCustomsCodeNc()); + item.setPurchaseorder(tmsOrder.getGoodsNumber()); + item.setObjtype("0"); + item.setDirection("1"); + item.setScomment(tmsOrder.getAppointShipper()); + item.setPk_currtype(tmsOrder.getSettlementCurrency()); + item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); + item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); + ysitemList.add(item); + /* AjaxResult ajaxResult=userServiceFeign.getShipperSummaryData(Long.valueOf(reconciliation.getSettlementPartyId())); 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(jsonObject.get("customerNcCode").toString()); - item.setPurchaseorder(tmsOrder.getGoodsNumber()); - item.setObjtype("0"); - item.setDirection("1"); - item.setScomment(jsonObject.get("shipperEnterpriseName").toString()); - item.setPk_currtype("CNY"); - item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight())); - item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight())); - ysitemList.add(item); - } + + + }*/ } } @@ -670,7 +686,7 @@ public class ReconciliationImpl extends ServiceImpl Date: Sat, 13 Dec 2025 19:52:26 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linke/product/interfaces/facade/tenants/SysTenantsApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_product/src/main/java/com/linke/product/interfaces/facade/tenants/SysTenantsApi.java b/mhd_product/src/main/java/com/linke/product/interfaces/facade/tenants/SysTenantsApi.java index 182d24a27..1e38fee3b 100644 --- a/mhd_product/src/main/java/com/linke/product/interfaces/facade/tenants/SysTenantsApi.java +++ b/mhd_product/src/main/java/com/linke/product/interfaces/facade/tenants/SysTenantsApi.java @@ -30,7 +30,7 @@ import java.util.List; */ @RestController @RequestMapping("/tenants") -@CrossOrigin +//@CrossOrigin public class SysTenantsApi extends BaseController { @Autowired From 97330de8ba736a24c5ca096f776b8059afcc2015 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, 13 Dec 2025 20:48:24 +0800 Subject: [PATCH 10/27] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/model/LoginUser.java | 4 +++ .../service/UserApplicationService.java | 1 + .../service/UserDriverApplicationService.java | 36 +++++++++++++++++++ .../userAggregate/factory/UserFactory.java | 2 ++ .../facade/UserDriverRepositoryInterface.java | 2 ++ .../repository/mapper/UserDriverMapper.java | 2 ++ .../persistence/UserDriverRepositoryImpl.java | 5 +++ .../service/UserDriverDomainService.java | 5 +++ .../user/interfaces/facade/UserDriverAPI.java | 11 ++++++ .../interfaces/vo/QueryAllShipperInfoVo.java | 3 ++ .../resources/mapper/UserDriverMapper.xml | 31 ++++++++++++++++ .../src/main/resources/mapper/UserMapper.xml | 2 +- .../material/persistence/MaterialDO.java | 5 +++ sql/finance20251213.sql | 11 ++++++ sql/transport20251213.sql | 12 +++++++ 15 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 sql/finance20251213.sql create mode 100644 sql/transport20251213.sql diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java index 76a537dc4..3afe4170e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java @@ -38,6 +38,10 @@ public class LoginUser implements Serializable * 用户名 */ private String username; + /** + * 用户名 + */ + private String realname; /** * 登录时间 diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 2e0896d5d..0ccf7cd51 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -2042,6 +2042,7 @@ public class UserApplicationService { VehiclePo vehiclePo = new VehiclePo(); sysUser.setUserid(userPo.getUserId()); sysUser.setUsername(userPo.getUserAccount()); + sysUser.setRealname(userPo.getUserName()); UserDriverPo userDriverPo = userDriverDomainService.selectByUserId(userPo.getUserId()); if (ObjectUtil.isNull(userDriverPo)) { userDriverPo = new UserDriverPo(); diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java index 705d88ea8..7300c47c1 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java @@ -2052,6 +2052,42 @@ public class UserDriverApplicationService { return mapList; } + public List> userPersonalDriverAuthList() { + //获取当前登录人 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + + UserDriverDO userDriverDO = new UserDriverDO(); + //20240227 修改为查询用户关联的司机数据，包括车队长、承运企业 + List userDriverPos = userDriverDomainService.userPersonalDriverAuthList(userDriverDO); + + List> mapList = new ArrayList<>(); + if (CollUtil.isNotEmpty(userDriverPos)) { + for (UserDriverPo u : userDriverPos) { + Map map = new HashMap<>(); + map.put("userId", u.getUserId().toString()); + + StringBuilder str = new StringBuilder(); + str.append(u.getUserName()); + + if (StrUtil.isNotEmpty(u.getUserPhone())) { + str.append(", ").append(u.getUserPhone()); + } + + if (StrUtil.isNotEmpty(u.getDriverEnterpriseName())) { + str.append("【").append(u.getDriverEnterpriseName()).append("】"); + } + + map.put("label", String.valueOf(str)); + mapList.add(map); + } + } + + return mapList; + } + /** * 车队认证-车队长查询 */ diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java index 3fe1fbe51..73fa75fe9 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java @@ -1,5 +1,6 @@ package com.mhd.user.domain.userAggregate.factory; +import cn.hutool.core.util.ObjectUtil; import com.mhd.user.domain.userAggregate.entity.UserEntity; import com.mhd.common.core.domain.po.UserPo; import com.mhd.user.domain.userAggregate.repository.todo.UserDO; @@ -20,6 +21,7 @@ public class UserFactory { public UserEntity getUserEntity(UserDO userDO) { UserEntity userEntity = new UserEntity(); BeanUtils.copyProperties(userDO,userEntity, IgnoreNullUtil.getNullPropertyNames(userDO)); + userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?Integer.valueOf(userDO.getDepartmentId()):null); return userEntity; } public CheckDO getCheckDo(UserDO userDO) { diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java index 2768d150a..42bfcf13a 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java @@ -55,6 +55,8 @@ public interface UserDriverRepositoryInterface extends IService userDriverAuthList(UserDriverDO userDriverDO); + List userPersonalDriverAuthList(UserDriverDO userDriverDO); + List> motorcadeAuthCaptainList(Long organizationId); List getRegionDriverList(UserDriverDO userDriverDO); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java index 6f29a301b..3dce2f973 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java @@ -54,6 +54,8 @@ public interface UserDriverMapper extends BaseMapper { List userDriverAuthList(UserDriverDO userDriverDO); + List userPersonalDriverAuthList(UserDriverDO userDriverDO); + List> motorcadeAuthCaptainList(Long organizationId); List getRegionDriverList(@Param("userDriverDO") UserDriverDO userDriverDO); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java index a3a0cd232..f9749b0f3 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java @@ -183,6 +183,11 @@ public class UserDriverRepositoryImpl extends ServiceImpl userPersonalDriverAuthList(UserDriverDO userDriverDO) { + return userDriverMapper.userPersonalDriverAuthList(userDriverDO); + } + @Override public List> motorcadeAuthCaptainList(Long organizationId) { return userDriverMapper.motorcadeAuthCaptainList(organizationId); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java index 1d1770b10..d7c2b70ee 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java @@ -187,6 +187,11 @@ public class UserDriverDomainService { return userDriverRepositoryInterface.userDriverAuthList(userDriverDO); } + @DataPermissions(cacheName = "master") + public List userPersonalDriverAuthList(UserDriverDO userDriverDO) { + return userDriverRepositoryInterface.userPersonalDriverAuthList(userDriverDO); + } + public List> motorcadeAuthCaptainList(Long organizationId) { return userDriverRepositoryInterface.motorcadeAuthCaptainList(organizationId); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java index 3a0fd9e9f..872d56fcd 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java @@ -246,6 +246,17 @@ public class UserDriverAPI extends BaseController { return AjaxResult.success(userDriverApplicationService.userDriverAuthList()); } + /** + * 车辆认证-承运人查询(个人司机) + * @return + */ + @Log(title = "承运人管理-查询", description ="车辆认证-承运人查询(个人司机)",businessType = BusinessType.INQUIRE) + @ApiOperation("车辆认证-承运人查询(个人司机)") + @GetMapping("/userPersonalDriverAuthList") + public AjaxResult userPersonalDriverAuthList() { + return AjaxResult.success(userDriverApplicationService.userPersonalDriverAuthList()); + } + /** * 车辆导入-承运人查询 * @return diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java index 35a03089f..bf5354eaa 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java @@ -58,4 +58,7 @@ public class QueryAllShipperInfoVo { @ApiModelProperty("是否有默认地址") private Boolean hasDefaultAddress; + + @ApiModelProperty("用户nc") + private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index 59b9303ce..96a32d8aa 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -975,6 +975,37 @@ + + SELECT - menu_component, - menu_redirect_path + menu_component AS menuComponent, + menu_redirect_path AS menuRedirectPath FROM sys_menu where diff --git a/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java deleted file mode 100644 index a33af3b5e..000000000 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.linke.thirdParty.infrastructure.config; - -import com.linke.thirdParty.infrastructure.utils.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_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/utils/CamelCaseUtils.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/utils/CamelCaseUtils.java deleted file mode 100644 index b3205fbbb..000000000 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/utils/CamelCaseUtils.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.linke.thirdParty.infrastructure.utils; - -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_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java deleted file mode 100644 index ef791c4bc..000000000 --- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/config/CamelCaseMapPlugin.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.linke.transport.infrastructure.config; - -import com.linke.transport.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_transport/src/main/java/com/linke/transport/infrastructure/util/CamelCaseUtils.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/util/CamelCaseUtils.java deleted file mode 100644 index 90cc892e2..000000000 --- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/util/CamelCaseUtils.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.linke.transport.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 From 4a7d28350ed65fcb21dc40ee9f06323f0226f3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sun, 14 Dec 2025 15:12:59 +0800 Subject: [PATCH 15/27] =?UTF-8?q?Revert=20"=E6=81=A2=E5=A4=8D=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 52cdfbe6d9bf1cd833a305e62ff000ad53a26cf1. --- .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../config/CamelCaseMapPlugin.java | 57 +++++++++++++++++++ .../infrastructure/util/CamelCaseUtils.java | 54 ++++++++++++++++++ .../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 ++++++++++++++++++ 13 files changed, 668 insertions(+), 2 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_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_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" + SELECT + a.* + FROM + user_driver_enterprise a + WHERE + a.del_flag = 1 + AND a.driver_type = 2 + AND a.user_id = #{userId} + + From c27e2b624d3c0313f6d5279daa19cb83b6bff90e 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, 15 Dec 2025 17:15:42 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E6=BC=8F=E6=89=AB=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/common/security/service/TokenService.java | 1 + .../assemble/accountManage/AccountAssembler.java | 2 ++ .../facade/approvalDocument/ApprovalDocumentApi.java | 9 +++++++++ .../mapper/receivingAccount/ReceivingAccountMapper.xml | 4 ++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java b/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java index a44a77d9d..a6e76396a 100644 --- a/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java +++ b/mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/service/TokenService.java @@ -129,6 +129,7 @@ public class TokenService if (StringUtils.isNotEmpty(token)) { String userkey = JwtUtils.getUserKey(token); + redisService.deleteObject(userkey); redisService.deleteObject(getTokenKey(userkey)); } } diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java index dfb8089bf..0fc4eb62b 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/assemble/accountManage/AccountAssembler.java @@ -4,6 +4,7 @@ import com.linke.finance.domain.accountManage.entity.AccountExpendRecords; import com.linke.finance.interfaces.dto.*; import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import java.util.Date; @@ -26,6 +27,7 @@ public class AccountAssembler { // 拷贝vehicleDto到vehicle中 BeanUtils.copyProperties(accountCashWalletDto, accountCashWallet); // 获取登录人id + LoginUser loginUser = SecurityUtils.getLoginUser(); Long userId = SecurityUtils.getLoginUser().getUserid(); if(accountCashWalletDto.getAccountCashWalletId() != null){ if(userId != null){ diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java index 21cd4481a..689785c04 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/approvalDocument/ApprovalDocumentApi.java @@ -17,9 +17,12 @@ import com.linke.finance.domain.approvalDocument.repository.po.ApprovalDocumentP import com.linke.finance.domain.approvalDocument.repository.todo.ApprovalDocumentDO; import com.linke.finance.interfaces.assemble.approvalDocument.ApprovalDocumentAssembler; import com.linke.finance.interfaces.dto.approvalDocument.ApprovalDocumentDTO; +import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.core.feign.ThirdPartyServiceFeign; import com.mhd.common.log.annotation.Log; import com.mhd.common.log.enums.BusinessType; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -55,6 +58,12 @@ public class ApprovalDocumentApi extends BaseController{ @GetMapping("/list") public TableDataInfo list(ApprovalDocumentDTO approvalDocumentDTO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + UserPo userPo = loginUser.getUserPo(); + String roleCode = userPo.getRoleCode(); + if (!"plat_admin".equals(roleCode)) { + return null; + } //转换实体 ApprovalDocumentDO approvalDocumentDO = approvalDocumentAssembler.toDO(approvalDocumentDTO); startPage(); diff --git a/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml b/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml index 0705d57de..c62228468 100644 --- a/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml +++ b/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into receiving_account (account_name, account_information, del_flag, create_time, update_time) + insert into receiving_account (account_name, account_information, del_flag, create_time, update_time,top_organization_id, organization_id) values ( @@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.accountInformation}, #{item.delFlag}, #{item.createTime}, - #{item.updateTime} + #{item.updateTime},#{item.topOrganizationId},#{item.organizationId} ) From 6c2fb7c01335ea7f4b0f4652bbc99ccb8cff29e1 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, 15 Dec 2025 22:15:42 +0800 Subject: [PATCH 19/27] bug --- mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index a842b1601..58e3a0098 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -229,6 +229,7 @@ SELECT a.driver_id, + a.user_driver_type, a.driver_allow_driving_type_id, a.driver_allow_driving_type_name, a.driver_certification_authority, From c78b9c325cfcef70c3924dd41e9a50522bc5b08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Tue, 16 Dec 2025 17:02:34 +0800 Subject: [PATCH 20/27] =?UTF-8?q?userDriver=E7=B1=BB=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E8=BE=86=E4=B8=BB=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mhd/common/core/domain/po/UserDriverListPo.java | 3 +++ .../main/java/com/mhd/common/core/domain/po/UserDriverPo.java | 3 +++ .../domain/userAggregate/repository/todo/UserDriverDO.java | 3 +++ .../java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java | 3 +++ 4 files changed, 12 insertions(+) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java index 638bcf9ec..58be1c4e2 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java @@ -304,4 +304,7 @@ public class UserDriverListPo { @ApiModelProperty(value = "用户身份") private Integer userIdentity; + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; + } diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java index 09589eee6..5027edf44 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverPo.java @@ -185,6 +185,9 @@ public class UserDriverPo { @ApiModelProperty(name = "用户实名认证状态：0-无状态，1-已注册未认证，2-已认证待审核，3-审核通过，4-已驳回") private Integer userAuthStatus; + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; + //===================车队司机参数=============== @ApiModelProperty("车队队长userId") diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java index c8f32f36e..f6c3d8a2c 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java @@ -286,4 +286,7 @@ public class UserDriverDO extends UserDO { @ApiModelProperty(name = "用户身份") private Integer userIdentity; + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; + } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java index 3db40186d..0aab9bcc2 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java @@ -311,4 +311,7 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "用户身份") private Integer userIdentity; + + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; } From 7ed03628fac26beaacf60b0df822021503900fe9 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, 16 Dec 2025 23:22:32 +0800 Subject: [PATCH 21/27] mqbug --- .../product/application/event/menu/publish/MenuPublish.java | 6 +++++- .../application/event/menu/subscribe/MenuSubscribe.java | 6 +++++- .../application/event/modules/publish/ModulesPublish.java | 6 +++++- .../event/modules/subscribe/ModulesSubscribe.java | 6 +++++- .../event/organization/publish/OrganizationPublish.java | 6 +++++- .../event/organization/subscribe/OrganizationSubscribe.java | 6 +++++- .../service/modules/SysModulesApplicationService.java | 6 +++--- .../organization/OrganizationApplicationService.java | 6 +++--- .../linke/product/infrastructure/util/mq/MenuChannel.java | 6 +++++- .../product/infrastructure/util/mq/ModulesChannel.java | 6 +++++- .../product/infrastructure/util/mq/OrganizationChannel.java | 6 +++++- 11 files changed, 51 insertions(+), 15 deletions(-) diff --git a/mhd_product/src/main/java/com/linke/product/application/event/menu/publish/MenuPublish.java b/mhd_product/src/main/java/com/linke/product/application/event/menu/publish/MenuPublish.java index cc75227ae..e0b66266b 100644 --- a/mhd_product/src/main/java/com/linke/product/application/event/menu/publish/MenuPublish.java +++ b/mhd_product/src/main/java/com/linke/product/application/event/menu/publish/MenuPublish.java @@ -1,3 +1,4 @@ +/* package com.linke.product.application.event.menu.publish; import com.linke.product.infrastructure.util.mq.MenuChannel; @@ -6,13 +7,15 @@ import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; +*/ /** * 消息发布 * * 2022-12-21 * * @author 王子豪 - */ + *//* + @EnableBinding(value = { MenuChannel.class }) @Service public class MenuPublish { @@ -27,3 +30,4 @@ public class MenuPublish { source.outputLog().send(MessageBuilder.withPayload(content).build()); } } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/application/event/menu/subscribe/MenuSubscribe.java b/mhd_product/src/main/java/com/linke/product/application/event/menu/subscribe/MenuSubscribe.java index 2cf9163ac..1ad67b19d 100644 --- a/mhd_product/src/main/java/com/linke/product/application/event/menu/subscribe/MenuSubscribe.java +++ b/mhd_product/src/main/java/com/linke/product/application/event/menu/subscribe/MenuSubscribe.java @@ -1,3 +1,4 @@ +/* package com.linke.product.application.event.menu.subscribe; import com.linke.product.infrastructure.util.mq.MenuChannel; @@ -5,13 +6,15 @@ import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.messaging.Message; +*/ /** * 消息接收 * * 2022-12-1 * * @author 王子豪 - */ + *//* + @EnableBinding(value = { MenuChannel.class }) public class MenuSubscribe { @@ -29,3 +32,4 @@ public class MenuSubscribe { // menuApplicationService.selectTreeMenu(); } } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/application/event/modules/publish/ModulesPublish.java b/mhd_product/src/main/java/com/linke/product/application/event/modules/publish/ModulesPublish.java index b632b7a98..2e6e7de6c 100644 --- a/mhd_product/src/main/java/com/linke/product/application/event/modules/publish/ModulesPublish.java +++ b/mhd_product/src/main/java/com/linke/product/application/event/modules/publish/ModulesPublish.java @@ -1,3 +1,4 @@ +/* package com.linke.product.application.event.modules.publish; import com.linke.product.infrastructure.util.mq.ModulesChannel; @@ -6,13 +7,15 @@ import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; +*/ /** * 消息发布 * * 2022-12-1 * * @author 王子豪 - */ + *//* + @EnableBinding(value = { ModulesChannel.class }) @Service public class ModulesPublish { @@ -27,3 +30,4 @@ public class ModulesPublish { source.outputLog().send(MessageBuilder.withPayload(content).build()); } } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/application/event/modules/subscribe/ModulesSubscribe.java b/mhd_product/src/main/java/com/linke/product/application/event/modules/subscribe/ModulesSubscribe.java index 3994b5299..1c54cab68 100644 --- a/mhd_product/src/main/java/com/linke/product/application/event/modules/subscribe/ModulesSubscribe.java +++ b/mhd_product/src/main/java/com/linke/product/application/event/modules/subscribe/ModulesSubscribe.java @@ -1,3 +1,4 @@ +/* package com.linke.product.application.event.modules.subscribe; import com.linke.product.infrastructure.util.mq.ModulesChannel; @@ -5,13 +6,15 @@ import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.messaging.Message; +*/ /** * 消息接收 * * 2022-12-1 * * @author 王子豪 - */ + *//* + @EnableBinding(value = { ModulesChannel.class }) public class ModulesSubscribe { @@ -29,3 +32,4 @@ public class ModulesSubscribe { // sysModulesApplicationService.selectTreeModules(); } } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/application/event/organization/publish/OrganizationPublish.java b/mhd_product/src/main/java/com/linke/product/application/event/organization/publish/OrganizationPublish.java index bb3c36235..fc20a9edb 100644 --- a/mhd_product/src/main/java/com/linke/product/application/event/organization/publish/OrganizationPublish.java +++ b/mhd_product/src/main/java/com/linke/product/application/event/organization/publish/OrganizationPublish.java @@ -1,3 +1,4 @@ +/* package com.linke.product.application.event.organization.publish; import com.linke.product.infrastructure.util.mq.OrganizationChannel; @@ -6,13 +7,15 @@ import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; +*/ /** * 消息发布 * * 2022-11-22 * * @author 王子豪 - */ + *//* + @EnableBinding(value = { OrganizationChannel.class }) @Service public class OrganizationPublish { @@ -27,3 +30,4 @@ public class OrganizationPublish { source.outputLog().send(MessageBuilder.withPayload(content).build()); } } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/application/event/organization/subscribe/OrganizationSubscribe.java b/mhd_product/src/main/java/com/linke/product/application/event/organization/subscribe/OrganizationSubscribe.java index 515b995f9..e8639c9f9 100644 --- a/mhd_product/src/main/java/com/linke/product/application/event/organization/subscribe/OrganizationSubscribe.java +++ b/mhd_product/src/main/java/com/linke/product/application/event/organization/subscribe/OrganizationSubscribe.java @@ -1,3 +1,4 @@ +/* package com.linke.product.application.event.organization.subscribe; import com.linke.product.application.service.organization.OrganizationApplicationService; @@ -8,13 +9,15 @@ import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.messaging.Message; +*/ /** * 消息接收 * * 2022-11-25 * * @author 王子豪 - */ + *//* + @EnableBinding(value = { OrganizationChannel.class }) public class OrganizationSubscribe { @@ -32,3 +35,4 @@ public class OrganizationSubscribe { // organizationASvc.selectTreeOrganization(); } } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/application/service/modules/SysModulesApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/modules/SysModulesApplicationService.java index 1ea76498a..31142f0dc 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/modules/SysModulesApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/modules/SysModulesApplicationService.java @@ -1,6 +1,6 @@ package com.linke.product.application.service.modules; -import com.linke.product.application.event.modules.publish.ModulesPublish; +//import com.linke.product.application.event.modules.publish.ModulesPublish; import com.linke.product.domain.modules.entity.ModulesMenu; import com.linke.product.domain.modules.entity.SysModules; import com.linke.product.domain.modules.service.ModulesMenuDomainService; @@ -27,8 +27,8 @@ public class SysModulesApplicationService { private SysModulesDomainService iSysModulesSvc; @Autowired private ModulesMenuDomainService iModulesMenuSvc; - @Autowired - private ModulesPublish modulesPublish; + /*@Autowired + private ModulesPublish modulesPublish;*/ /** * 查询产品中台-模块 diff --git a/mhd_product/src/main/java/com/linke/product/application/service/organization/OrganizationApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/organization/OrganizationApplicationService.java index cfe26b550..674dd75a7 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/organization/OrganizationApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/organization/OrganizationApplicationService.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; -import com.linke.product.application.event.organization.publish.OrganizationPublish; +//import com.linke.product.application.event.organization.publish.OrganizationPublish; import com.linke.product.domain.common.entity.DataPermission; import com.linke.product.domain.customAuth.service.CustomAuthDomainService; import com.linke.product.domain.customAuth.service.CustomAuthOrganizationDomainService; @@ -72,8 +72,8 @@ public class OrganizationApplicationService { private OrganizationWlhyDomainService organizationWlhyDomainService; @Autowired private OrganizationMenuDomainService iOrganizationMenuSvc; - @Autowired - private OrganizationPublish organizationPublish; + /* @Autowired + private OrganizationPublish organizationPublish;*/ @Autowired private MenuDomainService menuDomainService; @Autowired diff --git a/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/MenuChannel.java b/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/MenuChannel.java index c2c548144..34a7d6369 100644 --- a/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/MenuChannel.java +++ b/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/MenuChannel.java @@ -1,3 +1,4 @@ +/* package com.linke.product.infrastructure.util.mq; import org.springframework.cloud.stream.annotation.Input; @@ -5,6 +6,7 @@ import org.springframework.cloud.stream.annotation.Output; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; +*/ /** * 自定义消息通道 * @@ -12,7 +14,8 @@ import org.springframework.messaging.SubscribableChannel; * 2022-12-1 * * @author 王子豪 - */ + *//* + public interface MenuChannel { String INPUT_LOG = "inputMenu"; @@ -22,3 +25,4 @@ public interface MenuChannel { @Output(OUTPUT_LOG) MessageChannel outputLog(); } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/ModulesChannel.java b/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/ModulesChannel.java index f53d325a6..ed98671cf 100644 --- a/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/ModulesChannel.java +++ b/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/ModulesChannel.java @@ -1,3 +1,4 @@ +/* package com.linke.product.infrastructure.util.mq; import org.springframework.cloud.stream.annotation.Input; @@ -5,6 +6,7 @@ import org.springframework.cloud.stream.annotation.Output; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; +*/ /** * 自定义消息通道 * @@ -12,7 +14,8 @@ import org.springframework.messaging.SubscribableChannel; * 2022-12-1 * * @author 王子豪 - */ + *//* + public interface ModulesChannel { String INPUT_LOG = "inputModules"; @@ -22,3 +25,4 @@ public interface ModulesChannel { @Output(OUTPUT_LOG) MessageChannel outputLog(); } +*/ diff --git a/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/OrganizationChannel.java b/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/OrganizationChannel.java index 4d9e6539c..5c92a1cef 100644 --- a/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/OrganizationChannel.java +++ b/mhd_product/src/main/java/com/linke/product/infrastructure/util/mq/OrganizationChannel.java @@ -1,3 +1,4 @@ +/* package com.linke.product.infrastructure.util.mq; import org.springframework.cloud.stream.annotation.Input; @@ -5,6 +6,7 @@ import org.springframework.cloud.stream.annotation.Output; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; +*/ /** * 自定义消息通道 * @@ -12,7 +14,8 @@ import org.springframework.messaging.SubscribableChannel; * 2022-11-22 * * @author 王子豪 - */ + *//* + public interface OrganizationChannel { String INPUT_LOG = "inputOrganization"; @@ -22,3 +25,4 @@ public interface OrganizationChannel { @Output(OUTPUT_LOG) MessageChannel outputLog(); } +*/ From 2199c8c73969097237d83d06c0be6a338e763b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 17 Dec 2025 17:45:54 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=B4=A7=E8=BF=90=E5=8F=B8=E6=9C=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserDriverMapper.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index 58e3a0098..cc2089b4c 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -187,6 +187,7 @@ ude.driver_corp_idcard_number, r.roleName, dvb.vehicle_id, + wlhydriver.id as wlhydriverId, WM_CONCAT(DISTINCT dvb.vehicle_license_plate_number ) AS vehicleLicensePlateNumber, WM_CONCAT(DISTINCT m.motorcade_name ) AS driverTeamName FROM @@ -206,6 +207,8 @@ user_id ) r ON r.user_id = b.user_id LEFT JOIN user_driver a ON a.user_id = b.user_id + LEFT JOIN NGWL_TEST_WLHY.sys_user wlhyuser ON wlhyuser.szwl_user_id = b.user_id + LEFT JOIN NGWL_TEST_WLHY.tms_driver wlhydriver ON wlhydriver.driver_id = wlhyuser.id LEFT JOIN user_driver_enterprise ude ON b.user_id = ude.user_id AND ude.driver_type = 1 LEFT JOIN user_driver_enterprise ud ON b.user_id = ud.user_id @@ -607,6 +610,9 @@ and a.user_driver_type = #{userDriverDO.userDriverType} + + and a.user_identity = #{userDriverDO.userIdentity} + /*准驾车型id*/ and a.driver_allow_driving_type_id = #{userDriverDO.driverAllowDrivingTypeId} From bcabed521dfe1eb0dafd60924234004824e4935d Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Wed, 17 Dec 2025 18:02:55 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E9=97=AE=E9=A2=98=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index fa31d594d..52e63d3ea 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -70,7 +70,7 @@ a.department_id, a.ding_user_id, a.ding_dept_id, - a.validity_period_management + a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code FROM "USER" a where a.del_flag = 1 From e3f242f97b034ae804761ad7678aa3f4fbc9071e Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Wed, 17 Dec 2025 18:41:12 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E9=97=AE=E9=A2=98=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index 52e63d3ea..b5f65eb23 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -708,7 +708,7 @@