From 4e6d23991e28db955abf359c8115ab4ffe4443c1 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 24 Oct 2025 11:10:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=B8=AF=E5=8F=A3=20?= =?UTF-8?q?=E7=AD=89=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xjrsoft/module/mdm/controller/CategoryController.java | 2 +- .../com/xjrsoft/module/mdm/controller/LNGStationController.java | 2 +- .../java/com/xjrsoft/module/mdm/controller/PortController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java index 4b08ccf..9105575 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java @@ -60,7 +60,7 @@ public class CategoryController { .like(StrUtil.isNotBlank(dto.getCode()),LngBCategory::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getUnitCode()),LngBCategory::getUnitCode,dto.getUnitCode()) .eq(ObjectUtil.isNotNull(dto.getCoefficient()),LngBCategory::getCoefficient,dto.getCoefficient()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBCategory::getSort,dto.getSort()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBCategory::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBCategory::getNote,dto.getNote()) .orderByDesc(LngBCategory::getId) .select(LngBCategory.class,x -> VoToColumnUtil.fieldsToColumns(LngBCategoryPageVo.class).contains(x.getProperty())); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java index 2e72bd8..941a42a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java @@ -66,7 +66,7 @@ public class LNGStationController { .like(StrUtil.isNotBlank(dto.getAddrMail()),LngBStationLng::getAddrMail,dto.getAddrMail()) .like(StrUtil.isNotBlank(dto.getOwnSign()),LngBStationLng::getOwnSign,dto.getOwnSign()) .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngBStationLng::getOnlineSign,dto.getOnlineSign()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBStationLng::getSort,dto.getSort()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBStationLng::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBStationLng::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBStationLng::getNote,dto.getNote()) .orderByAsc(LngBStationLng::getCode) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java index 6dd95eb..db4204a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java @@ -67,7 +67,7 @@ public class PortController { .like(StrUtil.isNotBlank(dto.getLimit2()),LngBPort::getLimit2,dto.getLimit2()) .like(StrUtil.isNotBlank(dto.getLimit3()),LngBPort::getLimit3,dto.getLimit3()) .like(StrUtil.isNotBlank(dto.getLimit4()),LngBPort::getLimit4,dto.getLimit4()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBPort::getSort,dto.getSort()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBPort::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBPort::getNote,dto.getNote()) .orderByDesc(LngBPort::getId) .select(LngBPort.class,x -> VoToColumnUtil.fieldsToColumns(LngBPortPageVo.class).contains(x.getProperty())); From aacfefa6a879bafeb631430bde1e6846f4f048d5 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 24 Oct 2025 15:06:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=AE=A1=E9=81=93?= =?UTF-8?q?=E6=B0=94=E4=B8=8A=E8=BD=BD=E7=82=B9=E5=90=8E=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/mdm/dto/AddLngBPngLineDto.java | 80 ++++++++ .../module/mdm/dto/AddLngBStationPngDto.java | 134 ++++++++++++ .../module/mdm/dto/LngBPngLinePageDto.java | 60 ++++++ .../module/mdm/dto/LngBStationPngPageDto.java | 105 ++++++++++ .../module/mdm/dto/UpdateLngBPngLineDto.java | 100 +++++++++ .../mdm/dto/UpdateLngBStationPngDto.java | 163 +++++++++++++++ .../module/mdm/vo/LngBPngLinePageVo.java | 65 ++++++ .../xjrsoft/module/mdm/vo/LngBPngLineVo.java | 128 ++++++++++++ .../module/mdm/vo/LngBStationPngPageVo.java | 111 ++++++++++ .../module/mdm/vo/LngBStationPngVo.java | 191 +++++++++++++++++ .../controller/CountryRegionController.java | 4 +- .../PipeGasDownloadPointController.java | 116 +++++++++++ .../PipelineGgasLineController.java | 107 ++++++++++ .../module/mdm/entity/LngBPngLine.java | 140 +++++++++++++ .../module/mdm/entity/LngBStationPng.java | 194 ++++++++++++++++++ .../module/mdm/mapper/LngBPngLineMapper.java | 17 ++ .../mdm/mapper/LngBStationPngMapper.java | 17 ++ .../service/IPipeGasDownloadPointService.java | 19 ++ .../mdm/service/IPipelineGgasLineService.java | 19 ++ .../impl/PipeGasDownloadPointServiceImpl.java | 25 +++ .../impl/PipelineGgasLineServiceImpl.java | 25 +++ 21 files changed, 1818 insertions(+), 2 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPngLineDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBStationPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPngLinePageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBStationPngPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLineVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPngLine.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPngLineMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBStationPngMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPngLineDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPngLineDto.java new file mode 100644 index 0000000..fcdcc53 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPngLineDto.java @@ -0,0 +1,80 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 管道气管线 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_png_line",name="管道气管线") +public class AddLngBPngLineDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + @LogField(name="助记码(自动生成，4位，0001……)",index=0) + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + @LogField(name="名称(不能重复)",index=0) + private String fullName; + /** + * 自有管道标识(Y-是，N-否) + */ + @ApiModelProperty("自有管道标识(Y-是，N-否)") + @LogField(name="自有管道标识(Y-是，N-否)",index=0) + private String ownSign; + /** + * 自有接收站(惠州/阳江) + */ + @ApiModelProperty("自有接收站(惠州/阳江)") + @LogField(name="自有接收站(惠州/阳江)",index=0) + private String staCodeLng; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + @LogField(name="显示顺序",index=0) + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @LogField(name="有效标志(Y-有效，N-无效)",index=0) + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBStationPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBStationPngDto.java new file mode 100644 index 0000000..4227ef6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBStationPngDto.java @@ -0,0 +1,134 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + + + + +/** +* @title: 管道气上下载点 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_station_png",name="管道气上下载点") +public class AddLngBStationPngDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String code; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String fullName; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String pipelineCode; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String enterprise; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String contact; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String tel; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String email; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String regionCode; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String addr; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String addrMail; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String ownSign; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String staCodeLng; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String ownLineSign; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Short sort; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String valid; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private String note; + /** + * + */ + @ApiModelProperty("") + @LogField(name="",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPngLinePageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPngLinePageDto.java new file mode 100644 index 0000000..541fed5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPngLinePageDto.java @@ -0,0 +1,60 @@ +package com.xjrsoft.module.mdm.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBPngLinePageDto extends PageInput { + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + /** + * 自有管道标识(Y-是，N-否) + */ + @ApiModelProperty("自有管道标识(Y-是，N-否)") + private String ownSign; + /** + * 自有接收站(惠州/阳江) + */ + @ApiModelProperty("自有接收站(惠州/阳江)") + private String staCodeLng; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBStationPngPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBStationPngPageDto.java new file mode 100644 index 0000000..9dd7c3c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBStationPngPageDto.java @@ -0,0 +1,105 @@ +package com.xjrsoft.module.mdm.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBStationPngPageDto extends PageInput { + + /** + * + */ + @ApiModelProperty("") + private String code; + /** + * + */ + @ApiModelProperty("") + private String fullName; + /** + * + */ + @ApiModelProperty("") + private String pipelineCode; + /** + * + */ + @ApiModelProperty("") + private String enterprise; + /** + * + */ + @ApiModelProperty("") + private String contact; + /** + * + */ + @ApiModelProperty("") + private String tel; + /** + * + */ + @ApiModelProperty("") + private String email; + /** + * + */ + @ApiModelProperty("") + private String regionCode; + /** + * + */ + @ApiModelProperty("") + private String addr; + /** + * + */ + @ApiModelProperty("") + private String addrMail; + /** + * + */ + @ApiModelProperty("") + private String ownSign; + /** + * + */ + @ApiModelProperty("") + private String staCodeLng; + /** + * + */ + @ApiModelProperty("") + private String ownLineSign; + /** + * + */ + @ApiModelProperty("") + private Short sort; + /** + * + */ + @ApiModelProperty("") + private String valid; + /** + * + */ + @ApiModelProperty("") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java new file mode 100644 index 0000000..9088c5c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java @@ -0,0 +1,100 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 管道气管线 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_png_line",name="管道气管线") +public class UpdateLngBPngLineDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 助记码(自动生成，4位，0001……) + */ + @LogField(name="助记码(自动生成，4位，0001……)",index=1) + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + + /** + * 名称(不能重复) + */ + @LogField(name="名称(不能重复)",index=2) + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 自有管道标识(Y-是，N-否) + */ + @LogField(name="自有管道标识(Y-是，N-否)",index=3) + @ApiModelProperty("自有管道标识(Y-是，N-否)") + private String ownSign; + + /** + * 自有接收站(惠州/阳江) + */ + @LogField(name="自有接收站(惠州/阳江)",index=4) + @ApiModelProperty("自有接收站(惠州/阳江)") + private String staCodeLng; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=5) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @LogField(name="有效标志(Y-有效，N-无效)",index=6) + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @LogField(name="备注",index=7) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java new file mode 100644 index 0000000..23df4ba --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java @@ -0,0 +1,163 @@ +package com.xjrsoft.module.mdm.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 管道气上下载点 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_station_png",name="管道气上下载点") +public class UpdateLngBStationPngDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @LogField(name="",index=0) + @ApiModelProperty("") + private Long id; + + /** + * + */ + @LogField(name="",index=1) + @ApiModelProperty("") + private String code; + + /** + * + */ + @LogField(name="",index=2) + @ApiModelProperty("") + private String fullName; + + /** + * + */ + @LogField(name="",index=3) + @ApiModelProperty("") + private String pipelineCode; + + /** + * + */ + @LogField(name="",index=4) + @ApiModelProperty("") + private String enterprise; + + /** + * + */ + @LogField(name="",index=5) + @ApiModelProperty("") + private String contact; + + /** + * + */ + @LogField(name="",index=6) + @ApiModelProperty("") + private String tel; + + /** + * + */ + @LogField(name="",index=7) + @ApiModelProperty("") + private String email; + + /** + * + */ + @LogField(name="",index=8) + @ApiModelProperty("") + private String regionCode; + + /** + * + */ + @LogField(name="",index=9) + @ApiModelProperty("") + private String addr; + + /** + * + */ + @LogField(name="",index=10) + @ApiModelProperty("") + private String addrMail; + + /** + * + */ + @LogField(name="",index=11) + @ApiModelProperty("") + private String ownSign; + + /** + * + */ + @LogField(name="",index=12) + @ApiModelProperty("") + private String staCodeLng; + + /** + * + */ + @LogField(name="",index=13) + @ApiModelProperty("") + private String ownLineSign; + + /** + * + */ + @LogField(name="",index=14) + @ApiModelProperty("") + private Short sort; + + /** + * + */ + @LogField(name="",index=15) + @ApiModelProperty("") + private String valid; + + /** + * + */ + @LogField(name="",index=16) + @ApiModelProperty("") + private String note; + + /** + * + */ + @LogField(name="",index=17) + @ApiModelProperty("") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java new file mode 100644 index 0000000..13bc007 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java @@ -0,0 +1,65 @@ +package com.xjrsoft.module.mdm.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +public class LngBPngLinePageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 自有管道标识(Y-是，N-否) + */ + @ApiModelProperty("自有管道标识(Y-是，N-否)") + @Trans(type = TransType.DIC, id = "1978056598125330433") + private String ownSign; + /** + * 自有接收站(惠州/阳江) + */ + @ApiModelProperty("自有接收站(惠州/阳江)") + private String staCodeLng; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLineVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLineVo.java new file mode 100644 index 0000000..fa6110a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLineVo.java @@ -0,0 +1,128 @@ +package com.xjrsoft.module.mdm.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +public class LngBPngLineVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + + /** + * 自有管道标识(Y-是，N-否) + */ + @ApiModelProperty("自有管道标识(Y-是，N-否)") + private String ownSign; + + + /** + * 自有接收站(惠州/阳江) + */ + @ApiModelProperty("自有接收站(惠州/阳江)") + private String staCodeLng; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngPageVo.java new file mode 100644 index 0000000..0479fe8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngPageVo.java @@ -0,0 +1,111 @@ +package com.xjrsoft.module.mdm.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +public class LngBStationPngPageVo { + + /** + * + */ + @ApiModelProperty("") + private String id; + /** + * + */ + @ApiModelProperty("") + private String code; + /** + * + */ + @ApiModelProperty("") + private String fullName; + /** + * + */ + @ApiModelProperty("") + private String pipelineCode; + /** + * + */ + @ApiModelProperty("") + private String enterprise; + /** + * + */ + @ApiModelProperty("") + private String contact; + /** + * + */ + @ApiModelProperty("") + private String tel; + /** + * + */ + @ApiModelProperty("") + private String email; + /** + * + */ + @ApiModelProperty("") + private String regionCode; + /** + * + */ + @ApiModelProperty("") + private String addr; + /** + * + */ + @ApiModelProperty("") + private String addrMail; + /** + * + */ + @ApiModelProperty("") + @Trans(type = TransType.DIC, id = "1978056598125330433") + private String ownSign; + /** + * + */ + @ApiModelProperty("") + private String staCodeLng; + /** + * + */ + @ApiModelProperty("") + @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") + private String ownLineSign; + /** + * + */ + @ApiModelProperty("") + private Short sort; + /** + * + */ + @ApiModelProperty("") + @Trans(type = TransType.DIC, id = "1978057078528327681") + private String valid; + /** + * + */ + @ApiModelProperty("") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java new file mode 100644 index 0000000..9e3fe35 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java @@ -0,0 +1,191 @@ +package com.xjrsoft.module.mdm.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +public class LngBStationPngVo { + + /** + * + */ + @ApiModelProperty("") + private Long id; + + + /** + * + */ + @ApiModelProperty("") + private String code; + + + /** + * + */ + @ApiModelProperty("") + private String fullName; + + + /** + * + */ + @ApiModelProperty("") + private String pipelineCode; + + + /** + * + */ + @ApiModelProperty("") + private String enterprise; + + + /** + * + */ + @ApiModelProperty("") + private String contact; + + + /** + * + */ + @ApiModelProperty("") + private String tel; + + + /** + * + */ + @ApiModelProperty("") + private String email; + + + /** + * + */ + @ApiModelProperty("") + private String regionCode; + + + /** + * + */ + @ApiModelProperty("") + private String addr; + + + /** + * + */ + @ApiModelProperty("") + private String addrMail; + + + /** + * + */ + @ApiModelProperty("") + private String ownSign; + + + /** + * + */ + @ApiModelProperty("") + private String staCodeLng; + + + /** + * + */ + @ApiModelProperty("") + private String ownLineSign; + + + /** + * + */ + @ApiModelProperty("") + private Short sort; + + + /** + * + */ + @ApiModelProperty("") + private String valid; + + + /** + * + */ + @ApiModelProperty("") + private String note; + + + /** + * + */ + @ApiModelProperty("") + private Long createUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime createDate; + + + /** + * + */ + @ApiModelProperty("") + private Long modifyUserId; + + + /** + * + */ + @ApiModelProperty("") + private LocalDateTime modifyDate; + + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + + /** + * + */ + @ApiModelProperty("") + private Long deptId; + + + /** + * + */ + @ApiModelProperty("") + private Long ruleUserId; + + + + + +} 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 b2c1f74..f29f826 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 @@ -181,8 +181,8 @@ public class CountryRegionController { })); List voList = CollectionUtils.newArrayList(); - if(voList != null && voList.size() > 0) { - for(LngBRegionVo br:voList) { + if(voList != null && regionList.size() > 0) { + for(LngBRegion br:regionList) { LngBRegionVo vo = new LngBRegionVo(); BeanUtil.copyProperties(br, vo); Long parentId = br.getPid(); 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 new file mode 100644 index 0000000..4c9845c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java @@ -0,0 +1,116 @@ +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 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.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.AddLngBStationPngDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBStationPngPageDto; +import com.xjrsoft.module.mdm.entity.LngBStationPng; +import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService; +import com.xjrsoft.module.mdm.vo.LngBStationPngPageVo; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBStationPngVo; +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: 管道气上下载点 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/pipeGasDownloadPoint") +@Api(value = "/mdm" + "/pipeGasDownloadPoint",tags = "管道气上下载点代码") +@AllArgsConstructor +public class PipeGasDownloadPointController { + + + private final IPipeGasDownloadPointService pipeGasDownloadPointService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBStationPng列表(分页)") + @SaCheckPermission("pipeGasDownloadPoint:list") + public R page(@Valid LngBStationPngPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getCode()),LngBStationPng::getCode,dto.getCode()) + .like(StrUtil.isNotBlank(dto.getFullName()),LngBStationPng::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getPipelineCode()),LngBStationPng::getPipelineCode,dto.getPipelineCode()) + .like(StrUtil.isNotBlank(dto.getEnterprise()),LngBStationPng::getEnterprise,dto.getEnterprise()) + .like(StrUtil.isNotBlank(dto.getContact()),LngBStationPng::getContact,dto.getContact()) + .like(StrUtil.isNotBlank(dto.getTel()),LngBStationPng::getTel,dto.getTel()) + .like(StrUtil.isNotBlank(dto.getEmail()),LngBStationPng::getEmail,dto.getEmail()) + .like(StrUtil.isNotBlank(dto.getRegionCode()),LngBStationPng::getRegionCode,dto.getRegionCode()) + .like(StrUtil.isNotBlank(dto.getAddr()),LngBStationPng::getAddr,dto.getAddr()) + .like(StrUtil.isNotBlank(dto.getAddrMail()),LngBStationPng::getAddrMail,dto.getAddrMail()) + .like(StrUtil.isNotBlank(dto.getOwnSign()),LngBStationPng::getOwnSign,dto.getOwnSign()) + .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBStationPng::getStaCodeLng,dto.getStaCodeLng()) + .like(StrUtil.isNotBlank(dto.getOwnLineSign()),LngBStationPng::getOwnLineSign,dto.getOwnLineSign()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBStationPng::getSort,dto.getSort()) + .like(StrUtil.isNotBlank(dto.getValid()),LngBStationPng::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBStationPng::getNote,dto.getNote()) + .orderByDesc(LngBStationPng::getId) + .select(LngBStationPng.class,x -> VoToColumnUtil.fieldsToColumns(LngBStationPngPageVo.class).contains(x.getProperty())); + IPage page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBStationPngPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBStationPng信息") + @SaCheckPermission("pipeGasDownloadPoint:detail") + public R info(@RequestParam Long id){ + LngBStationPng lngBStationPng = pipeGasDownloadPointService.getById(id); + if (lngBStationPng == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBStationPng, LngBStationPngVo.class)); + } + + + @PostMapping + @ApiOperation(value = "新增LngBStationPng") + @SaCheckPermission("pipeGasDownloadPoint:add") + public R add(@Valid @RequestBody UpdateLngBStationPngDto dto){ + UpdateLngBStationPngDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBStationPng") + @SaCheckPermission("pipeGasDownloadPoint:edit") + public R update(@Valid @RequestBody UpdateLngBStationPngDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pipeGasDownloadPoint:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBStationPngDto.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/controller/PipelineGgasLineController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java new file mode 100644 index 0000000..e1e8d92 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java @@ -0,0 +1,107 @@ +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 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.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.mdm.dto.AddLngBPngLineDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBPngLinePageDto; +import com.xjrsoft.module.mdm.entity.LngBPngLine; +import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; +import com.xjrsoft.module.mdm.vo.LngBPngLinePageVo; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBPngLineVo; +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: 管道气管线 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/pipelineGgasLine") +@Api(value = "/mdm" + "/pipelineGgasLine",tags = "管道气管线代码") +@AllArgsConstructor +public class PipelineGgasLineController { + + + private final IPipelineGgasLineService pipelineGgasLineService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBPngLine列表(分页)") + @SaCheckPermission("pipelineGgasLine:list") + public R page(@Valid LngBPngLinePageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getFullName()),LngBPngLine::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getValid()),LngBPngLine::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getCode()),LngBPngLine::getCode,dto.getCode()) + .like(StrUtil.isNotBlank(dto.getOwnSign()),LngBPngLine::getOwnSign,dto.getOwnSign()) + .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBPngLine::getStaCodeLng,dto.getStaCodeLng()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBPngLine::getSort,dto.getSort()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBPngLine::getNote,dto.getNote()) + .orderByDesc(LngBPngLine::getId) + .select(LngBPngLine.class,x -> VoToColumnUtil.fieldsToColumns(LngBPngLinePageVo.class).contains(x.getProperty())); + IPage page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPngLinePageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBPngLine信息") + @SaCheckPermission("pipelineGgasLine:detail") + public R info(@RequestParam Long id){ + LngBPngLine lngBPngLine = pipelineGgasLineService.getById(id); + if (lngBPngLine == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBPngLine, LngBPngLineVo.class)); + } + + + @PostMapping + @ApiOperation(value = "新增LngBPngLine") + @SaCheckPermission("pipelineGgasLine:add") + public R add(@Valid @RequestBody UpdateLngBPngLineDto dto){ + UpdateLngBPngLineDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBPngLine") + @SaCheckPermission("pipelineGgasLine:edit") + public R update(@Valid @RequestBody UpdateLngBPngLineDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("pipelineGgasLine:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBPngLineDto.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/entity/LngBPngLine.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPngLine.java new file mode 100644 index 0000000..2f93271 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPngLine.java @@ -0,0 +1,140 @@ +package com.xjrsoft.module.mdm.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 管道气管线 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_png_line") +@ApiModel(value = "管道气管线对象", description = "管道气管线") +public class LngBPngLine implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 助记码(自动生成，4位，0001……) + */ + @ApiModelProperty("助记码(自动生成，4位，0001……)") + private String code; + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 自有管道标识(Y-是，N-否) + */ + @ApiModelProperty("自有管道标识(Y-是，N-否)") + private String ownSign; + + /** + * 自有接收站(惠州/阳江) + */ + @ApiModelProperty("自有接收站(惠州/阳江)") + private String staCodeLng; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 逻辑删除 + */ + @ApiModelProperty("逻辑删除") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java new file mode 100644 index 0000000..0abb2b8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java @@ -0,0 +1,194 @@ +package com.xjrsoft.module.mdm.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 管道气上下载点 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_station_png") +@ApiModel(value = "管道气上下载点对象", description = "管道气上下载点") +public class LngBStationPng implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @ApiModelProperty("") + @TableId + private Long id; + + /** + * + */ + @ApiModelProperty("") + private String code; + + /** + * + */ + @ApiModelProperty("") + private String fullName; + + /** + * + */ + @ApiModelProperty("") + private String pipelineCode; + + /** + * + */ + @ApiModelProperty("") + private String enterprise; + + /** + * + */ + @ApiModelProperty("") + private String contact; + + /** + * + */ + @ApiModelProperty("") + private String tel; + + /** + * + */ + @ApiModelProperty("") + private String email; + + /** + * + */ + @ApiModelProperty("") + private String regionCode; + + /** + * + */ + @ApiModelProperty("") + private String addr; + + /** + * + */ + @ApiModelProperty("") + private String addrMail; + + /** + * + */ + @ApiModelProperty("") + private String ownSign; + + /** + * + */ + @ApiModelProperty("") + private String staCodeLng; + + /** + * + */ + @ApiModelProperty("") + private String ownLineSign; + + /** + * + */ + @ApiModelProperty("") + private Short sort; + + /** + * + */ + @ApiModelProperty("") + private String valid; + + /** + * + */ + @ApiModelProperty("") + private String note; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * + */ + @ApiModelProperty("") + private Long tenantId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPngLineMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPngLineMapper.java new file mode 100644 index 0000000..da5d003 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPngLineMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.mdm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.mdm.entity.LngBPngLine; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Mapper +public interface LngBPngLineMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBStationPngMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBStationPngMapper.java new file mode 100644 index 0000000..3d1c475 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBStationPngMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.mdm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.mdm.entity.LngBStationPng; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Mapper +public interface LngBStationPngMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..1a86597 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java @@ -0,0 +1,19 @@ +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.LngBStationPng; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ + +public interface IPipeGasDownloadPointService extends IService { +} 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 new file mode 100644 index 0000000..a89acc9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java @@ -0,0 +1,19 @@ +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.LngBPngLine; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ + +public interface IPipelineGgasLineService extends IService { +} 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 new file mode 100644 index 0000000..9007d0a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.mdm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.mdm.entity.LngBStationPng; +import com.xjrsoft.module.mdm.mapper.LngBStationPngMapper; +import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService; +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 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PipeGasDownloadPointServiceImpl extends ServiceImpl implements IPipeGasDownloadPointService { +} 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 new file mode 100644 index 0000000..fc7a7ea --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.mdm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.mdm.entity.LngBPngLine; +import com.xjrsoft.module.mdm.mapper.LngBPngLineMapper; +import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; +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 +* @Author 管理员 +* @Date: 2025-10-24 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PipelineGgasLineServiceImpl extends ServiceImpl implements IPipelineGgasLineService { +} From 141da5498751336ff31592bf2f46b15196524c5e Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Fri, 24 Oct 2025 15:49:36 +0800 Subject: [PATCH 3/3] update --- .../pictc/constant/TableNameConstants.java | 11 +- .../PipeGasDownloadPointController.java | 72 +++++++++---- .../PipelineGgasLineController.java | 34 +++++- .../service/IPipeGasDownloadPointService.java | 18 ++-- .../mdm/service/IPipelineGgasLineService.java | 18 ++-- .../mdm/service/impl/BankServiceImpl.java | 10 +- .../impl/CountryRegionServiceImpl.java | 4 +- .../impl/PipeGasDownloadPointServiceImpl.java | 102 ++++++++++++++++-- .../impl/PipelineGgasLineServiceImpl.java | 95 ++++++++++++++++ 9 files changed, 309 insertions(+), 55 deletions(-) diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java index a942deb..8abd565 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java @@ -35,10 +35,19 @@ public interface TableNameConstants { /** - * 费用名称 + * 税率表 */ String LNG_B_TAX = "lng_b_tax"; + /** + * 管道气路线表 + */ + String LNG_B_PNG_LINE = "lng_b_png_line"; + + /** + * 管道气上下载点表 + */ + String LNG_B_STATION_PNG = "lng_b_station_png"; } 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 4c9845c..bcddd0a 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 @@ -1,36 +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.AddLngBStationPngDto; -import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto; -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.LngBStationPngPageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto; import com.xjrsoft.module.mdm.entity.LngBStationPng; import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService; import com.xjrsoft.module.mdm.vo.LngBStationPngPageVo; - -import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.vo.LngBStationPngVo; + +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: 管道气上下载点 @@ -39,7 +43,7 @@ import java.util.List; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/pipeGasDownloadPoint") +@RequestMapping("/mdm/pipeGasDownloadPoint") @Api(value = "/mdm" + "/pipeGasDownloadPoint",tags = "管道气上下载点代码") @AllArgsConstructor public class PipeGasDownloadPointController { @@ -94,23 +98,45 @@ public class PipeGasDownloadPointController { @ApiOperation(value = "新增LngBStationPng") @SaCheckPermission("pipeGasDownloadPoint:add") public R add(@Valid @RequestBody UpdateLngBStationPngDto dto){ - UpdateLngBStationPngDto res = dataService.insert(dto); - return R.ok(res.getId()); + return R.ok(pipeGasDownloadPointService.add(dto)); } @PutMapping @ApiOperation(value = "修改LngBStationPng") @SaCheckPermission("pipeGasDownloadPoint:edit") public R update(@Valid @RequestBody UpdateLngBStationPngDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(pipeGasDownloadPointService.update(dto)); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("pipeGasDownloadPoint:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBStationPngDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngBStationPngDto.class, ids)); } + + @PostMapping("/enable") + @ApiOperation(value = "启用") + @SaCheckPermission("pipeGasDownloadPoint:enable") + public R enable(@Valid @RequestBody List ids){ + return R.ok(pipeGasDownloadPointService.enable(ids)); + } + + + @PostMapping("/disable") + @ApiOperation(value = "禁用") + @SaCheckPermission("pipeGasDownloadPoint:disable") + public R disable(@Valid @RequestBody List ids){ + return R.ok(pipeGasDownloadPointService.disable(ids)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBStationPng数据详细日志") + @SaCheckPermission("pipeGasDownloadPoint:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + return R.ok(logs); + } } \ No newline at end of file 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 e1e8d92..432f785 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 @@ -17,11 +17,13 @@ import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; import cn.dev33.satoken.annotation.SaCheckPermission; import com.xjrsoft.module.mdm.dto.LngBPngLinePageDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; import com.xjrsoft.module.mdm.vo.LngBPngLinePageVo; import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.vo.LngBPngLineVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,7 +41,7 @@ import java.util.List; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/pipelineGgasLine") +@RequestMapping("/mdm/pipelineGgasLine") @Api(value = "/mdm" + "/pipelineGgasLine",tags = "管道气管线代码") @AllArgsConstructor public class PipelineGgasLineController { @@ -85,23 +87,45 @@ public class PipelineGgasLineController { @ApiOperation(value = "新增LngBPngLine") @SaCheckPermission("pipelineGgasLine:add") public R add(@Valid @RequestBody UpdateLngBPngLineDto dto){ - UpdateLngBPngLineDto res = dataService.insert(dto); - return R.ok(res.getId()); + return R.ok(pipelineGgasLineService.add(dto)); } @PutMapping @ApiOperation(value = "修改LngBPngLine") @SaCheckPermission("pipelineGgasLine:edit") public R update(@Valid @RequestBody UpdateLngBPngLineDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(pipelineGgasLineService.update(dto)); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("pipelineGgasLine:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngBPngLineDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngBPngLineDto.class, ids)); } + + @PostMapping("/enable") + @ApiOperation(value = "启用") + @SaCheckPermission("pipelineGgasLine:enable") + public R enable(@Valid @RequestBody List ids){ + return R.ok(pipelineGgasLineService.enable(ids)); + } + + + @PostMapping("/disable") + @ApiOperation(value = "禁用") + @SaCheckPermission("pipelineGgasLine:disable") + public R disable(@Valid @RequestBody List ids){ + return R.ok(pipelineGgasLineService.disable(ids)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngBPngLine数据详细日志") + @SaCheckPermission("pipelineGgasLine:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + return R.ok(logs); + } } \ No newline at end of file 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 1a86597..137a3cb 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,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.LngBStationPng; -import lombok.Data; 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; + /** * @title: service * @Author 管理员 @@ -16,4 +14,12 @@ import java.util.List; */ 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 a89acc9..b4e2048 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,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.LngBPngLine; -import lombok.Data; 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; + /** * @title: service * @Author 管理员 @@ -16,4 +14,12 @@ import java.util.List; */ public interface IPipelineGgasLineService extends IService { + + Boolean disable(List ids); + + Boolean enable(List ids); + + Long add(UpdateLngBPngLineDto dto); + + Long update(UpdateLngBPngLineDto dto); } 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 c0457e2..7469969 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 @@ -38,16 +38,16 @@ public class BankServiceImpl extends ServiceImpl imple private final ICodeRuleClient codeRuleClient; - private final String BANKCODE = "bankCode"; + private final String BANK_CODE = "bankCode"; @Override @Transactional(rollbackFor = Exception.class) public Long add(UpdateLngBBankDto dto) { - String code = codeRuleClient.genEncode(BANKCODE); + String code = codeRuleClient.genEncode(BANK_CODE); dto.setCode(code); this.checkParams(dto); UpdateLngBBankDto res = DataLogTools.insert(dto); - codeRuleClient.useEncode(BANKCODE); + codeRuleClient.useEncode(BANK_CODE); this.addOrUpdateAfter(res.getId()); return res.getId(); } @@ -65,7 +65,7 @@ public class BankServiceImpl extends ServiceImpl imple public boolean enable(List ids) { DataLogTools.enable(UpdateLngBBankDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_BANK, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } @@ -79,7 +79,7 @@ public class BankServiceImpl extends ServiceImpl imple DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + String msg = commonCallService.enableBefore(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 4aa6291..db41618 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 @@ -61,7 +61,7 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.enable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_REGION, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } @@ -74,7 +74,7 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.disable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { - String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_REGION, id); if (StringUtils.isNotBlank(msg)) { throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java index 9007d0a..ee39667 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,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.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; -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,82 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @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 + 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 + public Boolean disable(List ids) { + DataLogTools.disable(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; + } + + 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 fc7a7ea..305dd98 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 @@ -2,15 +2,31 @@ package com.xjrsoft.module.mdm.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.constant.FieldNameConstants; +import com.pictc.constant.TableNameConstants; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.utils.DataLogTools; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.common.db.service.CommonCallService; +import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto; +import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.entity.LngBPngLine; import com.xjrsoft.module.mdm.mapper.LngBPngLineMapper; import com.xjrsoft.module.mdm.service.IPipelineGgasLineService; +import com.xjrsoft.module.system.client.ICodeRuleClient; + import lombok.AllArgsConstructor; + +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** @@ -22,4 +38,83 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @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 + 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 Boolean disable(List ids) { + DataLogTools.disable(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; + } + + 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)); + } + } + }