安全围栏加区域字段
This commit is contained in:
parent
915422a8d3
commit
a6674264c4
@ -1,11 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.safetyhat.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.jeecg.common.util.oConvertUtils;
|
||||
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
|
||||
import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
|
||||
import io.swagger.annotations.Api;
|
||||
@ -14,18 +10,10 @@ import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.MapUtils;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
@ -90,6 +90,8 @@ public class SafetyHatFence implements Serializable {
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private Date updateTime;
|
||||
@ApiModelProperty(value = "区域id")
|
||||
private Long qualityRegionId;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "围栏内人数")
|
||||
@ -98,4 +100,8 @@ public class SafetyHatFence implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "围栏内人员列表")
|
||||
private List<WorkerInfo> workerListInFence;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "区域名称")
|
||||
private String regionName;
|
||||
}
|
||||
|
||||
@ -1,8 +1,15 @@
|
||||
package com.zhgd.xmgl.modules.safetyhat.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.safetyhat.entity.SafetyHatFence;
|
||||
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 SafetyHatFenceMapper extends BaseMapper<SafetyHatFence> {
|
||||
|
||||
List<SafetyHatFence> queryList(@Param(Constants.WRAPPER) QueryWrapper<SafetyHatFence> queryWrapper);
|
||||
|
||||
IPage<SafetyHatFence> queryList(Page<SafetyHatFence> page,@Param(Constants.WRAPPER) QueryWrapper<SafetyHatFence> queryWrapper);
|
||||
}
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
<?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.safetyhat.mapper.SafetyHatFenceMapper">
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence">
|
||||
select t.*, qr.region_name
|
||||
from safety_hat_fence t
|
||||
left join quality_region qr on t.quality_region_id = qr.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@ -2,31 +2,30 @@ package com.zhgd.xmgl.modules.safetyhat.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.safetyhat.entity.SafetyHatData;
|
||||
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
|
||||
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDataMapper;
|
||||
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
|
||||
import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
|
||||
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
||||
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.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.zhgd.xmgl.util.RefUtil;
|
||||
|
||||
/**
|
||||
* @Description: 智能安全帽-围栏
|
||||
* @author： pds
|
||||
@ -42,7 +41,7 @@ public class SafetyHatFenceServiceImpl extends ServiceImpl<SafetyHatFenceMapper,
|
||||
public IPage<SafetyHatFence> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<SafetyHatFence> queryWrapper = getQueryWrapper(paramMap);
|
||||
Page<SafetyHatFence> page = PageUtil.getPage(paramMap);
|
||||
IPage<SafetyHatFence> pageList = this.page(page, queryWrapper);
|
||||
IPage<SafetyHatFence> pageList = baseMapper.queryList(page, queryWrapper);
|
||||
pageList.setRecords(dealList(pageList.getRecords(), paramMap));
|
||||
return pageList;
|
||||
}
|
||||
@ -50,12 +49,13 @@ public class SafetyHatFenceServiceImpl extends ServiceImpl<SafetyHatFenceMapper,
|
||||
@Override
|
||||
public List<SafetyHatFence> queryList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<SafetyHatFence> queryWrapper = getQueryWrapper(paramMap);
|
||||
return dealList(this.list(queryWrapper), paramMap);
|
||||
return dealList(baseMapper.queryList(queryWrapper), paramMap);
|
||||
}
|
||||
|
||||
private QueryWrapper<SafetyHatFence> getQueryWrapper(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<SafetyHatFence> queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatFence.class, paramMap);
|
||||
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(SafetyHatFence::getId));
|
||||
String alias = "t.";
|
||||
QueryWrapper<SafetyHatFence> queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatFence.class, paramMap, alias);
|
||||
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatFence::getId));
|
||||
return queryWrapper;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user