Skip to content

Commit 7907a53

Browse files
xuwei-fit2cloudxuwei-fit2cloud
authored
Merge pull request dataease#553 from dataease/dev
Dev
2 parents 353a0f6 + f87ac3c commit 7907a53

35 files changed

+1069
-152
lines changed

‎backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public class ChartViewWithBLOBs extends ChartView implements Serializable {
1515

1616
private String extStack;
1717

18+
private String extBubble;
19+
1820
private String customAttr;
1921

2022
private String customStyle;

‎backend/src/main/java/io/dataease/base/domain/DatasetTableField.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
import java.io.Serializable;
44

5+
import lombok.AllArgsConstructor;
56
import lombok.Builder;
67
import lombok.Data;
8+
import lombok.NoArgsConstructor;
79

810
@Data
911
@Builder
12+
@AllArgsConstructor //全参构造函数
13+
@NoArgsConstructor //无参构造函数
1014
public class DatasetTableField implements Serializable {
1115
private String id;
1216

@@ -39,4 +43,4 @@ public class DatasetTableField implements Serializable {
3943
private Long lastSyncTime;
4044

4145
private static final long serialVersionUID = 1L;
42-
}
46+
}

‎backend/src/main/java/io/dataease/base/domain/PanelViewLinkageField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ public class PanelViewLinkageField implements Serializable {
99

1010
private String linkageId;
1111

12-
private String sourceFiled;
12+
private String sourceField;
1313

14-
private String targetFiled;
14+
private String targetField;
1515

1616
private Long updateTime;
1717

‎backend/src/main/java/io/dataease/base/domain/PanelViewLinkageFieldExample.java

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -244,143 +244,143 @@ public Criteria andLinkageIdNotBetween(String value1, String value2) {
244244
return (Criteria) this;
245245
}
246246

247-
public Criteria andSourceFiledIsNull() {
248-
addCriterion("source_filed is null");
247+
public Criteria andSourceFieldIsNull() {
248+
addCriterion("source_field is null");
249249
return (Criteria) this;
250250
}
251251

252-
public Criteria andSourceFiledIsNotNull() {
253-
addCriterion("source_filed is not null");
252+
public Criteria andSourceFieldIsNotNull() {
253+
addCriterion("source_field is not null");
254254
return (Criteria) this;
255255
}
256256

257-
public Criteria andSourceFiledEqualTo(String value) {
258-
addCriterion("source_filed =", value, "sourceFiled");
257+
public Criteria andSourceFieldEqualTo(String value) {
258+
addCriterion("source_field =", value, "sourceField");
259259
return (Criteria) this;
260260
}
261261

262-
public Criteria andSourceFiledNotEqualTo(String value) {
263-
addCriterion("source_filed <>", value, "sourceFiled");
262+
public Criteria andSourceFieldNotEqualTo(String value) {
263+
addCriterion("source_field <>", value, "sourceField");
264264
return (Criteria) this;
265265
}
266266

267-
public Criteria andSourceFiledGreaterThan(String value) {
268-
addCriterion("source_filed >", value, "sourceFiled");
267+
public Criteria andSourceFieldGreaterThan(String value) {
268+
addCriterion("source_field >", value, "sourceField");
269269
return (Criteria) this;
270270
}
271271

272-
public Criteria andSourceFiledGreaterThanOrEqualTo(String value) {
273-
addCriterion("source_filed >=", value, "sourceFiled");
272+
public Criteria andSourceFieldGreaterThanOrEqualTo(String value) {
273+
addCriterion("source_field >=", value, "sourceField");
274274
return (Criteria) this;
275275
}
276276

277-
public Criteria andSourceFiledLessThan(String value) {
278-
addCriterion("source_filed <", value, "sourceFiled");
277+
public Criteria andSourceFieldLessThan(String value) {
278+
addCriterion("source_field <", value, "sourceField");
279279
return (Criteria) this;
280280
}
281281

282-
public Criteria andSourceFiledLessThanOrEqualTo(String value) {
283-
addCriterion("source_filed <=", value, "sourceFiled");
282+
public Criteria andSourceFieldLessThanOrEqualTo(String value) {
283+
addCriterion("source_field <=", value, "sourceField");
284284
return (Criteria) this;
285285
}
286286

287-
public Criteria andSourceFiledLike(String value) {
288-
addCriterion("source_filed like", value, "sourceFiled");
287+
public Criteria andSourceFieldLike(String value) {
288+
addCriterion("source_field like", value, "sourceField");
289289
return (Criteria) this;
290290
}
291291

292-
public Criteria andSourceFiledNotLike(String value) {
293-
addCriterion("source_filed not like", value, "sourceFiled");
292+
public Criteria andSourceFieldNotLike(String value) {
293+
addCriterion("source_field not like", value, "sourceField");
294294
return (Criteria) this;
295295
}
296296

297-
public Criteria andSourceFiledIn(List<String> values) {
298-
addCriterion("source_filed in", values, "sourceFiled");
297+
public Criteria andSourceFieldIn(List<String> values) {
298+
addCriterion("source_field in", values, "sourceField");
299299
return (Criteria) this;
300300
}
301301

302-
public Criteria andSourceFiledNotIn(List<String> values) {
303-
addCriterion("source_filed not in", values, "sourceFiled");
302+
public Criteria andSourceFieldNotIn(List<String> values) {
303+
addCriterion("source_field not in", values, "sourceField");
304304
return (Criteria) this;
305305
}
306306

307-
public Criteria andSourceFiledBetween(String value1, String value2) {
308-
addCriterion("source_filed between", value1, value2, "sourceFiled");
307+
public Criteria andSourceFieldBetween(String value1, String value2) {
308+
addCriterion("source_field between", value1, value2, "sourceField");
309309
return (Criteria) this;
310310
}
311311

312-
public Criteria andSourceFiledNotBetween(String value1, String value2) {
313-
addCriterion("source_filed not between", value1, value2, "sourceFiled");
312+
public Criteria andSourceFieldNotBetween(String value1, String value2) {
313+
addCriterion("source_field not between", value1, value2, "sourceField");
314314
return (Criteria) this;
315315
}
316316

317-
public Criteria andTargetFiledIsNull() {
318-
addCriterion("target_filed is null");
317+
public Criteria andTargetFieldIsNull() {
318+
addCriterion("target_field is null");
319319
return (Criteria) this;
320320
}
321321

322-
public Criteria andTargetFiledIsNotNull() {
323-
addCriterion("target_filed is not null");
322+
public Criteria andTargetFieldIsNotNull() {
323+
addCriterion("target_field is not null");
324324
return (Criteria) this;
325325
}
326326

327-
public Criteria andTargetFiledEqualTo(String value) {
328-
addCriterion("target_filed =", value, "targetFiled");
327+
public Criteria andTargetFieldEqualTo(String value) {
328+
addCriterion("target_field =", value, "targetField");
329329
return (Criteria) this;
330330
}
331331

332-
public Criteria andTargetFiledNotEqualTo(String value) {
333-
addCriterion("target_filed <>", value, "targetFiled");
332+
public Criteria andTargetFieldNotEqualTo(String value) {
333+
addCriterion("target_field <>", value, "targetField");
334334
return (Criteria) this;
335335
}
336336

337-
public Criteria andTargetFiledGreaterThan(String value) {
338-
addCriterion("target_filed >", value, "targetFiled");
337+
public Criteria andTargetFieldGreaterThan(String value) {
338+
addCriterion("target_field >", value, "targetField");
339339
return (Criteria) this;
340340
}
341341

342-
public Criteria andTargetFiledGreaterThanOrEqualTo(String value) {
343-
addCriterion("target_filed >=", value, "targetFiled");
342+
public Criteria andTargetFieldGreaterThanOrEqualTo(String value) {
343+
addCriterion("target_field >=", value, "targetField");
344344
return (Criteria) this;
345345
}
346346

347-
public Criteria andTargetFiledLessThan(String value) {
348-
addCriterion("target_filed <", value, "targetFiled");
347+
public Criteria andTargetFieldLessThan(String value) {
348+
addCriterion("target_field <", value, "targetField");
349349
return (Criteria) this;
350350
}
351351

352-
public Criteria andTargetFiledLessThanOrEqualTo(String value) {
353-
addCriterion("target_filed <=", value, "targetFiled");
352+
public Criteria andTargetFieldLessThanOrEqualTo(String value) {
353+
addCriterion("target_field <=", value, "targetField");
354354
return (Criteria) this;
355355
}
356356

357-
public Criteria andTargetFiledLike(String value) {
358-
addCriterion("target_filed like", value, "targetFiled");
357+
public Criteria andTargetFieldLike(String value) {
358+
addCriterion("target_field like", value, "targetField");
359359
return (Criteria) this;
360360
}
361361

362-
public Criteria andTargetFiledNotLike(String value) {
363-
addCriterion("target_filed not like", value, "targetFiled");
362+
public Criteria andTargetFieldNotLike(String value) {
363+
addCriterion("target_field not like", value, "targetField");
364364
return (Criteria) this;
365365
}
366366

367-
public Criteria andTargetFiledIn(List<String> values) {
368-
addCriterion("target_filed in", values, "targetFiled");
367+
public Criteria andTargetFieldIn(List<String> values) {
368+
addCriterion("target_field in", values, "targetField");
369369
return (Criteria) this;
370370
}
371371

372-
public Criteria andTargetFiledNotIn(List<String> values) {
373-
addCriterion("target_filed not in", values, "targetFiled");
372+
public Criteria andTargetFieldNotIn(List<String> values) {
373+
addCriterion("target_field not in", values, "targetField");
374374
return (Criteria) this;
375375
}
376376

377-
public Criteria andTargetFiledBetween(String value1, String value2) {
378-
addCriterion("target_filed between", value1, value2, "targetFiled");
377+
public Criteria andTargetFieldBetween(String value1, String value2) {
378+
addCriterion("target_field between", value1, value2, "targetField");
379379
return (Criteria) this;
380380
}
381381

382-
public Criteria andTargetFiledNotBetween(String value1, String value2) {
383-
addCriterion("target_filed not between", value1, value2, "targetFiled");
382+
public Criteria andTargetFieldNotBetween(String value1, String value2) {
383+
addCriterion("target_field not between", value1, value2, "targetField");
384384
return (Criteria) this;
385385
}
386386

‎backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<result column="x_axis" jdbcType="LONGVARCHAR" property="xAxis" />
1818
<result column="y_axis" jdbcType="LONGVARCHAR" property="yAxis" />
1919
<result column="ext_stack" jdbcType="LONGVARCHAR" property="extStack" />
20+
<result column="ext_bubble" jdbcType="LONGVARCHAR" property="extBubble" />
2021
<result column="custom_attr" jdbcType="LONGVARCHAR" property="customAttr" />
2122
<result column="custom_style" jdbcType="LONGVARCHAR" property="customStyle" />
2223
<result column="custom_filter" jdbcType="LONGVARCHAR" property="customFilter" />
@@ -86,8 +87,8 @@
8687
style_priority
8788
</sql>
8889
<sql id="Blob_Column_List">
89-
x_axis, y_axis, ext_stack, custom_attr, custom_style, custom_filter, drill_fields,
90-
snapshot
90+
x_axis, y_axis, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter,
91+
drill_fields, snapshot
9192
</sql>
9293
<select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ChartViewExample" resultMap="ResultMapWithBLOBs">
9394
select
@@ -142,16 +143,16 @@
142143
table_id, `type`, title,
143144
create_by, create_time, update_time,
144145
style_priority, x_axis, y_axis,
145-
ext_stack, custom_attr, custom_style,
146-
custom_filter, drill_fields, snapshot
147-
)
146+
ext_stack, ext_bubble, custom_attr,
147+
custom_style, custom_filter, drill_fields,
148+
snapshot)
148149
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR},
149150
#{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR},
150151
#{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT},
151152
#{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR},
152-
#{extStack,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR},
153-
#{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}
154-
)
153+
#{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR},
154+
#{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR},
155+
#{snapshot,jdbcType=LONGVARCHAR})
155156
</insert>
156157
<insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
157158
insert into chart_view
@@ -195,6 +196,9 @@
195196
<if test="extStack != null">
196197
ext_stack,
197198
</if>
199+
<if test="extBubble != null">
200+
ext_bubble,
201+
</if>
198202
<if test="customAttr != null">
199203
custom_attr,
200204
</if>
@@ -251,6 +255,9 @@
251255
<if test="extStack != null">
252256
#{extStack,jdbcType=LONGVARCHAR},
253257
</if>
258+
<if test="extBubble != null">
259+
#{extBubble,jdbcType=LONGVARCHAR},
260+
</if>
254261
<if test="customAttr != null">
255262
#{customAttr,jdbcType=LONGVARCHAR},
256263
</if>
@@ -316,6 +323,9 @@
316323
<if test="record.extStack != null">
317324
ext_stack = #{record.extStack,jdbcType=LONGVARCHAR},
318325
</if>
326+
<if test="record.extBubble != null">
327+
ext_bubble = #{record.extBubble,jdbcType=LONGVARCHAR},
328+
</if>
319329
<if test="record.customAttr != null">
320330
custom_attr = #{record.customAttr,jdbcType=LONGVARCHAR},
321331
</if>
@@ -351,6 +361,7 @@
351361
x_axis = #{record.xAxis,jdbcType=LONGVARCHAR},
352362
y_axis = #{record.yAxis,jdbcType=LONGVARCHAR},
353363
ext_stack = #{record.extStack,jdbcType=LONGVARCHAR},
364+
ext_bubble = #{record.extBubble,jdbcType=LONGVARCHAR},
354365
custom_attr = #{record.customAttr,jdbcType=LONGVARCHAR},
355366
custom_style = #{record.customStyle,jdbcType=LONGVARCHAR},
356367
custom_filter = #{record.customFilter,jdbcType=LONGVARCHAR},
@@ -415,6 +426,9 @@
415426
<if test="extStack != null">
416427
ext_stack = #{extStack,jdbcType=LONGVARCHAR},
417428
</if>
429+
<if test="extBubble != null">
430+
ext_bubble = #{extBubble,jdbcType=LONGVARCHAR},
431+
</if>
418432
<if test="customAttr != null">
419433
custom_attr = #{customAttr,jdbcType=LONGVARCHAR},
420434
</if>
@@ -447,6 +461,7 @@
447461
x_axis = #{xAxis,jdbcType=LONGVARCHAR},
448462
y_axis = #{yAxis,jdbcType=LONGVARCHAR},
449463
ext_stack = #{extStack,jdbcType=LONGVARCHAR},
464+
ext_bubble = #{extBubble,jdbcType=LONGVARCHAR},
450465
custom_attr = #{customAttr,jdbcType=LONGVARCHAR},
451466
custom_style = #{customStyle,jdbcType=LONGVARCHAR},
452467
custom_filter = #{customFilter,jdbcType=LONGVARCHAR},

0 commit comments

Comments
 (0)