From 31c21a43f4c6a8939cbd0f6c271954c5f3521f64 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 15 Jul 2025 11:25:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E7=A8=8B=E3=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java | 8 ++++++++ .../njcn/csdevice/service/impl/CsLedgerServiceImpl.java | 2 ++ 2 files changed, 10 insertions(+) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java index 7b87cdd..a67127d 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java @@ -28,8 +28,16 @@ public class CsLedgerVO implements Serializable { @ApiModelProperty(name = "path",value = "拓扑图路径") private String path; + + @ApiModelProperty(name = "provinceId",value = "省Id") + private String provinceId; + + @ApiModelProperty(name = "cityId",value = "市Id") + private String cityId; + @ApiModelProperty(name = "area",value = "区域") private String area; + @ApiModelProperty(name = "remark",value = "备注") private String remark; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index f12815a..a09eb6c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -356,6 +356,8 @@ public class CsLedgerServiceImpl extends ServiceImpl i engineeringList.forEach(eng -> { CsEngineeringPO csEngineeringPO = csEngineeringMapper.selectById(eng.getId()); eng.setArea(this.getAreaById(csEngineeringPO.getProvince())+this.getAreaById(csEngineeringPO.getCity())); + eng.setProvinceId(csEngineeringPO.getProvince()); + eng.setCityId(csEngineeringPO.getCity()); eng.setRemark(csEngineeringPO.getDescription()); eng.setChildren(getChildren(eng, projectList)); }