From 7bb4abe584b111f847b6c0abd46230de2b9241e7 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 25 Jan 2024 15:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=91=8A=E9=93=BA=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pave/controller/PaveDevController.java | 10 +++ .../xmgl/modules/pave/entity/PaveDev.java | 12 ++++ .../pave/entity/vo/CountPaveDevVo.java | 12 ++++ .../modules/pave/mapper/PaveDevMapper.java | 14 ++++ .../modules/pave/mapper/xml/PaveDevMapper.xml | 66 +++++++++++++++++++ .../modules/pave/service/IPaveDevService.java | 3 + .../pave/service/impl/PaveDevServiceImpl.java | 12 +++- .../controller/WeighInfoController.java | 1 + .../weight/mapper/xml/WeighInfoMapper.xml | 11 +++- 9 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveDevVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveDevController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveDevController.java index 4efe78fa7..116dcbe4d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveDevController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.pave.controller; import com.zhgd.xmgl.modules.pave.entity.PaveDev; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveDevVo; import com.zhgd.xmgl.modules.pave.service.IPaveDevService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -136,4 +137,13 @@ public class PaveDevController { return result; } + @ApiOperation(value = "统计路面摊铺", notes = "统计路面摊铺", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countPaveDev") + public Result countPaveDev(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(paveDevService.countPaveDev(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java index 2e777d370..a35972deb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.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,15 @@ public class PaveDev 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 PaveRecord newestRecord; } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveDevVo.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveDevVo.java new file mode 100644 index 000000000..ccdc8e19b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/vo/CountPaveDevVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.pave.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountPaveDevVo { + @ApiModelProperty(value = "路面摊铺设备数量") + private java.lang.Integer devNum; + @ApiModelProperty(value = "路面摊铺在线设备数量") + private java.lang.Integer onlineDevNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveDevMapper.java index 767513b2b..7cce7d009 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveDevMapper.java @@ -1,8 +1,17 @@ package com.zhgd.xmgl.modules.pave.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.pave.entity.PaveDev; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveDevVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** * @Description: 路面摊铺-设备 @@ -13,4 +22,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface PaveDevMapper extends BaseMapper { + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountPaveDevVo countPaveDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml index 048cabc2a..6b2ee13ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveDevMapper.xml @@ -1,4 +1,70 @@ + + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java index dbe72d398..c7e48b184 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.pave.service; import com.zhgd.xmgl.modules.pave.entity.PaveDev; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveDevVo; import java.util.HashMap; import java.util.List; @@ -22,4 +23,6 @@ public interface IPaveDevService extends IService { void add(PaveDev paveDev); void edit(PaveDev paveDev); + + CountPaveDevVo countPaveDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java index 3c99732f6..48e0d6ea8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.pave.service.impl; import com.zhgd.xmgl.modules.pave.entity.PaveDev; +import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveDevVo; import com.zhgd.xmgl.modules.pave.mapper.PaveDevMapper; import com.zhgd.xmgl.modules.pave.service.IPaveDevService; import org.springframework.stereotype.Service; @@ -34,7 +35,7 @@ public class PaveDevServiceImpl extends ServiceImpl impl public IPage 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 PaveDevServiceImpl extends ServiceImpl impl @Override public List 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 = "pd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PaveDev.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PaveDev::getId)); return queryWrapper; @@ -66,4 +67,9 @@ public class PaveDevServiceImpl extends ServiceImpl impl public void edit(PaveDev paveDev) { baseMapper.updateById(paveDev); } + + @Override + public CountPaveDevVo countPaveDev(HashMap paramMap) { + return baseMapper.countPaveDev(paramMap); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java index eb98bbeba..2bc510d50 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java @@ -226,6 +226,7 @@ public class WeighInfoController { @ApiOperation(value = "统计货名（物料统计）", notes = "统计货名（物料统计）", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/countWeighInfoGoodsName") public Result countWeighInfoGoodsName(@ApiIgnore @RequestBody HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml index b55c0b0f1..53146403e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml @@ -37,7 +37,7 @@ wp.empty_pic2, wp.empty_pic3, wp.empty_pic4, - wp.add_date_time, + wp.gross_time, wp.mod_date_time, wp.remarks FROM weigh_info wi @@ -116,6 +116,15 @@ select goods_name name,count(*) count from weigh_info where project_sn=#{projectSn} + + and gross_time > current_date + + + and gross_time > date_sub(gross_time,interval 6 day) + + + and gross_time > date_sub(gross_time,interval 29 day) + group by goods_name order by count