From 3f738a172e3537bc7e5ddbfe20fed288a6fb402e Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 21 Oct 2025 17:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90bank=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/dto/AddLngBBankDto.java | 80 ++++++++--------- .../module/mdm/dto/LngBBankPageDto.java | 18 ++-- .../module/mdm/dto/UpdateLngBBankDto.java | 86 +++++++++---------- .../module/mdm/enums/CountryRegionEnum.java | 34 ++++++++ .../xjrsoft/module/mdm/vo/LngBBankPageVo.java | 26 +++--- .../com/xjrsoft/module/mdm/vo/LngBBankVo.java | 82 +++++++++--------- .../module/mdm/controller/BankController.java | 47 +++++----- .../controller/CountryRegionController.java | 62 +++++++------ .../xjrsoft/module/mdm/entity/LngBBank.java | 86 +++++++++---------- .../module/mdm/mapper/LngBBankMapper.java | 2 +- .../module/mdm/service/IBankService.java | 2 +- .../mdm/service/impl/BankServiceImpl.java | 2 +- 12 files changed, 279 insertions(+), 248 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/enums/CountryRegionEnum.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBBankDto.java index 7843874..730bfd8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBBankDto.java @@ -19,7 +19,7 @@ import com.pictc.annotations.datalog.LogTable; /** * @title: 银行 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Data @@ -29,82 +29,82 @@ public class AddLngBBankDto implements Serializable { private static final long serialVersionUID = 1L; /** - * + * 助记码(自动生成，4位，0001……) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("助记码(自动生成，4位，0001……)") + @LogField(name="助记码(自动生成，4位，0001……)",index=0) private String code; /** - * + * 名称(不能与名称、简称重复) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("名称(不能与名称、简称重复)") + @LogField(name="名称(不能与名称、简称重复)",index=0) private String fullName; /** - * + * 简称(不能与名称、简称重复) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("简称(不能与名称、简称重复)") + @LogField(name="简称(不能与名称、简称重复)",index=0) private String shortName; /** - * + * 联行号 */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("联行号") + @LogField(name="联行号",index=0) private String bankCode; /** - * + * 所属国家和地区 */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("所属国家和地区") + @LogField(name="所属国家和地区",index=0) private String regionCode; /** - * + * SWIFT */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("SWIFT") + @LogField(name="SWIFT",index=0) private String swift; /** - * + * 中转行 */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("中转行") + @LogField(name="中转行",index=0) private String ib; /** - * + * 中转行SWIFT */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("中转行SWIFT") + @LogField(name="中转行SWIFT",index=0) private String ibSwift; /** - * + * Routing */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("Routing") + @LogField(name="Routing",index=0) private String routing; /** - * + * 显示顺序 */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("显示顺序") + @LogField(name="显示顺序",index=0) private Short sort; /** - * + * 有效标志(Y-有效，N-无效) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @LogField(name="有效标志(Y-有效，N-无效)",index=0) private String valid; /** - * + * 备注 */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("备注") + @LogField(name="备注",index=0) private String note; /** - * + * 租户id */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) private Long tenantId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBBankPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBBankPageDto.java index 8e0ba5d..bfcbb08 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBBankPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBBankPageDto.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * @title: 分页查询入参 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Data @@ -22,24 +22,24 @@ import java.math.BigDecimal; public class LngBBankPageDto extends PageInput { /** - * + * 简称(不能与名称、简称重复) */ - @ApiModelProperty("") + @ApiModelProperty("简称(不能与名称、简称重复)") private String shortName; /** - * + * 联行号 */ - @ApiModelProperty("") + @ApiModelProperty("联行号") private String bankCode; /** - * + * 所属国家和地区 */ - @ApiModelProperty("") + @ApiModelProperty("所属国家和地区") private String regionCode; /** - * + * 有效标志(Y-有效，N-无效) */ - @ApiModelProperty("") + @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java index be984fa..3281a92 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java @@ -24,7 +24,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; /** * @title: 银行 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Data @@ -34,101 +34,101 @@ public class UpdateLngBBankDto implements Serializable { private static final long serialVersionUID = 1L; /** - * + * 主键 */ - @LogField(name="",index=0) - @ApiModelProperty("") + @LogField(name="主键",index=0) + @ApiModelProperty("主键") private Long id; /** - * + * 助记码(自动生成，4位，0001……) */ - @LogField(name="",index=1) - @ApiModelProperty("") + @LogField(name="助记码(自动生成，4位，0001……)",index=1) + @ApiModelProperty("助记码(自动生成，4位，0001……)") private String code; /** - * + * 名称(不能与名称、简称重复) */ - @LogField(name="",index=2) - @ApiModelProperty("") + @LogField(name="名称(不能与名称、简称重复)",index=2) + @ApiModelProperty("名称(不能与名称、简称重复)") private String fullName; /** - * + * 简称(不能与名称、简称重复) */ - @LogField(name="",index=3) - @ApiModelProperty("") + @LogField(name="简称(不能与名称、简称重复)",index=3) + @ApiModelProperty("简称(不能与名称、简称重复)") private String shortName; /** - * + * 联行号 */ - @LogField(name="",index=4) - @ApiModelProperty("") + @LogField(name="联行号",index=4) + @ApiModelProperty("联行号") private String bankCode; /** - * + * 所属国家和地区 */ - @LogField(name="",index=5) - @ApiModelProperty("") + @LogField(name="所属国家和地区",index=5) + @ApiModelProperty("所属国家和地区") private String regionCode; /** - * + * SWIFT */ - @LogField(name="",index=6) - @ApiModelProperty("") + @LogField(name="SWIFT",index=6) + @ApiModelProperty("SWIFT") private String swift; /** - * + * 中转行 */ - @LogField(name="",index=7) - @ApiModelProperty("") + @LogField(name="中转行",index=7) + @ApiModelProperty("中转行") private String ib; /** - * + * 中转行SWIFT */ - @LogField(name="",index=8) - @ApiModelProperty("") + @LogField(name="中转行SWIFT",index=8) + @ApiModelProperty("中转行SWIFT") private String ibSwift; /** - * + * Routing */ - @LogField(name="",index=9) - @ApiModelProperty("") + @LogField(name="Routing",index=9) + @ApiModelProperty("Routing") private String routing; /** - * + * 显示顺序 */ - @LogField(name="",index=10) - @ApiModelProperty("") + @LogField(name="显示顺序",index=10) + @ApiModelProperty("显示顺序") private Short sort; /** - * + * 有效标志(Y-有效，N-无效) */ - @LogField(name="",index=11) - @ApiModelProperty("") + @LogField(name="有效标志(Y-有效，N-无效)",index=11) + @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; /** - * + * 备注 */ - @LogField(name="",index=12) - @ApiModelProperty("") + @LogField(name="备注",index=12) + @ApiModelProperty("备注") private String note; /** - * + * 租户id */ - @LogField(name="",index=13) - @ApiModelProperty("") + @LogField(name="租户id",index=13) + @ApiModelProperty("租户id") private Long tenantId; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/enums/CountryRegionEnum.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/enums/CountryRegionEnum.java new file mode 100644 index 0000000..9e0a9ae --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/enums/CountryRegionEnum.java @@ -0,0 +1,34 @@ +package com.xjrsoft.module.mdm.enums; + +/** + * @Author: tzx + * @Date: 2023/3/1 15:12 + */ +public enum CountryRegionEnum { + + CONTINENT("CONTINENT", "洲"), + + COUNTRY("COUNTRY", "国家"), + + PROVINCE("PROVINCE", "省"), + + COUNTY("COUNTY", "区县"), + + CITY("COUNTY", "市"); + + final String code; + final String value; + + public String getCode() { + return this.code; + } + + public String getValue() { + return this.value; + } + + CountryRegionEnum(final String code, final String message) { + this.code = code; + this.value = message; + } +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java index e38ea82..2a07a8b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java @@ -13,42 +13,42 @@ import java.math.BigDecimal; /** * @title: 分页列表出参 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Data public class LngBBankPageVo { /** - * + * 主键 */ - @ApiModelProperty("") + @ApiModelProperty("主键") private String id; /** - * + * 简称(不能与名称、简称重复) */ - @ApiModelProperty("") + @ApiModelProperty("简称(不能与名称、简称重复)") private String shortName; /** - * + * 联行号 */ - @ApiModelProperty("") + @ApiModelProperty("联行号") private String bankCode; /** - * + * 所属国家和地区 */ - @ApiModelProperty("") + @ApiModelProperty("所属国家和地区") private String regionCode; /** - * + * 有效标志(Y-有效，N-无效) */ - @ApiModelProperty("") + @ApiModelProperty("有效标志(Y-有效，N-无效)") @Trans(type = TransType.DIC, id = "1978057078528327681") private String valid; /** - * + * 数据权限id */ - @ApiModelProperty("") + @ApiModelProperty("数据权限id") private Long ruleUserId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankVo.java index e0fb524..b94620e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankVo.java @@ -11,149 +11,149 @@ import java.util.List; /** * @title: 表单出参 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Data public class LngBBankVo { /** - * + * 主键 */ - @ApiModelProperty("") + @ApiModelProperty("主键") private Long id; /** - * + * 助记码(自动生成，4位，0001……) */ - @ApiModelProperty("") + @ApiModelProperty("助记码(自动生成，4位，0001……)") private String code; /** - * + * 名称(不能与名称、简称重复) */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能与名称、简称重复)") private String fullName; /** - * + * 简称(不能与名称、简称重复) */ - @ApiModelProperty("") + @ApiModelProperty("简称(不能与名称、简称重复)") private String shortName; /** - * + * 联行号 */ - @ApiModelProperty("") + @ApiModelProperty("联行号") private String bankCode; /** - * + * 所属国家和地区 */ - @ApiModelProperty("") + @ApiModelProperty("所属国家和地区") private String regionCode; /** - * + * SWIFT */ - @ApiModelProperty("") + @ApiModelProperty("SWIFT") private String swift; /** - * + * 中转行 */ - @ApiModelProperty("") + @ApiModelProperty("中转行") private String ib; /** - * + * 中转行SWIFT */ - @ApiModelProperty("") + @ApiModelProperty("中转行SWIFT") private String ibSwift; /** - * + * Routing */ - @ApiModelProperty("") + @ApiModelProperty("Routing") private String routing; /** - * + * 显示顺序 */ - @ApiModelProperty("") + @ApiModelProperty("显示顺序") private Short sort; /** - * + * 有效标志(Y-有效，N-无效) */ - @ApiModelProperty("") + @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; /** - * + * 备注 */ - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; /** - * + * 创建人id */ - @ApiModelProperty("") + @ApiModelProperty("创建人id") private Long createUserId; /** - * + * 创建时间 */ - @ApiModelProperty("") + @ApiModelProperty("创建时间") private LocalDateTime createDate; /** - * + * 修改人id */ - @ApiModelProperty("") + @ApiModelProperty("修改人id") private Long modifyUserId; /** - * + * 修改时间 */ - @ApiModelProperty("") + @ApiModelProperty("修改时间") private LocalDateTime modifyDate; /** - * + * 租户id */ - @ApiModelProperty("") + @ApiModelProperty("租户id") private Long tenantId; /** - * + * 部门id */ - @ApiModelProperty("") + @ApiModelProperty("部门id") private Long deptId; /** - * + * 数据权限id */ - @ApiModelProperty("") + @ApiModelProperty("数据权限id") private Long ruleUserId; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java index 36e8582..451c078 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java @@ -1,45 +1,44 @@ package com.xjrsoft.module.mdm.controller; -import java.util.ArrayList; -import java.util.List; - -import javax.validation.Valid; - -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.xjrsoft.common.model.result.R; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.mdm.dto.LngBBankPageDto; +import com.xjrsoft.module.mdm.dto.AddLngBBankDto; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBBankPageDto; import com.xjrsoft.module.mdm.entity.LngBBank; import com.xjrsoft.module.mdm.service.IBankService; import com.xjrsoft.module.mdm.vo.LngBBankPageVo; -import com.xjrsoft.module.mdm.vo.LngBBankVo; +import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; +import java.util.stream.Collectors; +import java.util.ArrayList; -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBBankVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; /** * @title: 银行 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @RestController @@ -101,7 +100,7 @@ public class BankController { @ApiOperation(value = "删除") @SaCheckPermission("bank:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBBankDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngBBankDto.class, ids)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index 804394d..c1ce851 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java @@ -1,41 +1,39 @@ package com.xjrsoft.module.mdm.controller; -import java.util.ArrayList; -import java.util.List; - -import javax.validation.Valid; - -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.xjrsoft.common.model.result.R; -import com.xjrsoft.common.page.ConventPage; -import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.mdm.dto.LngBRegionPageDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; -import com.xjrsoft.module.mdm.entity.LngBRegion; -import com.xjrsoft.module.mdm.service.ICountryRegionService; -import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; -import com.xjrsoft.module.mdm.vo.LngBRegionVo; - -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.mdm.dto.AddLngBRegionDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBRegionPageDto; +import com.xjrsoft.module.mdm.entity.LngBRegion; +import com.xjrsoft.module.mdm.service.ICountryRegionService; +import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; +import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; +import java.util.stream.Collectors; +import java.util.ArrayList; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBRegionVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; /** * @title: 国家地区 @@ -44,8 +42,8 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/mdm/countryRegion") -@Api(value = "/mdm/countryRegion",tags = "国家地区代码") +@RequestMapping("/mdm" + "/countryRegion") +@Api(value = "/mdm" + "/countryRegion",tags = "国家地区代码") @AllArgsConstructor public class CountryRegionController { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java index 3fb593a..ce281c4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java @@ -20,7 +20,7 @@ import java.util.List; /** * @title: 银行 * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Data @@ -31,137 +31,137 @@ public class LngBBank implements Serializable { private static final long serialVersionUID = 1L; /** - * + * 主键 */ - @ApiModelProperty("") + @ApiModelProperty("主键") @TableId private Long id; /** - * + * 助记码(自动生成，4位，0001……) */ - @ApiModelProperty("") + @ApiModelProperty("助记码(自动生成，4位，0001……)") private String code; /** - * + * 名称(不能与名称、简称重复) */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能与名称、简称重复)") private String fullName; /** - * + * 简称(不能与名称、简称重复) */ - @ApiModelProperty("") + @ApiModelProperty("简称(不能与名称、简称重复)") private String shortName; /** - * + * 联行号 */ - @ApiModelProperty("") + @ApiModelProperty("联行号") private String bankCode; /** - * + * 所属国家和地区 */ - @ApiModelProperty("") + @ApiModelProperty("所属国家和地区") private String regionCode; /** - * + * SWIFT */ - @ApiModelProperty("") + @ApiModelProperty("SWIFT") private String swift; /** - * + * 中转行 */ - @ApiModelProperty("") + @ApiModelProperty("中转行") private String ib; /** - * + * 中转行SWIFT */ - @ApiModelProperty("") + @ApiModelProperty("中转行SWIFT") private String ibSwift; /** - * + * Routing */ - @ApiModelProperty("") + @ApiModelProperty("Routing") private String routing; /** - * + * 显示顺序 */ - @ApiModelProperty("") + @ApiModelProperty("显示顺序") private Short sort; /** - * + * 有效标志(Y-有效，N-无效) */ - @ApiModelProperty("") + @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; /** - * + * 备注 */ - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; /** - * + * 创建人id */ - @ApiModelProperty("") + @ApiModelProperty("创建人id") @TableField(fill = FieldFill.INSERT) private Long createUserId; /** - * + * 创建时间 */ - @ApiModelProperty("") + @ApiModelProperty("创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createDate; /** - * + * 修改人id */ - @ApiModelProperty("") + @ApiModelProperty("修改人id") @TableField(fill = FieldFill.UPDATE) private Long modifyUserId; /** - * + * 修改时间 */ - @ApiModelProperty("") + @ApiModelProperty("修改时间") @TableField(fill = FieldFill.UPDATE) private LocalDateTime modifyDate; /** - * + * 逻辑删除 */ - @ApiModelProperty("") + @ApiModelProperty("逻辑删除") @TableField(fill = FieldFill.INSERT) @TableLogic private Integer deleteMark; /** - * + * 租户id */ - @ApiModelProperty("") + @ApiModelProperty("租户id") private Long tenantId; /** - * + * 部门id */ - @ApiModelProperty("") + @ApiModelProperty("部门id") @TableField(fill = FieldFill.INSERT) private Long deptId; /** - * + * 数据权限id */ - @ApiModelProperty("") + @ApiModelProperty("数据权限id") @TableField(fill = FieldFill.INSERT) private Long ruleUserId; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBBankMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBBankMapper.java index a53318b..28754f9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBBankMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBBankMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @title: mapper * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Mapper diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java index c0d19ac..5e46036 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java @@ -11,7 +11,7 @@ import java.util.List; /** * @title: service * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java index 8374579..05e3f9c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service * @Author 管理员 -* @Date: 2025-10-17 +* @Date: 2025-10-21 * @Version 1.0 */ @Service