diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java index 0f527003c..8a6ef29ab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java @@ -6,6 +6,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; +import com.zhgd.xmgl.modules.checking.entity.vo.TaskDetailPageVo; import com.zhgd.xmgl.modules.checking.service.CheckingPointInfoService; import com.zhgd.xmgl.modules.checking.service.CheckingPointService; import io.swagger.annotations.Api; @@ -16,8 +17,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Map; /** @@ -129,4 +132,17 @@ public class CheckingPointController { } return result; } + + @OperLog(operModul = "巡检点模块管理", operType = "查询", operDesc = "查询巡检任务列表包含的巡检点详情列表") + @ApiOperation(value = "查询巡检任务列表包含的巡检点详情列表", notes = "查询巡检任务列表包含的巡检点详情列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/getTaskDetailPage") + public Result> getTaskDetailPage(@ApiIgnore @RequestBody Map param) { + return Result.success(checkingPointService.getTaskDetailPage(param)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java index 08c8cb6c8..ab9262954 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java @@ -45,6 +45,11 @@ public class XzCheckingRouteController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "inspectTimeBegin", value = "检查开始时间", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "inspectTimeEnd", value = "检查结束时间", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "enterpriseId", value = "企业id", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "noticeUserIds", value = "通知人员id", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "inspectUserIds", value = "巡检人员id", paramType = "body", required = false, dataType = "String"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java index d76e85bdf..4adcecb49 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteTaskController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.entity.vo.CountMyTaskInspectStatusVo; import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,8 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import javax.naming.directory.SearchResult; import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -124,4 +127,10 @@ public class XzCheckingRouteTaskController { return Result.success(xzCheckingRouteTaskService.queryById(id)); } + @ApiOperation(value = "任务统计", notes = "任务统计", httpMethod = "POST") + @PostMapping(value = "/countMyTaskInspectStatus") + public Result countMyTaskInspectStatus(@ApiIgnore @RequestBody Map param) { + return Result.success(xzCheckingRouteTaskService.countMyTaskInspectStatus(param)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java index f90979751..62d80bae7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java @@ -64,9 +64,9 @@ public class CheckingPointInfo implements Serializable { private String template; /** - * 巡检点状态 1:正常 2:异常 + * 巡检点状态 1:正常 2:异常 3:未巡检 */ - @ApiModelProperty("巡检点状态 1:正常 2:异常 需要默认选择正常") + @ApiModelProperty("巡检点状态 1:正常 2:异常 3:未巡检") @TableField(value = "status") private Integer status; diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/vo/CountMyTaskInspectStatusVo.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/vo/CountMyTaskInspectStatusVo.java new file mode 100644 index 000000000..a2f658569 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/vo/CountMyTaskInspectStatusVo.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.checking.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountMyTaskInspectStatusVo { + @ApiModelProperty("未开始") + private Integer notStart; + @ApiModelProperty("进行中") + private Integer run; + @ApiModelProperty("已完成") + private Integer complete; + @ApiModelProperty("已逾期") + private Integer overdue; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/vo/TaskDetailPageVo.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/vo/TaskDetailPageVo.java new file mode 100644 index 000000000..3e57ad62d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/vo/TaskDetailPageVo.java @@ -0,0 +1,13 @@ +package com.zhgd.xmgl.modules.checking.entity.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class TaskDetailPageVo extends CheckingPointInfo { + @ApiModelProperty("巡检点状态 1:正常 2:异常 3:未巡检") + @TableField(value = "status") + private Integer status; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java index 9d559d4a7..5a05c68a8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java @@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; +import com.zhgd.xmgl.modules.checking.entity.vo.TaskDetailPageVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @author 邱平毅 @@ -51,4 +53,13 @@ public interface CheckingPointMapper extends BaseMapper { * @return */ List getFinishList(); + + /** + * 查询巡检任务列表包含的巡检点详情列表 + * + * @param page + * @param param + * @return + */ + IPage getTaskDetailPage(Page page, @Param("param") Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java index c66e9c4df..11f82c916 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/XzCheckingRouteTaskMapper.java @@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.entity.vo.CountMyTaskInspectStatusVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 星纵-巡检路线的任务 @@ -48,4 +50,12 @@ public interface XzCheckingRouteTaskMapper extends BaseMapper param); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml index 20a41827a..94e6c02b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml @@ -107,4 +107,35 @@ where end_time = DATE_SUB(CURDATE(), INTERVAL 1 DAY) and frequency_num is not null + + diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml index c7025b6ed..0320b892f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteTaskMapper.xml @@ -47,4 +47,20 @@ where t.id = #{id} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java index fbeae0ac9..c4bf0035c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; +import com.zhgd.xmgl.modules.checking.entity.vo.TaskDetailPageVo; import java.util.List; +import java.util.Map; /** * @author 邱平毅 @@ -32,6 +34,7 @@ public interface CheckingPointService extends IService { /** * 校验坐标位置是否在坐标中 + * * @param id * @param userId * @param longitude @@ -61,4 +64,12 @@ public interface CheckingPointService extends IService { * @param id */ void deleteProjectBim(Long id); + + /** + * 查询巡检任务列表包含的巡检点详情列表 + * + * @param param + * @return + */ + IPage getTaskDetailPage(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java index c7800ab57..188822722 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java @@ -3,9 +3,11 @@ package com.zhgd.xmgl.modules.checking.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.entity.vo.CountMyTaskInspectStatusVo; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 星纵-巡检路线的任务 @@ -59,4 +61,10 @@ public interface IXzCheckingRouteTaskService extends IService param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java index 0fbb70995..65185ea6c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java @@ -18,9 +18,11 @@ import com.zhgd.xmgl.modules.checking.entity.CheckingPoint; import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO; +import com.zhgd.xmgl.modules.checking.entity.vo.TaskDetailPageVo; import com.zhgd.xmgl.modules.checking.mapper.CheckingPointInfoMapper; import com.zhgd.xmgl.modules.checking.mapper.CheckingPointMapper; import com.zhgd.xmgl.modules.checking.service.CheckingPointService; +import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RegionUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +30,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; @@ -162,4 +165,9 @@ public class CheckingPointServiceImpl extends ServiceImpl getTaskDetailPage(Map param) { + return baseMapper.getTaskDetailPage(PageUtil.getPage(param), param); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java index a7ea2b7a8..65a667a2b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java @@ -10,17 +10,17 @@ 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.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint; -import com.zhgd.xmgl.modules.checking.enums.XzCheckingRouteFrequencyTypeEnum; -import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper; -import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteToPointMapper; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint; import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteMapper; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteToPointMapper; import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteService; import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -65,6 +65,14 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRoute.class, paramMap, alias); + String inspectTimeBegin = MapUtils.getString(paramMap, "inspectTimeBegin"); + String inspectTimeEnd = MapUtils.getString(paramMap, "inspectTimeEnd"); + if (StrUtil.isNotBlank(inspectTimeBegin)) { + queryWrapper.ge(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getEndTime), DateUtil.formatDate(DateUtil.parseDate(inspectTimeBegin))); + } + if (StrUtil.isNotBlank(inspectTimeEnd)) { + queryWrapper.le(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getStartTime), DateUtil.formatDate(DateUtil.parseDate(inspectTimeEnd))); + } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getCreateDate)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java index 8904392f8..6e607cfc1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java @@ -7,9 +7,11 @@ 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.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.checking.entity.vo.CountMyTaskInspectStatusVo; import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper; import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteTaskService; import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; import org.apache.commons.collections.MapUtils; @@ -19,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 星纵-巡检路线的任务 @@ -100,4 +103,11 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl param) { + Long userId = SecurityUtils.getUser().getUserId(); + param.put("checkingPointUserId", userId); + return baseMapper.countMyTaskInspectStatus(param); + } + }