Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
wr
2025-12-16 18:25:33 +08:00
parent 2d255a5dd3 614647d36d
commit 4b3ec39a11
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java
View File

@@ -211,14 +211,14 @@ public class SupervisionDevMainReportExcel {
/**
* 电镀功能
*/
@Excel(name = "电镀功能", width = 30, replace = {"关闭_0", "开启_1"})
@Excel(name = "电度功能", width = 30, replace = {"关闭_0", "开启_1"})
private String electroplatingFunction = "0";
/**
* 召换标志
*/
@Excel(name = "召换标志", width = 30, replace = {"周期触发_0", "变位触发_1"})
@Excel(name = "召唤标志", width = 30, replace = {"周期触发_0", "变位触发_1"})
private String summonFlag = "0";
/**

9
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java
View File

@@ -1,9 +1,6 @@
package com.njcn.supervision.pojo.po.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage;
@@ -35,14 +32,14 @@ public class UserReportProjectPO extends BaseEntity {
/**
* 用户协议容量
*/
@TableField(value = "agreement_capacity")
@TableField(value = "agreement_capacity",updateStrategy = FieldStrategy.IGNORED)
@Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR)
private Double agreementCapacity;
/**
* 非线性设备类型
*/
@TableField(value = "nonlinear_device_type")
@TableField(value = "nonlinear_device_type",updateStrategy = FieldStrategy.IGNORED)
private String nonlinearDeviceType;
/**

15
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java
View File

@@ -1,9 +1,6 @@
package com.njcn.supervision.pojo.po.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage;
@@ -40,28 +37,28 @@ public class UserReportSubstationPO extends BaseEntity {
/**
* 基准短路容量（MVA）
*/
@TableField(value = "base_short_circuit_capacity")
@TableField(value = "base_short_circuit_capacity",updateStrategy = FieldStrategy.IGNORED)
@Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR)
private BigDecimal baseShortCircuitCapacity;
/**
* 系统最小短路容量（MVA）
*/
@TableField(value = "min_short_circuit_capacity")
@TableField(value = "min_short_circuit_capacity",updateStrategy = FieldStrategy.IGNORED)
@Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR)
private BigDecimal minShortCircuitCapacity;
/**
* PCC供电设备容量（MVA）
*/
@TableField(value = "pcc_equipment_capacity")
@TableField(value = "pcc_equipment_capacity",updateStrategy = FieldStrategy.IGNORED)
@Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR)
private BigDecimal pccEquipmentCapacity;
/**
* 用户用电协议容量（MVA）
*/
@TableField(value = "user_agreement_capacity")
@TableField(value = "user_agreement_capacity",updateStrategy = FieldStrategy.IGNORED)
@Pattern(regexp = PatternRegex.COORDINATE, message = ValidMessage.PARAM_FORMAT_ERROR)
private BigDecimal userAgreementCapacity;
@@ -74,7 +71,7 @@ public class UserReportSubstationPO extends BaseEntity {
/**
* 非线性负荷类型
*/
@TableField(value = "nonlinear_load_type")
@TableField(value = "nonlinear_load_type",updateStrategy = FieldStrategy.IGNORED)
private String nonlinearLoadType;
/**