From 1249233b1e238eb433879ef9733e71ef69bcdff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= Date: Mon, 30 Mar 2026 09:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/AddLngInventoryPngNationDto.java | 105 ++++++++++ .../dto/AddLngInventoryPngZyDto.java | 115 +++++++++++ .../dto/LngInventoryPngNationPageDto.java | 30 +++ .../dto/LngInventoryPngZyPageDto.java | 30 +++ .../dto/UpdateLngInventoryPngNationDto.java | 147 +++++++++++++ .../dto/UpdateLngInventoryPngZyDto.java | 154 ++++++++++++++ .../vo/LngInventoryPngNationPageVo.java | 21 ++ .../inventory/vo/LngInventoryPngNationVo.java | 143 +++++++++++++ .../inventory/vo/LngInventoryPngZyPageVo.java | 21 ++ .../inventory/vo/LngInventoryPngZyVo.java | 154 ++++++++++++++ .../LngInventoryPngNaController.java | 139 +++++++++++++ .../LngInventoryPngZyController.java | 139 +++++++++++++ .../entity/LngInventoryPngNation.java | 187 +++++++++++++++++ .../inventory/entity/LngInventoryPngZy.java | 193 ++++++++++++++++++ .../mapper/LngInventoryPngNationMapper.java | 24 +++ .../mapper/LngInventoryPngZyMapper.java | 25 +++ .../service/ILngInventoryPngNaService.java | 17 ++ .../service/ILngInventoryPngZyService.java | 17 ++ .../impl/LngInventoryPngNaServiceImpl.java | 40 ++++ .../impl/LngInventoryPngZyServiceImpl.java | 40 ++++ 20 files changed, 1741 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngNationDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngZyDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngNationPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngZyPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngNationDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngZyDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngNaController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngZyController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngNation.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngZy.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngNationMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngZyMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngNaService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngZyService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngNaServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngZyServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngNationDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngNationDto.java new file mode 100644 index 0000000..a7c833f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngNationDto.java @@ -0,0 +1,105 @@ +package com.xjrsoft.module.inventory.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + + + + + +/** +* @title: 国网管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngInventoryPngNationDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 计量日期 + */ + @ApiModelProperty("计量日期") + private LocalDateTime dateMea; + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 前日管存(吉焦) + */ + @ApiModelProperty("前日管存(吉焦)") + private BigDecimal qtyBeginGj; + /** + * 当日上载量(吉焦) + */ + @ApiModelProperty("当日上载量(吉焦)") + private BigDecimal qtyInGj; + /** + * 当日下载量(吉焦) + */ + @ApiModelProperty("当日下载量(吉焦)") + private BigDecimal qtyOutGj; + /** + * 手工调整量(吉焦) + */ + @ApiModelProperty("手工调整量(吉焦)") + private BigDecimal qtyAdjGj; + /** + * 当日管存(吉焦) + */ + @ApiModelProperty("当日管存(吉焦)") + private BigDecimal qtyEndGj; + /** + * 前日管存(方) + */ + @ApiModelProperty("前日管存(方)") + private BigDecimal qtyBeginM3; + /** + * 当日上载量(方) + */ + @ApiModelProperty("当日上载量(方)") + private BigDecimal qtyInM3; + /** + * 当日下载量(方) + */ + @ApiModelProperty("当日下载量(方)") + private BigDecimal qtyOutM3; + /** + * 手工调整量(方) + */ + @ApiModelProperty("手工调整量(方)") + private BigDecimal qtyAdjM3; + /** + * 当日管存(方) + */ + @ApiModelProperty("当日管存(方)") + private BigDecimal qtyEndM3; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngZyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngZyDto.java new file mode 100644 index 0000000..9989e19 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/AddLngInventoryPngZyDto.java @@ -0,0 +1,115 @@ +package com.xjrsoft.module.inventory.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +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; + + + + + +/** +* @title: 自有管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddLngInventoryPngZyDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + /** + * 计量日期 + */ + @ApiModelProperty("计量日期") + private LocalDateTime dateMea; + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + /** + * 接收站(自有接收站) + */ + @ApiModelProperty("接收站(自有接收站)") + private String staCode; + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + /** + * 前日管存(吉焦) + */ + @ApiModelProperty("前日管存(吉焦)") + private BigDecimal qtyBeginGj; + /** + * 当日上载量(吉焦) + */ + @ApiModelProperty("当日上载量(吉焦)") + private BigDecimal qtyInGj; + /** + * 当日下载量(吉焦) + */ + @ApiModelProperty("当日下载量(吉焦)") + private BigDecimal qtyOutGj; + /** + * 手工调整量(吉焦) + */ + @ApiModelProperty("手工调整量(吉焦)") + private BigDecimal qtyAdjGj; + /** + * 当日管存(吉焦) + */ + @ApiModelProperty("当日管存(吉焦)") + private BigDecimal qtyEndGj; + /** + * 前日管存(方) + */ + @ApiModelProperty("前日管存(方)") + private BigDecimal qtyBeginM3; + /** + * 当日上载量(方) + */ + @ApiModelProperty("当日上载量(方)") + private BigDecimal qtyInM3; + /** + * 当日下载量(方) + */ + @ApiModelProperty("当日下载量(方)") + private BigDecimal qtyOutM3; + /** + * 手工调整量(方) + */ + @ApiModelProperty("手工调整量(方)") + private BigDecimal qtyAdjM3; + /** + * 当日管存(方) + */ + @ApiModelProperty("当日管存(方)") + private BigDecimal qtyEndM3; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngNationPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngNationPageDto.java new file mode 100644 index 0000000..b25f43a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngNationPageDto.java @@ -0,0 +1,30 @@ +package com.xjrsoft.module.inventory.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: 2026-03-23 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngInventoryPngNationPageDto extends PageInput { + + /** + * 主键(雪花算法，业务标识+Id) + */ + @ApiModelProperty("主键(雪花算法，业务标识+Id)") + private Long id; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngZyPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngZyPageDto.java new file mode 100644 index 0000000..e87c317 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/LngInventoryPngZyPageDto.java @@ -0,0 +1,30 @@ +package com.xjrsoft.module.inventory.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: 2026-03-23 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngInventoryPngZyPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngNationDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngNationDto.java new file mode 100644 index 0000000..d23d88b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngNationDto.java @@ -0,0 +1,147 @@ +package com.xjrsoft.module.inventory.dto; + +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.common.model.base.BaseModel; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + + +/** +* @title: 国网管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_inventory_png_nation",name="国网管存") +public class UpdateLngInventoryPngNationDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键(雪花算法，业务标识+Id) + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键(雪花算法，业务标识+Id)") + private Long id; + + /** + * 计划日期 + */ + @LogField(name="计划日期",index=1) + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + /** + * 计量日期 + */ + @LogField(name="计量日期",index=2) + @ApiModelProperty("计量日期") + private LocalDateTime dateMea; + + /** + * 公司编码(天然气公司/惠贸) + */ + @LogField(name="公司编码",index=3) + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=4) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 前日管存(吉焦) + */ + @LogField(name="前日管存(吉焦)",index=5) + @ApiModelProperty("前日管存(吉焦)") + private BigDecimal qtyBeginGj; + + /** + * 当日上载量(吉焦) + */ + @LogField(name="当日上载量(吉焦)",index=6) + @ApiModelProperty("当日上载量(吉焦)") + private BigDecimal qtyInGj; + + /** + * 当日下载量(吉焦) + */ + @LogField(name="当日下载量(吉焦)",index=7) + @ApiModelProperty("当日下载量(吉焦)") + private BigDecimal qtyOutGj; + + /** + * 手工调整量(吉焦) + */ + @LogField(name="手工调整量(吉焦)",index=8) + @ApiModelProperty("手工调整量(吉焦)") + private BigDecimal qtyAdjGj; + + /** + * 当日管存(吉焦) + */ + @LogField(name="当日管存(吉焦)",index=9) + @ApiModelProperty("当日管存(吉焦)") + private BigDecimal qtyEndGj; + + /** + * 前日管存(方) + */ + @LogField(name="前日管存(方)",index=10) + @ApiModelProperty("前日管存(方)") + private BigDecimal qtyBeginM3; + + /** + * 当日上载量(方) + */ + @LogField(name="当日上载量(方)",index=11) + @ApiModelProperty("当日上载量(方)") + private BigDecimal qtyInM3; + + /** + * 当日下载量(方) + */ + @LogField(name="当日下载量(方)",index=12) + @ApiModelProperty("当日下载量(方)") + private BigDecimal qtyOutM3; + + /** + * 手工调整量(方) + */ + @LogField(name="手工调整量(方)",index=13) + @ApiModelProperty("手工调整量(方)") + private BigDecimal qtyAdjM3; + + /** + * 当日管存(方) + */ + @LogField(name="当日管存(方)",index=14) + @ApiModelProperty("当日管存(方)") + private BigDecimal qtyEndM3; + + /** + * 备注 + */ + @LogField(name="备注",index=15) + @ApiModelProperty("备注") + private String note; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngZyDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngZyDto.java new file mode 100644 index 0000000..3b1226c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/dto/UpdateLngInventoryPngZyDto.java @@ -0,0 +1,154 @@ +package com.xjrsoft.module.inventory.dto; + +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.common.model.base.BaseModel; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + + +/** +* @title: 自有管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_inventory_png_zy",name="自有管存") +public class UpdateLngInventoryPngZyDto extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 计划日期 + */ + @LogField(name="计划日期",index=1) + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + /** + * 计量日期 + */ + @LogField(name="计量日期",index=2) + @ApiModelProperty("计量日期") + private LocalDateTime dateMea; + + /** + * 公司编码(天然气公司/惠贸) + */ + @LogField(name="公司编码",index=3) + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + /** + * 接收站(自有接收站) + */ + @LogField(name="接收站",index=4) + @ApiModelProperty("接收站(自有接收站)") + private String staCode; + + /** + * 比值(方/吉焦) + */ + @LogField(name="比值(方/吉焦)",index=5) + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + /** + * 前日管存(吉焦) + */ + @LogField(name="前日管存(吉焦)",index=6) + @ApiModelProperty("前日管存(吉焦)") + private BigDecimal qtyBeginGj; + + /** + * 当日上载量(吉焦) + */ + @LogField(name="当日上载量(吉焦)",index=7) + @ApiModelProperty("当日上载量(吉焦)") + private BigDecimal qtyInGj; + + /** + * 当日下载量(吉焦) + */ + @LogField(name="当日下载量(吉焦)",index=8) + @ApiModelProperty("当日下载量(吉焦)") + private BigDecimal qtyOutGj; + + /** + * 手工调整量(吉焦) + */ + @LogField(name="手工调整量(吉焦)",index=9) + @ApiModelProperty("手工调整量(吉焦)") + private BigDecimal qtyAdjGj; + + /** + * 当日管存(吉焦) + */ + @LogField(name="当日管存(吉焦)",index=10) + @ApiModelProperty("当日管存(吉焦)") + private BigDecimal qtyEndGj; + + /** + * 前日管存(方) + */ + @LogField(name="前日管存(方)",index=11) + @ApiModelProperty("前日管存(方)") + private BigDecimal qtyBeginM3; + + /** + * 当日上载量(方) + */ + @LogField(name="当日上载量(方)",index=12) + @ApiModelProperty("当日上载量(方)") + private BigDecimal qtyInM3; + + /** + * 当日下载量(方) + */ + @LogField(name="当日下载量(方)",index=13) + @ApiModelProperty("当日下载量(方)") + private BigDecimal qtyOutM3; + + /** + * 手工调整量(方) + */ + @LogField(name="手工调整量(方)",index=14) + @ApiModelProperty("手工调整量(方)") + private BigDecimal qtyAdjM3; + + /** + * 当日管存(方) + */ + @LogField(name="当日管存(方)",index=15) + @ApiModelProperty("当日管存(方)") + private BigDecimal qtyEndM3; + + /** + * 备注 + */ + @LogField(name="备注",index=16) + @ApiModelProperty("备注") + private String note; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationPageVo.java new file mode 100644 index 0000000..3f4d04e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationPageVo.java @@ -0,0 +1,21 @@ +package com.xjrsoft.module.inventory.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Data +public class LngInventoryPngNationPageVo { + + /** + * 主键(雪花算法，业务标识+Id) + */ + @ApiModelProperty("主键(雪花算法，业务标识+Id)") + private String id; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationVo.java new file mode 100644 index 0000000..0ad2126 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngNationVo.java @@ -0,0 +1,143 @@ +package com.xjrsoft.module.inventory.vo; + +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngInventoryPngNationVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键(雪花算法，业务标识+Id) + */ + @ApiModelProperty("主键(雪花算法，业务标识+Id)") + private Long id; + + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + private LocalDateTime datePlan; + + + /** + * 计量日期 + */ + @ApiModelProperty("计量日期") + private LocalDateTime dateMea; + + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + private String comName; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 前日管存(吉焦) + */ + @ApiModelProperty("前日管存(吉焦)") + private BigDecimal qtyBeginGj; + + + /** + * 当日上载量(吉焦) + */ + @ApiModelProperty("当日上载量(吉焦)") + private BigDecimal qtyInGj; + + + /** + * 当日下载量(吉焦) + */ + @ApiModelProperty("当日下载量(吉焦)") + private BigDecimal qtyOutGj; + + + /** + * 手工调整量(吉焦) + */ + @ApiModelProperty("手工调整量(吉焦)") + private BigDecimal qtyAdjGj; + + + /** + * 当日管存(吉焦) + */ + @ApiModelProperty("当日管存(吉焦)") + private BigDecimal qtyEndGj; + + + /** + * 前日管存(方) + */ + @ApiModelProperty("前日管存(方)") + private BigDecimal qtyBeginM3; + + + /** + * 当日上载量(方) + */ + @ApiModelProperty("当日上载量(方)") + private BigDecimal qtyInM3; + + + /** + * 当日下载量(方) + */ + @ApiModelProperty("当日下载量(方)") + private BigDecimal qtyOutM3; + + + /** + * 手工调整量(方) + */ + @ApiModelProperty("手工调整量(方)") + private BigDecimal qtyAdjM3; + + + /** + * 当日管存(方) + */ + @ApiModelProperty("当日管存(方)") + private BigDecimal qtyEndM3; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyPageVo.java new file mode 100644 index 0000000..b2e8bf4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyPageVo.java @@ -0,0 +1,21 @@ +package com.xjrsoft.module.inventory.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Data +public class LngInventoryPngZyPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyVo.java new file mode 100644 index 0000000..2501d52 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/inventory/vo/LngInventoryPngZyVo.java @@ -0,0 +1,154 @@ +package com.xjrsoft.module.inventory.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class LngInventoryPngZyVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime datePlan; + + + /** + * 计量日期 + */ + @ApiModelProperty("计量日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime dateMea; + + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + private String comName; + + + /** + * 接收站(自有接收站) + */ + @ApiModelProperty("接收站(自有接收站)") + private String staCode; + private String staName; + + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + private BigDecimal rateM3Gj; + + + /** + * 前日管存(吉焦) + */ + @ApiModelProperty("前日管存(吉焦)") + private BigDecimal qtyBeginGj; + + + /** + * 当日上载量(吉焦) + */ + @ApiModelProperty("当日上载量(吉焦)") + private BigDecimal qtyInGj; + + + /** + * 当日下载量(吉焦) + */ + @ApiModelProperty("当日下载量(吉焦)") + private BigDecimal qtyOutGj; + + + /** + * 手工调整量(吉焦) + */ + @ApiModelProperty("手工调整量(吉焦)") + private BigDecimal qtyAdjGj; + + + /** + * 当日管存(吉焦) + */ + @ApiModelProperty("当日管存(吉焦)") + private BigDecimal qtyEndGj; + + + /** + * 前日管存(方) + */ + @ApiModelProperty("前日管存(方)") + private BigDecimal qtyBeginM3; + + + /** + * 当日上载量(方) + */ + @ApiModelProperty("当日上载量(方)") + private BigDecimal qtyInM3; + + + /** + * 当日下载量(方) + */ + @ApiModelProperty("当日下载量(方)") + private BigDecimal qtyOutM3; + + + /** + * 手工调整量(方) + */ + @ApiModelProperty("手工调整量(方)") + private BigDecimal qtyAdjM3; + + + /** + * 当日管存(方) + */ + @ApiModelProperty("当日管存(方)") + private BigDecimal qtyEndM3; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngNaController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngNaController.java new file mode 100644 index 0000000..78d435f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngNaController.java @@ -0,0 +1,139 @@ +package com.xjrsoft.module.inventory.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.inventory.dto.LngInventoryPngNationPageDto; +import com.xjrsoft.module.inventory.dto.UpdateLngInventoryPngNationDto; +import com.xjrsoft.module.inventory.entity.LngInventoryPngNation; +import com.xjrsoft.module.inventory.service.ILngInventoryPngNaService; +import com.xjrsoft.module.inventory.vo.LngInventoryPngNationPageVo; +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: 国网管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/inventory" + "/lngInventoryPngNa") +@Api(value = "/inventory" + "/lngInventoryPngNa",tags = "国网管存代码") +@AllArgsConstructor +public class LngInventoryPngNaController { + + + private final ILngInventoryPngNaService lngInventoryPngNaService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngInventoryPngNation列表(分页)") + @SaCheckPermission("lngInventoryPngNa:list") + public R page(@Valid LngInventoryPngNationPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngInventoryPngNation::getId,dto.getId()) + .orderByDesc(LngInventoryPngNation::getId) + .select(LngInventoryPngNation.class,x -> VoToColumnUtil.fieldsToColumns(LngInventoryPngNationPageVo.class).contains(x.getProperty())); + IPage page = lngInventoryPngNaService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngInventoryPngNationPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngInventoryPngNation信息") + @SaCheckPermission("lngInventoryPngNa:detail") + public R info(@RequestParam Long id){ + return R.ok(lngInventoryPngNaService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngInventoryPngNation数据详细日志") + @SaCheckPermission("lngInventoryPngNa:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngInventoryPngNationDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngInventoryPngNation") + @SaCheckPermission("lngInventoryPngNa:add") + public R add(@Valid @RequestBody UpdateLngInventoryPngNationDto dto){ + UpdateLngInventoryPngNationDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngInventoryPngNationDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngInventoryPngNationDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + @PutMapping + @ApiOperation(value = "修改LngInventoryPngNation") + @SaCheckPermission("lngInventoryPngNa:edit") + public R update(@Valid @RequestBody UpdateLngInventoryPngNationDto dto){ + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngInventoryPngNationDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngInventoryPngNationDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("lngInventoryPngNa:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngInventoryPngNationDto.class, ids)); + } +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngZyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngZyController.java new file mode 100644 index 0000000..a39d90a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/controller/LngInventoryPngZyController.java @@ -0,0 +1,139 @@ +package com.xjrsoft.module.inventory.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.api.client.util.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.inventory.dto.LngInventoryPngZyPageDto; +import com.xjrsoft.module.inventory.dto.UpdateLngInventoryPngZyDto; +import com.xjrsoft.module.inventory.entity.LngInventoryPngZy; +import com.xjrsoft.module.inventory.service.ILngInventoryPngZyService; +import com.xjrsoft.module.inventory.vo.LngInventoryPngZyPageVo; +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: 自有管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/inventory" + "/lngInventoryPngZy") +@Api(value = "/inventory" + "/lngInventoryPngZy",tags = "自有管存代码") +@AllArgsConstructor +public class LngInventoryPngZyController { + + + private final ILngInventoryPngZyService lngInventoryPngZyService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngInventoryPngZy列表(分页)") + @SaCheckPermission("lngInventoryPngZy:list") + public R page(@Valid LngInventoryPngZyPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngInventoryPngZy::getId,dto.getId()) + .orderByDesc(LngInventoryPngZy::getId) + .select(LngInventoryPngZy.class,x -> VoToColumnUtil.fieldsToColumns(LngInventoryPngZyPageVo.class).contains(x.getProperty())); + IPage page = lngInventoryPngZyService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngInventoryPngZyPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngInventoryPngZy信息") + @SaCheckPermission("lngInventoryPngZy:detail") + public R info(@RequestParam Long id){ + return R.ok(lngInventoryPngZyService.getInfoById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngInventoryPngZy数据详细日志") + @SaCheckPermission("lngInventoryPngZy:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngInventoryPngZyDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngInventoryPngZy") + @SaCheckPermission("lngInventoryPngZy:add") + public R add(@Valid @RequestBody UpdateLngInventoryPngZyDto dto){ + UpdateLngInventoryPngZyDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngInventoryPngZyDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngInventoryPngZyDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res); + } + + private void execAfter(String table, Long id, String sign) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?, ?)}", table); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(id)); + params.add(JdbcParam.ofString(sign)); + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_SAVE_EXEC_ERROR, error)); + } + } + + @PutMapping + @ApiOperation(value = "修改LngInventoryPngZy") + @SaCheckPermission("lngInventoryPngZy:edit") + public R update(@Valid @RequestBody UpdateLngInventoryPngZyDto dto){ + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngInventoryPngZyDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngInventoryPngZyDto after(DataOperationContent content) { + execAfter(content.getTableName(), content.getIdValue(), "U"); + return content.getObj(); + } + })); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("lngInventoryPngZy:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngInventoryPngZyDto.class, ids)); + } +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngNation.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngNation.java new file mode 100644 index 0000000..8242674 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngNation.java @@ -0,0 +1,187 @@ +package com.xjrsoft.module.inventory.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** +* @title: 国网管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Data +@TableName("lng_inventory_png_nation") +@ApiModel(value = "国网管存对象", description = "国网管存") +public class LngInventoryPngNation implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键(雪花算法，业务标识+Id) + */ + @ApiModelProperty("主键(雪花算法，业务标识+Id)") + @TableId + private Long id; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 计量日期 + */ + @ApiModelProperty("计量日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateMea; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 前日管存(吉焦) + */ + @ApiModelProperty("前日管存(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyBeginGj; + + /** + * 当日上载量(吉焦) + */ + @ApiModelProperty("当日上载量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyInGj; + + /** + * 当日下载量(吉焦) + */ + @ApiModelProperty("当日下载量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyOutGj; + + /** + * 手工调整量(吉焦) + */ + @ApiModelProperty("手工调整量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyAdjGj; + + /** + * 当日管存(吉焦) + */ + @ApiModelProperty("当日管存(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyEndGj; + + /** + * 前日管存(方) + */ + @ApiModelProperty("前日管存(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyBeginM3; + + /** + * 当日上载量(方) + */ + @ApiModelProperty("当日上载量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyInM3; + + /** + * 当日下载量(方) + */ + @ApiModelProperty("当日下载量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyOutM3; + + /** + * 手工调整量(方) + */ + @ApiModelProperty("手工调整量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyAdjM3; + + /** + * 当日管存(方) + */ + @ApiModelProperty("当日管存(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyEndM3; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + 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/inventory/entity/LngInventoryPngZy.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngZy.java new file mode 100644 index 0000000..ee37d0b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/entity/LngInventoryPngZy.java @@ -0,0 +1,193 @@ +package com.xjrsoft.module.inventory.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** +* @title: 自有管存 +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Data +@TableName("lng_inventory_png_zy") +@ApiModel(value = "自有管存对象", description = "自有管存") +public class LngInventoryPngZy implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 计划日期 + */ + @ApiModelProperty("计划日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime datePlan; + + /** + * 计量日期 + */ + @ApiModelProperty("计量日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime dateMea; + + /** + * 公司编码(天然气公司/惠贸) + */ + @ApiModelProperty("公司编码(天然气公司/惠贸)") + private Long comId; + + /** + * 接收站(自有接收站) + */ + @ApiModelProperty("接收站(自有接收站)") + private String staCode; + + /** + * 比值(方/吉焦) + */ + @ApiModelProperty("比值(方/吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal rateM3Gj; + + /** + * 前日管存(吉焦) + */ + @ApiModelProperty("前日管存(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyBeginGj; + + /** + * 当日上载量(吉焦) + */ + @ApiModelProperty("当日上载量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyInGj; + + /** + * 当日下载量(吉焦) + */ + @ApiModelProperty("当日下载量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyOutGj; + + /** + * 手工调整量(吉焦) + */ + @ApiModelProperty("手工调整量(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyAdjGj; + + /** + * 当日管存(吉焦) + */ + @ApiModelProperty("当日管存(吉焦)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyEndGj; + + /** + * 前日管存(方) + */ + @ApiModelProperty("前日管存(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyBeginM3; + + /** + * 当日上载量(方) + */ + @ApiModelProperty("当日上载量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyInM3; + + /** + * 当日下载量(方) + */ + @ApiModelProperty("当日下载量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyOutM3; + + /** + * 手工调整量(方) + */ + @ApiModelProperty("手工调整量(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyAdjM3; + + /** + * 当日管存(方) + */ + @ApiModelProperty("当日管存(方)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyEndM3; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + 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/inventory/mapper/LngInventoryPngNationMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngNationMapper.java new file mode 100644 index 0000000..9106d36 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngNationMapper.java @@ -0,0 +1,24 @@ +package com.xjrsoft.module.inventory.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.inventory.entity.LngInventoryPngNation; +import com.xjrsoft.module.inventory.vo.LngInventoryPngNationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Mapper +public interface LngInventoryPngNationMapper extends BaseMapper { + + @Select("SELECT ipn.*, NVL(com.short_name,com.name) AS comName" + + " FROM lng_inventory_png_nation ipn" + + " LEFT JOIN xjr_department com ON com.id=ipn.com_id" + + " WHERE ipn.id = #{id}") + LngInventoryPngNationVo getInfoById(@Param("id") Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngZyMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngZyMapper.java new file mode 100644 index 0000000..a0e2893 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/mapper/LngInventoryPngZyMapper.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.inventory.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.inventory.entity.LngInventoryPngZy; +import com.xjrsoft.module.inventory.vo.LngInventoryPngZyVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Mapper +public interface LngInventoryPngZyMapper extends BaseMapper { + + @Select("SELECT ipz.*, sl.full_name AS staName, NVL(com.short_name,com.name) AS comName" + + " FROM lng_inventory_png_zy ipz" + + " LEFT JOIN lng_b_station_lng sl ON sl.code=ipz.sta_code" + + " LEFT JOIN xjr_department com ON com.id=ipz.com_id" + + " WHERE ipz.id = #{id}") + LngInventoryPngZyVo getInfoById(@Param("id") Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngNaService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngNaService.java new file mode 100644 index 0000000..265e89c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngNaService.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.inventory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.inventory.entity.LngInventoryPngNation; +import com.xjrsoft.module.inventory.vo.LngInventoryPngNationVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ + +public interface ILngInventoryPngNaService extends IService { + + LngInventoryPngNationVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngZyService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngZyService.java new file mode 100644 index 0000000..ec57b78 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/ILngInventoryPngZyService.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.inventory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.inventory.entity.LngInventoryPngZy; +import com.xjrsoft.module.inventory.vo.LngInventoryPngZyVo; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ + +public interface ILngInventoryPngZyService extends IService { + + LngInventoryPngZyVo getInfoById(Long id); +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngNaServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngNaServiceImpl.java new file mode 100644 index 0000000..0d2a0f2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngNaServiceImpl.java @@ -0,0 +1,40 @@ +package com.xjrsoft.module.inventory.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.inventory.entity.LngInventoryPngNation; +import com.xjrsoft.module.inventory.mapper.LngInventoryPngNationMapper; +import com.xjrsoft.module.inventory.service.ILngInventoryPngNaService; +import com.xjrsoft.module.inventory.vo.LngInventoryPngNationVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class LngInventoryPngNaServiceImpl extends ServiceImpl implements ILngInventoryPngNaService { + + private final IFileClient fileClient; + + @Override + public LngInventoryPngNationVo getInfoById(Long id) { + LngInventoryPngNationVo vo = this.baseMapper.getInfoById(id); + if (vo == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + List fileList = fileClient.getTableFiles("lng_inventory_png_nation", + "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngZyServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngZyServiceImpl.java new file mode 100644 index 0000000..11f44fc --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/inventory/service/impl/LngInventoryPngZyServiceImpl.java @@ -0,0 +1,40 @@ +package com.xjrsoft.module.inventory.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; +import com.xjrsoft.module.inventory.entity.LngInventoryPngZy; +import com.xjrsoft.module.inventory.mapper.LngInventoryPngZyMapper; +import com.xjrsoft.module.inventory.service.ILngInventoryPngZyService; +import com.xjrsoft.module.inventory.vo.LngInventoryPngZyVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-03-23 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class LngInventoryPngZyServiceImpl extends ServiceImpl implements ILngInventoryPngZyService { + + private final IFileClient fileClient; + + @Override + public LngInventoryPngZyVo getInfoById(Long id) { + LngInventoryPngZyVo vo = this.baseMapper.getInfoById(id); + if (vo == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + List fileList = fileClient.getTableFiles("lng_inventory_png_zy", + "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +}