From a4112a5d31fa3a66daafdc009ff3b3047bb98f67 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 24 五月 2025 17:14:04 +0800 Subject: [PATCH] #巷道 --- rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx | 2 +- rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx | 4 ++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java | 3 +++ rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 4 +++- rsf-admin/src/i18n/zh.js | 1 + rsf-admin/src/i18n/en.js | 2 ++ rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 4 ++++ 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index 31817ea..4f6fb83 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -771,6 +771,8 @@ deviceCode: "deviceCode", deviceSite: "deviceSite", flagInit: "flagInit", + wcsCode: "wcsCode", + channel: "channel", }, waitPakin: { code: "code", diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js index c374037..5f6a0a8 100644 --- a/rsf-admin/src/i18n/zh.js +++ b/rsf-admin/src/i18n/zh.js @@ -800,6 +800,7 @@ deviceSite: "璁惧绔欑偣", flagInit: "鏄惁鍒濆鍖�", wcsCode: "wcs缂栧彿", + channel: "宸烽亾", }, waitPakin: { code: "缂栫爜", diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx index 706513c..6a3ae77 100644 --- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx +++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx @@ -157,7 +157,7 @@ <TextField source="target" label="table.field.deviceSite.target" /> <TextField source="label" label="table.field.deviceSite.label" /> <TextField source="device$" label="table.field.deviceSite.device" /> - <TextField source="deviceCode" label="table.field.deviceSite.deviceCode" /> + <TextField source="channel" label="table.field.deviceSite.channel" /> <TextField source="deviceSite" label="table.field.deviceSite.deviceSite" /> <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}> <TextField source="nickname" /> diff --git a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx index 163c261..57c9d8c 100644 --- a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx +++ b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx @@ -121,8 +121,8 @@ </Grid> <Grid item xs={4}> <TextInput - label={translate("table.field.deviceSite.deviceCode")} - name="deviceCode" + label={translate("table.field.deviceSite.channel")} + name="channel" size="small" type="number" /> diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java index 68b6a76..45e687e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java @@ -31,4 +31,7 @@ @ApiModelProperty("鐩爣绔欑偣") private String target; + @ApiModelProperty("宸烽亾") + private Integer channel; + } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java index 2cd8934..4a318c6 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java @@ -105,6 +105,10 @@ @TableLogic private Integer deleted; + @ApiModelProperty(value= "宸烽亾") + private Integer channel; + + /** * 绉熸埛 */ diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java index 9f28a03..6526f3b 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java @@ -60,7 +60,9 @@ .setDevice(param.getDeviceType()) .setDeviceSite(deviceSite) .setTarget(target) - .setDeviceCode(param.getDeviceCode()); + .setDeviceCode(param.getDeviceCode()) + .setChannel(param.getChannel()) + ; deviceSites.add(site1); } } -- Gitblit v1.9.1