From 409587205b7d9dd62669cc7a6ada57e17a50eaf3 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 26 Jan 2024 10:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E9=9D=A2=E5=8E=8B=E5=AE=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PaveCompactionDevController.java | 10 +++ .../pave/entity/PaveCompactionDev.java | 11 +++ .../entity/vo/CountPaveCompactionDevVo.java | 12 ++++ .../pave/mapper/PaveCompactionDevMapper.java | 19 +++++- .../modules/pave/mapper/PaveRecordMapper.java | 3 + .../mapper/xml/PaveCompactionDevMapper.xml | 67 +++++++++++++++++++ .../service/IPaveCompactionDevService.java | 3 + .../impl/PaveCompactionDevServiceImpl.java | 12 +++- 8 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveCompactionDevVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionDevController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionDevController.java index 631f6b77e..6df8f1fac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionDevController.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.pave.controller; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveCompactionDevVo; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveDevVo; import com.zhgd.xmgl.modules.pave.service.IPaveCompactionDevService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -136,4 +138,12 @@ public class PaveCompactionDevController { return result; } + @ApiOperation(value = "统计路面压实", notes = "统计路面压实", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countPaveCompactionDev") + public Result countPaveCompactionDev(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(paveCompactionDevService.countPaveCompactionDev(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java index 655afe3ef..f7d4fa5af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java @@ -4,6 +4,7 @@ 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; @@ -98,4 +99,14 @@ public class PaveCompactionDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "上次数据上传时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date lastDataTime; + @TableField(exist = false) + @ApiModelProperty(value = "设备在线状态（0.离线 1.在线）") + private java.lang.Integer devOnline; + @TableField(exist = false) + @ApiModelProperty(value = "最新的路面摊铺-记录") + private PaveCompactionRecord newestRecord; } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveCompactionDevVo.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveCompactionDevVo.java new file mode 100644 index 000000000..79d58227d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveCompactionDevVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.pave.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountPaveCompactionDevVo { + @ApiModelProperty(value = "路面压实设备数量") + private Integer devNum; + @ApiModelProperty(value = "路面压实在线设备数量") + private Integer onlineDevNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionDevMapper.java index d7475cb57..1becaa9df 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionDevMapper.java @@ -1,8 +1,17 @@ package com.zhgd.xmgl.modules.pave.mapper; -import com.zhgd.xmgl.modules.pave.entity.PaveCompactionDev; -import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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.pave.entity.PaveCompactionDev; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveCompactionDevVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** * @Description: 路面压实-设备 @@ -13,4 +22,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface PaveCompactionDevMapper extends BaseMapper { + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountPaveCompactionDevVo countPaveCompactionDev(HashMap paramMap); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordMapper.java index ac8fd93e8..775566545 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordMapper.java @@ -1,9 +1,12 @@ package com.zhgd.xmgl.modules.pave.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhgd.xmgl.modules.pave.entity.PaveRecord; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @Description: 路面摊铺-记录 * @author： pds diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml index 16003a660..833f25c4a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionDevMapper.xml @@ -1,4 +1,71 @@ + + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java index 3f5d1b6f0..c1105bbe4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.pave.service; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionDev; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveCompactionDevVo; import java.util.HashMap; import java.util.List; @@ -22,4 +23,6 @@ public interface IPaveCompactionDevService extends IService { void add(PaveCompactionDev paveCompactionDev); void edit(PaveCompactionDev paveCompactionDev); + + CountPaveCompactionDevVo countPaveCompactionDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java index 615d3f239..39a1e6dad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.pave.service.impl; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionDev; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveCompactionDevVo; import com.zhgd.xmgl.modules.pave.mapper.PaveCompactionDevMapper; import com.zhgd.xmgl.modules.pave.service.IPaveCompactionDevService; import org.springframework.stereotype.Service; @@ -34,7 +35,7 @@ public class PaveCompactionDevServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -42,11 +43,11 @@ public class PaveCompactionDevServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { - String alias = ""; + String alias = "pcd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PaveCompactionDev.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PaveCompactionDev::getId)); return queryWrapper; @@ -66,4 +67,9 @@ public class PaveCompactionDevServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countPaveCompactionDev(paramMap); + } }