#

vincentlu

2025-02-17 d82bb87e2cbeaff41c120f6450ad2e2dbea58acc

#

 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:

 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: '否' },

 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' },

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

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

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

 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: