对接map

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMapPoint.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +29,10 @@ public class IsMapPoint extends BaseBean
     @Excel(name = "地图名称")
     private Long mapId;
 
+    @ApiModelProperty(value = "地图名称")
+    @TableField(exist = false)
+    private String mapName;
+
     @ApiModelProperty(value = "地图类型（1岗位; 2锁定站）")
     @Excel(name = "地图类型", readConverterExp = "1=岗位;,2=锁定站")
     private String mapType;
@@ -36,6 +41,10 @@ public class IsMapPoint extends BaseBean
     @Excel(name = "实体id")
     private Long entityId;
 
+    @ApiModelProperty(value = "实体NAME")
+    @TableField(exist = false)
+    private String entityName;
+
     @ApiModelProperty(value = "x坐标")
     @Excel(name = "x坐标")
     private String x;
@@ -44,12 +53,7 @@ public class IsMapPoint extends BaseBean
     @Excel(name = "y坐标")
     private String y;
 
-    @ApiModelProperty(value = "(x,y)")
-    @Excel(name = "(x,y)")
-    private String xy;
-
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-
 }

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMapPointMapper.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsMapPoint;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 地图点位数据Mapper接口
@@ -15,4 +15,6 @@ import com.ktg.iscs.domain.IsMapPoint;
 @Mapper
 public interface IsMapPointMapper extends BaseMapperX<IsMapPoint> {
 
+    Page<IsMapPoint> getIsMapPointPage(Page<IsMapPoint> page, @Param(value = "isMapPoint") IsMapPoint isMapPoint);
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMapPointServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.iscs.domain.IsMapPoint;
@@ -23,9 +22,8 @@ public class IsMapPointServiceImpl extends ServiceImpl<IsMapPointMapper, IsMapPo
 
     @Override
     public Page<IsMapPoint> getIsMapPointPage(Page<IsMapPoint> page, IsMapPoint isMapPoint) {
-        Page<IsMapPoint> result = page(page, Wrappers.<IsMapPoint>lambdaQuery()
-                .orderByDesc(IsMapPoint::getId));
-        return result;
+        Page<IsMapPoint> isMapPointPage = isMapPointMapper.getIsMapPointPage(page, isMapPoint);
+        return isMapPointPage;
     }
 
 }

ktg-iscs/src/main/resources/mapper/IsMapPointMapper.xml

@@ -4,4 +4,29 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsMapPointMapper">
 
+    <select id="getIsMapPointPage" resultType="com.ktg.iscs.domain.IsMapPoint">
+        SELECT
+            p.*,
+            m.name as map_name,
+            CASE
+                WHEN p.map_type = "1" THEN
+                    w.workstation_name
+                WHEN p.map_type = "2" THEN
+                    ip.point_name
+                END AS entity_name
+        FROM
+            is_map_point p
+                LEFT JOIN is_map m ON m.id = p.map_id
+                LEFT JOIN is_workstation w ON w.workstation_id = p.entity_id
+                LEFT JOIN is_isolation_point ip ON ip.point_id = p.entity_id
+        <where>
+            <if test="isMapPoint.mapId != null">
+            and p.map_id = #{isMapPoint.mapId}
+            </if>
+            <if test="isMapPoint.mapName != null  and isMapPoint.mapName != ''">
+                and m.name like concat('%',#{isMapPoint.mapName},'%')
+            </if>
+        </where>
+        order by p.id desc
+    </select>
 </mapper>