diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/agent.config b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/agent.config deleted file mode 100644 index ed3fb29..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/agent.config +++ /dev/null @@ -1,4 +0,0 @@ -# 应用名称(在 SkyWalking UI 中显示的服务名) -agent.service_name=your-springboot-app -# SkyWalking OAP 服务地址(默认本地) -collector.backend_service=localhost:11800 \ No newline at end of file diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/startApp.sh b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/startApp.sh deleted file mode 100644 index 7dff4c5..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/startApp.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -#cp /etc/hosts /etc/hosts.temp - -# 初始化环境变量(设置默认值,避免空变量) -APP_NAME=${APP_NAME:-"default-springboot-app"} # 默认服务名 -SKYWALKING_SERVER=${SKYWALKING_SERVER:-"localhost:11800"} # 默认SkyWalking服务地址 -ENV_APP_PRO_FILE=${ENV_APP_PRO_FILE:-"test"} # 默认环境为test - -# 初始化Java启动参数(包含是否使用-server模式) -java_base="java -javaagent:/opt/agent/skywalking-agent.jar -Dskywalking.agent.service_name=$APP_NAME" -export java_base="$java_base -Dskywalking.collector.backend_service=$SKYWALKING_SERVER" - -java_start="$java_base -jar" - -# 根据环境变量区分开发/生产环境配置 -if [ "$ENV_APP_PRO_FILE" = "prod" ]; then - # 生产环境JVM参数 - export JAVA_OPTS="-Xms1024m -Xmx4096m -Xmn512m -Xss512k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m" - export JAVA_OPTS="$JAVA_OPTS -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:G1ReservePercent=20" - export JAVA_OPTS="$JAVA_OPTS -XX:MaxGCPauseMillis=500 -XX:G1MixedGCCountTarget=10" - - export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:/var/log/app/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps" - export JAVA_OPTS="$JAVA_OPTS -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M" - - # 生产环境使用-server模式 - java_start="$java_base -jar -server" -else - # 开发环境JVM参数 - export JAVA_OPTS="-Xms512m -Xmx2048m -Xmn256m -Xss512k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m" - export JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC -XX:+UseParNewGC" - export JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:CMSMaxAbortablePrecleanTime=5000" - export JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly" - export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:./logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps" - # 开发环境开启远程调试 - export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" -fi - -# 公共配置(编码、时区等) -export JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8 -Dconsole.encoding=UTF-8" -export JAVA_OPTS="$JAVA_OPTS -Djava.awt.headless=true" -export JAVA_OPTS="$JAVA_OPTS -Duser.language=zh -Duser.country=CN -Duser.timezone=Asia/Shanghai" - -# SpringBoot 环境配置 -export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=$ENV_APP_PRO_FILE" - -# 输出启动参数 -echo "启动参数:$java_start $JAVA_OPTS $ENV_APP_FILE_PATH" - -# 执行启动命令(用双引号包裹每个变量) -exec $java_start $JAVA_OPTS $ENV_APP_FILE_PATH \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBCurrencyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBCurrencyDto.java index 98991e5..cd497f9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBCurrencyDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBCurrencyDto.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/AddLngBPriceTermDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPriceTermDto.java index 17a39ec..2d51eb6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPriceTermDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPriceTermDto.java @@ -19,7 +19,7 @@ import com.pictc.annotations.datalog.LogTable; /** * @title: 价格条款管理 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -29,52 +29,52 @@ public class AddLngBPriceTermDto implements Serializable { private static final long serialVersionUID = 1L; /** - * + * 助记码(FOB/DES/……) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("助记码(FOB/DES/……)") + @LogField(name="助记码(FOB/DES/……)",index=0) private String code; /** - * + * 名称(不能重复) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("名称(不能重复)") + @LogField(name="名称(不能重复)",index=0) private String fullName; /** - * + * 是否承担运费(Y-是,N-否) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("是否承担运费(Y-是,N-否)") + @LogField(name="是否承担运费(Y-是,N-否)",index=0) private String freightSign; /** - * + * 是否承担保险(Y-是,N-否) */ - @ApiModelProperty("") - @LogField(name="",index=0) + @ApiModelProperty("是否承担保险(Y-是,N-否)") + @LogField(name="是否承担保险(Y-是,N-否)",index=0) private String insuranceSign; /** - * + * 显示顺序 */ - @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/LngBCurrencyPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBCurrencyPageDto.java index bb2b18e..b0feb1a 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 @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * @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/LngBPriceTermPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPriceTermPageDto.java index d8a21ea..0eaf285 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 @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * @title: 分页查询入参 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -22,39 +22,39 @@ import java.math.BigDecimal; public class LngBPriceTermPageDto extends PageInput { /** - * + * 助记码(FOB/DES/……) */ - @ApiModelProperty("") + @ApiModelProperty("助记码(FOB/DES/……)") private String code; /** - * + * 名称(不能重复) */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能重复)") private String fullName; /** - * + * 是否承担运费(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担运费(Y-是,N-否)") private String freightSign; /** - * + * 是否承担保险(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担保险(Y-是,N-否)") private String insuranceSign; /** - * + * 显示顺序 */ - @ApiModelProperty("") + @ApiModelProperty("显示顺序") private Short sort; /** - * + * 有效标志(Y-有效,N-无效) */ - @ApiModelProperty("") + @ApiModelProperty("有效标志(Y-有效,N-无效)") private String valid; /** - * + * 备注 */ - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.java index c8973a0..d8602a2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBCurrencyDto.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/UpdateLngBPriceTermDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPriceTermDto.java index 6253917..56e59a4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPriceTermDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPriceTermDto.java @@ -24,7 +24,7 @@ import com.pictc.annotations.datalog.ValueDirectionType; /** * @title: 价格条款管理 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -34,66 +34,66 @@ public class UpdateLngBPriceTermDto implements Serializable { private static final long serialVersionUID = 1L; /** - * + * 主键 */ - @LogField(name="",index=0) - @ApiModelProperty("") + @LogField(name="主键",index=0) + @ApiModelProperty("主键") private Long id; /** - * + * 助记码(FOB/DES/……) */ - @LogField(name="",index=1) - @ApiModelProperty("") + @LogField(name="助记码(FOB/DES/……)",index=1) + @ApiModelProperty("助记码(FOB/DES/……)") private String code; /** - * + * 名称(不能重复) */ - @LogField(name="",index=2) - @ApiModelProperty("") + @LogField(name="名称(不能重复)",index=2) + @ApiModelProperty("名称(不能重复)") private String fullName; /** - * + * 是否承担运费(Y-是,N-否) */ - @LogField(name="",index=3) - @ApiModelProperty("") + @LogField(name="是否承担运费(Y-是,N-否)",index=3) + @ApiModelProperty("是否承担运费(Y-是,N-否)") private String freightSign; /** - * + * 是否承担保险(Y-是,N-否) */ - @LogField(name="",index=4) - @ApiModelProperty("") + @LogField(name="是否承担保险(Y-是,N-否)",index=4) + @ApiModelProperty("是否承担保险(Y-是,N-否)") private String insuranceSign; /** - * + * 显示顺序 */ - @LogField(name="",index=5) - @ApiModelProperty("") + @LogField(name="显示顺序",index=5) + @ApiModelProperty("显示顺序") private Short sort; /** - * + * 有效标志(Y-有效,N-无效) */ - @LogField(name="",index=6) - @ApiModelProperty("") + @LogField(name="有效标志(Y-有效,N-无效)",index=6) + @ApiModelProperty("有效标志(Y-有效,N-无效)") private String valid; /** - * + * 备注 */ - @LogField(name="",index=7) - @ApiModelProperty("") + @LogField(name="备注",index=7) + @ApiModelProperty("备注") private String note; /** - * + * 租户id */ - @LogField(name="",index=8) - @ApiModelProperty("") + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") private Long tenantId; 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 8828189..f26c0bb 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 @@ -13,7 +13,7 @@ import java.math.BigDecimal; /** * @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/LngBCurrencyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyVo.java index ed4093b..66a77f9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBCurrencyVo.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/LngBPriceTermPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermPageVo.java index fecc794..ec61e4c 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 @@ -13,54 +13,54 @@ import java.math.BigDecimal; /** * @title: 分页列表出参 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Data public class LngBPriceTermPageVo { /** - * + * 主键 */ - @ApiModelProperty("") + @ApiModelProperty("主键") private String id; /** - * + * 助记码(FOB/DES/……) */ - @ApiModelProperty("") + @ApiModelProperty("助记码(FOB/DES/……)") private String code; /** - * + * 名称(不能重复) */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能重复)") private String fullName; /** - * + * 是否承担运费(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担运费(Y-是,N-否)") @Trans(type = TransType.DIC, id = "1978056598125330433") private String freightSign; /** - * + * 是否承担保险(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担保险(Y-是,N-否)") @Trans(type = TransType.DIC, id = "1978056598125330433") private String insuranceSign; /** - * + * 显示顺序 */ - @ApiModelProperty("") + @ApiModelProperty("显示顺序") private Short sort; /** - * + * 有效标志(Y-有效,N-无效) */ - @ApiModelProperty("") + @ApiModelProperty("有效标志(Y-有效,N-无效)") @Trans(type = TransType.DIC, id = "1978057078528327681") private String valid; /** - * + * 备注 */ - @ApiModelProperty("") + @ApiModelProperty("备注") private String note; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermVo.java index d8aaec2..c672a1d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPriceTermVo.java @@ -11,114 +11,114 @@ import java.util.List; /** * @title: 表单出参 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Data public class LngBPriceTermVo { /** - * + * 主键 */ - @ApiModelProperty("") + @ApiModelProperty("主键") private Long id; /** - * + * 助记码(FOB/DES/……) */ - @ApiModelProperty("") + @ApiModelProperty("助记码(FOB/DES/……)") private String code; /** - * + * 名称(不能重复) */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能重复)") private String fullName; /** - * + * 是否承担运费(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担运费(Y-是,N-否)") private String freightSign; /** - * + * 是否承担保险(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担保险(Y-是,N-否)") private String insuranceSign; /** - * + * 显示顺序 */ - @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/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index c1ce851..b1317c5 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 @@ -18,6 +18,7 @@ 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.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; @@ -89,6 +90,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()); } @@ -97,6 +108,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 4c1ff05..789698f 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 @@ -35,7 +35,7 @@ import java.util.List; /** * @title: 币种管理 * @Author 管理员 -* @Date: 2025-10-21 +* @Date: 2025-10-22 * @Version 1.0 */ @RestController 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 199b8ad..399668e 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 @@ -35,7 +35,7 @@ import java.util.List; /** * @title: 价格条款管理 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @RestController @@ -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) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java index 467c416..2b0cbc2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBCurrency.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/LngBPriceTerm.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPriceTerm.java index 8453cfd..49f5f17 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPriceTerm.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPriceTerm.java @@ -20,7 +20,7 @@ import java.util.List; /** * @title: 价格条款管理 * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Data @@ -31,107 +31,107 @@ public class LngBPriceTerm implements Serializable { private static final long serialVersionUID = 1L; /** - * + * 主键 */ - @ApiModelProperty("") + @ApiModelProperty("主键") @TableId private Long id; /** - * + * 助记码(FOB/DES/……) */ - @ApiModelProperty("") + @ApiModelProperty("助记码(FOB/DES/……)") private String code; /** - * + * 名称(不能重复) */ - @ApiModelProperty("") + @ApiModelProperty("名称(不能重复)") private String fullName; /** - * + * 是否承担运费(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担运费(Y-是,N-否)") private String freightSign; /** - * + * 是否承担保险(Y-是,N-否) */ - @ApiModelProperty("") + @ApiModelProperty("是否承担保险(Y-是,N-否)") private String insuranceSign; /** - * + * 显示顺序 */ - @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/LngBCurrencyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.java index d6a6a55..85465b5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBCurrencyMapper.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/LngBPriceTermMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPriceTermMapper.java index 65ba9a5..416b88e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPriceTermMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPriceTermMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @title: mapper * @Author 管理员 -* @Date: 2025-10-20 +* @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/ICurrencyService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICurrencyService.java index 70b42a5..8bc3c58 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICurrencyService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICurrencyService.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/IPriceTermsService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java index a662068..71bc609 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java @@ -11,7 +11,7 @@ import java.util.List; /** * @title: service * @Author 管理员 -* @Date: 2025-10-20 +* @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/CurrencyServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java index f1b92c2..2afee40 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CurrencyServiceImpl.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/PriceTermsServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java index 58cb560..3275d2f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service * @Author 管理员 -* @Date: 2025-10-20 +* @Date: 2025-10-22 * @Version 1.0 */ @Service