diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java index 063d57244..ee092acc9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zhgd.jeecg.common.mybatis.EntityMap; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -442,6 +440,9 @@ public class Tower implements Serializable { @ApiModelProperty(value = "标准高") private java.lang.String standardHigh; + @ApiModelProperty(value = "钢丝绳设备id") + private java.lang.Long tckwWireRopeId; + @TableField(exist = false) @ApiModelProperty(value = "总承包单位企业名称") private java.lang.String generalContractorsName; diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml index 4538035c6..6ecf7f88f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml @@ -72,7 +72,9 @@ select * from dust_noise_data where project_sn = #{projectSn} - and device_id = #{deviceId} + + and device_id = #{deviceId} + ORDER BY upload_date desc limit 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java index 5c7913a2f..c356cb381 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.async.AsyncEnvironment; import com.zhgd.xmgl.modules.environment.entity.DustNoiseData; import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev; @@ -21,50 +20,16 @@ import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.WindDirectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; -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.stereotype.Service; -import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gexin.fastjson.JSON; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.environment.entity.DustNoiseData; -import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.UnsupportedEncodingException; -import java.util.List; -import java.util.Map; - /** * @Description: 扬尘噪声实时数据 * @author： pds @@ -107,8 +72,8 @@ public class DustNoiseDataServiceImpl extends ServiceImpl noiseDataList = dustNoiseDataMapper.getRealTimeDustNoiseDataList(map); - + DustNoiseData nd = dustNoiseDataMapper.getRealTimeDustNoiseData(map); + List noiseDataList = Arrays.asList(nd); for (DustNoiseData dustNoiseData : noiseDataList) { DustNoiseData dataBuilder = dataBuilder(dustNoiseData); if (noiseData == null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/tckw/controller/TckwWireRopeInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/tckw/controller/TckwWireRopeInspectionRecordController.java index 8b1d5b505..2d617e29d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/tckw/controller/TckwWireRopeInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/tckw/controller/TckwWireRopeInspectionRecordController.java @@ -10,13 +10,16 @@ import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord; import com.zhgd.xmgl.modules.tckw.service.ITckwWireRopeInspectionRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; +import java.util.Date; import java.util.HashMap; import java.util.List; @@ -46,11 +49,18 @@ public class TckwWireRopeInspectionRecordController { * @return */ @ApiOperation(value = " 分页列表查询TCK.W钢丝绳检测记录信息", notes = "分页列表查询TCK.W钢丝绳检测记录信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "startTime", value = "开始时间,格式2020-08-16", dataType = "String", paramType = "query", required = false), + @ApiImplicitParam(name = "endTime", value = "结束时间,格式2020-08-16", dataType = "String", paramType = "query", required = false), + }) @GetMapping(value = "/page") public Result> queryPageList(TckwWireRopeInspectionRecord tckwWireRopeInspectionRecord, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime + ) { Result> result = new Result>(); IPage pageList = tckwWireRopeInspectionRecordService.queryPageList(tckwWireRopeInspectionRecord, pageNo, pageSize, req); result.setSuccess(true); @@ -184,7 +194,7 @@ public class TckwWireRopeInspectionRecordController { } /** - * 设备端添加TCK.W钢丝绳记录，TCK.W检测站点名称填项目sn + * 设备端添加TCK.W钢丝绳记录 */ @ApiOperation(value = " 设备端添加TCK.W钢丝绳记录", notes = "设备端添加TCK.W钢丝绳记录", httpMethod = "POST") @PostMapping(value = "/addWithDamage") diff --git a/src/main/java/com/zhgd/xmgl/modules/tckw/entity/TckwWireRopeInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/tckw/entity/TckwWireRopeInspectionRecord.java index 6794e4d8d..1b71665fb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/tckw/entity/TckwWireRopeInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/tckw/entity/TckwWireRopeInspectionRecord.java @@ -136,4 +136,25 @@ public class TckwWireRopeInspectionRecord implements Serializable { @ApiModelProperty(value = "钢丝绳检测损伤记录列表") @TableField(exist = false) private List damageRecordList; + + @ApiModelProperty(value = "塔吊设备名称") + @TableField(exist = false) + private java.lang.String devName; + + @ApiModelProperty(value = "塔吊id（下拉查询）") + @TableField(exist = false) + private java.lang.Long towerId; + @ApiModelProperty(value = "损伤程度（0=轻微，1=轻度，2=中度，3=较重，4=严重， 5=超限）") + @TableField(exist = false) + private java.lang.Integer damageSeverity; + @ApiModelProperty(value = "查询开始时间，格式：2023-05-22 18:00:00") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(exist = false) + private Date queryStartTime; + @ApiModelProperty(value = "查询结束时间，格式：2023-05-22 18:00:00") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(exist = false) + private Date queryEndTime; } diff --git a/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/TckwWireRopeInspectionDamageRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/TckwWireRopeInspectionDamageRecordMapper.java index f6a95451b..d8354988e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/TckwWireRopeInspectionDamageRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/TckwWireRopeInspectionDamageRecordMapper.java @@ -1,8 +1,14 @@ package com.zhgd.xmgl.modules.tckw.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.tckw.entity.TckwWireRopeInspectionDamageRecord; +import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: TCK.W钢丝绳检测损伤记录 @@ -13,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface TckwWireRopeInspectionDamageRecordMapper extends BaseMapper { + IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/xml/TckwWireRopeInspectionDamageRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/xml/TckwWireRopeInspectionDamageRecordMapper.xml index 420990ad5..53e158778 100644 --- a/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/xml/TckwWireRopeInspectionDamageRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/tckw/mapper/xml/TckwWireRopeInspectionDamageRecordMapper.xml @@ -1,4 +1,12 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/tckw/service/impl/TckwWireRopeInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/tckw/service/impl/TckwWireRopeInspectionRecordServiceImpl.java index 9d5a0cb66..5c63b4e67 100644 --- a/src/main/java/com/zhgd/xmgl/modules/tckw/service/impl/TckwWireRopeInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/tckw/service/impl/TckwWireRopeInspectionRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.tckw.service.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,17 +9,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; import com.gexin.fastjson.JSONArray; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.bigdevice.entity.Tower; +import com.zhgd.xmgl.modules.bigdevice.mapper.TowerMapper; import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionDamageRecord; import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord; import com.zhgd.xmgl.modules.tckw.mapper.TckwWireRopeInspectionDamageRecordMapper; import com.zhgd.xmgl.modules.tckw.mapper.TckwWireRopeInspectionRecordMapper; import com.zhgd.xmgl.modules.tckw.service.ITckwWireRopeInspectionRecordService; +import com.zhgd.xmgl.util.ReflectionUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.HashMap; /** @@ -30,6 +35,8 @@ import java.util.HashMap; @Service @Transactional(rollbackFor = Exception.class) public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl implements ITckwWireRopeInspectionRecordService { + @Autowired + private TowerMapper towerMapper; @Autowired private TckwWireRopeInspectionDamageRecordMapper tckwWireRopeInspectionDamageRecordMapper; @@ -64,6 +71,12 @@ public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl, 释义：钢丝绳根数 ｝ */ + Long wireDeviceId = MapUtils.getLong(map, "ID"); + Tower tower = towerMapper.selectOne(new LambdaQueryWrapper().eq(Tower::getTckwWireRopeId, wireDeviceId)); + if (tower == null) { + throw new RuntimeException("塔吊设备未绑定钢丝绳设备（需要绑定钢丝绳设备id）"); + } + map.put("projectSn", tower.getProjectSn()); TckwWireRopeInspectionRecord tckwWireRopeInspectionRecord = saveTckwWireRopeInspectionRecord(map); saveTckwWireRopeInspectionDamageRecord(map, tckwWireRopeInspectionRecord); @@ -82,7 +95,7 @@ public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl queryPageList(TckwWireRopeInspectionRecord tckwWireRopeInspectionRecord, Integer pageNo, Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tckwWireRopeInspectionRecord, req.getParameterMap()); + String defaultAlias = "ir."; + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tckwWireRopeInspectionRecord, req.getParameterMap(), + ReflectionUtil.getFieldNameList(TckwWireRopeInspectionRecord::getDevName, TckwWireRopeInspectionRecord::getQueryStartTime, TckwWireRopeInspectionRecord::getQueryEndTime), null, defaultAlias); + Long towerId = tckwWireRopeInspectionRecord.getTowerId(); + queryWrapper.eq(towerId != null, "t." + ReflectionUtil.getFieldNameToUlc(TckwWireRopeInspectionRecord::getDevName), towerId); + Date queryEndTime = tckwWireRopeInspectionRecord.getQueryEndTime(); + Date queryStartTime = tckwWireRopeInspectionRecord.getQueryStartTime(); + queryWrapper.le(queryEndTime != null, defaultAlias + ReflectionUtil.getFieldNameToUlc(TckwWireRopeInspectionRecord::getStartTime), queryEndTime); + queryWrapper.ge(queryStartTime != null, defaultAlias + ReflectionUtil.getFieldNameToUlc(TckwWireRopeInspectionRecord::getStartTime), queryStartTime); Page page = new Page(pageNo, pageSize); - IPage pageList = page(page, queryWrapper); + IPage pageList = tckwWireRopeInspectionDamageRecordMapper.queryPageList(page, queryWrapper); return pageList; } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 89f9ed71b..d60cf20e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -55,6 +55,8 @@ import static com.zhgd.xmgl.config.FaceRunner.faceEngine; @Slf4j @Transactional(rollbackFor = Exception.class) public class WorkerAttendanceServiceImpl extends ServiceImpl implements IWorkerAttendanceService { + @Autowired + private WorkerAttendancePresenceServiceImpl workerAttendancePresenceService; @Autowired private WorkerAttendanceMapper workerAttendanceMapper; @Autowired @@ -754,9 +756,10 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl