From 07ffa451e65f9b7e95442b00e69f53f390e43d7e Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 28 Aug 2023 18:57:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E9=99=8D=E6=9C=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../government/GovLifterController.java | 8 ++-- .../GovTowerCraneAlarmController.java | 6 +++ .../government/GovTowerCraneController.java | 8 ++-- .../GovTowerCraneCurrentDataController.java | 7 +++ .../quality/entity/CheckAcceptPlan.java | 6 +-- .../xmgl/modules/wisdom/dto/LifterEntDto.java | 18 ++++++++ .../wisdom/dto/LifterOperationDto.java | 4 +- .../modules/wisdom/dto/LifterProjectDto.java | 17 +++++++ .../modules/wisdom/dto/TowerCraneEntDto.java | 18 ++++++++ .../wisdom/dto/TowerCraneProjectDto.java | 17 +++++++ .../wisdom/service/ILifterService.java | 8 ++-- .../wisdom/service/ITowerCraneService.java | 10 ++--- .../service/impl/LifterServiceImpl.java | 43 ++++++++++++++---- .../service/impl/TowerCraneServiceImpl.java | 44 +++++++++++++++---- 14 files changed, 174 insertions(+), 40 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterEntDto.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterProjectDto.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneEntDto.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneProjectDto.java diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java index 7374488..7f86814 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterController.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import com.zhgd.xmgl.modules.wisdom.dto.LifterEntDto; +import com.zhgd.xmgl.modules.wisdom.dto.LifterProjectDto; import com.zhgd.xmgl.modules.wisdom.entity.Lifter; import com.zhgd.xmgl.modules.wisdom.service.ILifterService; import io.swagger.annotations.Api; @@ -56,7 +56,7 @@ public class GovLifterController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/engineeringPage") - public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { + public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { return Result.success(lifterService.engineeringPageList(map)); } @@ -73,7 +73,7 @@ public class GovLifterController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/projectPage") - public Result> projectPageList(@ApiIgnore @RequestBody Map map) { + public Result> projectPageList(@ApiIgnore @RequestBody Map map) { return Result.success(lifterService.projectPageList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java index 8a4de78..dcc4e09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneAlarmController.java @@ -1,13 +1,16 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import cn.hutool.core.date.DateUtil; +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.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.wisdom.statistics.TowerCraneAlarmStat; @@ -64,6 +67,9 @@ public class GovTowerCraneAlarmController { if (dayRange != null) { queryWrapper.lambda().between(TowerCraneAlarm::getCreateTime, DateUtil.offsetDay(new Date(), dayRange), DateUtil.endOfDay(new Date())); } + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + queryWrapper.lambda().eq(TowerCraneAlarm::getEngineeringSn, StrUtil.EMPTY); + } queryWrapper.lambda().orderByDesc(TowerCraneAlarm::getCreateTime); IPage pageList = towerCraneAlarmService.page(page, queryWrapper); return Result.success(pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java index 2a5cd39..da71695 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneController.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneEntDto; +import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneProjectDto; import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; import io.swagger.annotations.Api; @@ -54,7 +54,7 @@ public class GovTowerCraneController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/engineeringPage") - public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { + public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { return Result.success(towerCraneService.engineeringPageList(map)); } @@ -71,7 +71,7 @@ public class GovTowerCraneController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/projectPage") - public Result> projectPageList(@ApiIgnore @RequestBody Map map) { + public Result> projectPageList(@ApiIgnore @RequestBody Map map) { return Result.success(towerCraneService.projectPageList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java index ec9aec5..e9287c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovTowerCraneCurrentDataController.java @@ -1,14 +1,17 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import cn.hutool.core.bean.BeanUtil; +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.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneCurrentDataDto; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneOperationDto; import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; @@ -20,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -65,6 +69,9 @@ public class GovTowerCraneCurrentDataController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(TowerCraneCurrentData.class, map); Page page = PageUtil.getPage(map); + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + queryWrapper.lambda().eq(TowerCraneCurrentData::getEngineeringSn, StrUtil.EMPTY); + } IPage pageList = towerCraneCurrentDataService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/CheckAcceptPlan.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/CheckAcceptPlan.java index 17b82f3..f2ceadd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/CheckAcceptPlan.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/CheckAcceptPlan.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.quality.entity; -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 com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -95,6 +92,7 @@ public class CheckAcceptPlan implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "实际完成时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date completeDate; /** * 备注 diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterEntDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterEntDto.java new file mode 100644 index 0000000..f6e5df8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterEntDto.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.modules.wisdom.dto; + +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "升降机工程信息(DTO)", description = "LifterEntDto") +public class LifterEntDto extends EngineeringPageDto { + + + @ApiModelProperty(value = "接入塔吊总数") + private Integer deviceNum; + + @ApiModelProperty(value = "今日报警次数") + private Integer alarmNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterOperationDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterOperationDto.java index fc55a39..d7884d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterOperationDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterOperationDto.java @@ -19,7 +19,7 @@ public class LifterOperationDto implements Serializable { @ApiModelProperty(value = "本次运行最大载重百分比") private String loadRatio; - @ApiModelProperty(value = "高度比") + @ApiModelProperty(value = "高度百分比") private String heightRatio; @ApiModelProperty(value = "运行速度") @@ -46,7 +46,7 @@ public class LifterOperationDto implements Serializable { @ApiModelProperty(value = "设备编号") private String devNumber; - @ApiModelProperty(value = "升降机备案号") + @ApiModelProperty(value = "升降机备案编号") private String filingNumber; @ApiModelProperty(value = "安装时间") diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterProjectDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterProjectDto.java new file mode 100644 index 0000000..f21acf3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/LifterProjectDto.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.wisdom.dto; + +import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "升降机项目信息(DTO)", description = "LifterProjectDto") +public class LifterProjectDto extends ProjectPageDto { + + @ApiModelProperty(value = "接入塔吊总数") + private Integer deviceNum; + + @ApiModelProperty(value = "今日报警次数") + private Integer alarmNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneEntDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneEntDto.java new file mode 100644 index 0000000..35061a9 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneEntDto.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.modules.wisdom.dto; + +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "塔吊工程信息(DTO)", description = "TowerCraneEntDto") +public class TowerCraneEntDto extends EngineeringPageDto { + + + @ApiModelProperty(value = "接入塔吊总数") + private Integer deviceNum; + + @ApiModelProperty(value = "今日报警次数") + private Integer alarmNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneProjectDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneProjectDto.java new file mode 100644 index 0000000..83814ec --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/TowerCraneProjectDto.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.wisdom.dto; + +import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "塔吊项目信息(DTO)", description = "TowerCraneProjectDto") +public class TowerCraneProjectDto extends ProjectPageDto { + + @ApiModelProperty(value = "接入塔吊总数") + private Integer deviceNum; + + @ApiModelProperty(value = "今日报警次数") + private Integer alarmNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java index 209c09e..b66f8fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java @@ -2,8 +2,8 @@ package com.zhgd.xmgl.modules.wisdom.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import com.zhgd.xmgl.modules.wisdom.dto.LifterEntDto; +import com.zhgd.xmgl.modules.wisdom.dto.LifterProjectDto; import com.zhgd.xmgl.modules.wisdom.entity.Lifter; import java.util.Map; @@ -16,7 +16,7 @@ import java.util.Map; */ public interface ILifterService extends IService { - Page engineeringPageList(Map map); + Page engineeringPageList(Map map); - Page projectPageList(Map map); + Page projectPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java index 0768e93..33d9989 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java @@ -1,10 +1,10 @@ package com.zhgd.xmgl.modules.wisdom.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneEntDto; +import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneProjectDto; +import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; import java.util.Map; @@ -16,7 +16,7 @@ import java.util.Map; */ public interface ITowerCraneService extends IService { - Page engineeringPageList(Map map); + Page engineeringPageList(Map map); - Page projectPageList(Map map); + Page projectPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java index 41bd977..a696f89 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java @@ -1,18 +1,24 @@ package com.zhgd.xmgl.modules.wisdom.service.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; +import com.zhgd.xmgl.modules.wisdom.dto.LifterEntDto; +import com.zhgd.xmgl.modules.wisdom.dto.LifterProjectDto; import com.zhgd.xmgl.modules.wisdom.entity.Lifter; +import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; import com.zhgd.xmgl.modules.wisdom.mapper.LifterMapper; +import com.zhgd.xmgl.modules.wisdom.service.ILifterAlarmService; import com.zhgd.xmgl.modules.wisdom.service.ILifterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - +import java.util.Date; import java.util.Map; /** @@ -30,13 +36,34 @@ public class LifterServiceImpl extends ServiceImpl impleme @Autowired private IProjectService projectService; + @Autowired + private ILifterAlarmService lifterAlarmService; + @Override - public Page engineeringPageList(Map map) { - return engineeringService.pageListForSuperior(map); + public Page engineeringPageList(Map map) { + Page lifterEntDtoPage = PageUtil.copyProperties(engineeringService.pageListForSuperior(map), LifterEntDto.class); + lifterEntDtoPage.getRecords().stream().forEach(e -> { + e.setDeviceNum(this.count(Wrappers.lambdaQuery() + .eq(Lifter::getEngineeringSn, e.getEngineeringSn()))); + e.setAlarmNum(lifterAlarmService.count(Wrappers.lambdaQuery() + .eq(LifterAlarm::getEngineeringSn, e.getEngineeringSn()) + .between(LifterAlarm::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())))); + }); + return lifterEntDtoPage; } @Override - public Page projectPageList(Map map) { - return projectService.pageListForGov(map); + public Page projectPageList(Map map) { + Page lifterProjectDtoPage = PageUtil.copyProperties(projectService.pageListForGov(map), LifterProjectDto.class); + lifterProjectDtoPage.getRecords().stream().forEach(e -> { + e.setDeviceNum(this.count(Wrappers.lambdaQuery() + .eq(Lifter::getProjectSn, e.getProjectSn()) + .eq(Lifter::getEngineeringSn, StrUtil.EMPTY))); + e.setAlarmNum(lifterAlarmService.count(Wrappers.lambdaQuery() + .eq(LifterAlarm::getProjectSn, e.getProjectSn()) + .eq(LifterAlarm::getEngineeringSn, StrUtil.EMPTY) + .between(LifterAlarm::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())))); + }); + return lifterProjectDtoPage; } } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java index 2d0ef17..8e30016 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java @@ -1,18 +1,24 @@ package com.zhgd.xmgl.modules.wisdom.service.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; +import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneEntDto; +import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneProjectDto; import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; +import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneMapper; +import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - +import java.util.Date; import java.util.Map; /** @@ -24,20 +30,40 @@ import java.util.Map; @Service public class TowerCraneServiceImpl extends ServiceImpl implements ITowerCraneService { - @Autowired private IEngineeringService engineeringService; @Autowired private IProjectService projectService; + @Autowired + private ITowerCraneAlarmService towerCraneAlarmService; + @Override - public Page engineeringPageList(Map map) { - return engineeringService.pageListForSuperior(map); + public Page engineeringPageList(Map map) { + Page towerCraneEntDtoPage = PageUtil.copyProperties(engineeringService.pageListForSuperior(map), TowerCraneEntDto.class); + towerCraneEntDtoPage.getRecords().stream().forEach(e -> { + e.setDeviceNum(this.count(Wrappers.lambdaQuery() + .eq(TowerCrane::getEngineeringSn, e.getEngineeringSn()))); + e.setAlarmNum(towerCraneAlarmService.count(Wrappers.lambdaQuery() + .eq(TowerCraneAlarm::getEngineeringSn, e.getEngineeringSn()) + .between(TowerCraneAlarm::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())))); + }); + return towerCraneEntDtoPage; } @Override - public Page projectPageList(Map map) { - return projectService.pageListForGov(map); + public Page projectPageList(Map map) { + Page towerCraneEntDtoPage = PageUtil.copyProperties(projectService.pageListForGov(map), TowerCraneProjectDto.class); + towerCraneEntDtoPage.getRecords().stream().forEach(e -> { + e.setDeviceNum(this.count(Wrappers.lambdaQuery() + .eq(TowerCrane::getProjectSn, e.getProjectSn()) + .eq(TowerCrane::getEngineeringSn, StrUtil.EMPTY))); + e.setAlarmNum(towerCraneAlarmService.count(Wrappers.lambdaQuery() + .eq(TowerCraneAlarm::getProjectSn, e.getProjectSn()) + .eq(TowerCraneAlarm::getEngineeringSn, StrUtil.EMPTY) + .between(TowerCraneAlarm::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())))); + }); + return towerCraneEntDtoPage; } }