From ad6ffe9a51f2b8985134d1ab9eb94171a915655e Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 22 Oct 2025 10:46:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xjrsoft/module/mdm/controller/PriceTermsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index 399668e..d5430a3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -59,7 +59,7 @@ public class PriceTermsController { .like(StrUtil.isNotBlank(dto.getFullName()),LngBPriceTerm::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getFreightSign()),LngBPriceTerm::getFreightSign,dto.getFreightSign()) .like(StrUtil.isNotBlank(dto.getInsuranceSign()),LngBPriceTerm::getInsuranceSign,dto.getInsuranceSign()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBPriceTerm::getSort,dto.getSort()) + // .like(StrUtil.isNotBlank(dto.getSort()),LngBPriceTerm::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBPriceTerm::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBPriceTerm::getNote,dto.getNote()) .orderByAsc(LngBPriceTerm::getCode) From 83625ace786ed3aa16688d6ee195f3d50f1fa5bb Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 22 Oct 2025 13:46:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/dto/AddLngBBankDto.java | 2 +- .../module/mdm/dto/AddLngBRegionDto.java | 2 +- .../module/mdm/dto/LngBBankPageDto.java | 17 +++- .../module/mdm/dto/LngBCurrencyPageDto.java | 26 ++--- .../module/mdm/dto/LngBPriceTermPageDto.java | 25 ----- .../module/mdm/dto/LngBRegionPageDto.java | 19 ++-- .../module/mdm/dto/UpdateLngBBankDto.java | 2 +- .../module/mdm/dto/UpdateLngBRegionDto.java | 2 +- .../xjrsoft/module/mdm/vo/LngBBankPageVo.java | 17 +++- .../com/xjrsoft/module/mdm/vo/LngBBankVo.java | 2 +- .../module/mdm/vo/LngBCurrencyPageVo.java | 10 -- .../module/mdm/vo/LngBPriceTermPageVo.java | 5 - .../module/mdm/vo/LngBRegionPageVo.java | 17 ++-- .../xjrsoft/module/mdm/vo/LngBRegionVo.java | 2 +- .../module/mdm/controller/BankController.java | 58 +++++++----- .../controller/CountryRegionController.java | 94 +++++++++---------- .../mdm/controller/CurrencyController.java | 18 +++- .../mdm/controller/PriceTermsController.java | 19 ++-- .../xjrsoft/module/mdm/entity/LngBBank.java | 2 +- .../xjrsoft/module/mdm/entity/LngBRegion.java | 2 +- .../module/mdm/mapper/LngBBankMapper.java | 2 +- .../module/mdm/mapper/LngBRegionMapper.java | 2 +- .../module/mdm/service/IBankService.java | 2 +- .../mdm/service/ICountryRegionService.java | 2 +- .../mdm/service/impl/BankServiceImpl.java | 2 +- .../impl/CountryRegionServiceImpl.java | 2 +- 26 files changed, 173 insertions(+), 180 deletions(-) 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 730bfd8..5a4891c 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBRegionDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBRegionDto.java index 926879e..75a87a9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBRegionDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBRegionDto.java @@ -19,7 +19,7 @@ import com.pictc.annotations.datalog.LogTable; /** * @title: 国家地区 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data 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 bfcbb08..7e3cce9 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -41,5 +41,20 @@ public class LngBBankPageDto extends PageInput { */ @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; + /** + * 名称(不能与名称、简称重复) + */ + @ApiModelProperty("名称(不能与名称、简称重复)") + private String fullName; + /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + /** + * SWIFT + */ + @ApiModelProperty("SWIFT") + private String swift; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java index b0feb1a..cdd6f11 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java @@ -21,37 +21,27 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = false) public class LngBCurrencyPageDto extends PageInput { - /** - * 助记码(USD/CNY) - */ - @ApiModelProperty("助记码(USD/CNY)") - private String code; /** * 名称(不能重复) */ @ApiModelProperty("名称(不能重复)") private String fullName; /** - * 符号 + * 有效标志(Y-有效，N-无效) */ - @ApiModelProperty("符号") - private String currSymbol; + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + /** + * 助记码(USD/CNY) + */ + @ApiModelProperty("助记码(USD/CNY)") + private String code; /** * 是否本币(Y-是，N-否；只能有一个有效的Y) */ @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") private String localSign; /** - * 显示顺序 - */ - @ApiModelProperty("显示顺序") - private Short sort; - /** - * 有效标志(Y-有效，N-无效) - */ - @ApiModelProperty("有效标志(Y-有效，N-无效)") - private String valid; - /** * 备注 */ @ApiModelProperty("备注") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java index 0eaf285..df0704f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java @@ -21,40 +21,15 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = false) public class LngBPriceTermPageDto extends PageInput { - /** - * 助记码(FOB/DES/……) - */ - @ApiModelProperty("助记码(FOB/DES/……)") - private String code; /** * 名称(不能重复) */ @ApiModelProperty("名称(不能重复)") private String fullName; /** - * 是否承担运费(Y-是，N-否) - */ - @ApiModelProperty("是否承担运费(Y-是，N-否)") - private String freightSign; - /** - * 是否承担保险(Y-是，N-否) - */ - @ApiModelProperty("是否承担保险(Y-是，N-否)") - private String insuranceSign; - /** - * 显示顺序 - */ - @ApiModelProperty("显示顺序") - private Short sort; - /** * 有效标志(Y-有效，N-无效) */ @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String note; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBRegionPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBRegionPageDto.java index bc11a40..b22659c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBRegionPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBRegionPageDto.java @@ -14,28 +14,23 @@ import java.math.BigDecimal; /** * @title: 分页查询入参 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @EqualsAndHashCode(callSuper = false) public class LngBRegionPageDto extends PageInput { - /** - * 主键 - */ - @ApiModelProperty("主键") - private Long id; /** * 助记码 */ @ApiModelProperty("助记码") private String code; /** - * 创建人id + * 名称(不能重复) */ - @ApiModelProperty("创建人id") - private Long createUserId; + @ApiModelProperty("名称(不能重复)") + private String fullName; /** * 类型 */ @@ -47,10 +42,10 @@ public class LngBRegionPageDto extends PageInput { @ApiModelProperty("上级ID") private Long pid; /** - * 名称(不能重复) + * 全路径名称 */ - @ApiModelProperty("名称(不能重复)") - private String fullName; + @ApiModelProperty("全路径名称") + private String fullPath; /** * 有效标志(Y-有效，N-无效) */ 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 3281a92..c5f3fbd 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java index a95a36a..89d47f4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBRegionDto.java @@ -24,7 +24,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; /** * @title: 国家地区 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data 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 2a07a8b..e75ca06 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,7 +13,7 @@ import java.math.BigDecimal; /** * @title: 分页列表出参 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -25,6 +25,16 @@ public class LngBBankPageVo { @ApiModelProperty("主键") private String id; /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + /** + * 名称(不能与名称、简称重复) + */ + @ApiModelProperty("名称(不能与名称、简称重复)") + private String fullName; + /** * 简称(不能与名称、简称重复) */ @ApiModelProperty("简称(不能与名称、简称重复)") @@ -40,6 +50,11 @@ public class LngBBankPageVo { @ApiModelProperty("所属国家和地区") private String regionCode; /** + * SWIFT + */ + @ApiModelProperty("SWIFT") + private String swift; + /** * 有效标志(Y-有效，N-无效) */ @ApiModelProperty("有效标志(Y-有效，N-无效)") 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 b94620e..20ed73f 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,7 +11,7 @@ import java.util.List; /** * @title: 表单出参 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java index f26c0bb..c618956 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyPageVo.java @@ -35,22 +35,12 @@ public class LngBCurrencyPageVo { @ApiModelProperty("名称(不能重复)") private String fullName; /** - * 符号 - */ - @ApiModelProperty("符号") - private String currSymbol; - /** * 是否本币(Y-是，N-否；只能有一个有效的Y) */ @ApiModelProperty("是否本币(Y-是，N-否；只能有一个有效的Y)") @Trans(type = TransType.DIC, id = "1978056598125330433") private String localSign; /** - * 显示顺序 - */ - @ApiModelProperty("显示顺序") - private Short sort; - /** * 有效标志(Y-有效，N-无效) */ @ApiModelProperty("有效标志(Y-有效，N-无效)") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java index ec61e4c..30d539d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java @@ -47,11 +47,6 @@ public class LngBPriceTermPageVo { @Trans(type = TransType.DIC, id = "1978056598125330433") private String insuranceSign; /** - * 显示顺序 - */ - @ApiModelProperty("显示顺序") - private Short sort; - /** * 有效标志(Y-有效，N-无效) */ @ApiModelProperty("有效标志(Y-有效，N-无效)") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionPageVo.java index c196b84..b8e7cd7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionPageVo.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; /** * @title: 分页列表出参 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -46,6 +46,11 @@ public class LngBRegionPageVo { @ApiModelProperty("上级ID") private Long pid; /** + * 全路径名称 + */ + @ApiModelProperty("全路径名称") + private String fullPath; + /** * 有效标志(Y-有效，N-无效) */ @ApiModelProperty("有效标志(Y-有效，N-无效)") @@ -56,15 +61,5 @@ public class LngBRegionPageVo { */ @ApiModelProperty("备注") private String note; - /** - * 创建人id - */ - @ApiModelProperty("创建人id") - private Long createUserId; - /** - * 数据权限id - */ - @ApiModelProperty("数据权限id") - private Long ruleUserId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionVo.java index 27bb2af..1012e45 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionVo.java @@ -11,7 +11,7 @@ import java.util.List; /** * @title: 表单出参 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data 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 451c078..d266d20 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,44 +1,46 @@ package com.xjrsoft.module.mdm.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +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.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.model.result.R; 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.AddLngBBankDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; -import cn.dev33.satoken.annotation.SaCheckPermission; - +import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; +import com.xjrsoft.module.datalog.entity.DataChangeLog; +import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.dto.LngBBankPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; 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.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.LngBBankVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @RestController @@ -62,6 +64,9 @@ public class BankController { .like(StrUtil.isNotBlank(dto.getBankCode()),LngBBank::getBankCode,dto.getBankCode()) .like(StrUtil.isNotBlank(dto.getRegionCode()),LngBBank::getRegionCode,dto.getRegionCode()) .like(StrUtil.isNotBlank(dto.getValid()),LngBBank::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getFullName()),LngBBank::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getCode()),LngBBank::getCode,dto.getCode()) + .like(StrUtil.isNotBlank(dto.getSwift()),LngBBank::getSwift,dto.getSwift()) .orderByDesc(LngBBank::getId) .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty())); IPage page = bankService.page(ConventPage.getPage(dto), queryWrapper); @@ -79,6 +84,14 @@ public class BankController { } return R.ok(BeanUtil.toBean(lngBBank, LngBBankVo.class)); } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBBank数据详细日志") + @SaCheckPermission("bank:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + return R.ok(logs); + } @PostMapping @@ -103,6 +116,7 @@ public class BankController { return R.ok(dataService.deleteByIds(UpdateLngBBankDto.class, ids)); } + @PutMapping("/data-auth") @ApiOperation(value = "批量设置权限所属人") 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 b1317c5..397a14b 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,45 +1,46 @@ package com.xjrsoft.module.mdm.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +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.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.model.result.R; 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.datalog.entity.DataChangeLog; +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.enums.CountryRegionEnum; 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 cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @RestController @@ -59,12 +60,11 @@ public class CountryRegionController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .eq(ObjectUtil.isNotNull(dto.getId()),LngBRegion::getId,dto.getId()) .like(StrUtil.isNotBlank(dto.getCode()),LngBRegion::getCode,dto.getCode()) - .eq(ObjectUtil.isNotNull(dto.getCreateUserId()),LngBRegion::getCreateUserId,dto.getCreateUserId()) + .like(StrUtil.isNotBlank(dto.getFullName()),LngBRegion::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getRegionTypeCode()),LngBRegion::getRegionTypeCode,dto.getRegionTypeCode()) .eq(ObjectUtil.isNotNull(dto.getPid()),LngBRegion::getPid,dto.getPid()) - .like(StrUtil.isNotBlank(dto.getFullName()),LngBRegion::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getFullPath()),LngBRegion::getFullPath,dto.getFullPath()) .like(StrUtil.isNotBlank(dto.getValid()),LngBRegion::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBRegion::getNote,dto.getNote()) .orderByDesc(LngBRegion::getId) @@ -84,22 +84,30 @@ public class CountryRegionController { } return R.ok(BeanUtil.toBean(lngBRegion, LngBRegionVo.class)); } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBRegion数据详细日志") + @SaCheckPermission("countryRegion:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBRegionDto.class,id); + return R.ok(logs); + } @PostMapping @ApiOperation(value = "新增LngBRegion") @SaCheckPermission("countryRegion:add") public R add(@Valid @RequestBody UpdateLngBRegionDto dto){ - if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { - if(dto.getPid() != null && dto.getPid() != 0) { - LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); - if(parentRegion != null) { - dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); - } - } - }else { - dto.setFullPath(dto.getFullName()); - } + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } UpdateLngBRegionDto res = dataService.insert(dto); return R.ok(res.getId()); } @@ -108,7 +116,7 @@ public class CountryRegionController { @ApiOperation(value = "修改LngBRegion") @SaCheckPermission("countryRegion:edit") public R update(@Valid @RequestBody UpdateLngBRegionDto dto){ - if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { if(dto.getPid() != null && dto.getPid() != 0) { LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); if(parentRegion != null) { @@ -128,18 +136,6 @@ public class CountryRegionController { return R.ok(dataService.deleteByIds(UpdateLngBRegionDto.class, ids)); } + - @PutMapping("/data-auth") - @ApiOperation(value = "批量设置权限所属人") - @SaCheckPermission("countryRegion:batchSetUserId") - public R setDataAUth(@RequestBody BatchSetDataAuthDto dto){ - List toUpdateList = new ArrayList<>(); - for (Long dataId : dto.getDataIdList()) { - LngBRegion lngBRegion = new LngBRegion(); - lngBRegion.setId(dataId); - lngBRegion.setRuleUserId(dto.getUserIdList().get(0)); - toUpdateList.add(lngBRegion); - } - return R.ok(countryRegionService.updateBatchById(toUpdateList)); - } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java index 789698f..c748afb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java @@ -20,7 +20,8 @@ import com.xjrsoft.module.mdm.dto.LngBCurrencyPageDto; import com.xjrsoft.module.mdm.entity.LngBCurrency; import com.xjrsoft.module.mdm.service.ICurrencyService; import com.xjrsoft.module.mdm.vo.LngBCurrencyPageVo; - +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.entity.DataChangeLog; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBCurrencyVo; import io.swagger.annotations.Api; @@ -55,12 +56,10 @@ public class CurrencyController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getCode()),LngBCurrency::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getFullName()),LngBCurrency::getFullName,dto.getFullName()) - .like(StrUtil.isNotBlank(dto.getCurrSymbol()),LngBCurrency::getCurrSymbol,dto.getCurrSymbol()) - .like(StrUtil.isNotBlank(dto.getLocalSign()),LngBCurrency::getLocalSign,dto.getLocalSign()) - //.like(StrUtil.isNotBlank(dto.getSort()),LngBCurrency::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBCurrency::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getCode()),LngBCurrency::getCode,dto.getCode()) + .like(StrUtil.isNotBlank(dto.getLocalSign()),LngBCurrency::getLocalSign,dto.getLocalSign()) .like(StrUtil.isNotBlank(dto.getNote()),LngBCurrency::getNote,dto.getNote()) .orderByDesc(LngBCurrency::getId) .select(LngBCurrency.class,x -> VoToColumnUtil.fieldsToColumns(LngBCurrencyPageVo.class).contains(x.getProperty())); @@ -79,6 +78,14 @@ public class CurrencyController { } return R.ok(BeanUtil.toBean(lngBCurrency, LngBCurrencyVo.class)); } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBCurrency数据详细日志") + @SaCheckPermission("currency:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBCurrencyDto.class,id); + return R.ok(logs); + } @PostMapping @@ -103,5 +110,6 @@ public class CurrencyController { return R.ok(dataService.deleteByIds(UpdateLngBCurrencyDto.class, ids)); } + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index d5430a3..006805e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -20,7 +20,8 @@ import com.xjrsoft.module.mdm.dto.LngBPriceTermPageDto; import com.xjrsoft.module.mdm.entity.LngBPriceTerm; import com.xjrsoft.module.mdm.service.IPriceTermsService; import com.xjrsoft.module.mdm.vo.LngBPriceTermPageVo; - +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.entity.DataChangeLog; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBPriceTermVo; import io.swagger.annotations.Api; @@ -55,14 +56,9 @@ public class PriceTermsController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getCode()),LngBPriceTerm::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getFullName()),LngBPriceTerm::getFullName,dto.getFullName()) - .like(StrUtil.isNotBlank(dto.getFreightSign()),LngBPriceTerm::getFreightSign,dto.getFreightSign()) - .like(StrUtil.isNotBlank(dto.getInsuranceSign()),LngBPriceTerm::getInsuranceSign,dto.getInsuranceSign()) - // .like(StrUtil.isNotBlank(dto.getSort()),LngBPriceTerm::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBPriceTerm::getValid,dto.getValid()) - .like(StrUtil.isNotBlank(dto.getNote()),LngBPriceTerm::getNote,dto.getNote()) - .orderByAsc(LngBPriceTerm::getCode) + .orderByDesc(LngBPriceTerm::getId) .select(LngBPriceTerm.class,x -> VoToColumnUtil.fieldsToColumns(LngBPriceTermPageVo.class).contains(x.getProperty())); IPage page = priceTermsService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPriceTermPageVo.class); @@ -79,6 +75,14 @@ public class PriceTermsController { } return R.ok(BeanUtil.toBean(lngBPriceTerm, LngBPriceTermVo.class)); } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBPriceTerm数据详细日志") + @SaCheckPermission("priceTerms:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBPriceTermDto.class,id); + return R.ok(logs); + } @PostMapping @@ -103,5 +107,6 @@ public class PriceTermsController { return R.ok(dataService.deleteByIds(UpdateLngBPriceTermDto.class, ids)); } + } \ No newline at end of file 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 ce281c4..dd46476 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java index 9825237..826e410 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBRegion.java @@ -20,7 +20,7 @@ import java.util.List; /** * @title: 国家地区 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Data 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 28754f9..d9fa233 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Mapper diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBRegionMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBRegionMapper.java index 213151d..42d18a3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBRegionMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBRegionMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @title: mapper * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @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 5e46036..67dc2d4 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java index 1bc9c10..7f0b99c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java @@ -11,7 +11,7 @@ import java.util.List; /** * @title: service * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @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 05e3f9c..b0dad17 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-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Service diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index 9de72ec..a9d2544 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @Service From 71b4e5419cbc425fa34c98465fe040b3e2cf0342 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 22 Oct 2025 14:26:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/dto/LngBPriceTermPageDto.java | 20 +++++++++ .../module/mdm/controller/BankController.java | 45 +++++++++---------- .../controller/CountryRegionController.java | 30 ++++--------- .../mdm/controller/PriceTermsController.java | 4 ++ 4 files changed, 54 insertions(+), 45 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java index df0704f..6070cce 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java @@ -31,5 +31,25 @@ public class LngBPriceTermPageDto extends PageInput { */ @ApiModelProperty("有效标志(Y-有效，N-无效)") private String valid; + /** + * 助记码(FOB/DES/……) + */ + @ApiModelProperty("助记码(FOB/DES/……)") + private String code; + /** + * 是否承担运费(Y-是，N-否) + */ + @ApiModelProperty("是否承担运费(Y-是，N-否)") + private String freightSign; + /** + * 是否承担保险(Y-是，N-否) + */ + @ApiModelProperty("是否承担保险(Y-是，N-否)") + private String insuranceSign; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; } 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 d266d20..b36dd0b 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,41 +1,40 @@ 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.entity.DataChangeLog; -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.authority.dto.BatchSetDataAuthDto; +import java.util.stream.Collectors; +import java.util.ArrayList; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.entity.DataChangeLog; +import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBBankVo; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; 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: 银行 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 397a14b..56cf047 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 @@ -24,7 +24,6 @@ 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.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; import com.xjrsoft.module.mdm.vo.LngBRegionVo; @@ -98,16 +97,6 @@ public class CountryRegionController { @ApiOperation(value = "新增LngBRegion") @SaCheckPermission("countryRegion:add") public R add(@Valid @RequestBody UpdateLngBRegionDto dto){ - if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { - if(dto.getPid() != null && dto.getPid() != 0) { - LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); - if(parentRegion != null) { - dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); - } - } - }else { - dto.setFullPath(dto.getFullName()); - } UpdateLngBRegionDto res = dataService.insert(dto); return R.ok(res.getId()); } @@ -116,16 +105,6 @@ public class CountryRegionController { @ApiOperation(value = "修改LngBRegion") @SaCheckPermission("countryRegion:edit") public R update(@Valid @RequestBody UpdateLngBRegionDto dto){ - if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { - if(dto.getPid() != null && dto.getPid() != 0) { - LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); - if(parentRegion != null) { - dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); - } - } - }else { - dto.setFullPath(dto.getFullName()); - } return R.ok(dataService.updateById(dto)); } @@ -133,9 +112,16 @@ public class CountryRegionController { @ApiOperation(value = "删除") @SaCheckPermission("countryRegion:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBRegionDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngBRegionDto.class, ids)); } + @GetMapping(value = "/tree") + @ApiOperation(value = "LngBRegion树形结构") + //@SaCheckPermission("countryRegion:edit") + public R tree(@Valid @RequestBody UpdateLngBRegionDto dto){ + + return R.ok(null); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index 006805e..3a1af0b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -58,6 +58,10 @@ public class PriceTermsController { queryWrapper .like(StrUtil.isNotBlank(dto.getFullName()),LngBPriceTerm::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getValid()),LngBPriceTerm::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getCode()),LngBPriceTerm::getCode,dto.getCode()) + .like(StrUtil.isNotBlank(dto.getFreightSign()),LngBPriceTerm::getFreightSign,dto.getFreightSign()) + .like(StrUtil.isNotBlank(dto.getInsuranceSign()),LngBPriceTerm::getInsuranceSign,dto.getInsuranceSign()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBPriceTerm::getNote,dto.getNote()) .orderByDesc(LngBPriceTerm::getId) .select(LngBPriceTerm.class,x -> VoToColumnUtil.fieldsToColumns(LngBPriceTermPageVo.class).contains(x.getProperty())); IPage page = priceTermsService.page(ConventPage.getPage(dto), queryWrapper); From 4edb5328c1982c999acf9864ecfcfb682d05395f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Wed, 22 Oct 2025 10:47:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=B6=88=E6=81=AF=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/controller/Testfrom6Controller.java | 1 - .../pictc/constant/TableNameConstants.java | 21 +++++++++++++++++++ .../com/pictc/enums/ExceptionCommonCode.java | 5 ++++- .../java/com/pictc/utils/DataLogTools.java | 5 +++++ 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom6Controller.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom6Controller.java index d3dcc58..2a607ef 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom6Controller.java +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom6Controller.java @@ -24,7 +24,6 @@ import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; import java.util.stream.Collectors; import java.util.ArrayList; -import com.xjrsoft.module.datalog.entity.DataChangeLog; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.dev.vo.Testfrom6Vo; diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java new file mode 100644 index 0000000..388fe7f --- /dev/null +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java @@ -0,0 +1,21 @@ +package com.pictc.constant; + +/** + * @author 张秉卓 + * @date 2025年10月22日 下午12:00:34 + * @Description: 表名常量 + */ +public interface TableNameConstants { + + /** + * 价格条款表 + */ + String LNG_B_PRICE_TERM = "lng_b_price_term"; + + /** + * 币种表 + */ + String LNG_B_CURRENCY = "lng_b_currency"; + + +} diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/enums/ExceptionCommonCode.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/enums/ExceptionCommonCode.java index 30b914a..23f152d 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/enums/ExceptionCommonCode.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/enums/ExceptionCommonCode.java @@ -16,6 +16,9 @@ public interface ExceptionCommonCode { * 数据删除时，id不能为空 */ final BusinessCode DATA_DEL_ID_IS_NULL = BusinessCode.of(10510,"删除数据时，表【{}】的主键为空，删除失败！"); - + /** + * 执行数据库函数失败 + */ + final BusinessCode DB_FUNCTION_EXEC_ERROR = BusinessCode.of(10511,"执行数据库函数失败：【{}】"); } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index cca0220..b6e7a1e 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -870,6 +870,11 @@ public class DataLogTools { vo.setPid(obj.getPid()); vo.setTableName(obj.getBusName()); vo.setOperationType(obj.getOperationType()); + vo.setOperatorName(obj.getOperatorName()); + vo.setOperationIp(obj.getOperationIp()); + vo.setOperationTime(DateUtils.format(obj.getOperationTime())); + + List fieldChanges = obj.getFieldChanges(); return vo; } From eb7bb07ec6c2cd80996350927258d0c01dd3614f Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 22 Oct 2025 14:41:49 +0800 Subject: [PATCH 5/5] udpate --- .../module/mdm/controller/BankController.java | 2 +- .../controller/CountryRegionController.java | 24 ++++++++++++++++++- .../mdm/controller/CurrencyController.java | 2 +- .../mdm/controller/PriceTermsController.java | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) 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 b36dd0b..6828735 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 @@ -88,7 +88,7 @@ public class BankController { @ApiOperation(value="根据id查询LngBBank数据详细日志") @SaCheckPermission("bank:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); return R.ok(logs); } 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 56cf047..a531947 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 @@ -21,9 +21,11 @@ import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.entity.DataChangeLog; import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; 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.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; import com.xjrsoft.module.mdm.vo.LngBRegionVo; @@ -88,7 +90,7 @@ public class CountryRegionController { @ApiOperation(value="根据id查询LngBRegion数据详细日志") @SaCheckPermission("countryRegion:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBRegionDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBRegionDto.class,id); return R.ok(logs); } @@ -97,6 +99,16 @@ public class CountryRegionController { @ApiOperation(value = "新增LngBRegion") @SaCheckPermission("countryRegion:add") public R add(@Valid @RequestBody UpdateLngBRegionDto dto){ + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } UpdateLngBRegionDto res = dataService.insert(dto); return R.ok(res.getId()); } @@ -105,6 +117,16 @@ public class CountryRegionController { @ApiOperation(value = "修改LngBRegion") @SaCheckPermission("countryRegion:edit") public R update(@Valid @RequestBody UpdateLngBRegionDto dto){ + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } return R.ok(dataService.updateById(dto)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java index c748afb..bbe6fc5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java @@ -83,7 +83,7 @@ public class CurrencyController { @ApiOperation(value="根据id查询LngBCurrency数据详细日志") @SaCheckPermission("currency:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBCurrencyDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBCurrencyDto.class,id); return R.ok(logs); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index 3a1af0b..cdb46ca 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -84,7 +84,7 @@ public class PriceTermsController { @ApiOperation(value="根据id查询LngBPriceTerm数据详细日志") @SaCheckPermission("priceTerms:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBPriceTermDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBPriceTermDto.class,id); return R.ok(logs); }