From 8306e37c038e5b7c853462863ab8240f266405f3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 13 九月 2024 14:12:32 +0800 Subject: [PATCH] # --- zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt | 8 +++ 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/controller/ZoneController.java | 2 zy-acs-flow/src/page/sta/StaList.jsx | 12 ++++- zy-acs-flow/src/page/zone/ZoneList.jsx | 8 +++ zy-acs-flow/src/page/staSts/StaStsList.jsx | 8 +++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaTypeController.java | 2 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java | 2 zy-acs-flow/src/page/code/CodeList.jsx | 8 +++ zy-acs-framework/src/main/resources/templates/react-admin/Controller.txt | 2 zy-acs-flow/src/page/staType/StaTypeList.jsx | 8 +++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaStsController.java | 2 12 files changed, 50 insertions(+), 14 deletions(-) diff --git a/zy-acs-flow/src/page/code/CodeList.jsx b/zy-acs-flow/src/page/code/CodeList.jsx index 2e236b5..cc4253d 100644 --- a/zy-acs-flow/src/page/code/CodeList.jsx +++ b/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"> diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx index 10b751d..b9530d8 100644 --- a/zy-acs-flow/src/page/sta/StaList.jsx +++ b/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"> diff --git a/zy-acs-flow/src/page/staSts/StaStsList.jsx b/zy-acs-flow/src/page/staSts/StaStsList.jsx index 78d52a2..587b1f4 100644 --- a/zy-acs-flow/src/page/staSts/StaStsList.jsx +++ b/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"> diff --git a/zy-acs-flow/src/page/staType/StaTypeList.jsx b/zy-acs-flow/src/page/staType/StaTypeList.jsx index 5e82b40..0b02739 100644 --- a/zy-acs-flow/src/page/staType/StaTypeList.jsx +++ b/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"> diff --git a/zy-acs-flow/src/page/zone/ZoneList.jsx b/zy-acs-flow/src/page/zone/ZoneList.jsx index c1684d3..5ddecf2 100644 --- a/zy-acs-flow/src/page/zone/ZoneList.jsx +++ b/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"> diff --git a/zy-acs-framework/src/main/resources/templates/react-admin/Controller.txt b/zy-acs-framework/src/main/resources/templates/react-admin/Controller.txt index 40d55ba..1a112d3 100644 --- a/zy-acs-framework/src/main/resources/templates/react-admin/Controller.txt +++ b/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))); diff --git a/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt b/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt index 55cd2ce..70f65df 100644 --- a/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt +++ b/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"> 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 e1641d5..6b54c89 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 @@ -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))); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java index ec549bc..d81987e 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaController.java +++ b/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))); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaStsController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaStsController.java index bdd98e2..51b98da 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaStsController.java +++ b/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))); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaTypeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaTypeController.java index 3f6cd02..eeb38a0 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/StaTypeController.java +++ b/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))); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ZoneController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ZoneController.java index 8a94def..8d47faf 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ZoneController.java +++ b/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))); -- Gitblit v1.9.1