@@ -33,9 +33,28 @@ public class APIAccount extends APIEntity {
3333
3434 private String slmOrganizationId ;
3535
36+ @ JsonInclude (Include .NON_NULL )
37+ private Long publicDevicesUsage ;
38+
39+ @ JsonInclude (Include .NON_NULL )
40+ private Long publicDevicesConcurrency ;
41+
42+ @ JsonInclude (Include .NON_NULL )
43+ private Float publicDevicesRatio ;
44+
45+ @ JsonInclude (Include .NON_NULL )
46+ private Long dedicatedDevicesUsage ;
47+
48+ @ JsonInclude (Include .NON_NULL )
49+ private Long dedicatedDevicesConcurrency ;
50+
51+ @ JsonInclude (Include .NON_NULL )
52+ private Float dedicatedDevicesRatio ;
53+
3654 public APIAccount () {
3755 }
3856
57+ @ SuppressWarnings ("squid:S107" )
3958 public APIAccount (
4059 Long id , String slmOrganizationId , String name , String userName , String comment , LocalDateTime createTime ) {
4160 super (id );
@@ -49,9 +68,25 @@ public APIAccount(
4968 @ SuppressWarnings ("squid:S107" )
5069 public APIAccount (
5170 Long id , String slmOrganizationId , String name , String userName , String comment , LocalDateTime createTime ,
52- long dedicatedDevicesCount ,
53- String activeServiceName ) {
71+ Long publicDevicesUsage , Long publicDevicesConcurrency , Float publicDevicesRatio ,
72+ Long dedicatedDevicesUsage , Long dedicatedDevicesConcurrency , Float dedicatedDevicesRatio ) {
5473 this (id , slmOrganizationId , name , userName , comment , createTime );
74+ this .publicDevicesUsage = publicDevicesUsage ;
75+ this .publicDevicesConcurrency = publicDevicesConcurrency ;
76+ this .publicDevicesRatio = publicDevicesRatio ;
77+ this .dedicatedDevicesUsage = dedicatedDevicesUsage ;
78+ this .dedicatedDevicesConcurrency = dedicatedDevicesConcurrency ;
79+ this .dedicatedDevicesRatio = dedicatedDevicesRatio ;
80+ }
81+
82+ @ SuppressWarnings ("squid:S107" )
83+ public APIAccount (
84+ Long id , String slmOrganizationId , String name , String userName , String comment , LocalDateTime createTime ,
85+ Long publicDevicesUsage , Long publicDevicesConcurrency , Float publicDevicesRatio ,
86+ Long dedicatedDevicesUsage , Long dedicatedDevicesConcurrency , Float dedicatedDevicesRatio ,
87+ long dedicatedDevicesCount , String activeServiceName ) {
88+ this (id , slmOrganizationId , name , userName , comment , createTime , publicDevicesUsage , publicDevicesConcurrency ,
89+ publicDevicesRatio , dedicatedDevicesUsage , dedicatedDevicesConcurrency , dedicatedDevicesRatio );
5590 this .dedicatedDevicesCount = dedicatedDevicesCount ;
5691 this .activeServiceName = activeServiceName ;
5792 }
@@ -120,6 +155,54 @@ public void setSlmOrganizationId(String slmOrganizationId) {
120155 this .slmOrganizationId = slmOrganizationId ;
121156 }
122157
158+ public Long getPublicDevicesUsage () {
159+ return publicDevicesUsage ;
160+ }
161+
162+ public void setPublicDevicesUsage (Long publicDevicesUsage ) {
163+ this .publicDevicesUsage = publicDevicesUsage ;
164+ }
165+
166+ public Long getPublicDevicesConcurrency () {
167+ return publicDevicesConcurrency ;
168+ }
169+
170+ public void setPublicDevicesConcurrency (Long publicDevicesConcurrency ) {
171+ this .publicDevicesConcurrency = publicDevicesConcurrency ;
172+ }
173+
174+ public Float getPublicDevicesRatio () {
175+ return publicDevicesRatio ;
176+ }
177+
178+ public void setPublicDevicesRatio (Float publicDevicesRatio ) {
179+ this .publicDevicesRatio = publicDevicesRatio ;
180+ }
181+
182+ public Long getDedicatedDevicesUsage () {
183+ return dedicatedDevicesUsage ;
184+ }
185+
186+ public void setDedicatedDevicesUsage (Long dedicatedDevicesUsage ) {
187+ this .dedicatedDevicesUsage = dedicatedDevicesUsage ;
188+ }
189+
190+ public Long getDedicatedDevicesConcurrency () {
191+ return dedicatedDevicesConcurrency ;
192+ }
193+
194+ public void setDedicatedDevicesConcurrency (Long dedicatedDevicesConcurrency ) {
195+ this .dedicatedDevicesConcurrency = dedicatedDevicesConcurrency ;
196+ }
197+
198+ public Float getDedicatedDevicesRatio () {
199+ return dedicatedDevicesRatio ;
200+ }
201+
202+ public void setDedicatedDevicesRatio (Float dedicatedDevicesRatio ) {
203+ this .dedicatedDevicesRatio = dedicatedDevicesRatio ;
204+ }
205+
123206 @ Override
124207 @ JsonIgnore
125208 protected <T extends APIEntity > void clone (T from ) {
@@ -133,5 +216,11 @@ protected <T extends APIEntity> void clone(T from) {
133216 this .userName = account .userName ;
134217 this .invoiceDetails = account .invoiceDetails ;
135218 this .slmOrganizationId = account .slmOrganizationId ;
219+ this .publicDevicesUsage = account .publicDevicesUsage ;
220+ this .publicDevicesConcurrency = account .publicDevicesConcurrency ;
221+ this .publicDevicesRatio = account .publicDevicesRatio ;
222+ this .dedicatedDevicesUsage = account .dedicatedDevicesUsage ;
223+ this .dedicatedDevicesConcurrency = account .dedicatedDevicesConcurrency ;
224+ this .dedicatedDevicesRatio = account .dedicatedDevicesRatio ;
136225 }
137226}
0 commit comments