From 89a3781fab0dafd0bf349ba92c7d3ed398ab751f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Mon, 27 Oct 2025 10:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E8=B5=84=E8=B4=A8=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E3=80=81=E5=93=81=E7=A7=8D=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pictc/constant/TableNameConstants.java | 10 ++ .../mdm/controller/CategoryController.java | 63 +++++++------ .../mdm/controller/CurrencyController.java | 5 +- .../mdm/controller/DocCpController.java | 61 +++++++------ .../mdm/controller/LNGStationController.java | 4 +- .../module/mdm/controller/PortController.java | 5 +- .../mdm/controller/PriceTermsController.java | 5 +- .../module/mdm/service/ICategoryService.java | 15 ++- .../module/mdm/service/IDocCpService.java | 15 ++- .../mdm/service/impl/CategoryServiceImpl.java | 84 ++++++++++++++++- .../mdm/service/impl/DocCpServiceImpl.java | 91 ++++++++++++++++++- 11 files changed, 281 insertions(+), 77 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 77a777d..5a75ffb 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 @@ -27,6 +27,16 @@ public interface TableNameConstants { */ String LNG_B_STATION_LNG = "lng_b_station_lng"; + /** + * 公司资质证书表 + */ + String LNG_B_DOC_CP = "lng_b_doc_cp"; + + /** + * 品种表 + */ + String LNG_B_CATEGORY = "lng_b_category"; + /** * 银行表 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java index 9105575..c57b34e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java @@ -1,27 +1,21 @@ 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.AddLngBCategoryDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBCategoryDto; -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.LngBCategoryPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBCategoryDto; import com.xjrsoft.module.mdm.entity.LngBCategory; import com.xjrsoft.module.mdm.service.ICategoryService; import com.xjrsoft.module.mdm.vo.LngBCategoryPageVo; - -import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBCategoryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,7 +23,6 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -55,15 +48,11 @@ public class CategoryController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getFullName()),LngBCategory::getFullName,dto.getFullName()) - .like(StrUtil.isNotBlank(dto.getValid()),LngBCategory::getValid,dto.getValid()) - .like(StrUtil.isNotBlank(dto.getCode()),LngBCategory::getCode,dto.getCode()) - .like(StrUtil.isNotBlank(dto.getUnitCode()),LngBCategory::getUnitCode,dto.getUnitCode()) - .eq(ObjectUtil.isNotNull(dto.getCoefficient()),LngBCategory::getCoefficient,dto.getCoefficient()) - //.like(StrUtil.isNotBlank(dto.getSort()),LngBCategory::getSort,dto.getSort()) - .like(StrUtil.isNotBlank(dto.getNote()),LngBCategory::getNote,dto.getNote()) - .orderByDesc(LngBCategory::getId) - .select(LngBCategory.class,x -> VoToColumnUtil.fieldsToColumns(LngBCategoryPageVo.class).contains(x.getProperty())); + .like(StrUtil.isNotBlank(dto.getFullName()), LngBCategory::getFullName, dto.getFullName()) + .eq(StrUtil.isNotBlank(dto.getValid()), LngBCategory::getValid, dto.getValid()) + .orderByDesc(LngBCategory::getCode) + .select(LngBCategory.class,x -> VoToColumnUtil.fieldsToColumns(LngBCategoryPageVo.class) + .contains(x.getProperty())); IPage page = categoryService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBCategoryPageVo.class); return R.ok(pageOutput); @@ -79,29 +68,47 @@ public class CategoryController { } return R.ok(BeanUtil.toBean(lngBCategory, LngBCategoryVo.class)); } - - + @PostMapping @ApiOperation(value = "新增LngBCategory") @SaCheckPermission("category:add") public R add(@Valid @RequestBody UpdateLngBCategoryDto dto){ - UpdateLngBCategoryDto res = dataService.insert(dto); - return R.ok(res.getId()); + return R.ok(categoryService.add(dto)); } @PutMapping @ApiOperation(value = "修改LngBCategory") @SaCheckPermission("category:edit") public R update(@Valid @RequestBody UpdateLngBCategoryDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(categoryService.updateByDTO(dto)); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("category:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBCategoryDto.class, ids)); - + return R.ok(dataService.deleteByIds(UpdateLngBCategoryDto.class, ids)); } + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBCategory数据详细日志") + @SaCheckPermission("category:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBCategoryDto.class,id); + return R.ok(logs); + } + + @PostMapping("/enable") + @ApiOperation(value = "启用LngBCategory") + @SaCheckPermission("category:enable") + public R enable(@Valid @RequestBody List ids){ + return R.ok(categoryService.enable(ids)); + } + + @PostMapping("/disable") + @ApiOperation(value = "禁用LngBCategory") + @SaCheckPermission("category:disable") + public R disable(@Valid @RequestBody List ids){ + return R.ok(categoryService.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/controller/CurrencyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java index ef60ab8..bd5cf8e 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 @@ -49,8 +49,9 @@ public class CurrencyController { queryWrapper .and(StrUtil.isNotBlank(dto.getFullName()), r -> r.like(LngBCurrency::getCode, dto.getFullName()) - .or() - .like(LngBCurrency::getFullName, dto.getFullName())) + .or() + .like(LngBCurrency::getFullName, dto.getFullName()) + ) .eq(StrUtil.isNotBlank(dto.getValid()), LngBCurrency::getValid, dto.getValid()) .orderByAsc(LngBCurrency::getSort, LngBCurrency::getCode) .select(LngBCurrency.class,x -> VoToColumnUtil.fieldsToColumns(LngBCurrencyPageVo.class) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java index b2b086a..10e4050 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java @@ -1,27 +1,21 @@ 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.AddLngBDocCpDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBDocCpDto; -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.LngBDocCpPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBDocCpDto; import com.xjrsoft.module.mdm.entity.LngBDocCp; import com.xjrsoft.module.mdm.service.IDocCpService; import com.xjrsoft.module.mdm.vo.LngBDocCpPageVo; - -import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBDocCpVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,7 +23,6 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -55,16 +48,11 @@ public class DocCpController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getFullName()),LngBDocCp::getFullName,dto.getFullName()) - .like(StrUtil.isNotBlank(dto.getValid()),LngBDocCp::getValid,dto.getValid()) - .like(StrUtil.isNotBlank(dto.getCode()),LngBDocCp::getCode,dto.getCode()) - .like(StrUtil.isNotBlank(dto.getSuSign()),LngBDocCp::getSuSign,dto.getSuSign()) - .like(StrUtil.isNotBlank(dto.getSuNecSign()),LngBDocCp::getSuNecSign,dto.getSuNecSign()) - .like(StrUtil.isNotBlank(dto.getCuSign()),LngBDocCp::getCuSign,dto.getCuSign()) - .like(StrUtil.isNotBlank(dto.getCuNecSign()),LngBDocCp::getCuNecSign,dto.getCuNecSign()) - .like(StrUtil.isNotBlank(dto.getNote()),LngBDocCp::getNote,dto.getNote()) - .orderByDesc(LngBDocCp::getId) - .select(LngBDocCp.class,x -> VoToColumnUtil.fieldsToColumns(LngBDocCpPageVo.class).contains(x.getProperty())); + .like(StrUtil.isNotBlank(dto.getFullName()), LngBDocCp::getFullName, dto.getFullName()) + .eq(StrUtil.isNotBlank(dto.getValid()), LngBDocCp::getValid, dto.getValid()) + .orderByDesc(LngBDocCp::getCode) + .select(LngBDocCp.class,x -> VoToColumnUtil.fieldsToColumns(LngBDocCpPageVo.class) + .contains(x.getProperty())); IPage page = docCpService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBDocCpPageVo.class); return R.ok(pageOutput); @@ -86,23 +74,42 @@ public class DocCpController { @ApiOperation(value = "新增LngBDocCp") @SaCheckPermission("docCp:add") public R add(@Valid @RequestBody UpdateLngBDocCpDto dto){ - UpdateLngBDocCpDto res = dataService.insert(dto); - return R.ok(res.getId()); + return R.ok(docCpService.add(dto)); } @PutMapping @ApiOperation(value = "修改LngBDocCp") @SaCheckPermission("docCp:edit") public R update(@Valid @RequestBody UpdateLngBDocCpDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(docCpService.updateByDTO(dto)); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("docCp:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBDocCpDto.class, ids)); - + return R.ok(dataService.deleteByIds(UpdateLngBDocCpDto.class, ids)); } + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBDocCp数据详细日志") + @SaCheckPermission("docCp:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBDocCpDto.class,id); + return R.ok(logs); + } + + @PostMapping("/enable") + @ApiOperation(value = "启用LngBDocCp") + @SaCheckPermission("docCp:enable") + public R enable(@Valid @RequestBody List ids){ + return R.ok(docCpService.enable(ids)); + } + + @PostMapping("/disable") + @ApiOperation(value = "禁用LngBDocCp") + @SaCheckPermission("docCp:disable") + public R disable(@Valid @RequestBody List ids){ + return R.ok(docCpService.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/controller/LNGStationController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java index 476d03d..de2aa54 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 @@ -47,8 +47,8 @@ public class LNGStationController { public R page(@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()) + .like(StrUtil.isNotBlank(dto.getFullName()), LngBStationLng::getFullName, dto.getFullName()) + .eq(StrUtil.isNotBlank(dto.getValid()), LngBStationLng::getValid, dto.getValid()) .orderByAsc(LngBStationLng::getSort, LngBStationLng::getCode) .select(LngBStationLng.class,x -> VoToColumnUtil.fieldsToColumns(LngBStationLngPageVo.class) .contains(x.getProperty())); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java index 6889cf4..f56cf59 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java @@ -49,8 +49,9 @@ public class PortController { queryWrapper .and(StrUtil.isNotBlank(dto.getFullName()), r -> r.like(LngBPort::getShortName, dto.getFullName()) - .or() - .like(LngBPort::getFullName, dto.getFullName())) + .or() + .like(LngBPort::getFullName, dto.getFullName()) + ) .eq(StrUtil.isNotBlank(dto.getValid()), LngBPort::getValid, dto.getValid()) .orderByAsc(LngBPort::getSort, LngBPort::getCode) .select(LngBPort.class,x -> VoToColumnUtil.fieldsToColumns(LngBPortPageVo.class) 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 e8ae204..07b09b8 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 @@ -49,8 +49,9 @@ public class PriceTermsController { queryWrapper .and(StrUtil.isNotBlank(dto.getFullName()), r -> r.like(LngBPriceTerm::getCode, dto.getFullName()) - .or() - .like(LngBPriceTerm::getFullName, dto.getFullName())) + .or() + .like(LngBPriceTerm::getFullName, dto.getFullName()) + ) .eq(StrUtil.isNotBlank(dto.getValid()), LngBPriceTerm::getValid, dto.getValid()) .orderByAsc(LngBPriceTerm::getSort, LngBPriceTerm::getCode) .select(LngBPriceTerm.class,x -> VoToColumnUtil.fieldsToColumns(LngBPriceTermPageVo.class) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICategoryService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICategoryService.java index 05fa3e8..c74f606 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICategoryService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICategoryService.java @@ -1,11 +1,10 @@ package com.xjrsoft.module.mdm.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.mdm.dto.UpdateLngBCategoryDto; import com.xjrsoft.module.mdm.entity.LngBCategory; -import lombok.Data; + +import javax.validation.Valid; import java.util.List; /** @@ -16,4 +15,12 @@ import java.util.List; */ public interface ICategoryService extends IService { + + Long add(@Valid UpdateLngBCategoryDto dto); + + boolean updateByDTO(@Valid UpdateLngBCategoryDto dto); + + boolean enable(@Valid List ids); + + boolean disable(@Valid List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IDocCpService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IDocCpService.java index b8464b9..091f37f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IDocCpService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IDocCpService.java @@ -1,11 +1,10 @@ package com.xjrsoft.module.mdm.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.mdm.dto.UpdateLngBDocCpDto; import com.xjrsoft.module.mdm.entity.LngBDocCp; -import lombok.Data; + +import javax.validation.Valid; import java.util.List; /** @@ -16,4 +15,12 @@ import java.util.List; */ public interface IDocCpService extends IService { + + Long add(@Valid UpdateLngBDocCpDto dto); + + boolean updateByDTO(@Valid UpdateLngBDocCpDto dto); + + boolean enable(@Valid List ids); + + boolean disable(@Valid List ids); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CategoryServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CategoryServiceImpl.java index 00afd2f..b7d3244 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CategoryServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CategoryServiceImpl.java @@ -1,17 +1,25 @@ package com.xjrsoft.module.mdm.service.impl; +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; +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.mdm.dto.UpdateLngBCategoryDto; import com.xjrsoft.module.mdm.entity.LngBCategory; import com.xjrsoft.module.mdm.mapper.LngBCategoryMapper; import com.xjrsoft.module.mdm.service.ICategoryService; 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.toolkit.Wrappers; /** * @title: service @@ -22,4 +30,74 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class CategoryServiceImpl extends ServiceImpl implements ICategoryService { + + private final CommonCallService commonCallService; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long add(UpdateLngBCategoryDto dto) { + this.checkParams(dto); + UpdateLngBCategoryDto res = DataLogTools.insert(dto); + this.addOrUpdateAfter(res.getId()); + return res.getId(); + } + + private void checkParams(UpdateLngBCategoryDto dto) { + Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() + .eq(LngBCategory::getCode, dto.getCode()) + .ne(!Objects.isNull(dto.getId()), LngBCategory::getId, dto.getId())); + if (codeCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.CODE)); + } + Long nameCount = this.baseMapper.selectCount(new LambdaQueryWrapper() + .eq(LngBCategory::getFullName, dto.getFullName()) + .ne(!Objects.isNull(dto.getId()), LngBCategory::getId, dto.getId())); + if (nameCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.FULL_NAME)); + } + } + + private void addOrUpdateAfter(Long id) { + String msg = commonCallService.saveAfter(TableNameConstants.LNG_B_CATEGORY, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateByDTO(UpdateLngBCategoryDto dto) { + this.checkParams(dto); + DataLogTools.update(dto); + this.addOrUpdateAfter(dto.getId()); + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean enable(List ids) { + DataLogTools.enable(UpdateLngBCategoryDto.class, ids); + for (Long id : ids) { + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_CATEGORY, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean disable(List ids) { + DataLogTools.disable(UpdateLngBCategoryDto.class, ids); + for (Long id : ids) { + String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_CATEGORY, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/DocCpServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/DocCpServiceImpl.java index a850827..e53cee9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/DocCpServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/DocCpServiceImpl.java @@ -1,17 +1,26 @@ package com.xjrsoft.module.mdm.service.impl; +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; +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.mdm.dto.UpdateLngBDocCpDto; import com.xjrsoft.module.mdm.entity.LngBDocCp; import com.xjrsoft.module.mdm.mapper.LngBDocCpMapper; import com.xjrsoft.module.mdm.service.IDocCpService; +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.toolkit.Wrappers; /** * @title: service @@ -22,4 +31,80 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class DocCpServiceImpl extends ServiceImpl implements IDocCpService { + + private final CommonCallService commonCallService; + + private final ICodeRuleClient codeRuleClient; + + private final String DOCCPCODE = "docCpCode"; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long add(UpdateLngBDocCpDto dto) { + this.checkParams(dto); + dto.setCode(codeRuleClient.genEncode(DOCCPCODE)); + UpdateLngBDocCpDto res = DataLogTools.insert(dto); + codeRuleClient.useEncode(DOCCPCODE); + this.addOrUpdateAfter(res.getId()); + return res.getId(); + } + + private void checkParams(UpdateLngBDocCpDto dto) { + Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() + .eq(LngBDocCp::getCode, dto.getCode()) + .ne(!Objects.isNull(dto.getId()), LngBDocCp::getId, dto.getId())); + if (codeCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.CODE)); + } + Long nameCount = this.baseMapper.selectCount(new LambdaQueryWrapper() + .eq(LngBDocCp::getFullName, dto.getFullName()) + .ne(!Objects.isNull(dto.getId()), LngBDocCp::getId, dto.getId())); + if (nameCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.FULL_NAME)); + } + } + + private void addOrUpdateAfter(Long id) { + String msg = commonCallService.saveAfter(TableNameConstants.LNG_B_DOC_CP, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateByDTO(UpdateLngBDocCpDto dto) { + this.checkParams(dto); + DataLogTools.update(dto); + this.addOrUpdateAfter(dto.getId()); + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean enable(List ids) { + DataLogTools.enable(UpdateLngBDocCpDto.class, ids); + for (Long id : ids) { + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_DOC_CP, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean disable(List ids) { + DataLogTools.disable(UpdateLngBDocCpDto.class, ids); + for (Long id : ids) { + String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_DOC_CP, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; + } }