diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/banner.txt b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/banner.txt deleted file mode 100644 index f0052df..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/banner.txt +++ /dev/null @@ -1,6 +0,0 @@ - ██████╗ ███████╗ ██████╗ ██╗████████╗ ██████╗ -██╔════╝ ██╔════╝██╔════╝ ██║╚══██╔══╝██╔════╝ -██║ ███╗█████╗ ██║ ███╗█████╗██║ ██║ ██║ -██║ ██║██╔══╝ ██║ ██║╚════╝██║ ██║ ██║ -╚██████╔╝███████╗╚██████╔╝ ██║ ██║ ╚██████╗ - ╚═════╝ ╚══════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝ \ No newline at end of file diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap-local.yml b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap-local.yml deleted file mode 100644 index f75a2a3..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap-local.yml +++ /dev/null @@ -1,49 +0,0 @@ -spring: - cloud: - nacos: #nacos监控 - config: - server-addr: 127.0.0.1:8848 # nacos 配置中心地址 - namespace: ITC-MS - group: DNE - username: nacos - password: nacos - extension-configs: - - data-id: global-local.yml - refresh: true - group: DNE - - - data-id: discovery-local.yml - refresh: true - group: DNE - - - data-id: datasource-local.yml - refresh: true - group: DNE - - - data-id: seata-local.yml - refresh: true - group: DNE - - - data-id: redis-local.yml - refresh: true - group: DNE - - - data-id: magic-api.yml - refresh: true - group: DNE - - - data-id: sa-token.yml - refresh: true - group: DNE - - - data-id: camunda.yml - refresh: true - group: DNE - - - data-id: sentinel-local.yml - refresh: true - group: DNE - -datalog: - db: - url: jdbc:kingbase8://127.0.0.1:54321/itc?currentSchema=dne_log_sit \ No newline at end of file diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml b/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml deleted file mode 100644 index 1a9a95d..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-service/target/classes/bootstrap.yml +++ /dev/null @@ -1,56 +0,0 @@ -server: - port: 8099 - -spring: - application: - name: demo-service - main: - allow-bean-definition-overriding: true - profiles: - active: remote - cloud: - nacos: #nacos监控 - config: - server-addr: 10.0.252.1:8848 # nacos 配置中心地址 - namespace: ITC-MS - group: DNE - username: nacos - password: Yudean@2025 - file-extension: yml # 默认配置 ${spring.application.name}-${spring.profiles.active}.${file-extension} - refresh-enabled: true - extension-configs: - - data-id: global.yml - refresh: true - group: DNE - - - data-id: discovery.yml - refresh: true - group: DNE - - - data-id: datasource.yml - refresh: true - group: DNE - - - data-id: seata.yml - refresh: true - group: DNE - - - data-id: redis.yml - refresh: true - group: DNE - - - data-id: magic-api.yml - refresh: true - group: DNE - - - data-id: sa-token.yml - refresh: true - group: DNE - - - data-id: camunda.yml - refresh: true - group: DNE - - - data-id: sentinel.yml - refresh: true - group: DNE diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/utils/CommonCallUtils.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/utils/CommonCallUtils.java index 82585e5..761e12d 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/utils/CommonCallUtils.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/utils/CommonCallUtils.java @@ -31,7 +31,8 @@ public class CommonCallUtils { * @return String 返回类型 函数返回非空、或者数据库异常时rollback，函数返回空时commit； */ public static String saveAfter(String table,long id) { - return callService.saveAfter(table, id); + String msg = callService.saveAfter(table, id); + return msg; } /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java index 2422533..3a47032 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java @@ -68,7 +68,7 @@ public class LngBBankPageVo { private Long ruleUserId; - + @ApiModelProperty("所属国家和地区名称") private String regionName; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionTreeVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionTreeVo.java index 3572c47..81f3c3c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionTreeVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBRegionTreeVo.java @@ -59,5 +59,10 @@ public class LngBRegionTreeVo implements ITreeNode, Ser private String valid; private List children; + + + private Boolean hasChild; + + private Boolean isLeaf; } 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 5ab413e..46beb38 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 @@ -5,6 +5,7 @@ import java.util.List; import javax.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -16,25 +17,29 @@ 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.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto; +import com.xjrsoft.module.common.db.utils.CommonCallUtils; 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.entity.LngBRegion; import com.xjrsoft.module.mdm.service.IBankService; -import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBBankPageVo; import com.xjrsoft.module.mdm.vo.LngBBankVo; +import com.xjrsoft.module.system.client.ICodeRuleClient; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -54,9 +59,12 @@ public class BankController { private final IBankService bankService; + private final DatalogService dataService; - private final ICountryRegionService regionService; + private final ICodeRuleClient codeRuleClient; + + private final String BANK_CODE = "bankCode"; @GetMapping(value = "/page") @ApiOperation(value="LngBBank列表(分页)") @@ -110,15 +118,34 @@ public class BankController { @ApiOperation(value = "新增LngBBank") @SaCheckPermission("bank:add") public R add(@Valid @RequestBody UpdateLngBBankDto dto){ - Long res = bankService.add(dto); - return R.ok(res); + + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngBBankDto before(DataOperationContent content) { + String code = codeRuleClient.genEncode(BANK_CODE); + dto.setCode(code); + return content.getObj(); + } + + @Override + public UpdateLngBBankDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + codeRuleClient.useEncode(BANK_CODE); + return content.getObj(); + } + })); + } @PutMapping @ApiOperation(value = "修改LngBBank") @SaCheckPermission("bank:edit") public R update(@Valid @RequestBody UpdateLngBBankDto dto){ - return R.ok(bankService.update(dto)); + return R.ok(dataService.updateById(dto)); } @DeleteMapping 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 685803c..ff68834 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 @@ -1,9 +1,14 @@ package com.xjrsoft.module.mdm.controller; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; import javax.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -16,20 +21,30 @@ 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.esotericsoftware.kryo.kryo5.minlog.Log; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; import com.pictc.enums.ValidEnum; import com.pictc.utils.CollectionUtils; import com.xjrsoft.common.constant.GlobalConstant; import com.xjrsoft.common.enums.YesOrNoEnum; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.CacheUtil; import com.xjrsoft.common.utils.TreeUtil; import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.common.db.utils.CommonCallUtils; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBRegionPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; import com.xjrsoft.module.mdm.entity.LngBRegion; +import com.xjrsoft.module.mdm.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo; @@ -42,6 +57,7 @@ import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import shade.powerjob.com.google.common.collect.Lists; /** * @title: 国家地区 @@ -103,17 +119,67 @@ public class CountryRegionController { @ApiOperation(value = "新增LngBRegion") @SaCheckPermission("countryRegion:add") public R add(@Valid @RequestBody UpdateLngBRegionDto dto){ - - Long res = countryRegionService.add(dto); - return R.ok(res); + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngBRegionDto before(DataOperationContent content) { + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } + return content.getObj(); + } + + @Override + public UpdateLngBRegionDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + refreshCahe(); + return content.getObj(); + } + })); + } @PutMapping @ApiOperation(value = "修改LngBRegion") @SaCheckPermission("countryRegion:edit") public R update(@Valid @RequestBody UpdateLngBRegionDto dto){ - - return R.ok(countryRegionService.update(dto)); + return R.ok(dataService.updateById(dto,new DataOperationListener() { + + @Override + public UpdateLngBRegionDto before(DataOperationContent content) { + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } + return content.getObj(); + } + + @Override + public UpdateLngBRegionDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + refreshCahe(); + return content.getObj(); + } + })); } @DeleteMapping @@ -184,7 +250,6 @@ public class CountryRegionController { .eq(pid != null, LngBRegion::getPid, pid) .eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode()) .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); })); @@ -209,4 +274,21 @@ public class CountryRegionController { return R.ok(voList); } + + @GetMapping("/getParentByCode") + @ApiOperation(value = "根据id 查询下级区域") + public R getRegionByParentId(@RequestParam(required = true) String code,@RequestParam(required = false) String excludeType + ) { + + return R.ok(countryRegionService.getRegionByParentId(code,excludeType)); + + } + + private void refreshCahe(){ + //异步更新 + + CompletableFuture.runAsync(() -> { + CacheUtil.refreshRegionList(); + }); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java index b8822ba..097fdb9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/FeeController.java @@ -42,7 +42,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/fee") +@RequestMapping("/mdm/fee") @Api(value = "/mdm" + "/fee",tags = "费用名称代码") @AllArgsConstructor public class FeeController { @@ -85,14 +85,14 @@ public class FeeController { @ApiOperation(value = "新增LngBFee") @SaCheckPermission("fee:add") public R add(@Valid @RequestBody UpdateLngBFeeDto dto){ - return R.ok(feeService.add(dto)); + return R.ok(dataService.insert(dto)); } @PutMapping @ApiOperation(value = "修改LngBFee") @SaCheckPermission("fee:edit") public R update(@Valid @RequestBody UpdateLngBFeeDto dto){ - return R.ok(feeService.update(dto)); + return R.ok(dataService.updateById(dto)); } @DeleteMapping 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 0579267..439dab0 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 @@ -4,6 +4,7 @@ import java.util.List; import javax.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -15,10 +16,16 @@ 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.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.common.db.utils.CommonCallUtils; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBStationPngPageDto; @@ -29,6 +36,7 @@ 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; +import com.xjrsoft.module.system.client.ICodeRuleClient; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; @@ -51,9 +59,14 @@ public class PipeGasDownloadPointController { private final IPipeGasDownloadPointService pipeGasDownloadPointService; + private final DatalogService dataService; private final IPipelineGgasLineService pipelineGgasLineService ; + + private final ICodeRuleClient codeRuleClient; + + private final String PNG_DL_POINT_CODE = "pngDlPointCode"; @GetMapping(value = "/page") @ApiOperation(value="LngBStationPng列表(分页)") @@ -70,7 +83,6 @@ public class PipeGasDownloadPointController { .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()) .orderByAsc(LngBStationPng::getSort,LngBStationPng::getCode) @@ -102,14 +114,33 @@ public class PipeGasDownloadPointController { @ApiOperation(value = "新增LngBStationPng") @SaCheckPermission("pipeGasDownloadPoint:add") public R add(@Valid @RequestBody UpdateLngBStationPngDto dto){ - return R.ok(pipeGasDownloadPointService.add(dto)); + + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngBStationPngDto before(DataOperationContent content) { + String code = codeRuleClient.genEncode(PNG_DL_POINT_CODE); + dto.setCode(code); + return content.getObj(); + } + + @Override + public UpdateLngBStationPngDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + codeRuleClient.useEncode(PNG_DL_POINT_CODE); + return content.getObj(); + } + })); } @PutMapping @ApiOperation(value = "修改LngBStationPng") @SaCheckPermission("pipeGasDownloadPoint:edit") public R update(@Valid @RequestBody UpdateLngBStationPngDto dto){ - return R.ok(pipeGasDownloadPointService.update(dto)); + return R.ok(dataService.updateById(dto)); } @DeleteMapping 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 c17a8ad..4ce5752 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 @@ -4,6 +4,7 @@ import java.util.List; import javax.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -15,10 +16,16 @@ 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.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.common.db.utils.CommonCallUtils; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBPngLinePageDto; @@ -27,6 +34,7 @@ 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.mdm.vo.LngBPngLineVo; +import com.xjrsoft.module.system.client.ICodeRuleClient; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; @@ -49,7 +57,12 @@ public class PipelineGgasLineController { private final IPipelineGgasLineService pipelineGgasLineService; - private final DatalogService dataService; + + private final DatalogService dataService; + + private final ICodeRuleClient codeRuleClient; + + private final String PNG_LINE_CODE = "pngLineCode"; @GetMapping(value = "/page") @ApiOperation(value="LngBPngLine列表(分页)") @@ -88,14 +101,33 @@ public class PipelineGgasLineController { @ApiOperation(value = "新增LngBPngLine") @SaCheckPermission("pipelineGgasLine:add") public R add(@Valid @RequestBody UpdateLngBPngLineDto dto){ - return R.ok(pipelineGgasLineService.add(dto)); + + return R.ok(dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngBPngLineDto before(DataOperationContent content) { + String code = codeRuleClient.genEncode(PNG_LINE_CODE); + dto.setCode(code); + return content.getObj(); + } + + @Override + public UpdateLngBPngLineDto after(DataOperationContent content) { + String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + codeRuleClient.useEncode(PNG_LINE_CODE); + return content.getObj(); + } + })); } @PutMapping @ApiOperation(value = "修改LngBPngLine") @SaCheckPermission("pipelineGgasLine:edit") public R update(@Valid @RequestBody UpdateLngBPngLineDto dto){ - return R.ok(pipelineGgasLineService.update(dto)); + return R.ok(dataService.updateById(dto)); } @DeleteMapping 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 afbee14..f992657 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 @@ -87,14 +87,14 @@ public class TaxRateController { @ApiOperation(value = "新增LngBTax") @SaCheckPermission("taxRate:add") public R add(@Valid @RequestBody UpdateLngBTaxDto dto){ - return R.ok(taxRateService.add(dto)); + return R.ok(dataService.insert(dto)); } @PutMapping @ApiOperation(value = "修改LngBTax") @SaCheckPermission("taxRate:edit") public R update(@Valid @RequestBody UpdateLngBTaxDto dto){ - return R.ok(taxRateService.update(dto)); + return R.ok(dataService.updateById(dto)); } @DeleteMapping @@ -117,7 +117,7 @@ public class TaxRateController { @ApiOperation(value = "启用") @SaCheckPermission("taxRate:enable") public R enable(@Valid @RequestBody List ids){ - return R.ok(dataService.enable(UpdateLngBTaxDto.class,ids)); + return R.ok(dataService.enable(UpdateLngBTaxDto.class,ids)); } @@ -125,7 +125,7 @@ public class TaxRateController { @ApiOperation(value = "禁用") @SaCheckPermission("taxRate:disable") public R disable(@Valid @RequestBody List ids){ - return R.ok(dataService.disable(UpdateLngBTaxDto.class,ids)); + return R.ok(dataService.disable(UpdateLngBTaxDto.class,ids)); } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java index 26e2c34..99ce120 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IBankService.java @@ -1,9 +1,6 @@ package com.xjrsoft.module.mdm.service; -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; /** @@ -15,11 +12,5 @@ import com.xjrsoft.module.mdm.entity.LngBBank; public interface IBankService extends IService { - Long add(UpdateLngBBankDto dto); - boolean enable(List ids); - - boolean disable(List ids); - - Long update(UpdateLngBBankDto dto); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java index 2e73d8a..5e98b9f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ICountryRegionService.java @@ -1,11 +1,8 @@ package com.xjrsoft.module.mdm.service; -import java.util.List; - -import javax.validation.Valid; +import java.util.Map; import com.baomidou.mybatisplus.extension.service.IService; -import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; import com.xjrsoft.module.mdm.entity.LngBRegion; /** @@ -17,11 +14,7 @@ import com.xjrsoft.module.mdm.entity.LngBRegion; public interface ICountryRegionService extends IService { - Long add(UpdateLngBRegionDto dto); - boolean enable(List ids); + Map getRegionByParentId(String code, String excludeType); - boolean disable(List ids); - - Long update(UpdateLngBRegionDto dto); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java index e5edff6..dcf2f4c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IFeeService.java @@ -1,9 +1,6 @@ package com.xjrsoft.module.mdm.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; import com.xjrsoft.module.mdm.entity.LngBFee; /** @@ -15,11 +12,4 @@ import com.xjrsoft.module.mdm.entity.LngBFee; public interface IFeeService extends IService { - Boolean enable(List ids); - - Boolean disable(List ids); - - Long update(UpdateLngBFeeDto dto); - - Long add(UpdateLngBFeeDto dto); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java index 137a3cb..478473f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java @@ -1,9 +1,6 @@ package com.xjrsoft.module.mdm.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto; import com.xjrsoft.module.mdm.entity.LngBStationPng; /** @@ -15,11 +12,6 @@ import com.xjrsoft.module.mdm.entity.LngBStationPng; public interface IPipeGasDownloadPointService extends IService { - Boolean enable(List ids); - Boolean disable(List ids); - Long add(UpdateLngBStationPngDto dto); - - Long update(UpdateLngBStationPngDto dto); } 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 0903448..5d71399 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 @@ -1,9 +1,6 @@ package com.xjrsoft.module.mdm.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; import com.xjrsoft.module.mdm.entity.LngBPngLine; /** @@ -15,13 +12,6 @@ import com.xjrsoft.module.mdm.entity.LngBPngLine; public interface IPipelineGgasLineService extends IService { - Boolean disable(List ids); - - Boolean enable(List ids); - - 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/ITaxRateService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITaxRateService.java index 960a1f9..3cfdd01 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITaxRateService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITaxRateService.java @@ -1,9 +1,6 @@ package com.xjrsoft.module.mdm.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto; import com.xjrsoft.module.mdm.entity.LngBTax; /** @@ -15,11 +12,5 @@ import com.xjrsoft.module.mdm.entity.LngBTax; public interface ITaxRateService extends IService { - Long add(UpdateLngBTaxDto dto); - Long update(UpdateLngBTaxDto dto); - - Boolean enable(List ids); - - Boolean disable(List ids); } 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 06bbf3a..448b5cc 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 @@ -1,25 +1,11 @@ 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.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.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; @@ -32,89 +18,6 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class BankServiceImpl extends ServiceImpl implements IBankService { - - private final CommonCallService commonCallService; - - private final ICodeRuleClient codeRuleClient; - - private final String BANK_CODE = "bankCode"; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long add(UpdateLngBBankDto dto) { - String code = codeRuleClient.genEncode(BANK_CODE); - dto.setCode(code); - this.checkParams(dto); - UpdateLngBBankDto res = DataLogTools.insert(dto); - codeRuleClient.useEncode(BANK_CODE); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long update(UpdateLngBBankDto dto) { - this.checkParams(dto); - UpdateLngBBankDto res = DataLogTools.update(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean enable(List ids) { - DataLogTools.enable(UpdateLngBBankDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_BANK, 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(UpdateLngBBankDto.class,ids); - - for (Long id : ids) { - String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_BANK, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - - return true; - } - - private void checkParams(UpdateLngBBankDto dto) { - Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBBank::getCode, dto.getCode()).ne(dto.getId() != null, LngBBank::getId, dto.getId())); - if (codeCount > 0) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, - FieldNameConstants.CODE)); - } - Long shortNameCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBBank::getShortName, dto.getShortName()).ne(dto.getId() != null, LngBBank::getId, dto.getId())); - if (shortNameCount > 0) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, - FieldNameConstants.SHORT_NAME)); - } - Long nameCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBBank::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBBank::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_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 832e49d..5e2eece 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -1,30 +1,29 @@ package com.xjrsoft.module.mdm.service.impl; +import java.util.Collections; +import java.util.HashMap; import java.util.List; -import java.util.concurrent.CompletableFuture; +import java.util.Map; +import java.util.stream.Collectors; 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.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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.common.utils.CacheUtil; -import com.xjrsoft.module.common.db.service.CommonCallService; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; +import com.pictc.utils.CollectionUtils; +import com.xjrsoft.common.constant.GlobalConstant; +import com.xjrsoft.common.utils.TreeUtil; import com.xjrsoft.module.mdm.entity.LngBRegion; import com.xjrsoft.module.mdm.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.mapper.LngBRegionMapper; import com.xjrsoft.module.mdm.service.ICountryRegionService; +import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo; +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; +import shade.powerjob.com.google.common.collect.Lists; /** * @title: service @@ -35,113 +34,65 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class CountryRegionServiceImpl extends ServiceImpl implements ICountryRegionService { - - private final CommonCallService commonCallService; - - private final DatalogService dataService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long add(UpdateLngBRegionDto dto) { - if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { - if(dto.getPid() != null && dto.getPid() != 0) { - LngBRegion parentRegion = this.getById(dto.getPid()); - if(parentRegion != null) { - dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); - } - } - }else { - dto.setFullPath(dto.getFullName()); - } - this.checkParams(dto); - UpdateLngBRegionDto res = DataLogTools.insert(dto); - this.addOrUpdateAfter(res.getId()); - refreshCahe(); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean enable(List ids) { - dataService.enable(UpdateLngBRegionDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_REGION, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - refreshCahe(); - return true; - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean disable(List ids) { - dataService.disable(UpdateLngBRegionDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_REGION, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - refreshCahe(); - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long update(UpdateLngBRegionDto dto) { - if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { - if(dto.getPid() != null && dto.getPid() != 0) { - LngBRegion parentRegion = this.getById(dto.getPid()); - if(parentRegion != null) { - dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); - } - } - }else { - dto.setFullPath(dto.getFullName()); - } - this.checkParams(dto); - UpdateLngBRegionDto res = DataLogTools.update(dto); - this.addOrUpdateAfter(res.getId()); - refreshCahe(); - return res.getId(); + public Map getRegionByParentId(String code,String excludeType) { + Map result = new HashMap<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(LngBRegion::getCode,code); + LngBRegion temp = this.getOne(queryWrapper); + if(temp == null) { + return result; + } + List codeList = CollectionUtils.newArrayList(); + + List allList = this.list(Wrappers.query() + .lambda().ne(StringUtils.isNotBlank(excludeType),LngBRegion::getRegionTypeCode, excludeType)); + Map map = allList.stream().collect(Collectors.toMap(LngBRegion::getId, + obj -> obj)); + if(map != null) { + codeList.add(code); + while(temp != null && temp.getPid() != null && !CountryRegionEnum.CONTINENT.getCode().equals(temp.getRegionTypeCode())) { + temp = map.get(temp.getPid()); + if(temp != null) { + codeList.add(temp.getCode()); + } + } + } + List voList = CollectionUtils.newArrayList(); + if(allList != null && allList.size() > 0) { + for(LngBRegion br:allList) { + LngBRegionTreeVo vo = new LngBRegionTreeVo(); + BeanUtil.copyProperties(br, vo); + + if(br.getPid() != null) { + vo.setParentId(String.valueOf(br.getPid()) ); + }else { + vo.setParentId(String.valueOf(GlobalConstant.FIRST_NODE_VALUE)); + } + voList.add(vo); + } + } + List treeVoList = TreeUtil.build(voList); + filterNode(treeVoList,codeList); + result.put("areaList", treeVoList); + Collections.reverse(codeList); + result.put("regionCode", codeList); + return result; } - - private void checkParams(UpdateLngBRegionDto dto) { - Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBRegion::getCode, dto.getCode()).ne(dto.getId() != null, LngBRegion::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(LngBRegion::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBRegion::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_REGION, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - - - private void refreshCahe(){ - - //异步更新 - - CompletableFuture.runAsync(() -> { - CacheUtil.refreshRegionList(); - }); - - } + private void filterNode(List treeVoList,List codeList) { + for(LngBRegionTreeVo tree:treeVoList) { + if( tree.getChildren() != null && tree.getChildren().size() > 0 ) { + tree.setIsLeaf(false); + if( !codeList.contains(tree.getCode())){ + tree.setChildren(Lists.newArrayList()); + } + filterNode(tree.getChildren(),codeList); + }else { + tree.setIsLeaf(true); + } + } + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java index ecbbb8b..64ebe4c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/FeeServiceImpl.java @@ -1,22 +1,8 @@ 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.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.UpdateLngBBankDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; import com.xjrsoft.module.mdm.entity.LngBFee; import com.xjrsoft.module.mdm.mapper.LngBFeeMapper; import com.xjrsoft.module.mdm.service.IFeeService; @@ -33,75 +19,6 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class FeeServiceImpl extends ServiceImpl implements IFeeService { - private final CommonCallService commonCallService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long add(UpdateLngBFeeDto dto) { - this.checkParams(dto); - UpdateLngBFeeDto res = DataLogTools.insert(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long update(UpdateLngBFeeDto dto) { - this.checkParams(dto); - UpdateLngBFeeDto res = DataLogTools.update(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean enable(List ids) { - DataLogTools.enable(UpdateLngBBankDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_FEE, 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(UpdateLngBBankDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_FEE, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - return true; - } - - private void checkParams(UpdateLngBFeeDto dto) { - Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBFee::getCode, dto.getCode()).ne(dto.getId() != null, LngBFee::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(LngBFee::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBFee::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_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 c23cd1b..acc41b8 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 @@ -1,25 +1,11 @@ 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.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.UpdateLngBStationPngDto; import com.xjrsoft.module.mdm.entity.LngBStationPng; import com.xjrsoft.module.mdm.mapper.LngBStationPngMapper; import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService; -import com.xjrsoft.module.system.client.ICodeRuleClient; import lombok.AllArgsConstructor; @@ -32,84 +18,10 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class PipeGasDownloadPointServiceImpl extends ServiceImpl implements IPipeGasDownloadPointService { - - private final CommonCallService commonCallService; - private final ICodeRuleClient codeRuleClient; - private final String PNG_DL_POINT_CODE = "pngDlPointCode"; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long add(UpdateLngBStationPngDto dto) { - String code = codeRuleClient.genEncode(PNG_DL_POINT_CODE); - dto.setCode(code); - this.checkParams(dto); - UpdateLngBStationPngDto res = DataLogTools.insert(dto); - codeRuleClient.useEncode(PNG_DL_POINT_CODE); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long update(UpdateLngBStationPngDto dto) { - this.checkParams(dto); - UpdateLngBStationPngDto res = DataLogTools.update(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean enable(List ids) { - DataLogTools.enable(UpdateLngBStationPngDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_STATION_PNG, 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(UpdateLngBStationPngDto.class,ids); - - for (Long id : ids) { - String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_STATION_PNG, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - - return true; - } - - private void checkParams(UpdateLngBStationPngDto dto) { - Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBStationPng::getCode, dto.getCode()).ne(dto.getId() != null, LngBStationPng::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(LngBStationPng::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBStationPng::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_STATION_PNG, 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/PipelineGgasLineServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java index b47e45b..7d8e77d 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 @@ -33,46 +33,6 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class PipelineGgasLineServiceImpl extends ServiceImpl implements IPipelineGgasLineService { - - private final CommonCallService commonCallService; - - private final ICodeRuleClient codeRuleClient; - - private final String PNG_LINE_CODE = "pngLineCode"; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long add(UpdateLngBPngLineDto dto) { - String code = codeRuleClient.genEncode(PNG_LINE_CODE); - dto.setCode(code); - this.checkParams(dto); - UpdateLngBPngLineDto res = DataLogTools.insert(dto); - codeRuleClient.useEncode(PNG_LINE_CODE); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long update(UpdateLngBPngLineDto dto) { - this.checkParams(dto); - UpdateLngBPngLineDto res = DataLogTools.update(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean enable(List ids) { - DataLogTools.enable(UpdateLngBPngLineDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PNG_LINE, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - return true; - } @Override public LngBPngLine getByCode(String code) { @@ -82,42 +42,6 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl ids) { - DataLogTools.disable(UpdateLngBPngLineDto.class,ids); - - for (Long id : ids) { - String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_PNG_LINE, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - - return true; - } - - private void checkParams(UpdateLngBPngLineDto dto) { - Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBPngLine::getCode, dto.getCode()).ne(dto.getId() != null, LngBPngLine::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(LngBPngLine::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBPngLine::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_PNG_LINE, 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/TaxRateServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java index 2e92052..19a1f12 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 @@ -1,22 +1,8 @@ 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.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.UpdateLngBBankDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto; import com.xjrsoft.module.mdm.entity.LngBTax; import com.xjrsoft.module.mdm.mapper.LngBTaxMapper; import com.xjrsoft.module.mdm.service.ITaxRateService; @@ -33,74 +19,5 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class TaxRateServiceImpl extends ServiceImpl implements ITaxRateService { - private final CommonCallService commonCallService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long add(UpdateLngBTaxDto dto) { - this.checkParams(dto); - UpdateLngBTaxDto res = DataLogTools.insert(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long update(UpdateLngBTaxDto dto) { - this.checkParams(dto); - UpdateLngBTaxDto res = DataLogTools.update(dto); - this.addOrUpdateAfter(res.getId()); - return res.getId(); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean enable(List ids) { - DataLogTools.enable(UpdateLngBTaxDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_TAX, 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(UpdateLngBBankDto.class,ids); - for (Long id : ids) { - String msg = commonCallService.disableBefore(TableNameConstants.LNG_B_TAX, id); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - } - return true; - } - - private void checkParams(UpdateLngBTaxDto dto) { - Long codeCount = this.baseMapper.selectCount(new LambdaQueryWrapper() - .eq(LngBTax::getCode, dto.getCode()).ne(dto.getId() != null, LngBTax::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(LngBTax::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBTax::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_TAX, 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-start/src/main/resources/bootstrap.yml b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap.yml index b7c7902..656ae61 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: dev + active: remote cloud: nacos: #nacos监控 config: