From 3193bb8288394dce54a4200a60ebcc6d0a78a3e5 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Thu, 23 Oct 2025 16:40:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add=E6=A0=B9=E6=8D=AEpid=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=8C=BA=E5=9F=9F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CountryRegionController.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) 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 353a315..b3170af 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 @@ -15,7 +15,10 @@ 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.pictc.enums.ValidEnum; import com.pictc.utils.CollectionUtils; +import com.xjrsoft.common.constant.GlobalConstant; import com.xjrsoft.common.enums.YesOrNoEnum; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; @@ -27,7 +30,6 @@ 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.LngBRegionTreeVo; @@ -48,7 +50,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/countryRegion") +@RequestMapping("/mdm/countryRegion") @Api(value = "/mdm" + "/countryRegion",tags = "国家地区代码") @AllArgsConstructor public class CountryRegionController { @@ -140,7 +142,7 @@ public class CountryRegionController { if(br.getPid() != null) { vo.setParentId(String.valueOf(br.getPid()) ); }else { - vo.setParentId("0"); + vo.setParentId(String.valueOf(GlobalConstant.FIRST_NODE_VALUE)); } voList.add(vo); @@ -165,4 +167,19 @@ public class CountryRegionController { public R disable(@Valid @RequestBody List ids){ return R.ok(countryRegionService.disable(ids)); } + + @GetMapping("/child") + @ApiOperation(value = "根据id 查询下级区域") + public R getRegionByParentId(@RequestParam(required = false) Long pid, @RequestParam(required = false) String keyword) { + List regionList = countryRegionService.list(Wrappers.query().lambda() + .eq(pid != null, LngBRegion::getPid, pid) + .eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode()) + .eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE) + .and(StrUtil.isNotBlank(keyword), x -> { + x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword); + })); + + List resultList = BeanUtil.copyToList(regionList, LngBRegionVo.class); + return R.ok(resultList); + } } \ No newline at end of file From ba66d2d48a0c2f62144e38625c670662f94c64c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Thu, 23 Oct 2025 17:41:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B8=B8=E9=87=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/controller/CurrencyController.java | 30 +++++++++---------- .../mdm/controller/PriceTermsController.java | 9 ++++++ 2 files changed, 23 insertions(+), 16 deletions(-) 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 d633561..6181980 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 @@ -1,37 +1,28 @@ package com.xjrsoft.module.mdm.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.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.*; -import cn.dev33.satoken.annotation.SaCheckPermission; - +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.mdm.dto.LngBCurrencyPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBCurrencyDto; import com.xjrsoft.module.mdm.entity.LngBCurrency; -import com.xjrsoft.module.mdm.entity.LngBPriceTerm; 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 com.xjrsoft.module.mdm.vo.LngBPriceTermPageVo; -import com.xjrsoft.module.mdm.vo.LngBPriceTermVo; 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; /** @@ -97,8 +88,15 @@ public class CurrencyController { @ApiOperation(value = "删除") @SaCheckPermission("currency:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBCurrencyDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngBCurrencyDto.class, ids)); + } + @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("/enable") 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 93a289e..0052d2e 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 @@ -10,6 +10,7 @@ import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBPriceTermPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBPriceTermDto; import com.xjrsoft.module.mdm.entity.LngBPriceTerm; @@ -90,6 +91,14 @@ public class PriceTermsController { return R.ok(dataService.deleteByIds(UpdateLngBPriceTermDto.class, ids)); } + @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("/enable") @ApiOperation(value = "启用LngBPriceTerm") @SaCheckPermission("priceTerms:enable")