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-common/mhd-common-core/pom.xml b/mhd-common/mhd-common-core/pom.xml index c023cacc6..0ac4933ce 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/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-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..81bcbabf3 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,13 @@ public class UserDriverListPo { @ApiModelProperty(value = "是否允许竞价(0-不允许竞价,1-允许参与竞价，2-允许查看竞价)") private Integer isDriverBidding; + @ApiModelProperty(value = "用户身份") + private Integer userIdentity; + + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; + + @ApiModelProperty(name = "") + private String wlhydriverId; + } 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-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java b/mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java index 9b70c9463..b7b289f68 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 @@ -15,10 +15,12 @@ import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.UUID; + @Service public class MinIoUploadService { - @Autowired(required=false) + private MinioClient minioClient; + private static String bucket="ngwl"; private static String host="http://10.102.192.5:6000"; private static String accessKey="minioadmin"; @@ -32,7 +34,7 @@ public class MinIoUploadService { /** * 上传到minio - * @param + * @param fileName * @throws Exception */ @@ -65,7 +67,7 @@ public class MinIoUploadService { .stream(inputStream,inputStream.available(),-1).build(); //文件名称相同会覆盖 minioClient.putObject(objectArgs); - String url =host+ "/"+bucket + "/"+fileName; + String url =host+"/browser/"+bucket + "/"+fileName; // return url; 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-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/application/service/UserDriverEnterpriseApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverEnterpriseApplicationService.java index 3140f3e9d..de18319c8 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverEnterpriseApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverEnterpriseApplicationService.java @@ -750,6 +750,15 @@ public class UserDriverEnterpriseApplicationService { public UserDriverEnterprisePo getEnterpriseByUserId(Long userId) { return userDriverEnterpriseDomainService.getEnterpriseByUserId(userId); } + /** + * 根据用户id查询用户企业信息 + * + * @param userId + * @return + */ + public UserDriverEnterprisePo getEnterpriseByUserIds(Long userId) { + return userDriverEnterpriseDomainService.getEnterpriseByUserIds(userId); + } /** * @param driverEnterpriseCode 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/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/UserDriverEnterpriseService.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverEnterpriseService.java index 7055535e5..451a70fe7 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverEnterpriseService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverEnterpriseService.java @@ -52,4 +52,6 @@ public interface UserDriverEnterpriseService extends IService queryCaptainList(UserDriverEnterpriseDo userDriverEnterpriseDo); UserDriverEnterprisePo getEnterpriseByUserId(Long userId); + + UserDriverEnterprisePo getEnterpriseByUserIds(Long userId); } 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/UserDriverEnterpriseMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverEnterpriseMapper.java index ae60b0b7a..80eb5af59 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverEnterpriseMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverEnterpriseMapper.java @@ -35,4 +35,6 @@ public interface UserDriverEnterpriseMapper extends BaseMapper queryCaptainList(@Param("userDriverEnterpriseDo") UserDriverEnterpriseDo userDriverEnterpriseDo); UserDriverEnterprisePo getEnterpriseByUserId(@Param("userId") Long userId); + + UserDriverEnterprisePo getEnterpriseByUserIds(@Param("userId") Long userId); } 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/UserDriverEnterpriseImpl.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverEnterpriseImpl.java index 7aee24793..cdcdf7ba5 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverEnterpriseImpl.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverEnterpriseImpl.java @@ -111,4 +111,9 @@ public class UserDriverEnterpriseImpl 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/repository/po/UserDriverPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java index 42e57bfcc..8456359f0 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,13 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送") private Integer tmsPushStatus; + + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; + + @ApiModelProperty(name = "经营许可证") + private String driverBusinessLicenseFrontUrl; + + @ApiModelProperty(name = "经营许可证号") + private String driverBusinessLicenseNumber; } 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..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 @@ -283,4 +283,10 @@ public class UserDriverDO extends UserDO { @ApiModelProperty(name = "车队名称") private String motorcadeName; + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; + + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; + } 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/domain/userAggregate/service/UserDriverEnterpriseDomainService.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverEnterpriseDomainService.java index c2e74f025..05267d7a4 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverEnterpriseDomainService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverEnterpriseDomainService.java @@ -154,4 +154,8 @@ public class UserDriverEnterpriseDomainService { .eq(UserDriverEnterprise::getUserId, userId) .update(); } + + public UserDriverEnterprisePo getEnterpriseByUserIds(Long userId) { + return userDriverEnterpriseService.getEnterpriseByUserIds(userId); + } } 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..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 @@ -308,4 +308,10 @@ public class UserDriverDTO extends UserDTO { @ApiModelProperty(name = "部门id") private String departmentId; + + @ApiModelProperty(name = "用户身份") + private Integer userIdentity; + + @ApiModelProperty(name = "车辆主体") + private String vehicleBody; } 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..0c3e28b4e 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 @@ -8,6 +8,7 @@ import com.mhd.common.log.enums.BusinessType; import com.mhd.user.application.service.*; import com.mhd.user.domain.userAggregate.entity.DriverExcel; import com.mhd.user.domain.userAggregate.repository.po.DriverVehicleBindPo; +import com.mhd.user.domain.userAggregate.repository.po.UserDriverEnterprisePo; import com.mhd.user.domain.userAggregate.repository.todo.*; import com.mhd.user.interfaces.assember.*; import com.mhd.user.interfaces.dto.DriverExcelDto; @@ -246,6 +247,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 @@ -303,6 +315,12 @@ public class UserDriverAPI extends BaseController { return AjaxResult.success(userDriverEnterpriseApplicationService.getEnterpriseByUserId(userId)); } + @ApiOperation("根据用户id查询企业信息(返回值不同)") + @GetMapping("/getEnterpriseByUserIds") + public UserDriverEnterprisePo getEnterpriseByUserIds(@RequestParam("userId") Long userId) { + return userDriverEnterpriseApplicationService.getEnterpriseByUserIds(userId); + } + /** * 获取司机校验相应值 */ 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..6d968a59b 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,10 @@ public class QueryAllShipperInfoVo { @ApiModelProperty("是否有默认地址") private Boolean hasDefaultAddress; + + @ApiModelProperty("用户nc") + private String documentPreparerNcCode; + + @ApiModelProperty(name = "客户nc编码") + private String customerNcCode; } diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverEnterpriseMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverEnterpriseMapper.xml index 5b1965e5e..e52d8b6da 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverEnterpriseMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverEnterpriseMapper.xml @@ -106,4 +106,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.user_id = #{userId} + + diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index 80e2c2aea..cc2089b4c 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, @@ -186,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 @@ -205,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 @@ -228,6 +232,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, @@ -262,6 +267,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, @@ -300,11 +306,13 @@ ude.driver_corp_legal_name, ude.driver_corp_name, ude.driver_corp_idcard_number, + ude.driver_business_license_front_url, + ude.driver_business_license_number, WM_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber, WM_CONCAT(m.motorcade_name) AS driverTeamName, md.motorcade_id motorcade_header_id FROM "USER" b - LEFT JOIN user_driver a ON a.user_id = b.user_id AND b.del_flag = 1 + LEFT JOIN user_driver a ON a.user_id = b.user_id AND a.del_flag = 1 LEFT JOIN user_driver_enterprise ude ON a.user_id = ude.user_id AND ude.del_flag = 1 LEFT JOIN driver_vehicle_bind dvb ON a.user_id = dvb.user_id AND dvb.del_flag = 1 LEFT JOIN motorcade m ON a.driver_id = m.motorcade_header_id AND m.del_flag = 1 @@ -602,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} @@ -973,6 +984,37 @@ + + + + + + + + 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,top_organization_id, organization_id) + values + + ( + #{item.accountName}, + #{item.accountInformation}, + #{item.delFlag}, + #{item.createTime}, + #{item.updateTime},#{item.topOrganizationId},#{item.organizationId} + ) + + + + + 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 + + diff --git a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml index 734a06646..02e08049e 100644 --- a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml +++ b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml @@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -35,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, top_organization_id,organization_id,organization_name,department_name,settlement_party_name,receive_payment_number, receive_payment_amount, assignable_amount,assignment_status,credit_amount,credit_reason, receive_payment_time, serial_number,receive_voucher_url, - remark, create_by,create_by_name, create_time, update_by,update_by_name, update_time, del_flag from tms_receipt + remark, account_name, account_information, create_by,create_by_name, create_time, update_by,update_by_name, update_time, del_flag from tms_receipt @@ -89,6 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and remark = #{remark} + + + and account_name like concat('%', #{accountName}, '%') + + + and account_information like concat('%', #{accountInformation}, '%') order by create_time desc diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index 6d035cb51..317ea4ab5 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -93,7 +93,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided @@ -132,7 +132,12 @@ io.minio minio - 8.5.2 + 8.4.3 + + + com.squareup.okhttp3 + okhttp + 4.8.1 compile 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/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index da14c46f2..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; @@ -100,6 +101,7 @@ public class MenuApplicationService { @Autowired(required = false) private MinIoUploadService minIoUploadService; + /** * 查询菜单集合 * 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(); } +*/ 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 diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index a4341ca80..7e056cac0 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -99,7 +99,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 33822d0e4..6b22bb78e 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -93,7 +93,7 @@ org.projectlombok lombok - 1.18.4 + 1.18.22 provided @@ -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 - 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..934ed4034 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 @@ -405,9 +405,7 @@ public class VehicleApplicationService { throw new ServiceException("车牌号不能为空"); } - if (! Pattern.matches(Constants.LICENSE_PLATE_REGEX, vehicleLicensePlateNumber)) { - throw new ServiceException("车牌号格式不正确"); - } + // Removed license plate regex validation as per requirement VehicleDto query = new VehicleDto(); query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber()); @@ -680,9 +678,7 @@ public class VehicleApplicationService { if (StrUtil.isEmpty(vehicleLicensePlateNumber)) { throw new ServiceException("车牌号不能为空"); } - if (! Pattern.matches(Constants.LICENSE_PLATE_REGEX, vehicleLicensePlateNumber)) { - throw new ServiceException("车牌号格式不正确"); - } + // Removed license plate regex validation as per requirement VehicleDto query = new VehicleDto(); query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber()); @@ -2920,4 +2916,41 @@ 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("请选择副驾"); + } + UserDriverDTO userDriverDTO = new UserDriverDTO(); + //将pilot1或是pilot2的id传给userDriverDTO,判断一下谁有值传谁 + userDriverDTO.setUserId(Long.valueOf(hasPilot1 ? vehicleDto.getPilot1Id() : vehicleDto.getPilot2Id())); + userDriverDTO.setVehicleId(vehicleDto.getVehicleId()); + + // 更新 + vehicleMapper.updatePilotDriver(vehicleDto); + + + + userServiceFeign.bindVehicle(userDriverDTO); + + return 1; + + } } 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 * 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 329986365..08f97c6cb 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 @@ -29,8 +29,15 @@ 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 String topOrganizationId; + /**组织相关*/ + private String organizationId; + // 私有构造方法 private Material(Long ownerId, @@ -42,7 +49,9 @@ public class Material { BigDecimal value, boolean codeManaged, BigDecimal weight, - String remark) { + BigDecimal materialVolume, + String materialContent, + String remark,String topOrganizationId,String organizationId ) { validateRequiredFields( category, name, unit); this.ownerId = ownerId; this.shipper = shipper; @@ -54,8 +63,12 @@ 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(); + this.topOrganizationId = topOrganizationId; + this.organizationId = organizationId; } @@ -69,10 +82,13 @@ public class Material { BigDecimal value, boolean codeManaged, BigDecimal weight, - String remark, + BigDecimal materialVolume, + String materialContent, + String remark,String topOrganizationId,String organizationId, MaterialCodeGenerator codeGenerator) { Material material = new Material(ownerId, shipper, category, name, model, - unit, value, codeManaged, weight,remark + unit, value, codeManaged, weight, materialVolume, materialContent, remark, + topOrganizationId,organizationId ); material.materialCode = codeGenerator.generate(); return material; @@ -86,7 +102,9 @@ public class Material { BigDecimal value, boolean codeManaged, BigDecimal weight, - String remark) { + BigDecimal materialVolume, + String materialContent, + String remark,String topOrganizationId,String organizationId ) { this.ownerId = ownerId; this.shipper = shipper; this.category = category; @@ -94,10 +112,14 @@ 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; this.updateTime = LocalDateTime.now(); + this.topOrganizationId = topOrganizationId; + this.organizationId = organizationId; } // 保留的核心校验 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 64f500bac..7662cb0c1 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 @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import java.time.LocalDateTime; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -33,4 +34,10 @@ public class MaterialDO { @TableLogic @TableField("is_deleted") private Boolean deleted; + private BigDecimal materialVolume; + private String materialContent; + /**组织相关*/ + private String topOrganizationId; + /**组织相关*/ + private String organizationId; } 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..efba73931 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 +