From 18e945b058a0ae96d13c8dfa0de25005e0292560 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Fri, 9 Jun 2023 09:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/pojo/param/CsDevModelAddParm.java | 5 +++++ .../pojo/param/CsDevModelAuditParm.java | 3 +++ .../csdevice/pojo/param/CsEdDataAddParm.java | 3 +++ .../csdevice/pojo/param/CsEdDataAuditParm.java | 3 +++ .../njcn/csdevice/pojo/po/CsDevModelPO.java | 3 +++ .../com/njcn/csdevice/pojo/po/CsEdDataPO.java | 4 ++++ .../njcn/csdevice/pojo/vo/AppProjectVO.java | 2 +- .../csdevice/pojo/vo/CsDevModelPageVO.java | 4 ++-- .../com/njcn/csdevice/pojo/vo/CsEdDataVO.java | 4 ++-- .../mapper/mapping/CsDevModelMapper.xml | 12 ++++-------- .../csdevice/mapper/mapping/CsEdDataMapper.xml | 7 ++----- .../service/impl/AppProjectServiceImpl.java | 18 +++++++++++++----- 12 files changed, 45 insertions(+), 23 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java index 5d02b5f..36089c3 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotBlank; import java.time.LocalDateTime; /** @@ -27,6 +28,10 @@ public class CsDevModelAddParm { @ApiModelProperty(value = "装置型号") private String devType; + @ApiModelProperty(value = "装置型号") + @NotBlank(message="装置型号名称不能为空！") + private String devTypeName; + @ApiModelProperty(value = "模板名称") private String name; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java index 305a3d9..41a4d52 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; @@ -28,6 +29,8 @@ public class CsDevModelAuditParm { */ @ApiModelProperty(value = "装置型号") private String devType; + @ApiModelProperty(value = "装置型号") + private String devTypeName; @ApiModelProperty(value = "模板名称") private String name; /** diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java index 45bbe42..0bb8aaf 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java @@ -31,6 +31,9 @@ public class CsEdDataAddParm { @ApiModelProperty(value = "装置型号") @NotBlank(message="装置型号不能为空！") private String devType; + @ApiModelProperty(value = "装置型号") + @NotBlank(message="装置型号名称不能为空！") + private String devTypeName; @ApiModelProperty(value = "装置类型") private String type; /** diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java index 5ef0e34..20be7a1 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java @@ -6,6 +6,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.multipart.MultipartFile; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; @@ -30,6 +31,8 @@ public class CsEdDataAuditParm { */ @ApiModelProperty(value = "装置型号") private String devType; + @ApiModelProperty(value = "装置型号") + private String devTypeName; @ApiModelProperty(value = "装置类型") private String type; /** diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java index 856c4c6..b404ea1 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java @@ -36,6 +36,9 @@ public class CsDevModelPO extends BaseEntity { @TableField(value = "dev_type") private String devType; + @TableField(value = "dev_type_name") + private String devTypeName; + /** * 模板名称 */ diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java index 8be99d3..65656ea 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java @@ -37,6 +37,10 @@ public class CsEdDataPO extends BaseEntity { */ @TableField(value = "dev_type") private String devType; + + @TableField(value = "dev_type_name") + private String devTypeName; + /** * 装置类型(直连设备、网关设备) */ diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppProjectVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppProjectVO.java index bd0dd6c..bb0d36b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppProjectVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppProjectVO.java @@ -45,7 +45,7 @@ public class AppProjectVO { /** * 拓扑图路径 */ - private List topologyDiagramPaths; + private List topologyDiagramPaths; /** * 中心点经度 diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java index 6584b6b..b611d4e 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java @@ -32,8 +32,8 @@ public class CsDevModelPageVO extends BaseEntity { */ @ApiModelProperty(value = "设备模板型号id") private String devType; - @ApiModelProperty(value = "设备模板型号id名称") - private String devName; + private String devTypeName; + @ApiModelProperty(value = "模板名称") private String name; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java index 881ac49..32a26b4 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java @@ -30,8 +30,8 @@ public class CsEdDataVO extends BaseEntity { */ @ApiModelProperty(value = "装置型号") private String devType; - @ApiModelProperty(value = "装置名称") - private String devName; + private String devTypeName; + @ApiModelProperty(value = "装置类型") private String type; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml index c6ed5d8..d3783ef 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml @@ -20,10 +20,8 @@ id, dev_type, version_no, version_date, file_path, create_by, create_time, update_by, update_time, `status` - SELECT a.*, - b.code as devName - FROM cs_ed_data a - LEFT JOIN sys_dict_data b ON a.dev_type = b.id + SELECT a.* FROM cs_ed_data a WHERE 1 = 1 @@ -38,7 +35,7 @@ - AND b.CODE LIKE concat('%',#{csEdDataQueryParm.devName},'%') + AND a.dev_type_name LIKE concat('%',#{csEdDataQueryParm.devName},'%') AND a.dev_type = #{csEdDataQueryParm.devType} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java index 82046f3..f114c09 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java @@ -6,12 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.mapper.AppProjectMapper; -import com.njcn.csdevice.pojo.param.AppProjectAddParm; -import com.njcn.csdevice.pojo.param.AppProjectAuditParm; -import com.njcn.csdevice.pojo.param.AppProjectQueryParm; -import com.njcn.csdevice.pojo.param.AppTopologyDiagramAddParm; +import com.njcn.csdevice.pojo.param.*; import com.njcn.csdevice.pojo.po.AppProjectPO; import com.njcn.csdevice.pojo.vo.AppProjectVO; +import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; import com.njcn.csdevice.service.AppProjectService; import com.njcn.csdevice.service.AppTopologyDiagramService; import com.njcn.oss.utils.FileStorageUtil; @@ -21,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; /** * Description: @@ -32,7 +31,7 @@ import java.util.List; */ @Service @RequiredArgsConstructor -public class AppProjectServiceImpl extends ServiceImpl implements AppProjectService { +class AppProjectServiceImpl extends ServiceImpl implements AppProjectService { private final AppProjectMapper appProjectMapper; private final AppTopologyDiagramService appTopologyDiagramService; @@ -104,6 +103,15 @@ public class AppProjectServiceImpl extends ServiceImpl returnpage = new Page<> (appProjectQueryParm.getCurrentPage ( ), appProjectQueryParm.getPageSize ( )); returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm); + List collect = returnpage.getRecords().stream().map(temp -> { + AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm(); + appTopologyDiagramQueryParm.setProjectId(temp.getId()); + List appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramQueryParm); + temp.setTopologyDiagramPaths(appTopologyDiagramVOList); + return temp; + }).collect(Collectors.toList()); + returnpage.setRecords(collect); + // Page appProjectPOPage = new Page<> (appProjectQueryParm.getCurrentPage ( ), appProjectQueryParm.getPageSize ( )); // QueryWrapper queryWrapper = new QueryWrapper ( ); // queryWrapper.eq ("status", "1").