#

luxiaotao1123

2024-09-13 8306e37c038e5b7c853462863ab8240f266405f3

#

 zy-acs-flow/src/page/code/CodeList.jsx

@@ -122,7 +122,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <CodePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.code.uuid" />
@@ -133,7 +133,13 @@
                    <TextField source="scale" label="table.field.code.scale" />

                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">

 zy-acs-flow/src/page/sta/StaList.jsx

@@ -132,20 +132,20 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <StaPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'uuid', 'offset', 'updateBy', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.sta.uuid" />
                    <TextField source="staNo" label="table.field.sta.staNo" />
                    <ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <TextField source="staNo" label="table.field.sta.staNo" />
                    <TextField source="name" label="table.field.sta.name" />
                    <ReferenceField source="staType" label="table.field.sta.staType" reference="staType" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <ReferenceField source="code" label="table.field.sta.code" reference="code" link={false} sortable={false}>
                        <TextField source="uuid" />
                        <TextField source="data" />
                    </ReferenceField>
                    <NumberField source="offset" label="table.field.sta.offset" />
                    <TextField source="autoing" label="table.field.sta.autoing" />
@@ -158,7 +158,13 @@
                    </ReferenceField>

                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">

 zy-acs-flow/src/page/staSts/StaStsList.jsx

@@ -113,14 +113,20 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <StaStsPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.staSts.uuid" />
                    <TextField source="name" label="table.field.staSts.name" />

                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">

 zy-acs-flow/src/page/staType/StaTypeList.jsx

@@ -113,14 +113,20 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <StaTypePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.staType.uuid" />
                    <TextField source="name" label="table.field.staType.name" />

                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">

 zy-acs-flow/src/page/zone/ZoneList.jsx

@@ -115,7 +115,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <ZonePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.zone.uuid" />
@@ -124,7 +124,13 @@
                    <NumberField source="capacity" label="table.field.zone.capacity" />

                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">

 zy-acs-framework/src/main/resources/templates/react-admin/Controller.txt

@@ -40,7 +40,7 @@
        return R.ok().add(@{SIMPLEENTITYNAME}Service.list());
    }

    @PreAuthorize("hasAuthority('system:@{SIMPLEENTITYNAME}:list')")
    @PreAuthorize("hasAuthority('@{ITEMNAME}:@{SIMPLEENTITYNAME}:list')")
    @PostMapping({"/@{SIMPLEENTITYNAME}/many/{ids}", "/@{SIMPLEENTITYNAME}s/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(@{SIMPLEENTITYNAME}Service.listByIds(Arrays.asList(ids)));

 zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt

@@ -111,12 +111,18 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <@{ENTITYNAME}Panel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
@{REACTLISTCONTENT}
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java

@@ -40,7 +40,7 @@
        return R.ok().add(codeService.list());
    }

    @PreAuthorize("hasAuthority('system:code:list')")
    @PreAuthorize("hasAuthority('manager:code:list')")
    @PostMapping({"/code/many/{ids}", "/codes/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(codeService.listByIds(Arrays.asList(ids)));

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java

@@ -40,7 +40,7 @@
        return R.ok().add(staService.list());
    }

    @PreAuthorize("hasAuthority('system:sta:list')")
    @PreAuthorize("hasAuthority('manager:sta:list')")
    @PostMapping({"/sta/many/{ids}", "/stas/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(staService.listByIds(Arrays.asList(ids)));

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaStsController.java

@@ -40,7 +40,7 @@
        return R.ok().add(staStsService.list());
    }

    @PreAuthorize("hasAuthority('system:staSts:list')")
    @PreAuthorize("hasAuthority('manager:staSts:list')")
    @PostMapping({"/staSts/many/{ids}", "/staStss/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(staStsService.listByIds(Arrays.asList(ids)));

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaTypeController.java

@@ -40,7 +40,7 @@
        return R.ok().add(staTypeService.list());
    }

    @PreAuthorize("hasAuthority('system:staType:list')")
    @PreAuthorize("hasAuthority('manager:staType:list')")
    @PostMapping({"/staType/many/{ids}", "/staTypes/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(staTypeService.listByIds(Arrays.asList(ids)));

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ZoneController.java

@@ -40,7 +40,7 @@
        return R.ok().add(zoneService.list());
    }

    @PreAuthorize("hasAuthority('system:zone:list')")
    @PreAuthorize("hasAuthority('manager:zone:list')")
    @PostMapping({"/zone/many/{ids}", "/zones/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(zoneService.listByIds(Arrays.asList(ids)));