安全围栏加区域字段

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/entity/MechanicalEquipmentPositionFence.java

@@ -1,18 +1,18 @@
 package com.zhgd.xmgl.modules.mechanicalequipmentposition.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 机械设备定位-围栏
@@ -89,7 +89,14 @@ public class MechanicalEquipmentPositionFence implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "区域id")
+    private Long qualityRegionId;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "围栏内人数")
     private Integer workerNum;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "区域名称")
+    private String regionName;
 }

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionFenceMapper.java

@@ -1,8 +1,15 @@
 package com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionFence;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description: 机械设备定位-围栏
@@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface MechanicalEquipmentPositionFenceMapper extends BaseMapper<MechanicalEquipmentPositionFence> {
 
+    IPage<MechanicalEquipmentPositionFence> queryList(Page<MechanicalEquipmentPositionFence> page,@Param(Constants.WRAPPER) QueryWrapper<MechanicalEquipmentPositionFence> queryWrapper);
+
+    List<MechanicalEquipmentPositionFence> queryList(@Param(Constants.WRAPPER)QueryWrapper<MechanicalEquipmentPositionFence> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionFenceMapper.xml

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionFenceMapper">
+
+<select id="queryList"
+            resultType="com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionFence">
+    select t.*, qr.region_name
+    from mechanical_equipment_position_fence t
+    left join quality_region qr on t.quality_region_id = qr.id
+    ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionFenceServiceImpl.java

@@ -2,29 +2,28 @@ package com.zhgd.xmgl.modules.mechanicalequipmentposition.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData;
 import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionFence;
 import com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionDataMapper;
 import com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionFenceMapper;
 import com.zhgd.xmgl.modules.mechanicalequipmentposition.service.IMechanicalEquipmentPositionFenceService;
+import com.zhgd.xmgl.util.PageUtil;
+import com.zhgd.xmgl.util.RefUtil;
 import com.zhgd.xmgl.util.RegionUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.util.PageUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
-import com.zhgd.xmgl.util.RefUtil;
-
 /**
  * @Description: 机械设备定位-围栏
  * @author： pds
@@ -40,7 +39,7 @@ public class MechanicalEquipmentPositionFenceServiceImpl extends ServiceImpl<Mec
     public IPage<MechanicalEquipmentPositionFence> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<MechanicalEquipmentPositionFence> queryWrapper = getQueryWrapper(paramMap);
         Page<MechanicalEquipmentPositionFence> page = PageUtil.getPage(paramMap);
-        IPage<MechanicalEquipmentPositionFence> pageList = this.page(page, queryWrapper);
+        IPage<MechanicalEquipmentPositionFence> pageList = baseMapper.queryList(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords(), paramMap));
         return pageList;
     }
@@ -48,12 +47,13 @@ public class MechanicalEquipmentPositionFenceServiceImpl extends ServiceImpl<Mec
     @Override
     public List<MechanicalEquipmentPositionFence> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<MechanicalEquipmentPositionFence> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(this.list(queryWrapper), paramMap);
+        return dealList(baseMapper.queryList(queryWrapper), paramMap);
     }
 
     private QueryWrapper<MechanicalEquipmentPositionFence> getQueryWrapper(HashMap<String, Object> paramMap) {
-        QueryWrapper<MechanicalEquipmentPositionFence> queryWrapper = QueryGenerator.initPageQueryWrapper(MechanicalEquipmentPositionFence.class, paramMap);
+        String alias = "t.";
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(MechanicalEquipmentPositionFence::getId));
+        QueryWrapper<MechanicalEquipmentPositionFence> queryWrapper = QueryGenerator.initPageQueryWrapper(MechanicalEquipmentPositionFence.class, paramMap, alias);
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(MechanicalEquipmentPositionFence::getId));
         return queryWrapper;
     }