2022-12-14 布局图补充楼栋楼层的名称

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabExitLineVertexDetailVo.java

@@ -0,0 +1,24 @@
+package com.zd.laboratory.domain.vo;
+
+import com.zd.laboratory.domain.LabExitLineVertex;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author cyl
+ * @date 2022/12/14
+ */
+@ApiModel("逃生线路顶点")
+@Data
+public class LabExitLineVertexDetailVo extends LabExitLineVertex {
+    /** 楼栋名称 */
+    @ApiModelProperty(value = "楼栋名称")
+    private String buildName;
+
+    /** 楼层名称 */
+    @ApiModelProperty(value = "楼层名称")
+    private String floorName;
+}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabExitLineVertexMapper.java

@@ -3,6 +3,7 @@ package com.zd.laboratory.mapper;
 import com.zd.laboratory.domain.LabExitLine;
 import com.zd.laboratory.domain.LabExitLineVertex;
 import com.zd.laboratory.domain.vo.LabExitLineVO;
+import com.zd.laboratory.domain.vo.LabExitLineVertexDetailVo;
 
 import java.util.List;
 
@@ -80,5 +81,5 @@ public interface LabExitLineVertexMapper
      * @param labExitLineVertex 布局图
      * @return 布局图
      */
-    public List<LabExitLineVertex> getExitLineVertexList(LabExitLineVertex labExitLineVertex);
+    public List<LabExitLineVertexDetailVo> getExitLineVertexList(LabExitLineVertex labExitLineVertex);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabBuildFloorServiceImpl.java

@@ -120,9 +120,11 @@ public class LabBuildFloorServiceImpl implements ILabBuildFloorService {
             LabExitLineVertex labExitLineVertex = new LabExitLineVertex();
             labExitLineVertex.setBuildId(labBuildFloor.getParentId());
             labExitLineVertex.setFloorId(labBuildFloor.getId());
-            List<LabExitLineVertex> exitLineList = labExitLineVertexMapper.getExitLineVertexList(labExitLineVertex);
+            List<LabExitLineVertexDetailVo> exitLineList = labExitLineVertexMapper.getExitLineVertexList(labExitLineVertex);
             if(exitLineList.size()<1){
-                exitLineList.add(labExitLineVertex);
+                LabExitLineVertexDetailVo labExitLineVertexDetailVo = new LabExitLineVertexDetailVo();
+                BeanUtils.copyProperties(labExitLineVertex,labExitLineVertexDetailVo);
+                exitLineList.add(labExitLineVertexDetailVo);
             }
             labBuildFloorPage.setTotal(new PageInfo(exitLineList).getTotal());
             labBuildFloorPage.setLabBuildList(new LabBuildList<LabExitLineVertex>().getDataTable(exitLineList));

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineVertexServiceImpl.java

@@ -620,7 +620,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
     public LabExitLineVertexInfoVo getFloorInfo(Long floorId) {
         LabExitLineVertex labExitLineVertex = new LabExitLineVertex();
         labExitLineVertex.setFloorId(floorId);
-        List<LabExitLineVertex> exitLineList = labExitLineVertexMapper.getExitLineVertexList(labExitLineVertex);
+        List<LabExitLineVertexDetailVo> exitLineList = labExitLineVertexMapper.getExitLineVertexList(labExitLineVertex);
         //布局图基础信息
         LabExitLineVertexInfoVo labExitLineVertexInfoVo = new LabExitLineVertexInfoVo();
         if(exitLineList.size()>0){

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabExitLineVertexMapper.xml

@@ -28,7 +28,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <sql id="selectLabExitLineListVo">
         select t.id,t.build_id, t.floor_id, t.relational_data, t.layout_data, t.layout_join_data, t.img_url, t.canvas_width, t.canvas_height, t.user_id, t.create_by, t.create_time,
-        t.update_by, t.update_time, t.remark from lab_exit_line_vertex as t
+        t.update_by, t.update_time, t.remark,
+        (SELECT bf.name FROM lab_build_floor bf WHERE bf.type=2 AND bf.id = t.build_id) buildName,
+        (SELECT bf.name FROM lab_build_floor bf WHERE bf.type=3 AND bf.id = t.floor_id) floorName
+        from lab_exit_line_vertex as t
     </sql>
     <select id="selectLabExitLineVertexList" parameterType="com.zd.laboratory.domain.LabExitLineVertex" resultMap="LabExitLineVertexResult">
         <include refid="selectLabExitLineVertexVo"/>
@@ -46,12 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getExitLineVertexList" parameterType="com.zd.laboratory.domain.LabExitLineVertex" resultMap="LabExitLineVertexResult">
-        <include refid="selectLabExitLineVertexVo"/>
+    <select id="getExitLineVertexList" parameterType="com.zd.laboratory.domain.LabExitLineVertex" resultType="com.zd.laboratory.domain.vo.LabExitLineVertexDetailVo">
+        <include refid="selectLabExitLineListVo"/>
         <where>
-            <if test="id != null "> and id = #{id}</if>
-            <if test="buildId != null "> and build_id = #{buildId}</if>
-            <if test="floorId != null "> and floor_id = #{floorId}</if>
+            <if test="id != null "> and t.id = #{id}</if>
+            <if test="buildId != null "> and t.build_id = #{buildId}</if>
+            <if test="floorId != null "> and t.floor_id = #{floorId}</if>
         </where>
     </select>