geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source 
# Conflicts:
#	itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPriceTermsService.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PriceTermsServiceImpl.java
This commit is contained in:
张秉卓
2025-10-23 10:14:56 +08:00
parent 286a3058e2 4bacf06ecf
commit 26cb8498a2
20 changed files with 334 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java
View File

@ -17,7 +17,6 @@ public interface FieldNameConstants {
*/
String FULL_NAME = "名称";
/**
* 本币
*/

11
itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java
View File

@ -17,5 +17,16 @@ public interface TableNameConstants {
*/
String LNG_B_CURRENCY = "lng_b_currency";
/**
* 银行表
*/
String LNG_B_BANK = "lng_b_bank";
/**
* 币种表
*/
String LNG_B_REGION = "lng_b_region";
}

5
itc-pcitc-dependencies/itc-pcitc-dependencies-api/target/maven-archiver/pom.properties
View File

@ -1,5 +0,0 @@
#Generated by Maven
#Tue Oct 21 16:19:00 CST 2025
version=2.0.4
groupId=com.geg
artifactId=itc-pcitc-dependencies-api

22
itc-pcitc-dependencies/itc-pcitc-dependencies-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View File

@ -1,22 +0,0 @@
com\pictc\enums\BSalesCode.class
com\pictc\annotations\datalog\LogField.class
com\pictc\annotations\datalog\LogTable.class
com\pictc\enums\BContractCode.class
com\pictc\annotations\datalog\JoinValueType.class
com\pictc\constant\ContractLiteflowRule.class
com\pictc\annotations\datalog\LogJoin.class
com\xjrsoft\module\datalog\vo\DataChangeLogDto.class
com\pictc\annotations\datalog\LogJoinColumn.class
com\pictc\annotations\datalog\ValueDirectionType.class
com\pictc\enums\BReserveCode.class
com\pictc\enums\ExceptionCommonCode.class
com\pictc\annotations\datalog\SourceType.class
com\xjrsoft\module\datalog\vo\OperationType.class
com\pictc\common\mybatis\JsonTypeHandler.class
com\pictc\enums\BusinessCode.class
com\pictc\enums\BTransportCode.class
com\xjrsoft\module\datalog\vo\FieldChangeDto.class
com\pictc\enums\BProcurementCode.class
com\pictc\enums\BFinanceCode.class
com\pictc\annotations\datalog\JoinCaseType.class
com\pictc\annotations\datalog\JoinType.class

22
itc-pcitc-dependencies/itc-pcitc-dependencies-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View File

@ -1,22 +0,0 @@
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\xjrsoft\module\datalog\vo\FieldChangeDto.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BProcurementCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BSalesCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\xjrsoft\module\datalog\vo\OperationType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BContractCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\JoinCaseType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BFinanceCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogField.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\JoinValueType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogJoin.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\JoinType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\common\mybatis\JsonTypeHandler.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BusinessCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\ExceptionCommonCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\xjrsoft\module\datalog\vo\DataChangeLogDto.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\ValueDirectionType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\SourceType.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogTable.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\constant\ContractLiteflowRule.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BTransportCode.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\annotations\datalog\LogJoinColumn.java
F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-dependencies\itc-pcitc-dependencies-api\src\main\java\com\pictc\enums\BReserveCode.java

4
itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java
View File

@ -317,7 +317,7 @@ public class DataLogTools {
T old = BeanUtils.newInstance(klazz);
BeanUtil.copyProperties(entity,old,true);
List<DataChangeLog> logs = CollectionUtils.newArrayList();
tabInfo.setFieldValue(entity,"valid",YesOrNoEnum.YES.getTextCode());
BeanUtils.setFieldValue("valid", YesOrNoEnum.YES.getTextCode(), entity);
mapper.updateById(entity);
T dto = (T)tabInfo.toDto(entity);
DataChangeLog datalog = createLog(klazz,OperationType.UPDATE);
@ -343,7 +343,7 @@ public class DataLogTools {
T old = BeanUtils.newInstance(klazz);
BeanUtil.copyProperties(entity,old,true);
List<DataChangeLog> logs = CollectionUtils.newArrayList();
tabInfo.setFieldValue(entity,"valid",YesOrNoEnum.NO.getTextCode());
BeanUtils.setFieldValue("valid",YesOrNoEnum.NO.getTextCode(), entity);
mapper.updateById(entity);
T dto = (T)tabInfo.toDto(entity);
DataChangeLog datalog = createLog(klazz,OperationType.UPDATE);

2
itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java
View File

@ -35,7 +35,7 @@ public class CommonCallService {
* @param id 表主键
* @return String 返回类型 函数返回非空、或者数据库异常时rollback，函数返回空时commit；
*/
public String saveAfter(String table,Long id) {
public String saveAfter(String table,long id) {
String sql = StringUtils.format("{? = call pc_{0}.f_save(?)}",table);
List<JdbcParam> params = ListUtils.newArrayList(JdbcParam.ofLong(id));
JdbcParam outParam = JdbcParam.ofString(null).setOut(true);

63
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionTreeVo.java Normal file
View File

@ -0,0 +1,63 @@
package com.xjrsoft.module.mdm.vo;
import java.io.Serializable;
import java.util.List;
import com.xjrsoft.common.model.tree.ITreeNode;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-10-22
* @Version 1.0
*/
@Data
public class LngBRegionTreeVo implements ITreeNode<LngBRegionTreeVo,String>, Serializable{
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 助记码
*/
@ApiModelProperty("助记码")
private String code;
/**
* 名称(不能重复)
*/
@ApiModelProperty("名称(不能重复)")
private String fullName;
/**
* 类型
*/
@ApiModelProperty("类型")
//@Trans(type = TransType.DIC, id = "1980458729324212226")
private String regionTypeCode;
/**
* 上级ID
*/
@ApiModelProperty("上级ID")
private Long pid;
@ApiModelProperty("上级ID")
private String parentId;
/**
* 全路径名称
*/
@ApiModelProperty("全路径名称")
private String fullPath;
/**
* 有效标志(Y-有效，N-无效)
*/
@ApiModelProperty("有效标志(Y-有效，N-无效)")
//@Trans(type = TransType.DIC, id = "1978057078528327681")
private String valid;
private List<LngBRegionTreeVo> children;
}

69
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java
View File

@ -1,40 +1,41 @@
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.ArrayList;
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.AddLngBBankDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.mdm.dto.LngBBankPageDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
import com.xjrsoft.module.mdm.entity.LngBBank;
import com.xjrsoft.module.mdm.service.IBankService;
import com.xjrsoft.module.mdm.vo.LngBBankPageVo;
import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
import java.util.stream.Collectors;
import java.util.ArrayList;
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.LngBBankVo;
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: 银行
@ -43,7 +44,7 @@ import java.util.List;
* @Version 1.0
*/
@RestController
@RequestMapping("/mdm" + "/bank")
@RequestMapping("/mdm/bank")
@Api(value = "/mdm" + "/bank",tags = "银行代码")
@AllArgsConstructor
public class BankController {
@ -97,8 +98,9 @@ public class BankController {
@ApiOperation(value = "新增LngBBank")
@SaCheckPermission("bank:add")
public R add(@Valid @RequestBody UpdateLngBBankDto dto){
UpdateLngBBankDto res = dataService.insert(dto);
return R.ok(res.getId());
Long res = bankService.add(dto);
return R.ok(res);
}
@PutMapping
@ -112,7 +114,7 @@ public class BankController {
@ApiOperation(value = "删除")
@SaCheckPermission("bank:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngBBankDto.class, ids));
return R.ok(dataService.deleteByIds(UpdateLngBBankDto.class, ids));
}
@ -130,4 +132,19 @@ public class BankController {
}
return R.ok(bankService.updateBatchById(toUpdateList));
}
@PostMapping("/enable")
@ApiOperation(value = "启用")
@SaCheckPermission("bank:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(bankService.enable(ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用")
@SaCheckPermission("bank:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(bankService.disable(ids));
}
}

48
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
View File

@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pictc.utils.CollectionUtils;
import com.xjrsoft.common.enums.YesOrNoEnum;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.utils.TreeUtil;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.datalog.entity.DataChangeLog;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.mdm.dto.LngBRegionPageDto;
@ -28,6 +30,7 @@ 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;
import com.xjrsoft.module.mdm.vo.LngBRegionVo;
import cn.dev33.satoken.annotation.SaCheckPermission;
@ -109,8 +112,8 @@ public class CountryRegionController {
}else {
dto.setFullPath(dto.getFullName());
}
UpdateLngBRegionDto res = dataService.insert(dto);
return R.ok(res.getId());
Long res = countryRegionService.add(dto);
return R.ok(res);
}
@PutMapping
@ -142,8 +145,41 @@ public class CountryRegionController {
@GetMapping(value = "/tree")
@ApiOperation(value = "LngBRegion树形结构")
//@SaCheckPermission("countryRegion:edit")
public R tree(@Valid @RequestBody UpdateLngBRegionDto dto){
return R.ok(null);
public R tree(){
LambdaQueryWrapper<LngBRegion> queryWrapper = new LambdaQueryWrapper<LngBRegion>();
queryWrapper.eq(LngBRegion::getValid,YesOrNoEnum.YES.getTextCode());
List<LngBRegion> list = countryRegionService.list(queryWrapper);
List<LngBRegionTreeVo> voList = CollectionUtils.newArrayList();
if(list != null && list.size() > 0) {
for(LngBRegion br:list) {
LngBRegionTreeVo vo = new LngBRegionTreeVo();
BeanUtil.copyProperties(br, vo);
if(br.getPid() != null) {
vo.setParentId(String.valueOf(br.getPid()) );
}else {
vo.setParentId("0");
}
voList.add(vo);
}
}
List<LngBRegionTreeVo> treeVoList = TreeUtil.build(voList);
return R.ok(treeVoList);
}
@PostMapping("/enable")
@ApiOperation(value = "启用")
@SaCheckPermission("countryRegion:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(countryRegionService.enable(ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用")
@SaCheckPermission("countryRegion:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(countryRegionService.disable(ids));
}
}

16
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java
View File

@ -1,13 +1,11 @@
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.entity.LngBBank;
import lombok.Data;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
import com.xjrsoft.module.mdm.entity.LngBBank;
/**
* @title: service
* @Author 管理员
@ -16,4 +14,10 @@ import java.util.List;
*/
public interface IBankService extends IService<LngBBank> {
Long add(UpdateLngBBankDto dto);
boolean enable(List<Long> ids);
boolean disable(List<Long> ids);
}

16
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java
View File

@ -1,13 +1,11 @@
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.entity.LngBRegion;
import lombok.Data;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto;
import com.xjrsoft.module.mdm.entity.LngBRegion;
/**
* @title: service
* @Author 管理员
@ -16,4 +14,10 @@ import java.util.List;
*/
public interface ICountryRegionService extends IService<LngBRegion> {
Long add(UpdateLngBRegionDto dto);
boolean enable(List<Long> ids);
boolean disable(List<Long> ids);
}

76
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java
View File

@ -1,17 +1,28 @@
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;
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;
import com.xjrsoft.module.mdm.service.IBankService;
import com.xjrsoft.module.system.client.ICodeRuleClient;
import lombok.AllArgsConstructor;
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 +33,55 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@Service
@AllArgsConstructor
public class BankServiceImpl extends ServiceImpl<LngBBankMapper, LngBBank> implements IBankService {
private final CommonCallService commonCallService;
private final DatalogService dataService;
private final ICodeRuleClient codeRuleClient;
@Override
@Transactional(rollbackFor = Exception.class)
public Long add(UpdateLngBBankDto dto) {
String code = codeRuleClient.genEncode("bankCode");
dto.setCode(code);
this.checkParams(dto);
UpdateLngBBankDto res = DataLogTools.insert(dto);
//this.addOrUpdateAfter(res.getId());
return res.getId();
}
@Override
public boolean enable(List<Long> ids) {
return dataService.disable(UpdateLngBBankDto.class,ids);
}
@Override
public boolean disable(List<Long> ids) {
return dataService.disable(UpdateLngBBankDto.class,ids);
}
private void checkParams(UpdateLngBBankDto dto) {
Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper<LngBBank>()
.eq(LngBBank::getCode, dto.getCode()));
if (codeCount > 0) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION,
FieldNameConstants.CODE));
}
Long nameCount = this.baseMapper.selectCount(new LambdaQueryWrapper<LngBBank>()
.eq(LngBBank::getFullName, dto.getFullName()));
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_BANK, id);
if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
}
}
}

71
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java
View File

@ -1,17 +1,27 @@
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;
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.UpdateLngBRegionDto;
import com.xjrsoft.module.mdm.entity.LngBRegion;
import com.xjrsoft.module.mdm.mapper.LngBRegionMapper;
import com.xjrsoft.module.mdm.service.ICountryRegionService;
import lombok.AllArgsConstructor;
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 +32,51 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@Service
@AllArgsConstructor
public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngBRegion> implements ICountryRegionService {
private final CommonCallService commonCallService;
private final DatalogService dataService;
@Override
@Transactional(rollbackFor = Exception.class)
public Long add(UpdateLngBRegionDto dto) {
this.checkParams(dto);
UpdateLngBRegionDto res = DataLogTools.insert(dto);
//this.addOrUpdateAfter(res.getId());
return res.getId();
}
@Override
public boolean enable(List<Long> ids) {
return dataService.disable(UpdateLngBRegionDto.class,ids);
}
@Override
public boolean disable(List<Long> ids) {
return dataService.disable(UpdateLngBRegionDto.class,ids);
}
private void checkParams(UpdateLngBRegionDto dto) {
Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper<LngBRegion>()
.eq(LngBRegion::getCode, dto.getCode()));
if (codeCount > 0) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION,
FieldNameConstants.CODE));
}
Long nameCount = this.baseMapper.selectCount(new LambdaQueryWrapper<LngBRegion>()
.eq(LngBRegion::getFullName, dto.getFullName()));
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_REGION, id);
if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
}
}
}

11
itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml
View File

@ -29,6 +29,7 @@
</dependency>
</dependencies>
<build>
<finalName>app</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@ -105,15 +106,7 @@
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.yml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.vm</include>
<include>**/*.ftl</include>
<include>**/*.jpg</include>
<include>**/*.png</include>
<include>**/*.xls</include>
<include>**/*.xlsx</include>
<include>**/*</include>
</includes>
<filtering>false</filtering>
</resource>

6
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/Dockerfile
View File

@ -1,5 +1,5 @@
#FROM --platform=linux/arm64 docker.ges.bjgastx.com/openjdk-arm64:8-jre
FROM docker.ges.bjgastx.com/jdk8u112:v1
FROM jdk8u112:v1
RUN mkdir -p /root/logs/java/ \
@ -23,9 +23,9 @@ ARG PRO_FILE
ARG SOURCE_NAME
ADD ./startApp.sh /opt/app/
RUN chmod u+x /opt/app/*.sh
RUN chmod u+x /opt/app/startApp.sh
ADD ./${SOURCE_NAME} /opt/app/app.jar
RUN test -f /opt/app/app.jar || { echo "Error: JAR file not found at ${SOURCE_NAME}"; exit 1; }
#RUN test -f /opt/app/app.jar || { echo "Error: JAR file not found at ${SOURCE_NAME}"; exit 1; }
#应用名称
ENV APP_NAME=itc-pcitc-mdm

2
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/docker-mdm.sh
View File

@ -3,7 +3,7 @@
# 定义变量
CONTAINER_NAME="itc-pcitc-mdm"
IMAGE_NAME="10.10.2.102/itc-pcitc-mdm"
IMAGE_VERSION="2025-08-04-0940"
IMAGE_VERSION="2025-10-22-0851"
IMAGE_FULL="$IMAGE_NAME:$IMAGE_VERSION"
PORT=8096 # 服务暴露端口
CONTAINER_PORT=8096 # 服务暴露端口

4
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/startApp.sh
View File

@ -31,8 +31,8 @@ else
export JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:CMSMaxAbortablePrecleanTime=5000"
export JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly"
export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:./logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps"
# 开发环境开启远程调试
#export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
# 开发环境开启远程调试
# export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
fi
# 公共配置（编码、时区等）

5
itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java Normal file
View File

@ -0,0 +1,5 @@
package com.xjrsoft.test;
public class CallTest {
}

6
pom.xml
View File

@ -30,6 +30,12 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<docker-registry>http://127.0.0.1:2375</docker-registry>
<maven.build.timestamp.format>yyyy-MM-dd-HHmm</maven.build.timestamp.format>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<docker-jar-name>${project.build.finalName}.jar</docker-jar-name>
</properties>
<dependencyManagement>