From 17ebe4463c01bb2967e08211c530b1cacb3e07ea Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 4 Nov 2025 18:11:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/dto/UpdateLngBBankDto.java | 20 +++------- .../module/mdm/dto/UpdateLngBRegionDto.java | 20 +++------- ...NameController.java => FeeController.java} | 38 +++++++++---------- ...penseNameService.java => IFeeService.java} | 2 +- ...meServiceImpl.java => FeeServiceImpl.java} | 4 +- 5 files changed, 32 insertions(+), 52 deletions(-) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/{ExpenseNameController.java => FeeController.java} (79%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/{IExpenseNameService.java => IFeeService.java} (87%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/{ExpenseNameServiceImpl.java => FeeServiceImpl.java} (95%) 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 c5f3fbd..5fec267 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 @@ -1,22 +1,12 @@ package com.xjrsoft.module.mdm.dto; +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.List; - -import com.pictc.annotations.datalog.LogTable; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogJoin; -import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; -import com.pictc.annotations.datalog.ValueDirectionType; 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 89d47f4..b64e7d5 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 @@ -1,22 +1,12 @@ package com.xjrsoft.module.mdm.dto; +import java.io.Serializable; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.List; - -import com.pictc.annotations.datalog.LogTable; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogJoin; -import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; -import com.pictc.annotations.datalog.ValueDirectionType; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java similarity index 79% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java index 72d9b5e..2449164 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java @@ -24,7 +24,7 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBFeePageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; import com.xjrsoft.module.mdm.entity.LngBFee; -import com.xjrsoft.module.mdm.service.IExpenseNameService; +import com.xjrsoft.module.mdm.service.IFeeService; import com.xjrsoft.module.mdm.vo.LngBFeePageVo; import com.xjrsoft.module.mdm.vo.LngBFeeVo; @@ -42,18 +42,18 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/expenseName") -@Api(value = "/mdm" + "/expenseName",tags = "费用名称代码") +@RequestMapping("/mdm" + "/fee") +@Api(value = "/mdm" + "/fee",tags = "费用名称代码") @AllArgsConstructor -public class ExpenseNameController { +public class FeeController { - private final IExpenseNameService expenseNameService; + private final IFeeService feeService; private final DatalogService dataService; @GetMapping(value = "/page") @ApiOperation(value="LngBFee列表(分页)") - @SaCheckPermission("expenseName:list") + @SaCheckPermission("fee:list") public R page(@Valid LngBFeePageDto dto){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -64,16 +64,16 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) .orderByAsc(LngBFee::getSort,LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); - IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); + IPage page = feeService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); return R.ok(pageOutput); } @GetMapping(value = "/info") @ApiOperation(value="根据id查询LngBFee信息") - @SaCheckPermission("expenseName:detail") + @SaCheckPermission("fee:detail") public R info(@RequestParam Long id){ - LngBFee lngBFee = expenseNameService.getById(id); + LngBFee lngBFee = feeService.getById(id); if (lngBFee == null) { return R.error("找不到此数据！"); } @@ -83,21 +83,21 @@ public class ExpenseNameController { @PostMapping @ApiOperation(value = "新增LngBFee") - @SaCheckPermission("expenseName:add") + @SaCheckPermission("fee:add") public R add(@Valid @RequestBody UpdateLngBFeeDto dto){ - return R.ok(expenseNameService.add(dto)); + return R.ok(feeService.add(dto)); } @PutMapping @ApiOperation(value = "修改LngBFee") - @SaCheckPermission("expenseName:edit") + @SaCheckPermission("fee:edit") public R update(@Valid @RequestBody UpdateLngBFeeDto dto){ - return R.ok(expenseNameService.update(dto)); + return R.ok(feeService.update(dto)); } @DeleteMapping @ApiOperation(value = "删除") - @SaCheckPermission("expenseName:delete") + @SaCheckPermission("fee:delete") public R delete(@Valid @RequestBody List ids){ return R.ok(dataService.deleteByIds(UpdateLngBFeeDto.class, ids)); @@ -105,7 +105,7 @@ public class ExpenseNameController { @GetMapping(value = "/datalog") @ApiOperation(value="根据id查询LngBFee数据详细日志") - @SaCheckPermission("expenseName:datalog") + @SaCheckPermission("fee:datalog") public R datalog(@RequestParam Long id){ List logs = dataService.findLogsByEntityId(UpdateLngBFeeDto.class,id); return R.ok(logs); @@ -113,17 +113,17 @@ public class ExpenseNameController { @PostMapping("/enable") @ApiOperation(value = "启用") - @SaCheckPermission("expenseName:enable") + @SaCheckPermission("fee:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(expenseNameService.enable(ids)); + return R.ok(feeService.enable(ids)); } @PostMapping("/disable") @ApiOperation(value = "禁用") - @SaCheckPermission("expenseName:disable") + @SaCheckPermission("fee:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(expenseNameService.disable(ids)); + return R.ok(feeService.disable(ids)); } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java similarity index 87% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java index ca8c26e..e5edff6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java @@ -13,7 +13,7 @@ import com.xjrsoft.module.mdm.entity.LngBFee; * @Version 1.0 */ -public interface IExpenseNameService extends IService { +public interface IFeeService extends IService { Boolean enable(List ids); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java similarity index 95% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java index 38ca4dc..ecbbb8b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java @@ -19,7 +19,7 @@ import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; import com.xjrsoft.module.mdm.entity.LngBFee; import com.xjrsoft.module.mdm.mapper.LngBFeeMapper; -import com.xjrsoft.module.mdm.service.IExpenseNameService; +import com.xjrsoft.module.mdm.service.IFeeService; import lombok.AllArgsConstructor; @@ -31,7 +31,7 @@ import lombok.AllArgsConstructor; */ @Service @AllArgsConstructor -public class ExpenseNameServiceImpl extends ServiceImpl implements IExpenseNameService { +public class FeeServiceImpl extends ServiceImpl implements IFeeService { private final CommonCallService commonCallService; From d54cee4d446dada6458368b500f1861e049381ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Tue, 4 Nov 2025 18:19:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?---=E6=B5=8B=E8=AF=95=E8=BF=9C=E7=A8=8Bjar?= =?UTF-8?q?=E5=8C=85=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- itc-pcitc-demo/itc-pcitc-demo-service/pom.xml | 26 ++++++++++++++++--- .../dev/controller/Testfrom3Controller.java | 21 ++------------- .../main/java/com/pictc/jdbc/JdbcContext.java | 6 ++++- .../main/java/com/pictc/jdbc/JdbcTools.java | 1 + .../common/db/service/CommonCallService.java | 2 +- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml index 9fceb92..66a71c1 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml +++ b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml @@ -18,6 +18,8 @@ ${java.version} ${java.version} pcitc/itc-pcitc-demo + http://172.27.46.206:23117 + false @@ -81,7 +83,7 @@ app - + + classes false - + --> + + com.geg + tanuki-boot-maven-plugin + 1.0.0 + + ${libServerUrl} + ${ignoreUpload} + ${libServerUser} + ${libServerPwd} + + + + + repackage + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java index 615d490..718f8fb 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java @@ -142,34 +142,17 @@ public class Testfrom3Controller { @Override public UpdateTestfrom3Dto before(DataOperationContent content) { - if(content.getType()==OperationType.DELETE) { - CommonCallUtils.deleteBefore(content.getTableName(),content.getIdValue()); - }else if(content.getType()==OperationType.DISABLE){ - CommonCallUtils.disableBefore(content.getTableName(),content.getIdValue()); - }else if(content.getType()==OperationType.ENABLE){ - CommonCallUtils.enableBefore(content.getTableName(),content.getIdValue()); - } + return content.getObj(); } @Override public UpdateTestfrom3Dto after(DataOperationContent content) { - if(content.getType()==OperationType.INSERT || content.getType()==OperationType.UPDATE) { + if(content.getType()==OperationType.UPDATE) { CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); } return content.getObj(); } - - @Override - public void onError(DataOperationContent content) { - // TODO Auto-generated method stub - } - - @Override - public void onFinally(DataOperationContent content) { - // TODO Auto-generated method stub - } - })); } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java index e1a8fee..c5d5da2 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java @@ -7,13 +7,17 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.List; + import javax.sql.DataSource; + import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.jdbc.support.JdbcUtils; + import com.pictc.jdbc.model.JdbcParam; import com.pictc.utils.CollectionUtils; + import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -23,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; @Setter public class JdbcContext { -public static final int DEF_STEP = 1000; + public static final int DEF_STEP = 1000; private JdbcTemplate jdbc; diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java index 0428aca..7c64f13 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.pictc.jdbc.model.JdbcParam; import com.pictc.jdbc.model.QueryParameter; import com.pictc.utils.CollectionUtils; diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java index ce370c8..14ba190 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java @@ -4,10 +4,10 @@ import java.util.List; import org.springframework.stereotype.Component; +import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.google.api.client.util.Lists; import com.pictc.jdbc.JdbcTools; import com.pictc.jdbc.model.JdbcParam; -import com.pictc.utils.ListUtils; import com.pictc.utils.StringUtils; /** From b639a5f28434a52383e7c8fdf0ab3e3f3e8418b7 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 5 Nov 2025 12:20:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/client/ICountryRegionClient.java | 17 +++++++ .../mdm/client/CountryRegionClientImpl.java | 49 +++++++++++++++++++ .../impl/CountryRegionServiceImpl.java | 14 ++++++ 3 files changed, 80 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ICountryRegionClient.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ICountryRegionClient.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ICountryRegionClient.java new file mode 100644 index 0000000..9a8023d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ICountryRegionClient.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.mdm.client; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import com.xjrsoft.common.constant.GlobalConstant; + +/** + * @author: ksy + * @since: 2025/11/5 + */ +@FeignClient(value = GlobalConstant.CLIENT_PCITC_MDM_NAME, path = GlobalConstant.CLIENT_API_PRE + GlobalConstant.MDM_MODULE_PREFIX + "/countryRegion") +public interface ICountryRegionClient { + + @GetMapping("/refreshCache") + void refreshCache(); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java new file mode 100644 index 0000000..e16dca8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java @@ -0,0 +1,49 @@ +package com.xjrsoft.module.mdm.client; + +import java.util.List; +import java.util.stream.Collectors; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.xjrsoft.common.constant.GlobalConstant; +import com.xjrsoft.common.utils.RedisUtil; +import com.xjrsoft.common.utils.TenantUtil; +import com.xjrsoft.module.mdm.entity.LngBRegion; +import com.xjrsoft.module.mdm.service.ICountryRegionService; + +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * @author: yjw + * @since: 2025/3/5 + */ +//@Api(hidden = true) +@RestController +@RequestMapping(GlobalConstant.CLIENT_API_PRE + GlobalConstant.MDM_MODULE_PREFIX + "/countryRegion") +@AllArgsConstructor +@Slf4j +public class CountryRegionClientImpl implements ICountryRegionClient { + + private final ICountryRegionService countryRegionService; + private final RedisUtil redisUtil; + + + + @GetMapping("/refreshCache") + public void refreshCache() { + try { + TenantUtil.ignore(true); + log.info("MDM: 加载所有国家地区表缓存开始"); + List list = countryRegionService.list(); + redisUtil.set(GlobalConstant.REGION_CACHE_KEY, list); + redisUtil.set(GlobalConstant.USER_NAME_CACHE_KEY, list.stream().collect(Collectors.toMap(LngBRegion::getCode,LngBRegion::getFullPath))); + log.info("ITC-FRAMEWORK: 加载所有国家地区表缓存结束"); + }finally { + TenantUtil.clear(); + } + } + +} 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 194cbf0..d66c4b3 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 @@ -1,6 +1,7 @@ package com.xjrsoft.module.mdm.service.impl; import java.util.List; +import java.util.concurrent.CompletableFuture; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -14,6 +15,7 @@ import com.pictc.enums.BusinessCode; import com.pictc.enums.ExceptionCommonCode; import com.pictc.utils.DataLogTools; import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.utils.CacheUtil; import com.xjrsoft.module.common.db.service.CommonCallService; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; @@ -54,6 +56,7 @@ public class CountryRegionServiceImpl extends ServiceImpl { + CacheUtil.refreshRegionList(); + }); + } } From d191bbeaaf87d7fc528f3044d2f3a9477569d0a4 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 5 Nov 2025 16:07:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/client/CountryRegionClientImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java index e16dca8..06597cc 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/CountryRegionClientImpl.java @@ -39,8 +39,8 @@ public class CountryRegionClientImpl implements ICountryRegionClient { log.info("MDM: 加载所有国家地区表缓存开始"); List list = countryRegionService.list(); redisUtil.set(GlobalConstant.REGION_CACHE_KEY, list); - redisUtil.set(GlobalConstant.USER_NAME_CACHE_KEY, list.stream().collect(Collectors.toMap(LngBRegion::getCode,LngBRegion::getFullPath))); - log.info("ITC-FRAMEWORK: 加载所有国家地区表缓存结束"); + redisUtil.set(GlobalConstant.REGION_NAME_CACHE_KEY, list.stream().collect(Collectors.toMap(LngBRegion::getCode,LngBRegion::getFullPath))); + log.info("MDM: 加载所有国家地区表缓存结束"); }finally { TenantUtil.clear(); } From 299bdc02751606ee21f230bf6dd8029be0140757 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, 5 Nov 2025 17:47:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?----=E6=B7=BB=E5=8A=A0=EF=BC=8Cjar=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/dev/entity/SysJarInfo.java | 38 +++++++++++++++++++ .../itc-pcitc-dependencies-api/pom.xml | 1 - .../module/mdm/controller/BankController.java | 1 - pom.xml | 6 +-- 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/entity/SysJarInfo.java diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/entity/SysJarInfo.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/entity/SysJarInfo.java new file mode 100644 index 0000000..2ff4d41 --- /dev/null +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/entity/SysJarInfo.java @@ -0,0 +1,38 @@ +package com.xjrsoft.module.dev.entity; + +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 测试3 +* @Author 管理员 +* @Date: 2025-09-25 +* @Version 1.0 +*/ +@Data +@TableName("sys_jar_info") +@ApiModel(value = "jar包明细对象", description = "jar包明细") +public class SysJarInfo { + + /** + * + */ + @ApiModelProperty("") + @TableId + private String id; + + private String name; + + private String custom; + + private String url; + + private String fid; + +} diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/pom.xml b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/pom.xml index 196ebf9..f368c9b 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/pom.xml +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/pom.xml @@ -16,7 +16,6 @@ ${java.version} ${java.version} - 2.0.4 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 f2f7cbd..a9cd754 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 @@ -113,7 +113,6 @@ public class BankController { @ApiOperation(value = "新增LngBBank") @SaCheckPermission("bank:add") public R add(@Valid @RequestBody UpdateLngBBankDto dto){ - Long res = bankService.add(dto); return R.ok(res); } diff --git a/pom.xml b/pom.xml index 4360764..305c568 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom - itc-pcitc-demo + itc-pcitc-dependencies itc-pcitc-mdm