From 4f25031859700cac40306a7e3f3985b76728bd59 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 24 Oct 2025 17:32:25 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=8E=E7=8E=87?= =?UTF-8?q?=E5=92=8C=E8=B4=B9=E7=94=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java | 2 +- .../com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/ExpenseNameServiceImpl.java index eb1426c..4a8f0aa 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/ExpenseNameServiceImpl.java @@ -37,7 +37,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl @Override public Long add(UpdateLngBFeeDto dto) { this.checkParams(dto); - UpdateLngBFeeDto res = DataLogTools.update(dto); + UpdateLngBFeeDto res = DataLogTools.insert(dto); this.addOrUpdateAfter(res.getId()); return res.getId(); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java index 24f328e..81ec99c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java @@ -37,7 +37,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl @Override public Long add(UpdateLngBTaxDto dto) { this.checkParams(dto); - UpdateLngBTaxDto res = DataLogTools.update(dto); + UpdateLngBTaxDto res = DataLogTools.insert(dto); this.addOrUpdateAfter(res.getId()); return res.getId(); } From 374a1f1c810553ac8e2bdb90bf23bbbcfda76504 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 27 Oct 2025 10:34:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8B=E7=BA=A7=E5=9C=B0=E5=8C=BA=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdm/controller/CountryRegionController.java | 6 ++++-- .../com/xjrsoft/module/mdm/entity/LngBBank.java | 13 +++++-------- .../module/mdm/service/impl/BankServiceImpl.java | 1 - 3 files changed, 9 insertions(+), 11 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 f29f826..cb937a7 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 @@ -171,11 +171,13 @@ public class CountryRegionController { @GetMapping("/child") @ApiOperation(value = "根据id 查询下级区域") - public R getRegionByParentId(@RequestParam(required = false) Long pid, @RequestParam(required = false) String keyword) { + public R getRegionByParentId(@RequestParam(required = false) Long pid,@RequestParam(required = false) String excludeType, @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) + .ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType) .and(StrUtil.isNotBlank(keyword), x -> { x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword); })); @@ -185,7 +187,7 @@ public class CountryRegionController { for(LngBRegion br:regionList) { LngBRegionVo vo = new LngBRegionVo(); BeanUtil.copyProperties(br, vo); - Long parentId = br.getPid(); + Long parentId = br.getId(); if(parentId == null) { parentId = 0L; } 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 dd46476..8fba883 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 @@ -1,20 +1,17 @@ package com.xjrsoft.module.mdm.entity; +import java.io.Serializable; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; -import com.github.yulichang.annotation.EntityMapping; + import io.swagger.annotations.ApiModel; 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 java.util.List; /** 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 7469969..ae76bff 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 @@ -15,7 +15,6 @@ import com.pictc.enums.ExceptionCommonCode; import com.pictc.utils.DataLogTools; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.common.db.service.CommonCallService; -import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.entity.LngBBank; import com.xjrsoft.module.mdm.mapper.LngBBankMapper; From 2cc0fe151768fcc1f9a58aeb7a3ba9b9197a61f4 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 27 Oct 2025 15:23:00 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=AE=A1=E9=81=93=E6=B0=94=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/vo/LngBPortPageVo.java | 1 - .../module/mdm/controller/BankController.java | 2 +- .../controller/CountryRegionController.java | 16 +++++-- .../mdm/controller/ExpenseNameController.java | 41 +++++++++--------- .../mdm/controller/LNGStationController.java | 21 +++++++++ .../PipeGasDownloadPointController.java | 3 +- .../PipelineGgasLineController.java | 43 ++++++++++--------- 7 files changed, 79 insertions(+), 48 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java index 927bde1..859552a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java @@ -43,7 +43,6 @@ public class LngBPortPageVo { * 所属国家和地区 */ @ApiModelProperty("所属国家和地区") - @Trans(type = TransType.CASCADE, id = "0772d128d20f4f80aaafc784adba338a", separator = "/", showFormat = "all") private String regionCode; /** * 吞吐量 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 e3c9021..6b39eef 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 @@ -72,7 +72,7 @@ public class BankController { .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) + .orderByDesc(LngBBank::getCode) .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty())); IPage page = bankService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class); 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 cb937a7..f463fdf 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 @@ -73,7 +73,7 @@ public class CountryRegionController { .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) + .orderByDesc(LngBRegion::getCode) .select(LngBRegion.class,x -> VoToColumnUtil.fieldsToColumns(LngBRegionPageVo.class).contains(x.getProperty())); IPage page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBRegionPageVo.class); @@ -173,11 +173,21 @@ public class CountryRegionController { @ApiOperation(value = "根据id 查询下级区域") public R getRegionByParentId(@RequestParam(required = false) Long pid,@RequestParam(required = false) String excludeType, @RequestParam(required = false) String keyword ) { + List pidList = CollectionUtils.newArrayList(); + if(StrUtil.isNotBlank(excludeType) && (pid == null || pid ==0) ){ + List pList = countryRegionService.list(Wrappers.query() + .lambda().eq(LngBRegion::getRegionTypeCode, excludeType)); + if(pList != null && pList.size() > 0) { + for(LngBRegion p:pList) { + pidList.add(p.getId()); + } + } + } 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) - .ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType) + .in(pid == null, LngBRegion::getPid, pidList) + //.ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType) .and(StrUtil.isNotBlank(keyword), x -> { x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword); })); 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/ExpenseNameController.java index d87b299..e7682a9 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/ExpenseNameController.java @@ -1,38 +1,39 @@ 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.AddLngBFeeDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; -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.LngBFeePageDto; -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.service.IExpenseNameService; import com.xjrsoft.module.mdm.vo.LngBFeePageVo; - -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.vo.LngBFeeVo; + +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/LNGStationController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java index de2aa54..fe8d19c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java @@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.utils.CollectionUtils; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -15,6 +16,7 @@ import com.xjrsoft.module.mdm.dto.LngBStationLngPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBStationLngDto; import com.xjrsoft.module.mdm.entity.LngBStationLng; import com.xjrsoft.module.mdm.service.ILNGStationService; +import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo; import com.xjrsoft.module.mdm.vo.LngBStationLngPageVo; import com.xjrsoft.module.mdm.vo.LngBStationLngVo; import io.swagger.annotations.Api; @@ -110,4 +112,23 @@ public class LNGStationController { public R disable(@Valid @RequestBody List ids){ return R.ok(lNGStationService.disable(ids)); } + + @GetMapping(value = "/list") + @ApiOperation(value="LngBStationLng列表(不分页)") + public R list(@Valid LngBStationLngPageDto dto){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getFullName()), LngBStationLng::getFullName, dto.getFullName()) + .eq(StrUtil.isNotBlank(dto.getValid()), LngBStationLng::getValid, dto.getValid()) + .eq(StrUtil.isNotBlank(dto.getOwnSign()), LngBStationLng::getOwnSign, dto.getOwnSign()) + .orderByAsc(LngBStationLng::getSort, LngBStationLng::getCode); + List list = lNGStationService.list(queryWrapper); + List voList = CollectionUtils.newArrayList(); + for(LngBStationLng s:list) { + LngBStationLngVo vo = new LngBStationLngVo(); + BeanUtil.copyProperties(s, vo); + voList.add(vo); + } + return R.ok(voList); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java index bcddd0a..bf4df19 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java @@ -22,7 +22,6 @@ 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.LngBStationPngPageDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto; import com.xjrsoft.module.mdm.entity.LngBStationPng; import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService; @@ -135,7 +134,7 @@ public class PipeGasDownloadPointController { @ApiOperation(value="根据id查询LngBStationPng数据详细日志") @SaCheckPermission("pipeGasDownloadPoint:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBStationPngDto.class,id); return R.ok(logs); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java index 432f785..80dc795 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java @@ -1,38 +1,39 @@ 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.AddLngBPngLineDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; -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.LngBPngLinePageDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; import com.xjrsoft.module.mdm.vo.LngBPngLinePageVo; - -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.vo.LngBPngLineVo; + +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: 管道气管线 @@ -124,7 +125,7 @@ public class PipelineGgasLineController { @ApiOperation(value="根据id查询LngBPngLine数据详细日志") @SaCheckPermission("pipelineGgasLine:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBPngLineDto.class,id); return R.ok(logs); } From 57420c88c101f95cbf571af4d18412e0380d04d1 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 27 Oct 2025 15:43:20 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/controller/CountryRegionController.java | 1 - .../module/mdm/controller/ExpenseNameController.java | 2 +- .../mdm/controller/PipeGasDownloadPointController.java | 7 +------ .../module/mdm/controller/PipelineGgasLineController.java | 2 +- .../xjrsoft/module/mdm/controller/TaxRateController.java | 2 +- 5 files changed, 4 insertions(+), 10 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 f463fdf..6d10ac5 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 @@ -72,7 +72,6 @@ public class CountryRegionController { .eq(ObjectUtil.isNotNull(dto.getPid()),LngBRegion::getPid,dto.getPid()) .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::getCode) .select(LngBRegion.class,x -> VoToColumnUtil.fieldsToColumns(LngBRegionPageVo.class).contains(x.getProperty())); IPage page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper); 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/ExpenseNameController.java index e7682a9..969fb3e 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/ExpenseNameController.java @@ -63,7 +63,7 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getCode()),LngBFee::getCode,dto.getCode()) //.like(StrUtil.isNotBlank(dto.getSort()),LngBFee::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) - .orderByDesc(LngBFee::getId) + .orderByDesc(LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java index bf4df19..805a53b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java @@ -62,19 +62,14 @@ public class PipeGasDownloadPointController { .like(StrUtil.isNotBlank(dto.getFullName()),LngBStationPng::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getPipelineCode()),LngBStationPng::getPipelineCode,dto.getPipelineCode()) .like(StrUtil.isNotBlank(dto.getEnterprise()),LngBStationPng::getEnterprise,dto.getEnterprise()) - .like(StrUtil.isNotBlank(dto.getContact()),LngBStationPng::getContact,dto.getContact()) - .like(StrUtil.isNotBlank(dto.getTel()),LngBStationPng::getTel,dto.getTel()) - .like(StrUtil.isNotBlank(dto.getEmail()),LngBStationPng::getEmail,dto.getEmail()) .like(StrUtil.isNotBlank(dto.getRegionCode()),LngBStationPng::getRegionCode,dto.getRegionCode()) - .like(StrUtil.isNotBlank(dto.getAddr()),LngBStationPng::getAddr,dto.getAddr()) - .like(StrUtil.isNotBlank(dto.getAddrMail()),LngBStationPng::getAddrMail,dto.getAddrMail()) .like(StrUtil.isNotBlank(dto.getOwnSign()),LngBStationPng::getOwnSign,dto.getOwnSign()) .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBStationPng::getStaCodeLng,dto.getStaCodeLng()) .like(StrUtil.isNotBlank(dto.getOwnLineSign()),LngBStationPng::getOwnLineSign,dto.getOwnLineSign()) //.like(StrUtil.isNotBlank(dto.getSort()),LngBStationPng::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBStationPng::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBStationPng::getNote,dto.getNote()) - .orderByDesc(LngBStationPng::getId) + .orderByDesc(LngBStationPng::getCode) .select(LngBStationPng.class,x -> VoToColumnUtil.fieldsToColumns(LngBStationPngPageVo.class).contains(x.getProperty())); IPage page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBStationPngPageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java index 80dc795..f033342 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java @@ -65,7 +65,7 @@ public class PipelineGgasLineController { .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBPngLine::getStaCodeLng,dto.getStaCodeLng()) //.like(StrUtil.isNotBlank(dto.getSort()),LngBPngLine::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBPngLine::getNote,dto.getNote()) - .orderByDesc(LngBPngLine::getId) + .orderByDesc(LngBPngLine::getCode) .select(LngBPngLine.class,x -> VoToColumnUtil.fieldsToColumns(LngBPngLinePageVo.class).contains(x.getProperty())); IPage page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPngLinePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java index fba230c..b9196b1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java @@ -63,7 +63,7 @@ public class TaxRateController { .eq(ObjectUtil.isNotNull(dto.getRate()),LngBTax::getRate,dto.getRate()) //.like(StrUtil.isNotBlank(dto.getSort()),LngBTax::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBTax::getNote,dto.getNote()) - .orderByDesc(LngBTax::getId) + .orderByDesc(LngBTax::getCode) .select(LngBTax.class,x -> VoToColumnUtil.fieldsToColumns(LngBTaxPageVo.class).contains(x.getProperty())); IPage page = taxRateService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBTaxPageVo.class); From f1e70966b77e559c80ff817d8a4e82643270224d Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Mon, 27 Oct 2025 17:50:36 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=AE=A1=E9=81=93=E6=B0=94=E7=AE=A1?= =?UTF-8?q?=E7=BA=BF=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pictc/constant/TableNameConstants.java | 2 +- .../module/mdm/vo/LngBStationPngVo.java | 3 ++- .../PipeGasDownloadPointController.java | 12 ++++++++- .../mdm/service/IPipelineGgasLineService.java | 2 ++ .../impl/PipelineGgasLineServiceImpl.java | 27 ++++++++++--------- 5 files changed, 30 insertions(+), 16 deletions(-) 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 index 5a75ffb..2d65170 100644 --- 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 @@ -59,7 +59,7 @@ public interface TableNameConstants { String LNG_B_TAX = "lng_b_tax"; /** - * 管道气路线表 + * 管道气管线表 */ String LNG_B_PNG_LINE = "lng_b_png_line"; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java index 9e3fe35..85cfd6d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java @@ -185,7 +185,8 @@ public class LngBStationPngVo { private Long ruleUserId; - + @ApiModelProperty("") + private String staNameLng; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java index 805a53b..04702d7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java @@ -23,8 +23,10 @@ import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBStationPngPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto; +import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.entity.LngBStationPng; import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService; +import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; import com.xjrsoft.module.mdm.vo.LngBStationPngPageVo; import com.xjrsoft.module.mdm.vo.LngBStationPngVo; @@ -50,6 +52,8 @@ public class PipeGasDownloadPointController { private final IPipeGasDownloadPointService pipeGasDownloadPointService; private final DatalogService dataService; + + private final IPipelineGgasLineService pipelineGgasLineService ; @GetMapping(value = "/page") @ApiOperation(value="LngBStationPng列表(分页)") @@ -84,7 +88,13 @@ public class PipeGasDownloadPointController { if (lngBStationPng == null) { return R.error("找不到此数据！"); } - return R.ok(BeanUtil.toBean(lngBStationPng, LngBStationPngVo.class)); + LngBStationPngVo vo = new LngBStationPngVo(); + BeanUtil.copyProperties(lngBStationPng,vo); + LngBPngLine bl = pipelineGgasLineService.getByCode(vo.getCode()); + if(bl != null) { + vo.setStaNameLng(bl.getFullName()); + } + return R.ok(vo); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java index b4e2048..0903448 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java @@ -22,4 +22,6 @@ public interface IPipelineGgasLineService extends IService { Long add(UpdateLngBPngLineDto dto); Long update(UpdateLngBPngLineDto dto); + + LngBPngLine getByCode(String code); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java index 305dd98..fbc77d7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java @@ -1,7 +1,13 @@ package com.xjrsoft.module.mdm.service.impl; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; import com.pictc.constant.FieldNameConstants; import com.pictc.constant.TableNameConstants; import com.pictc.enums.BusinessCode; @@ -10,8 +16,6 @@ import com.pictc.utils.DataLogTools; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.common.db.service.CommonCallService; import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; -import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.mapper.LngBPngLineMapper; import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; @@ -19,16 +23,6 @@ import com.xjrsoft.module.system.client.ICodeRuleClient; import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; - /** * @title: service * @Author 管理员 @@ -78,6 +72,13 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl() + .eq(LngBPngLine::getCode, code)); + return bl; + } @Override From 0821471679012bc24f95f0cbb3676d879c315b2b Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 28 Oct 2025 15:51:37 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xjrsoft/module/mdm/controller/BankController.java | 2 +- .../xjrsoft/module/mdm/controller/CountryRegionController.java | 2 +- .../xjrsoft/module/mdm/controller/ExpenseNameController.java | 3 +-- .../module/mdm/controller/PipeGasDownloadPointController.java | 2 +- .../module/mdm/controller/PipelineGgasLineController.java | 2 +- .../com/xjrsoft/module/mdm/controller/TaxRateController.java | 3 +-- 6 files changed, 6 insertions(+), 8 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 6b39eef..41bf1a7 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 @@ -72,7 +72,7 @@ public class BankController { .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::getCode) + .orderByAsc(LngBBank::getSort,LngBBank::getCode) .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty())); IPage page = bankService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class); 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 6d10ac5..803ddf5 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 @@ -72,7 +72,7 @@ public class CountryRegionController { .eq(ObjectUtil.isNotNull(dto.getPid()),LngBRegion::getPid,dto.getPid()) .like(StrUtil.isNotBlank(dto.getFullPath()),LngBRegion::getFullPath,dto.getFullPath()) .like(StrUtil.isNotBlank(dto.getValid()),LngBRegion::getValid,dto.getValid()) - .orderByDesc(LngBRegion::getCode) + .orderByAsc(LngBRegion::getCode) .select(LngBRegion.class,x -> VoToColumnUtil.fieldsToColumns(LngBRegionPageVo.class).contains(x.getProperty())); IPage page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBRegionPageVo.class); 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/ExpenseNameController.java index 969fb3e..7ee4ece 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/ExpenseNameController.java @@ -61,9 +61,8 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getFullName()),LngBFee::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getValid()),LngBFee::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getCode()),LngBFee::getCode,dto.getCode()) - //.like(StrUtil.isNotBlank(dto.getSort()),LngBFee::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) - .orderByDesc(LngBFee::getCode) + .orderByAsc(LngBFee::getCode,LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java index 04702d7..28f6972 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java @@ -73,7 +73,7 @@ public class PipeGasDownloadPointController { //.like(StrUtil.isNotBlank(dto.getSort()),LngBStationPng::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBStationPng::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBStationPng::getNote,dto.getNote()) - .orderByDesc(LngBStationPng::getCode) + .orderByAsc(LngBStationPng::getSort,LngBStationPng::getCode) .select(LngBStationPng.class,x -> VoToColumnUtil.fieldsToColumns(LngBStationPngPageVo.class).contains(x.getProperty())); IPage page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBStationPngPageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java index f033342..c5ebcbe 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java @@ -65,7 +65,7 @@ public class PipelineGgasLineController { .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBPngLine::getStaCodeLng,dto.getStaCodeLng()) //.like(StrUtil.isNotBlank(dto.getSort()),LngBPngLine::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBPngLine::getNote,dto.getNote()) - .orderByDesc(LngBPngLine::getCode) + .orderByAsc(LngBPngLine::getSort,LngBPngLine::getCode) .select(LngBPngLine.class,x -> VoToColumnUtil.fieldsToColumns(LngBPngLinePageVo.class).contains(x.getProperty())); IPage page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPngLinePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java index b9196b1..6c400fa 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java @@ -61,9 +61,8 @@ public class TaxRateController { .like(StrUtil.isNotBlank(dto.getValid()),LngBTax::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getCode()),LngBTax::getCode,dto.getCode()) .eq(ObjectUtil.isNotNull(dto.getRate()),LngBTax::getRate,dto.getRate()) - //.like(StrUtil.isNotBlank(dto.getSort()),LngBTax::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBTax::getNote,dto.getNote()) - .orderByDesc(LngBTax::getCode) + .orderByAsc(LngBTax::getSort,LngBTax::getCode) .select(LngBTax.class,x -> VoToColumnUtil.fieldsToColumns(LngBTaxPageVo.class).contains(x.getProperty())); IPage page = taxRateService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBTaxPageVo.class); From f8aad0fd815c66f191184f490336c395470aca26 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 28 Oct 2025 17:04:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/controller/BankController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 41bf1a7..1447b1f 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 @@ -65,11 +65,16 @@ public class BankController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getShortName()),LngBBank::getShortName,dto.getShortName()) + .and( + StrUtil.isNotBlank(dto.getShortName()), r -> + r.like(LngBBank::getShortName, dto.getShortName()) + .or() + .like(LngBBank::getFullName, dto.getShortName()) + ) .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.getFullName()),LngBBank::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getCode()),LngBBank::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getSwift()),LngBBank::getSwift,dto.getSwift()) .orderByAsc(LngBBank::getSort,LngBBank::getCode) From 80110a4d4647472f8e36559e6b48652ed9e134a5 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 28 Oct 2025 18:25:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/controller/ExpenseNameController.java | 2 +- .../com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java | 4 +++- .../module/mdm/service/impl/CountryRegionServiceImpl.java | 5 ++++- .../module/mdm/service/impl/ExpenseNameServiceImpl.java | 5 +++++ .../mdm/service/impl/PipeGasDownloadPointServiceImpl.java | 4 +++- .../module/mdm/service/impl/PipelineGgasLineServiceImpl.java | 4 +++- .../xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java | 5 +++++ 7 files changed, 24 insertions(+), 5 deletions(-) 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/ExpenseNameController.java index 7ee4ece..72d9b5e 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/ExpenseNameController.java @@ -62,7 +62,7 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getValid()),LngBFee::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getCode()),LngBFee::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) - .orderByAsc(LngBFee::getCode,LngBFee::getCode) + .orderByAsc(LngBFee::getSort,LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); 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 ae76bff..be572a2 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 @@ -60,7 +60,8 @@ public class BankServiceImpl extends ServiceImpl imple return res.getId(); } - @Override + @Override + @Transactional(rollbackFor = Exception.class) public boolean enable(List ids) { DataLogTools.enable(UpdateLngBBankDto.class,ids); for (Long id : ids) { @@ -74,6 +75,7 @@ public class BankServiceImpl extends ServiceImpl imple @Override + @Transactional(rollbackFor = Exception.class) public boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); 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 db41618..2c53742 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 @@ -57,7 +57,8 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.enable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { @@ -71,6 +72,7 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.disable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { @@ -85,6 +87,7 @@ public class CountryRegionServiceImpl extends ServiceImpl private final CommonCallService commonCallService; @Override + @Transactional(rollbackFor = Exception.class) public Long add(UpdateLngBFeeDto dto) { this.checkParams(dto); UpdateLngBFeeDto res = DataLogTools.insert(dto); @@ -43,6 +45,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl } @Override + @Transactional(rollbackFor = Exception.class) public Long update(UpdateLngBFeeDto dto) { this.checkParams(dto); UpdateLngBFeeDto res = DataLogTools.update(dto); @@ -52,6 +55,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl @Override + @Transactional(rollbackFor = Exception.class) public Boolean enable(List ids) { DataLogTools.enable(UpdateLngBBankDto.class,ids); for (Long id : ids) { @@ -64,6 +68,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl } @Override + @Transactional(rollbackFor = Exception.class) public Boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java index ee39667..f05d157 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java @@ -60,7 +60,8 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl ids) { DataLogTools.enable(UpdateLngBStationPngDto.class,ids); for (Long id : ids) { @@ -74,6 +75,7 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl ids) { DataLogTools.disable(UpdateLngBStationPngDto.class,ids); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java index fbc77d7..cfb03af 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java @@ -61,7 +61,8 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl ids) { DataLogTools.enable(UpdateLngBPngLineDto.class,ids); for (Long id : ids) { @@ -82,6 +83,7 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl ids) { DataLogTools.disable(UpdateLngBPngLineDto.class,ids); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java index 81ec99c..07f739d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -35,6 +36,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl private final CommonCallService commonCallService; @Override + @Transactional(rollbackFor = Exception.class) public Long add(UpdateLngBTaxDto dto) { this.checkParams(dto); UpdateLngBTaxDto res = DataLogTools.insert(dto); @@ -43,6 +45,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = Exception.class) public Long update(UpdateLngBTaxDto dto) { this.checkParams(dto); UpdateLngBTaxDto res = DataLogTools.update(dto); @@ -52,6 +55,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl @Override + @Transactional(rollbackFor = Exception.class) public Boolean enable(List ids) { DataLogTools.enable(UpdateLngBTaxDto.class,ids); for (Long id : ids) { @@ -64,6 +68,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = Exception.class) public Boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) { From e2f5e6e37dc48550678aa93450eba67fe9e75f70 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, 29 Oct 2025 09:04:46 +0800 Subject: [PATCH 09/10] =?UTF-8?q?---=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pictc/utils/DataLogTools.java | 58 ++++++++++++++----- .../src/main/resources/bootstrap.yml | 2 +- 2 files changed, 46 insertions(+), 14 deletions(-) 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 335a968..bdca6ed 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 @@ -27,6 +27,8 @@ import java.util.Map.Entry; import java.util.Objects; import java.util.Set; import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collector; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -723,6 +725,27 @@ public class DataLogTools { return null; } + /** + * @Description: 判断是否有子表数据日志 + * @param item + * @param pidMap + * @return boolean 返回类型 + */ + private static boolean hasChild(DataChangeLog item,Map> pidMap) { + if(!pidMap.containsKey(item.getId())) { + return false; + } + boolean flag = false; + List childs = pidMap.get(item.getId()); + for (DataChangeLog child : childs) { + if(child.hasFieldChanges() || hasChild(child,pidMap)) { + flag = true; + break; + } + } + return flag; + } + /** * @Description: 保存数据日志 @@ -734,20 +757,29 @@ public class DataLogTools { initTable(tableName); String sql = parseSql(SQL_INSERT, tableName); List> batchParams = CollectionUtils.newArrayList(); - for (DataChangeLog log : logs) { + Map> pidMap = logs.stream().collect(Collectors.groupingBy(DataChangeLog::getPid)); + + + + for (DataChangeLog item : logs) { + //没有改变的属性，且没有子表修改时跳过 + if(!item.hasFieldChanges() && !hasChild(item, pidMap)) { + continue; + } + List params = CollectionUtils.newArrayList(); - params.add(JdbcParam.of(Types.VARCHAR,String.class, log.getId())); - params.add(JdbcParam.of(Types.VARCHAR,String.class, log.getFlowId())); - params.add(JdbcParam.of(Types.VARCHAR,String.class, log.getPid())); - params.add(JdbcParam.of(Types.VARCHAR,String.class, log.getEntityClassName())); - params.add(JdbcParam.of(Types.VARCHAR,String.class, log.getBusName())); - params.add(JdbcParam.of(Types.BIGINT,long.class, log.getEntityId())); - params.add(JdbcParam.of(Types.VARCHAR,String.class,JSON.toJSONString(log.getFieldChanges()))); - params.add(JdbcParam.of(Types.VARCHAR,String.class,log.getOperationType().name())); - params.add(JdbcParam.of(Types.VARCHAR,long.class,log.getOperatorId())); - params.add(JdbcParam.of(Types.VARCHAR,String.class,log.getOperatorName())); - params.add(JdbcParam.of(Types.TIMESTAMP,Timestamp.class,log.getOperationTime())); - params.add(JdbcParam.of(Types.VARCHAR,String.class,log.getOperationIp())); + params.add(JdbcParam.of(Types.VARCHAR,String.class, item.getId())); + params.add(JdbcParam.of(Types.VARCHAR,String.class, item.getFlowId())); + params.add(JdbcParam.of(Types.VARCHAR,String.class, item.getPid())); + params.add(JdbcParam.of(Types.VARCHAR,String.class, item.getEntityClassName())); + params.add(JdbcParam.of(Types.VARCHAR,String.class, item.getBusName())); + params.add(JdbcParam.of(Types.BIGINT,long.class, item.getEntityId())); + params.add(JdbcParam.of(Types.VARCHAR,String.class,JSON.toJSONString(item.getFieldChanges()))); + params.add(JdbcParam.of(Types.VARCHAR,String.class,item.getOperationType().name())); + params.add(JdbcParam.of(Types.VARCHAR,long.class,item.getOperatorId())); + params.add(JdbcParam.of(Types.VARCHAR,String.class,item.getOperatorName())); + params.add(JdbcParam.of(Types.TIMESTAMP,Timestamp.class,item.getOperationTime())); + params.add(JdbcParam.of(Types.VARCHAR,String.class,item.getOperationIp())); batchParams.add(params); } executeBatch(sql, batchParams); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml index 656ae61..b7c7902 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: main: allow-bean-definition-overriding: true profiles: - active: remote + active: dev cloud: nacos: #nacos监控 config: From 17e5dd1a2e1485cc3c688e5389b099da78795957 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 29 Oct 2025 11:06:19 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java | 4 ++-- .../module/mdm/service/impl/CountryRegionServiceImpl.java | 2 +- .../module/mdm/service/impl/ExpenseNameServiceImpl.java | 2 +- .../mdm/service/impl/PipeGasDownloadPointServiceImpl.java | 2 +- .../module/mdm/service/impl/PipelineGgasLineServiceImpl.java | 2 +- .../xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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 be572a2..06bbf3a 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 @@ -78,9 +78,9 @@ public class BankServiceImpl extends ServiceImpl imple @Transactional(rollbackFor = Exception.class) public boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); - + for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_BANK, id); + String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_BANK, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } 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 2c53742..194cbf0 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 @@ -76,7 +76,7 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.disable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_REGION, id); + String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_REGION, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } 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/ExpenseNameServiceImpl.java index 7ed51f6..38ca4dc 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/ExpenseNameServiceImpl.java @@ -72,7 +72,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl public Boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_FEE, id); + String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_FEE, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java index f05d157..c23cd1b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java @@ -80,7 +80,7 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl impl public Boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_TAX, id); + String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_TAX, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); }