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

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

Browse Source 
# Conflicts:
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java
This commit is contained in:
张秉卓
2025-10-24 16:30:09 +08:00
parent ae23e72f67 141da54987
commit a5c052e614
25 changed files with 2081 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,10 +44,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";
}

80
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBPngLineDto.java Normal file
View File

@ -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;
}

134
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBStationPngDto.java Normal file
View File

@ -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;
}

60
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBPngLinePageDto.java Normal file
View File

@ -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;
}

105
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBStationPngPageDto.java Normal file
View File

@ -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;
}

100
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPngLineDto.java Normal file
View File

@ -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;
}

163
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBStationPngDto.java Normal file
View File

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

@ -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()));

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

@ -181,8 +181,8 @@ public class CountryRegionController {
}));
List<LngBRegionVo> 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();

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

@ -0,0 +1,142 @@
package com.xjrsoft.module.mdm.controller;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xjrsoft.common.model.result.R;
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.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.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;
/**
* @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<LngBStationPng> 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<LngBStationPng> page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngBStationPngPageVo> 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){
return R.ok(pipeGasDownloadPointService.add(dto));
}
@PutMapping
@ApiOperation(value = "修改LngBStationPng")
@SaCheckPermission("pipeGasDownloadPoint:edit")
public R update(@Valid @RequestBody UpdateLngBStationPngDto dto){
return R.ok(pipeGasDownloadPointService.update(dto));
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("pipeGasDownloadPoint:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngBStationPngDto.class, ids));
}
@PostMapping("/enable")
@ApiOperation(value = "启用")
@SaCheckPermission("pipeGasDownloadPoint:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(pipeGasDownloadPointService.enable(ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用")
@SaCheckPermission("pipeGasDownloadPoint:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(pipeGasDownloadPointService.disable(ids));
}
@GetMapping(value = "/datalog")
@ApiOperation(value="根据id查询LngBStationPng数据详细日志")
@SaCheckPermission("pipeGasDownloadPoint:datalog")
public R datalog(@RequestParam Long id){
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id);
return R.ok(logs);
}
}

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

@ -0,0 +1,131 @@
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.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;
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<LngBPngLine> 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<LngBPngLine> page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngBPngLinePageVo> 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){
return R.ok(pipelineGgasLineService.add(dto));
}
@PutMapping
@ApiOperation(value = "修改LngBPngLine")
@SaCheckPermission("pipelineGgasLine:edit")
public R update(@Valid @RequestBody UpdateLngBPngLineDto dto){
return R.ok(pipelineGgasLineService.update(dto));
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("pipelineGgasLine:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateLngBPngLineDto.class, ids));
}
@PostMapping("/enable")
@ApiOperation(value = "启用")
@SaCheckPermission("pipelineGgasLine:enable")
public R enable(@Valid @RequestBody List<Long> ids){
return R.ok(pipelineGgasLineService.enable(ids));
}
@PostMapping("/disable")
@ApiOperation(value = "禁用")
@SaCheckPermission("pipelineGgasLine:disable")
public R disable(@Valid @RequestBody List<Long> ids){
return R.ok(pipelineGgasLineService.disable(ids));
}
@GetMapping(value = "/datalog")
@ApiOperation(value="根据id查询LngBPngLine数据详细日志")
@SaCheckPermission("pipelineGgasLine:datalog")
public R datalog(@RequestParam Long id){
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id);
return R.ok(logs);
}
}

140
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBPngLine.java Normal file
View File

@ -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;
}

194
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBStationPng.java Normal file
View File

@ -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;
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBPngLineMapper.java Normal file
View File

@ -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<LngBPngLine> {
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBStationPngMapper.java Normal file
View File

@ -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<LngBStationPng> {
}

25
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipeGasDownloadPointService.java Normal file
View File

@ -0,0 +1,25 @@
package com.xjrsoft.module.mdm.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto;
import com.xjrsoft.module.mdm.entity.LngBStationPng;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-24
* @Version 1.0
*/
public interface IPipeGasDownloadPointService extends IService<LngBStationPng> {
Boolean enable(List<Long> ids);
Boolean disable(List<Long> ids);
Long add(UpdateLngBStationPngDto dto);
Long update(UpdateLngBStationPngDto dto);
}

25
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java Normal file
View File

@ -0,0 +1,25 @@
package com.xjrsoft.module.mdm.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto;
import com.xjrsoft.module.mdm.entity.LngBPngLine;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-24
* @Version 1.0
*/
public interface IPipelineGgasLineService extends IService<LngBPngLine> {
Boolean disable(List<Long> ids);
Boolean enable(List<Long> ids);
Long add(UpdateLngBPngLineDto dto);
Long update(UpdateLngBPngLineDto dto);
}

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

@ -38,16 +38,16 @@ public class BankServiceImpl extends ServiceImpl<LngBBankMapper, LngBBank> 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<LngBBankMapper, LngBBank> imple
public boolean enable(List<Long> 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<LngBBankMapper, LngBBank> 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));
}

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

@ -61,7 +61,7 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
public boolean enable(List<Long> 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<LngBRegionMapper, LngB
public boolean disable(List<Long> 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));
}

113
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java Normal file
View File

@ -0,0 +1,113 @@
package com.xjrsoft.module.mdm.service.impl;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.constant.FieldNameConstants;
import com.pictc.constant.TableNameConstants;
import com.pictc.enums.BusinessCode;
import com.pictc.enums.ExceptionCommonCode;
import com.pictc.utils.DataLogTools;
import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.module.common.db.service.CommonCallService;
import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto;
import com.xjrsoft.module.mdm.entity.LngBStationPng;
import com.xjrsoft.module.mdm.mapper.LngBStationPngMapper;
import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService;
import com.xjrsoft.module.system.client.ICodeRuleClient;
import lombok.AllArgsConstructor;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-24
* @Version 1.0
*/
@Service
@AllArgsConstructor
public class PipeGasDownloadPointServiceImpl extends ServiceImpl<LngBStationPngMapper, LngBStationPng> 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<Long> 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<Long> 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<LngBStationPng>()
.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<LngBStationPng>()
.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));
}
}
}

120
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java Normal file
View File

@ -0,0 +1,120 @@
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;
/**
* @title: service
* @Author 管理员
* @Date: 2025-10-24
* @Version 1.0
*/
@Service
@AllArgsConstructor
public class PipelineGgasLineServiceImpl extends ServiceImpl<LngBPngLineMapper, LngBPngLine> 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<Long> 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<Long> 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<LngBPngLine>()
.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<LngBPngLine>()
.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));
}
}
}