隔离点关联锁具类型表调整

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsIsolationPointController.java

@@ -10,12 +10,12 @@ import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsIsolationPoint;
 import com.ktg.iscs.domain.dto.point.PagePointDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
+import com.ktg.iscs.domain.vo.points.PointPageVO;
 import com.ktg.iscs.service.IIsIsolationPointService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -46,8 +46,8 @@ public class IsIsolationPointController extends BaseController {
     })
     @PreAuthorize("@ss.hasPermi('mes:md:seg:query')")
     @GetMapping("/getIsIsolationPointPage")
-    public CommonResult<Page<IsIsolationPoint>> getIsIsolationPointPage(Page<IsIsolationPoint> page, PagePointDTO dto) {
-        Page<IsIsolationPoint> result = isIsolationPointService.page(page, Wrappers.<IsIsolationPoint>lambdaQuery()
+    public CommonResult<Page<PointPageVO>> getIsIsolationPointPage(Page<IsIsolationPoint> page, PagePointDTO dto) {
+       /*Page<IsIsolationPoint> result = isIsolationPointService.page(page, Wrappers.<IsIsolationPoint>lambdaQuery()
                 .like(StringUtils.isNotBlank(dto.getPointCode()), IsIsolationPoint::getPointCode, dto.getPointCode())
                 .like(StringUtils.isNotBlank(dto.getPointName()), IsIsolationPoint::getPointName, dto.getPointName())
                 .eq(StringUtils.isNotBlank(dto.getDelFlag()), IsIsolationPoint::getDelFlag, dto.getDelFlag())
@@ -56,7 +56,8 @@ public class IsIsolationPointController extends BaseController {
                 .ge(StringUtils.isNotBlank(dto.getStartTime()), IsIsolationPoint::getCreateTime, dto.getStartTime())
                 .le(StringUtils.isNotBlank(dto.getEndTime()), IsIsolationPoint::getCreateTime, dto.getEndTime())
                 .eq(dto.getLockTypeId() != null, IsIsolationPoint::getLockTypeId, dto.getLockTypeId())
-                .orderByDesc(IsIsolationPoint::getPointId));
+                .orderByDesc(IsIsolationPoint::getPointId));*/
+        Page<PointPageVO> result = isIsolationPointService.getIsIsolationPointPage(page, dto);
         return CommonResult.success(result);
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -65,14 +65,17 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "锁具类型id")
     private Long lockTypeId;
 
-    @ApiModelProperty(value = "锁具名称")
-    private String lockName;
+    @ApiModelProperty(value = "锁具类型编码")
+    private String lockTypeCode;
 
-    @ApiModelProperty(value = "锁具类型")
-    private String lockType;
+    @ApiModelProperty(value = "锁具类型名称")
+    private String lockTypeName;
 
-    @ApiModelProperty(value = "锁具图片")
-    private String lockImg;
+    @ApiModelProperty(value = "锁具类型图标")
+    private String lockTypeIcon;
+
+    @ApiModelProperty(value = "锁具类型图片")
+    private String lockTypeImg;
 
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointPageVO.java

@@ -0,0 +1,71 @@
+package com.ktg.iscs.domain.vo.points;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 隔离点对象 is_isolation_point
+ *
+ * @author cgj
+ * @date 2024-10-18
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class PointPageVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "隔离点ID")
+    private Long pointId;
+
+    @ApiModelProperty(value = "隔离点编号")
+    private String pointCode;
+
+    @ApiModelProperty(value = "隔离点名称")
+    private String pointName;
+
+    @ApiModelProperty(value = "隔离点类型")
+    private String pointType;
+
+    @ApiModelProperty(value = "所属车间ID")
+    private Long workshopId;
+
+    @ApiModelProperty(value = "所属区域ID")
+    private Long workareaId;
+
+    @ApiModelProperty(value = "危险能量类型")
+    private String powerType;
+
+    @ApiModelProperty(value = "隔离方式")
+    private String isolationMethod;
+
+    @ApiModelProperty(value = "隔离点图标")
+    private String pointIcon;
+
+    @ApiModelProperty(value = "隔离点图片")
+    private String pointPicture;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty(value = "锁具类型id")
+    private Long lockTypeId;
+
+    @ApiModelProperty(value = "锁具类型编码")
+    private String lockTypeCode;
+
+    @ApiModelProperty(value = "锁具类型名称")
+    private String lockTypeName;
+
+    @ApiModelProperty(value = "锁具类型图标")
+    private String lockTypeIcon;
+
+    @ApiModelProperty(value = "锁具类型图片")
+    private String lockTypeImg;
+
+}

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

@@ -1,8 +1,11 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsIsolationPoint;
+import com.ktg.iscs.domain.dto.point.PagePointDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
+import com.ktg.iscs.domain.vo.points.PointPageVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,4 +69,6 @@ public interface IsIsolationPointMapper extends BaseMapperX<IsIsolationPoint>
     int deleteIsIsolationPointByPointIds(Long[] pointIds);
 
     List<PointDetailVO> getPointDetailList(@Param(value = "pointIds") List<Long> pointIds);
+
+    Page<PointPageVO> getIsIsolationPointPage(Page<IsIsolationPoint> page, @Param(value = "dto") PagePointDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsIsolationPointService.java

@@ -1,8 +1,11 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsIsolationPoint;
+import com.ktg.iscs.domain.dto.point.PagePointDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
+import com.ktg.iscs.domain.vo.points.PointPageVO;
 
 import java.util.List;
 
@@ -64,5 +67,7 @@ public interface IIsIsolationPointService extends IService<IsIsolationPoint>
 
     List<PointDetailVO> getPointDetailList(List<Long> pointIds);
 
+    Page<PointPageVO> getIsIsolationPointPage(Page<IsIsolationPoint> page, PagePointDTO dto);
+
 
 }

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

@@ -2,12 +2,15 @@ package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
 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.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.iscs.domain.IsIsolationPoint;
 import com.ktg.iscs.domain.IsSopPoints;
+import com.ktg.iscs.domain.dto.point.PagePointDTO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
+import com.ktg.iscs.domain.vo.points.PointPageVO;
 import com.ktg.iscs.mapper.IsIsolationPointMapper;
 import com.ktg.iscs.service.IIsIsolationPointService;
 import com.ktg.iscs.service.IIsSopPointsService;
@@ -144,4 +147,9 @@ public class IsIsolationPointServiceImpl extends ServiceImpl<IsIsolationPointMap
         List<PointDetailVO> isIsolationPoints = isIsolationPointMapper.getPointDetailList(pointIds);
         return isIsolationPoints;
     }
+
+    @Override
+    public Page<PointPageVO> getIsIsolationPointPage(Page<IsIsolationPoint> page, PagePointDTO dto) {
+        return isIsolationPointMapper.getIsIsolationPointPage(page, dto);
+    }
 }

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

@@ -136,9 +136,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             p.*,
             wa.workarea_name,
-            l.lock_name,
-            l.lock_type,
-            l.lock_img
+            l.lock_type_name,
+            l.lock_type_code,
+            l.lock_type_icon,
+            l.lock_type_img
         FROM
             is_isolation_point p
                 LEFT JOIN is_workarea wa ON p.workarea_id = wa.workarea_id
@@ -146,4 +147,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             p.point_id = #{pointId}
     </select>
+    <select id="getIsIsolationPointPage" resultType="com.ktg.iscs.domain.vo.points.PointPageVO">
+        SELECT
+            p.*,
+            l.lock_type_name,
+            l.lock_type_code,
+            l.lock_type_icon,
+            l.lock_type_img
+        FROM
+            is_isolation_point p
+                LEFT JOIN is_lock_type l ON l.lock_type_id = p.lock_type_id
+        <where>
+            <if test="dto.pointCode != null and dto.pointCode.trim != ''">
+                and p.point_code like concat('%',#{dto.pointCode},'%')
+            </if>
+            <if test="dto.pointName != null and dto.pointName.trim != ''">
+                and p.point_name like concat('%',#{dto.pointName},'%')
+            </if>
+            <if test="dto.delFlag != null and dto.delFlag.trim != ''">
+                and p.del_flag = #{dto.delFlag}
+            </if>
+            <if test="dto.pointType != null and dto.pointType.trim != ''">
+                and p.point_type = #{dto.pointType}
+            </if>
+            <if test="dto.powerType != null and dto.powerType.trim != ''">
+                and p.power_type = #{dto.powerType}
+            </if>
+            <if test="dto.startTime != null and dto.startTime.trim != ''">
+                and p.create_time &gt;= #{dto.startTime}
+            </if>
+            <if test="dto.endTime != null and dto.endTime.trim != ''">
+                and p.create_time &lt;= #{dto.endTime}
+            </if>
+            <if test="dto.lockTypeId != null">
+                and p.lock_type_id = #{dto.lockTypeId}
+            </if>
+        </where>
+            order by p.pointId desc
+    </select>
 </mapper>