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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
t-shunyi.kuang
2025-11-04 18:13:20 +08:00
parent 17ebe4463c 82fbaa4f25
commit 382cd30c79
27 changed files with 973 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ public class BankController {
@ApiOperation(value = "启用")
@SaCheckPermission("bank:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(bankService.enable(ids));
return R.ok(dataService.enable(UpdateLngBBankDto.class,ids));
}
@ -160,7 +160,7 @@ public class BankController {
@ApiOperation(value = "禁用")
@SaCheckPermission("bank:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(bankService.disable(ids));
return R.ok(dataService.disable(UpdateLngBBankDto.class,ids));
}
private void setRegionName(List<LngBBankPageVo> list) {

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

@ -102,13 +102,13 @@ public class CategoryController {
@ApiOperation(value = "启用LngBCategory")
@SaCheckPermission("category:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(categoryService.enable(ids));
return R.ok(dataService.enable(UpdateLngBCategoryDto.class,ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用LngBCategory")
@SaCheckPermission("category:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(categoryService.disable(ids));
return R.ok(dataService.disable(UpdateLngBCategoryDto.class,ids));
}
}

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

@ -121,7 +121,6 @@ public class CountryRegionController {
@SaCheckPermission("countryRegion:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngBRegionDto.class, ids));
}
@ -156,8 +155,7 @@ public class CountryRegionController {
@ApiOperation(value = "启用")
@SaCheckPermission("countryRegion:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(countryRegionService.enable(ids));
return R.ok(dataService.enable(UpdateLngBRegionDto.class,ids));
}
@ -165,7 +163,7 @@ public class CountryRegionController {
@ApiOperation(value = "禁用")
@SaCheckPermission("countryRegion:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(countryRegionService.disable(ids));
return R.ok(dataService.disable(UpdateLngBRegionDto.class,ids));
}
@GetMapping("/child")

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

@ -105,13 +105,13 @@ public class CurrencyController {
@ApiOperation(value = "启用LngBCurrency")
@SaCheckPermission("currency:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(currencyService.enable(ids));
return R.ok(dataService.enable(UpdateLngBCurrencyDto.class,ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用LngBCurrency")
@SaCheckPermission("currency:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(currencyService.disable(ids));
return R.ok(dataService.disable(UpdateLngBCurrencyDto.class,ids));
}
}

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

@ -1,8 +1,18 @@
package com.xjrsoft.module.mdm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xjrsoft.common.model.result.R;
@ -17,13 +27,13 @@ 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.mdm.vo.LngBDocCpVo;
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 java.util.List;
/**
* @title: 公司资质证书
@ -103,13 +113,13 @@ public class DocCpController {
@ApiOperation(value = "启用LngBDocCp")
@SaCheckPermission("docCp:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(docCpService.enable(ids));
return R.ok(dataService.enable(UpdateLngBDocCpDto.class,ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用LngBDocCp")
@SaCheckPermission("docCp:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(docCpService.disable(ids));
return R.ok(dataService.disable(UpdateLngBDocCpDto.class,ids));
}
}

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

@ -115,7 +115,7 @@ public class FeeController {
@ApiOperation(value = "启用")
@SaCheckPermission("fee:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(feeService.enable(ids));
return R.ok(dataService.enable(UpdateLngBFeeDto.class,ids));
}
@ -123,7 +123,7 @@ public class FeeController {
@ApiOperation(value = "禁用")
@SaCheckPermission("fee:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(feeService.disable(ids));
return R.ok(dataService.disable(UpdateLngBFeeDto.class,ids));
}
}

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

@ -1,8 +1,18 @@
package com.xjrsoft.module.mdm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pictc.utils.CollectionUtils;
@ -16,16 +26,15 @@ import com.xjrsoft.module.mdm.dto.LngBStationLngPageDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBStationLngDto;
import com.xjrsoft.module.mdm.entity.LngBStationLng;
import com.xjrsoft.module.mdm.service.ILNGStationService;
import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo;
import com.xjrsoft.module.mdm.vo.LngBStationLngPageVo;
import com.xjrsoft.module.mdm.vo.LngBStationLngVo;
import 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 java.util.List;
/**
* @title: LNG气源地
@ -103,14 +112,14 @@ public class LNGStationController {
@ApiOperation(value = "启用LngBStationLng")
@SaCheckPermission("lNGStation:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(lNGStationService.enable(ids));
return R.ok(dataService.enable(UpdateLngBStationLngDto.class,ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用LngBStationLng")
@SaCheckPermission("lNGStation:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(lNGStationService.disable(ids));
return R.ok(dataService.disable(UpdateLngBStationLngDto.class,ids));
}
@GetMapping(value = "/list")

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

@ -124,7 +124,7 @@ public class PipeGasDownloadPointController {
@ApiOperation(value = "启用")
@SaCheckPermission("pipeGasDownloadPoint:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(pipeGasDownloadPointService.enable(ids));
return R.ok(dataService.enable(UpdateLngBStationPngDto.class,ids));
}
@ -132,7 +132,7 @@ public class PipeGasDownloadPointController {
@ApiOperation(value = "禁用")
@SaCheckPermission("pipeGasDownloadPoint:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(pipeGasDownloadPointService.disable(ids));
return R.ok(dataService.disable(UpdateLngBStationPngDto.class,ids));
}
@GetMapping(value = "/datalog")

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

@ -110,7 +110,7 @@ public class PipelineGgasLineController {
@ApiOperation(value = "启用")
@SaCheckPermission("pipelineGgasLine:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(pipelineGgasLineService.enable(ids));
return R.ok(dataService.enable(UpdateLngBPngLineDto.class,ids));
}
@ -118,7 +118,7 @@ public class PipelineGgasLineController {
@ApiOperation(value = "禁用")
@SaCheckPermission("pipelineGgasLine:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(pipelineGgasLineService.disable(ids));
return R.ok(dataService.disable(UpdateLngBPngLineDto.class,ids));
}
@GetMapping(value = "/datalog")

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

@ -1,8 +1,18 @@
package com.xjrsoft.module.mdm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xjrsoft.common.model.result.R;
@ -17,13 +27,13 @@ import com.xjrsoft.module.mdm.entity.LngBPort;
import com.xjrsoft.module.mdm.service.IPortService;
import com.xjrsoft.module.mdm.vo.LngBPortPageVo;
import com.xjrsoft.module.mdm.vo.LngBPortVo;
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 java.util.List;
/**
* @title: 港口
@ -105,13 +115,13 @@ public class PortController {
@ApiOperation(value = "启用LngBPort")
@SaCheckPermission("port:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(portService.enable(ids));
return R.ok(dataService.enable(UpdateLngBPortDto.class,ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用LngBPort")
@SaCheckPermission("port:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(portService.disable(ids));
return R.ok(dataService.disable(UpdateLngBPortDto.class,ids));
}
}

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

@ -1,8 +1,18 @@
package com.xjrsoft.module.mdm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xjrsoft.common.model.result.R;
@ -17,13 +27,13 @@ import com.xjrsoft.module.mdm.entity.LngBPriceTerm;
import com.xjrsoft.module.mdm.service.IPriceTermsService;
import com.xjrsoft.module.mdm.vo.LngBPriceTermPageVo;
import com.xjrsoft.module.mdm.vo.LngBPriceTermVo;
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 java.util.List;
/**
* @title: 价格条款管理
@ -105,13 +115,13 @@ public class PriceTermsController {
@ApiOperation(value = "启用LngBPriceTerm")
@SaCheckPermission("priceTerms:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(priceTermsService.enable(ids));
return R.ok(dataService.enable(UpdateLngBPriceTermDto.class,ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用LngBPriceTerm")
@SaCheckPermission("priceTerms:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(priceTermsService.disable(ids));
return R.ok(dataService.disable(UpdateLngBPriceTermDto.class,ids));
}
}

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

@ -1,38 +1,40 @@
package com.xjrsoft.module.mdm.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.xjrsoft.common.constant.GlobalConstant;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.mdm.dto.AddLngBTaxDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto;
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.LngBTaxPageDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto;
import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto;
import com.xjrsoft.module.mdm.entity.LngBTax;
import com.xjrsoft.module.mdm.service.ITaxRateService;
import com.xjrsoft.module.mdm.vo.LngBTaxPageVo;
import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.mdm.vo.LngBTaxVo;
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 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: 税率
@ -115,7 +117,7 @@ public class TaxRateController {
@ApiOperation(value = "启用")
@SaCheckPermission("taxRate:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(taxRateService.enable(ids));
return R.ok(dataService.enable(UpdateLngBTaxDto.class,ids));
}
@ -123,7 +125,7 @@ public class TaxRateController {
@ApiOperation(value = "禁用")
@SaCheckPermission("taxRate:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(taxRateService.disable(ids));
return R.ok(dataService.disable(UpdateLngBTaxDto.class,ids));
}
}

2
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/java/com/xjrsoft/ITCMdmApplication.java
View File

@ -1,5 +1,6 @@
package com.xjrsoft;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
@ -14,6 +15,7 @@ import com.xjrsoft.common.annotation.UniqueNameGenerator;
* 主数据服务---开发使用
* 使用时集成到其它模块使用，不作为单独的服务
*/
@MapperScan("com.xjrsoft.module.*.mapper")
@SpringBootApplication
@EnableAspectJAutoProxy(exposeProxy = true)
@ComponentScan(nameGenerator = UniqueNameGenerator.class)