From d82bb87e2cbeaff41c120f6450ad2e2dbea58acc Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 17 二月 2025 10:38:34 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/code/CodePanel.jsx | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java | 10 +++++-----
zy-acs-fake/src/main/java/com/zy/acs/fake/entity/Code.java | 10 +++++-----
zy-acs-flow/src/page/code/CodeCreate.jsx | 4 ++--
zy-acs-flow/src/page/code/CodeEdit.jsx | 4 ++--
zy-acs-flow/src/page/code/CodeList.jsx | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/zy-acs-fake/src/main/java/com/zy/acs/fake/entity/Code.java b/zy-acs-fake/src/main/java/com/zy/acs/fake/entity/Code.java
index 2d1272a..7302756 100644
--- a/zy-acs-fake/src/main/java/com/zy/acs/fake/entity/Code.java
+++ b/zy-acs-fake/src/main/java/com/zy/acs/fake/entity/Code.java
@@ -50,7 +50,7 @@
* 杞 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "杞 1: 鏄� 0: 鍚� ")
- private Integer concer;
+ private Integer corner;
/**
* 缂╂斁
@@ -108,12 +108,12 @@
public Code() {}
- public Code(String uuid, String data, Double x, Double y, Integer concer, Integer status, Integer deleted, Long tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public Code(String uuid, String data, Double x, Double y, Integer corner, Integer status, Integer deleted, Long tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.data = data;
this.x = x;
this.y = y;
- this.concer = concer;
+ this.corner = corner;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -141,8 +141,8 @@
// );
public Boolean getCornerBool(){
- if (null == this.concer){ return null; }
- switch (this.concer){
+ if (null == this.corner){ return null; }
+ switch (this.corner){
case 1:
return true;
case 0:
diff --git a/zy-acs-flow/src/page/code/CodeCreate.jsx b/zy-acs-flow/src/page/code/CodeCreate.jsx
index d81fb1c..0e72673 100644
--- a/zy-acs-flow/src/page/code/CodeCreate.jsx
+++ b/zy-acs-flow/src/page/code/CodeCreate.jsx
@@ -107,8 +107,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
- label="table.field.code.concer"
- source="concer"
+ label="table.field.code.corner"
+ source="corner"
choices={[
{ id: 1, name: '鏄�' },
{ id: 0, name: '鍚�' },
diff --git a/zy-acs-flow/src/page/code/CodeEdit.jsx b/zy-acs-flow/src/page/code/CodeEdit.jsx
index c3af119..9741cd5 100644
--- a/zy-acs-flow/src/page/code/CodeEdit.jsx
+++ b/zy-acs-flow/src/page/code/CodeEdit.jsx
@@ -79,8 +79,8 @@
validate={required()}
/>
<SelectInput
- label="table.field.code.concer"
- source="concer"
+ label="table.field.code.corner"
+ source="corner"
choices={[
{ id: '1', name: 'common.enums.true' },
{ id: '0', name: 'common.enums.false' },
diff --git a/zy-acs-flow/src/page/code/CodeList.jsx b/zy-acs-flow/src/page/code/CodeList.jsx
index 8a8ff9e..6387fa8 100644
--- a/zy-acs-flow/src/page/code/CodeList.jsx
+++ b/zy-acs-flow/src/page/code/CodeList.jsx
@@ -71,7 +71,7 @@
<TextInput source="data" label="table.field.code.data" alwaysOn />,
<NumberInput source="x" label="table.field.code.x" />,
<NumberInput source="y" label="table.field.code.y" />,
- <SelectInput source="concer" label="table.field.code.concer"
+ <SelectInput source="corner" label="table.field.code.corner"
choices={[
{ id: '1', name: 'common.enums.true' },
{ id: '0', name: 'common.enums.false' },
@@ -135,7 +135,7 @@
<TextField source="data" label="table.field.code.data" />
<NumberField source="x" label="table.field.code.x" />
<NumberField source="y" label="table.field.code.y" />
- <BooleanField source="cornerBool" label="table.field.code.concer" sortable={false} />
+ <BooleanField source="cornerBool" label="table.field.code.corner" sortable={false} />
<TextField source="scale" label="table.field.code.scale" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
diff --git a/zy-acs-flow/src/page/code/CodePanel.jsx b/zy-acs-flow/src/page/code/CodePanel.jsx
index 636df04..88f9a75 100644
--- a/zy-acs-flow/src/page/code/CodePanel.jsx
+++ b/zy-acs-flow/src/page/code/CodePanel.jsx
@@ -66,8 +66,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.code.concer"
- property={record.concer$}
+ title="table.field.code.corner"
+ property={record.corner$}
/>
</Grid>
<Grid item xs={6}>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
index dfa6833..6b262b6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -135,7 +135,7 @@
}
code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
code.setUuid("code".concat(code.getData()));
- code.setConcer(0);
+ code.setCorner(0);
code.setScale(GsonUtils.toJson(Cools.add("x", 1).add("y", 1)));
code.setCreateBy(userId);
code.setCreateTime(now);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java
index 508cbf9..fbf7529 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java
@@ -50,7 +50,7 @@
* 杞 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "杞 1: 鏄� 0: 鍚� ")
- private Integer concer;
+ private Integer corner;
/**
* 缂╂斁
@@ -108,12 +108,12 @@
public Code() {}
- public Code(String uuid,String data,Double x,Double y,Integer concer,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Code(String uuid,String data,Double x,Double y,Integer corner,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.data = data;
this.x = x;
this.y = y;
- this.concer = concer;
+ this.corner = corner;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -141,8 +141,8 @@
// );
public Boolean getCornerBool(){
- if (null == this.concer){ return null; }
- switch (this.concer){
+ if (null == this.corner){ return null; }
+ switch (this.corner){
case 1:
return true;
case 0:
--
Gitblit v1.9.1