提交代码

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppLineTopologyDiagramVO.java

@@ -0,0 +1,45 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:18【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * 项目拓扑图关系表
+    */
+@Data
+public class AppLineTopologyDiagramVO  {
+    /**
+     * 拓扑图Id
+     */
+    private String id;
+
+    /**
+     * 监测点ID
+     */
+    private String lineId;
+
+    /**
+     * 0：删除 1：正常
+     */
+    private String status;
+
+    private Double lng;
+
+    private Double lat;
+
+    private String linePostion;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppTopologyDiagramVO.java

@@ -60,7 +60,7 @@ public class AppTopologyDiagramVO extends BaseEntity {
 
     private List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOList;
 
-    private List<AppLineTopologyDiagramPO> appsLineTopologyDiagramPO;
+    private List<AppLineTopologyDiagramVO> appsLineTopologyDiagramPO;
 
 
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppLineTopologyDiagramMapper.java

@@ -2,6 +2,10 @@ package com.njcn.csdevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 
@@ -13,4 +17,5 @@ import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
  * @version V1.0.0
  */
 public interface AppLineTopologyDiagramMapper extends BaseMapper<AppLineTopologyDiagramPO> {
+    List<AppLineTopologyDiagramVO> queryByTopoId(@Param("id") String id);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml

@@ -16,4 +16,8 @@
     <!--@mbg.generated-->
     id, line_id, `status`, create_by, create_time, update_by, update_time
   </sql>
+
+  <select id="queryByTopoId" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
+    select a.*,b.position linePostion  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where a.id=#{id}
+  </select>
 </mapper>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppLineTopologyDiagramService.java

@@ -2,6 +2,7 @@ package com.njcn.csdevice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO;
 import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
 import com.njcn.csdevice.pojo.vo.CsLineTopologyTemplateVO;
 
@@ -21,5 +22,5 @@ public interface AppLineTopologyDiagramService extends IService<AppLineTopologyD
 
     AppTopologyDiagramVO query(String devId);
 
-    List<AppLineTopologyDiagramPO> queryByTopoId(String id);
+    List<AppLineTopologyDiagramVO> queryByTopoId(String id);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java

@@ -8,6 +8,7 @@ import com.njcn.csdevice.mapper.AppLineTopologyDiagramMapper;
 import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
 import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO;
 import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
 import com.njcn.csdevice.pojo.vo.CsLineTopologyTemplateVO;
 import com.njcn.csdevice.service.AppLineTopologyDiagramService;
@@ -16,6 +17,7 @@ import com.njcn.csdevice.service.CsLinePOService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,8 +57,9 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
     }
 
     @Override
-    public List<AppLineTopologyDiagramPO> queryByTopoId(String id) {
-        List<AppLineTopologyDiagramPO> list = this.lambdaQuery().eq(AppLineTopologyDiagramPO::getId, id).list();
-        return list;
+    public List<AppLineTopologyDiagramVO> queryByTopoId(String id) {
+        List<AppLineTopologyDiagramVO> result = new ArrayList<>();
+        result = this.getBaseMapper().queryByTopoId( id);
+        return result;
     }
 }