From 452f449b96b19e5f15b91f3c7f4031d80769a47e Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 23 May 2024 21:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=B7=AF=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CheckingPointController.java | 5 + .../CheckingPointInfoController.java | 4 +- .../checking/entity/CheckingPoint.java | 12 +- .../checking/entity/CheckingPointInfo.java | 20 ++ .../entity/dto/CheckingPointInfoPageDto.java | 4 + .../checking/entity/qo/ProjectSnQO.java | 5 + .../mapper/CheckingPointInfoMapper.java | 3 +- .../checking/mapper/CheckingPointMapper.java | 3 +- .../mapper/xml/CheckingPointInfoMapper.xml | 59 +++--- .../mapper/xml/CheckingPointMapper.xml | 44 +++-- .../controller/XzCheckingRouteController.java | 143 ++++++++++++++ .../XzCheckingRouteTaskController.java | 147 ++++++++++++++ .../modules/x/entity/XzCheckingRoute.java | 137 +++++++++++++ .../modules/x/entity/XzCheckingRouteTask.java | 73 +++++++ .../XzCheckingRouteTaskToInspectUser.java | 81 ++++++++ .../x/entity/XzCheckingRouteToPoint.java | 52 +++++ .../x/mapper/XzCheckingRouteMapper.java | 26 +++ .../x/mapper/XzCheckingRouteTaskMapper.java | 26 +++ ...zCheckingRouteTaskToInspectUserMapper.java | 19 ++ .../mapper/XzCheckingRouteToPointMapper.java | 19 ++ .../x/mapper/xml/XzCheckingRouteMapper.xml | 21 ++ .../mapper/xml/XzCheckingRouteTaskMapper.xml | 37 ++++ ...XzCheckingRouteTaskToInspectUserMapper.xml | 4 + .../xml/XzCheckingRouteToPointMapper.xml | 4 + .../x/service/IXzCheckingRouteService.java | 30 +++ .../service/IXzCheckingRouteTaskService.java | 30 +++ ...CheckingRouteTaskToInspectUserService.java | 30 +++ .../IXzCheckingRouteToPointService.java | 30 +++ .../impl/XzCheckingRouteServiceImpl.java | 181 ++++++++++++++++++ .../impl/XzCheckingRouteTaskServiceImpl.java | 100 ++++++++++ ...kingRouteTaskToInspectUserServiceImpl.java | 93 +++++++++ .../XzCheckingRouteToPointServiceImpl.java | 93 +++++++++ 32 files changed, 1494 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/controller/XzCheckingRouteTaskController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRoute.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTaskToInspectUser.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteToPoint.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskToInspectUserMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteToPointMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java 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 918011766..eeaacd8e7 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 @@ -54,6 +54,11 @@ public class CheckingPointController { } @ApiOperation(value = "分页查询巡检点列表", notes = "分页查询巡检点列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "checkingPointUserId", value = "巡检人员id", paramType = "query", required = false, dataType = "String"), + + }) @PostMapping(value = "/selectPage") public Result> selectCheckingPointPage(@RequestBody ProjectSnQO projectSnQO) { Result> result = new Result<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java index b549c1bee..56a8e8439 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java @@ -45,7 +45,9 @@ public class CheckingPointInfoController { @ApiImplicitParam(name = "projectSn", value = "项目sn", required = true, paramType = "query", dataType = "string"), @ApiImplicitParam(name = "queryStr", value = "查询条件、多条件（巡检点、巡检位置、巡检人、巡检时间）", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "pageNo", value = "当前页", paramType = "query", dataType = "int"), - @ApiImplicitParam(name = "pageSize", value = "页大小", paramType = "query", required = true, dataType = "int") + @ApiImplicitParam(name = "pageSize", value = "页大小", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "checkingPointUserId", value = "巡检人员id", paramType = "query", required = false, dataType = "String"), }) public Result> selectCheckingPointInfoPage(CheckingPointInfoPageDto dto) { Result> result = new Result<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java index 468f2d96f..4e801ba1b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java @@ -18,7 +18,7 @@ import java.io.Serializable; import java.util.Date; /** - * /** + * * 巡检点表 * * @author 邱平毅 @@ -60,6 +60,7 @@ public class CheckingPoint implements Serializable { */ @ApiModelProperty("检查人员id列表") @TableField(value = "inspect_user_ids") + @Deprecated private String inspectUserIds; /** @@ -170,7 +171,10 @@ public class CheckingPoint implements Serializable { @ApiModelProperty(value = "区域id") private java.lang.Long qualityRegionId; @ApiModelProperty(value = "合作单位ids") + @Deprecated private java.lang.String enterpriseId; + @ApiModelProperty(value = "最低巡检时长(分钟)") + private java.lang.Integer minInspectTime; /** * 创建人名称 @@ -180,6 +184,7 @@ public class CheckingPoint implements Serializable { private String createUserName; @ApiModelProperty("检查人名称") @TableField(exist = false) + @Deprecated private String inspectUserNames; @ApiModelProperty("通知人名称") @TableField(exist = false) @@ -189,6 +194,11 @@ public class CheckingPoint implements Serializable { private String regionName; @TableField(exist = false) @ApiModelProperty(value = "企业名称") + @Deprecated private String enterpriseName; + @ApiModelProperty("巡检任务的巡检人是否巡检该巡检点") + @TableField(exist = false) + private String isInspectFromTask; + } 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 96ca3afba..95e738f6c 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 @@ -138,6 +138,10 @@ public class CheckingPointInfo implements Serializable { */ @ApiModelProperty(value = "报警详情") private String alarmDetails; + @ApiModelProperty(value = "星纵-巡检路线的任务id") + private Long xzCheckingRouteTaskId; + @ApiModelProperty(value = "巡检时长(分钟)") + private java.lang.Integer inspectTime; /** * 巡检点名称 @@ -167,4 +171,20 @@ public class CheckingPointInfo implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "操作人") private java.lang.String operateName; + + @TableField(exist = false) + @ApiModelProperty(value = "区域名称") + private String regionName; + + @TableField(exist = false) + @ApiModelProperty(value = "最低巡检时长(分钟)") + private java.lang.Integer minInspectTime; + + @TableField(exist = false) + @ApiModelProperty(value = "路线名称") + private java.lang.String routeName; + @TableField(exist = false) + @ApiModelProperty(value = "任务名称") + private java.lang.String itemName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java index 3856f1def..b63860e2a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java @@ -27,4 +27,8 @@ public class CheckingPointInfoPageDto { private Integer status; @ApiModelProperty("巡检点名称") private String checkingPointName; + @ApiModelProperty("星纵-巡检路线的任务Id") + private String xzCheckingRouteTaskId; + @ApiModelProperty("巡检人id") + private String checkingPointUserId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java index 3907810dc..1194ff8e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java @@ -20,4 +20,9 @@ public class ProjectSnQO extends PageQO { private String projectSn; @ApiModelProperty("巡检点名称") private String checkingPointName; + @ApiModelProperty("星纵-巡检路线的任务Id") + private String xzCheckingRouteTaskId; + @ApiModelProperty("巡检人id") + private String checkingPointUserId; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java index d8577bb7c..765a11ad9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java @@ -20,9 +20,8 @@ import java.util.Set; * @Version 1.0 */ @Mapper -@DataScope(includeTable = "enterprise_info") public interface CheckingPointInfoMapper extends BaseMapper { - IPage selectCheckingPointInfoPage(@Param("dto") CheckingPointInfoPageDto dto, Page objectPage); + IPage selectCheckingPointInfoPage(@Param("param") CheckingPointInfoPageDto dto, Page objectPage); List selectAllList(); 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 db081f4de..21dbde27e 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 @@ -18,9 +18,8 @@ import java.util.List; * @Version 1.0 */ @Mapper -@DataScope(includeTable = "enterprise_info") public interface CheckingPointMapper extends BaseMapper { - IPage selectCheckingPointPage(@Param("qo") ProjectSnQO projectSnQO, Page objectPage); + IPage selectCheckingPointPage(@Param("param") ProjectSnQO projectSnQO, Page objectPage); List getStartingListByFrequencyType(int type); diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml index 563095472..daca55763 100644 --- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml @@ -2,40 +2,55 @@ - select cp.*, + select t.*, su.real_name createUserName, - (SELECT group_concat( iu.real_name ) FROM system_user iu WHERE find_in_set( iu.user_id, cp.inspect_user_ids )) + (SELECT group_concat( iu.real_name ) FROM system_user iu WHERE find_in_set( iu.user_id, t.inspect_user_ids )) inspectUserNames, - (SELECT group_concat( nu.real_name ) FROM system_user nu WHERE find_in_set( nu.user_id, cp.notice_user_ids ) ) + (SELECT group_concat( nu.real_name ) FROM system_user nu WHERE find_in_set( nu.user_id, t.notice_user_ids ) ) noticeUserNames, group_concat( ei.enterprise_name ) as enterprise_name, + + (select if(count(*) > 0,1,0) from checking_point_info where + xz_checking_route_task_id=#{param.xzCheckingRouteTaskId} and checking_point_user_id = + #{param.checkingPointUserId}) as isInspectFromTask, + qr.region_name - from checking_point cp - inner join system_user su on cp.create_user_id = su.user_id - join enterprise_info ei on find_in_set(ei.id,cp.enterprise_id) - join quality_region qr on qr.id=cp.quality_region_id + from checking_point t + inner join system_user su on t.create_user_id = su.user_id + join enterprise_info ei on find_in_set(ei.id,t.enterprise_id) + join quality_region qr on qr.id=t.quality_region_id + + join xz_checking_route_task xcrt on xcrt.id = #{param.xzCheckingRouteTaskId} + join xz_checking_route xcr on xcr.id=xcrt.xz_checking_route_id + join xz_checking_route_to_point xcrtp on xcrtp.xz_checking_route_id=xcrt.xz_checking_route_id and + t.id=xcrtp.checking_point_id + - - and cp.project_sn = #{qo.projectSn} + + and t.project_sn = #{param.projectSn} - - and cp.checking_point_name like CONCAT(CONCAT('%', #{qo.checkingPointName}), '%') + + and t.checking_point_name like CONCAT(CONCAT('%', #{param.checkingPointName}), '%') - group by cp.id - order by cp.create_date desc + group by t.id + + + order by xcrtp.sort + + + order by t.create_date desc + + + + + ${ew.customSqlSegment} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml new file mode 100644 index 000000000..8705aec58 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml new file mode 100644 index 000000000..630438af6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml new file mode 100644 index 000000000..f16388dcd --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteToPointMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java new file mode 100644 index 000000000..107b9a04f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteService.java @@ -0,0 +1,30 @@ +package com.zhgd.xmgl.modules.x.service; + +import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 星纵-巡检路线 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +public interface IXzCheckingRouteService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(XzCheckingRoute xzCheckingRoute); + + void edit(XzCheckingRoute xzCheckingRoute); + + void delete(String id); + + XzCheckingRoute queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java new file mode 100644 index 000000000..d828d4ec0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskService.java @@ -0,0 +1,30 @@ +package com.zhgd.xmgl.modules.x.service; + +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 星纵-巡检路线的任务 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +public interface IXzCheckingRouteTaskService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(XzCheckingRouteTask xzCheckingRouteTask); + + void edit(XzCheckingRouteTask xzCheckingRouteTask); + + void delete(String id); + + XzCheckingRouteTask queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java new file mode 100644 index 000000000..725db4cba --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java @@ -0,0 +1,30 @@ +package com.zhgd.xmgl.modules.x.service; + +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTaskToInspectUser; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 星纵-巡检任务和巡检人中间表 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +public interface IXzCheckingRouteTaskToInspectUserService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser); + + void edit(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser); + + void delete(String id); + + XzCheckingRouteTaskToInspectUser queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java new file mode 100644 index 000000000..19fe886fa --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteToPointService.java @@ -0,0 +1,30 @@ +package com.zhgd.xmgl.modules.x.service; + +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 星纵-巡检路线和巡检点中间表 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +public interface IXzCheckingRouteToPointService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(XzCheckingRouteToPoint xzCheckingRouteToPoint); + + void edit(XzCheckingRouteToPoint xzCheckingRouteToPoint); + + void delete(String id); + + XzCheckingRouteToPoint queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java new file mode 100644 index 000000000..7a2943760 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java @@ -0,0 +1,181 @@ +package com.zhgd.xmgl.modules.x.service.impl; + +import cn.hutool.core.collection.CollUtil; +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; +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.x.entity.XzCheckingRoute; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteMapper; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteToPointMapper; +import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteService; +import com.zhgd.xmgl.util.DateUtils; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 星纵-巡检路线 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class XzCheckingRouteServiceImpl extends ServiceImpl implements IXzCheckingRouteService { + @Autowired + private XzCheckingRouteMapper xzCheckingRouteMapper; + @Autowired + private XzCheckingRouteTaskMapper xzCheckingRouteTaskMapper; + @Autowired + private XzCheckingRouteToPointMapper xzCheckingRouteToPointMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = baseMapper.queryList(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(baseMapper.queryList(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = "t."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRoute.class, paramMap, alias); + queryWrapper.groupBy("t.id"); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getCreateDate)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzCheckingRoute xzCheckingRoute) { + xzCheckingRoute.setId(null); + baseMapper.insert(xzCheckingRoute); + saveRouteToPoint(xzCheckingRoute); + saveTask(xzCheckingRoute); + } + + private void saveTask(XzCheckingRoute xzCheckingRoute) { + if (xzCheckingRoute.getFrequencyType() == 1) { + saveTaskItemRecord(xzCheckingRoute, ""); + } else if (xzCheckingRoute.getFrequencyType() == 2) { + //天 + List dayList = DateUtils.getDiffTimeDayList(DateUtil.formatDate(xzCheckingRoute.getStartTime()), DateUtil.formatDate(xzCheckingRoute.getEndTime())); + if (dayList != null && dayList.size() > 0) { + for (String day : dayList) { + saveTaskItemRecord(xzCheckingRoute, day); + } + } + } else if (xzCheckingRoute.getFrequencyType() == 3) { + //周 + List dayList = DateUtils.getDiffTimeWeekList(DateUtil.formatDate(xzCheckingRoute.getStartTime()), DateUtil.formatDate(xzCheckingRoute.getEndTime())); + if (dayList != null && dayList.size() > 0) { + for (String day : dayList) { + saveTaskItemRecord(xzCheckingRoute, day); + } + } + } else if (xzCheckingRoute.getFrequencyType() == 4) { + //月 + List dayList = DateUtils.getDiffTimeMonthList(DateUtil.formatDate(xzCheckingRoute.getStartTime()), DateUtil.formatDate(xzCheckingRoute.getEndTime())); + if (dayList != null && dayList.size() > 0) { + for (String day : dayList) { + saveTaskItemRecord(xzCheckingRoute, day); + } + } + } else if (xzCheckingRoute.getFrequencyType() == 5) { + //年 + List dayList = DateUtils.getDiffTimeYearList(DateUtil.formatDate(xzCheckingRoute.getStartTime()), DateUtil.formatDate(xzCheckingRoute.getEndTime())); + if (dayList != null && dayList.size() > 0) { + for (String day : dayList) { + saveTaskItemRecord(xzCheckingRoute, day); + } + } + } + } + + public void saveTaskItemRecord(XzCheckingRoute route, String title) { + for (int i = 0; i < route.getFrequencyNum(); i++) { + XzCheckingRouteTask itemRecord = new XzCheckingRouteTask(); + itemRecord.setFrequencyType(route.getFrequencyType()); + itemRecord.setXzCheckingRouteId(route.getId()); + if (StringUtils.isNotEmpty(title)) { + itemRecord.setItemName(title + "/第" + (i + 1) + "次"); + } else { + itemRecord.setItemName("第" + (i + 1) + "次"); + } + itemRecord.setInspectOrder(i); + itemRecord.setAddTime(new Date()); + xzCheckingRouteTaskMapper.insert(itemRecord); + } + } + + private void saveRouteToPoint(XzCheckingRoute xzCheckingRoute) { + xzCheckingRouteToPointMapper.delete(new LambdaQueryWrapper() + .eq(XzCheckingRouteToPoint::getXzCheckingRouteId, xzCheckingRoute.getId())); + List routeToPointList = xzCheckingRoute.getRouteToPointList(); + if (CollUtil.isNotEmpty(routeToPointList)) { + for (XzCheckingRouteToPoint to : routeToPointList) { + to.setId(null); + to.setXzCheckingRouteId(xzCheckingRoute.getId()); + xzCheckingRouteToPointMapper.insert(to); + } + } + } + + @Override + public void edit(XzCheckingRoute xzCheckingRoute) { + XzCheckingRoute oldXzCheckingRoute = baseMapper.selectById(xzCheckingRoute.getId()); + if (oldXzCheckingRoute == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzCheckingRoute); + saveRouteToPoint(xzCheckingRoute); + saveTask(xzCheckingRoute); + } + + @Override + public void delete(String id) { + XzCheckingRoute xzCheckingRoute = baseMapper.selectById(id); + if (xzCheckingRoute == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public XzCheckingRoute queryById(String id) { + XzCheckingRoute entity = getById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + List xzCheckingRouteToPoints = xzCheckingRouteToPointMapper.selectList(new LambdaQueryWrapper() + .eq(XzCheckingRouteToPoint::getXzCheckingRouteId, id)); + entity.setRouteToPointList(xzCheckingRouteToPoints); + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java new file mode 100644 index 000000000..92a325817 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java @@ -0,0 +1,100 @@ +package com.zhgd.xmgl.modules.x.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper; +import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskService; +import com.zhgd.xmgl.util.MapUtil; +import org.apache.commons.collections.MapUtils; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 星纵-巡检路线的任务 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class XzCheckingRouteTaskServiceImpl extends ServiceImpl implements IXzCheckingRouteTaskService { + @Autowired + private XzCheckingRouteTaskMapper xzCheckingRouteTaskMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = baseMapper.queryList(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(baseMapper.queryList(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = "t."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteTask.class, paramMap, alias); + String checkingPointUserId = MapUtils.getString(paramMap, "checkingPointUserId"); + if (StrUtil.isNotBlank(checkingPointUserId)) { + queryWrapper.apply("find_in_set({0},xcr.inspect_user_ids)", checkingPointUserId); + } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTask::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzCheckingRouteTask xzCheckingRouteTask) { + xzCheckingRouteTask.setId(null); + baseMapper.insert(xzCheckingRouteTask); + } + + @Override + public void edit(XzCheckingRouteTask xzCheckingRouteTask) { + XzCheckingRouteTask oldXzCheckingRouteTask = baseMapper.selectById(xzCheckingRouteTask.getId()); + if (oldXzCheckingRouteTask == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzCheckingRouteTask); + } + + @Override + public void delete(String id) { + XzCheckingRouteTask xzCheckingRouteTask = baseMapper.selectById(id); + if (xzCheckingRouteTask == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public XzCheckingRouteTask queryById(String id) { + XzCheckingRouteTask entity = getById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java new file mode 100644 index 000000000..0d63d70f3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java @@ -0,0 +1,93 @@ +package com.zhgd.xmgl.modules.x.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTaskToInspectUser; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskToInspectUserMapper; +import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteTaskToInspectUserService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 星纵-巡检任务和巡检人中间表 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class XzCheckingRouteTaskToInspectUserServiceImpl extends ServiceImpl implements IXzCheckingRouteTaskToInspectUserService { + @Autowired + private XzCheckingRouteTaskToInspectUserMapper xzCheckingRouteTaskToInspectUserMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteTaskToInspectUser.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTaskToInspectUser::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser) { + xzCheckingRouteTaskToInspectUser.setId(null); + baseMapper.insert(xzCheckingRouteTaskToInspectUser); + } + + @Override + public void edit(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser) { + XzCheckingRouteTaskToInspectUser oldXzCheckingRouteTaskToInspectUser = baseMapper.selectById(xzCheckingRouteTaskToInspectUser.getId()); + if (oldXzCheckingRouteTaskToInspectUser == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzCheckingRouteTaskToInspectUser); + } + + @Override + public void delete(String id) { + XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser = baseMapper.selectById(id); + if (xzCheckingRouteTaskToInspectUser == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public XzCheckingRouteTaskToInspectUser queryById(String id) { + XzCheckingRouteTaskToInspectUser entity = getById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java new file mode 100644 index 000000000..e93efc920 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteToPointServiceImpl.java @@ -0,0 +1,93 @@ +package com.zhgd.xmgl.modules.x.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteToPoint; +import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteToPointMapper; +import com.zhgd.xmgl.modules.x.service.IXzCheckingRouteToPointService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.HashMap; +import java.util.List; + +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 星纵-巡检路线和巡检点中间表 + * @author： pds + * @date： 2024-05-23 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class XzCheckingRouteToPointServiceImpl extends ServiceImpl implements IXzCheckingRouteToPointService { + @Autowired + private XzCheckingRouteToPointMapper xzCheckingRouteToPointMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteToPoint.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteToPoint::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzCheckingRouteToPoint xzCheckingRouteToPoint) { + xzCheckingRouteToPoint.setId(null); + baseMapper.insert(xzCheckingRouteToPoint); + } + + @Override + public void edit(XzCheckingRouteToPoint xzCheckingRouteToPoint) { + XzCheckingRouteToPoint oldXzCheckingRouteToPoint = baseMapper.selectById(xzCheckingRouteToPoint.getId()); + if (oldXzCheckingRouteToPoint == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzCheckingRouteToPoint); + } + + @Override + public void delete(String id) { + XzCheckingRouteToPoint xzCheckingRouteToPoint = baseMapper.selectById(id); + if (xzCheckingRouteToPoint == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public XzCheckingRouteToPoint queryById(String id) { + XzCheckingRouteToPoint entity = getById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +}