admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

巡检路线

Browse Source
This commit is contained in:
guoshengxiong 2024-05-24 22:56:27 +08:00
parent 4d878071d7
commit f100ff9cc4
26 changed files with 282 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java
View File

@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Title: CheckingPointController
@ -39,6 +41,30 @@ public class CheckingPointController {
@Value("${basePath}")
String basePath;
@ApiOperation(value = "分页查询巡检点列表", notes = "分页查询巡检点列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"),
})
@PostMapping(value = "/selectPage")
public Result<IPage<CheckingPoint>> selectCheckingPointPage(@RequestBody ProjectSnQO projectSnQO) {
Result<IPage<CheckingPoint>> result = new Result<>();
result.setResult(checkingPointService.selectCheckingPointPage(projectSnQO));
result.setSuccess(true);
return result;
}
@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 = "/list")
public Result<List<CheckingPoint>> selectCheckingPointList(@RequestBody ProjectSnQO projectSnQO) {
return Result.success(checkingPointService.selectCheckingPointList(projectSnQO));
}
@ApiOperation(value = "新建巡检点", notes = "新建巡检点")
@PostMapping(value = "/add")
public Result add(@RequestBody CheckingPoint checkingPoint) {
@ -52,21 +78,6 @@ public class CheckingPointController {
checkingPointService.edit(checkingPoint);
return Result.ok();
}
@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<IPage<CheckingPoint>> selectCheckingPointPage(@RequestBody ProjectSnQO projectSnQO) {
Result<IPage<CheckingPoint>> result = new Result<>();
result.setResult(checkingPointService.selectCheckingPointPage(projectSnQO));
result.setSuccess(true);
return result;
}
/**
* 删除巡检点
*/

18
src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointInfoController.java
View File

@ -39,23 +39,21 @@ public class CheckingPointInfoController {
CheckingPointService checkingPointService;
@ApiOperation(value = "分页查询巡检记录列表 from data", notes = "分页查询巡检记录列表 from data")
@ApiOperation(value = "分页查询巡检记录列表", notes = "分页查询巡检记录列表")
@PostMapping(value = "/selectPage")
@ApiImplicitParams({
@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 = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "checkingPointUserId", value = "巡检人员id", paramType = "query", required = false, dataType = "String"),
})
public Result<IPage<CheckingPointInfo>> selectCheckingPointInfoPage(CheckingPointInfoPageDto dto) {
public Result<IPage<CheckingPointInfo>> selectCheckingPointInfoPage(@RequestBody CheckingPointInfoPageDto dto) {
Result<IPage<CheckingPointInfo>> result = new Result<>();
result.setResult(checkingPointInfoService.selectCheckingPointInfoPage(dto));
result.setSuccess(true);
return result;
}
@ApiOperation(value = "查询巡检记录列表", notes = "查询巡检记录列表")
@PostMapping(value = "/list")
public Result<List<CheckingPointInfo>> selectCheckingPointInfoList(@RequestBody CheckingPointInfoPageDto dto) {
return Result.success(checkingPointInfoService.selectCheckingPointInfoList(dto));
}
@ApiOperation(value = "分页查询巡检记录列表", notes = "分页查询巡检记录列表")
@PostMapping(value = "/selectAllList")
public Result<List<CheckingPointInfo>> selectAllList() {

14
src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPoint.java
View File

@ -179,15 +179,15 @@ public class CheckingPoint implements Serializable {
/**
* 创建人名称
*/
@TableField(exist = false)
@ApiModelProperty("创建人名称")
@TableField(exist = false)
private String createUserName;
@ApiModelProperty("检查人名称")
@TableField(exist = false)
@ApiModelProperty("检查人名称")
@Deprecated
private String inspectUserNames;
@ApiModelProperty("通知人名称")
@TableField(exist = false)
@ApiModelProperty("通知人名称")
private String noticeUserNames;
@TableField(exist = false)
@ApiModelProperty(value = "区域名称")
@ -196,9 +196,11 @@ public class CheckingPoint implements Serializable {
@ApiModelProperty(value = "企业名称")
@Deprecated
private String enterpriseName;
@ApiModelProperty("巡检任务的巡检人是否巡检该巡检点")
@TableField(exist = false)
private String isInspectFromTask;
@ApiModelProperty("巡检任务的巡检人的巡检状态 0：未巡检 1：正常 2：异常")
private Integer inspectStatus;
@TableField(exist = false)
@ApiModelProperty(value = "排序")
private Integer sort;
}

5
src/main/java/com/zhgd/xmgl/modules/checking/entity/CheckingPointInfo.java
View File

@ -164,7 +164,6 @@ public class CheckingPointInfo implements Serializable {
@TableField(exist = false)
private String checkingPointUserName;
@ApiModelProperty("通知人名称")
@TableField(exist = false)
private String noticeUserNames;
@ -183,8 +182,12 @@ public class CheckingPointInfo implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "路线名称")
private java.lang.String routeName;
@TableField(exist = false)
@ApiModelProperty(value = "任务名称")
private java.lang.String itemName;
@TableField(exist = false)
@ApiModelProperty(value = "合作单位")
private java.lang.String enterpriseName;
}

6
src/main/java/com/zhgd/xmgl/modules/checking/entity/dto/CheckingPointInfoPageDto.java
View File

@ -10,10 +10,13 @@ import java.util.Date;
@Data
public class CheckingPointInfoPageDto {
@ApiModelProperty(value = "项目编号", required = true)
String projectSn;
@ApiModelProperty("查询条件、多条件（巡检点、巡检位置、巡检人、巡检时间）")
String queryStr;
@ApiModelProperty(value = "pageNo", required = true)
Integer pageNo = 1;
@ApiModelProperty(value = "pageSize", required = true)
Integer pageSize = 10;
@ApiModelProperty(value = "查询开始时间，格式：2023-05-22")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@ -31,4 +34,7 @@ public class CheckingPointInfoPageDto {
private String xzCheckingRouteTaskId;
@ApiModelProperty("巡检人id")
private String checkingPointUserId;
@ApiModelProperty("巡检点id")
private String checkingPointId;
}

4
src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java
View File

@ -22,7 +22,7 @@ public class ProjectSnQO extends PageQO {
private String checkingPointName;
@ApiModelProperty("星纵-巡检路线的任务Id")
private String xzCheckingRouteTaskId;
@ApiModelProperty("巡检人id")
private String checkingPointUserId;
@ApiModelProperty("巡检点id")
private String checkingPointId;
}

5
src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointInfoMapper.java
View File

@ -20,8 +20,11 @@ import java.util.Set;
* @Version 1.0
*/
@Mapper
@DataScope(includeTable = "enterprise_info")
public interface CheckingPointInfoMapper extends BaseMapper<CheckingPointInfo> {
IPage<CheckingPointInfo> selectCheckingPointInfoPage(@Param("param") CheckingPointInfoPageDto dto, Page<?> objectPage);
IPage<CheckingPointInfo> selectCheckingPointInfoList(@Param("param") CheckingPointInfoPageDto dto, Page<?> objectPage);
List<CheckingPointInfo> selectCheckingPointInfoList(@Param("param") CheckingPointInfoPageDto dto);
List<CheckingPointInfo> selectAllList();

5
src/main/java/com/zhgd/xmgl/modules/checking/mapper/CheckingPointMapper.java
View File

@ -18,8 +18,11 @@ import java.util.List;
* @Version 1.0
*/
@Mapper
@DataScope(includeTable = "enterprise_info")
public interface CheckingPointMapper extends BaseMapper<CheckingPoint> {
IPage<CheckingPoint> selectCheckingPointPage(@Param("param") ProjectSnQO projectSnQO, Page<?> objectPage);
IPage<CheckingPoint> selectCheckingPointList(@Param("param") ProjectSnQO projectSnQO, Page<?> objectPage);
List<CheckingPoint> selectCheckingPointList(@Param("param") ProjectSnQO projectSnQO);
List<CheckingPoint> getStartingListByFrequencyType(int type);

27
src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointInfoMapper.xml
View File

@ -1,30 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.checking.mapper.CheckingPointInfoMapper">
<select id="selectCheckingPointInfoPage" resultType="com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo">
<select id="selectCheckingPointInfoList" resultType="com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo">
select t.*,
cp.checking_point_name checkingPointName,
cp.checking_point_name as checkingPointName,
cp.position,
su.real_name checkingPointUserName,
su.real_name as checkingPointUserName,
(SELECT group_concat(nu.real_name)
FROM system_user nu
WHERE find_in_set(nu.user_id, cp.notice_user_ids)) noticeUserNames,
uo.real_name operate_name,
WHERE find_in_set(nu.user_id, xcr.notice_user_ids)) noticeUserNames,
uo.real_name as operate_name,
cp.min_inspect_time,
qr.region_name,
xcr.route_name,
xcrt.item_name
xcrt.item_name,
(SELECT group_concat(nu.enterprise_name)
FROM enterprise_info nu
WHERE find_in_set(nu.id, cp.enterprise_id)) as enterprise_name
from checking_point_info t
inner join checking_point cp on t.checking_point_id = cp.id
join checking_point cp on t.checking_point_id = cp.id
left join system_user su on t.checking_point_user_id = su.user_id
left join enterprise_info ei on find_in_set(ei.id,cp.enterprise_id)
inner join system_user su on t.checking_point_user_id = su.user_id
left join system_user uo on t.operate_id = uo.user_id
left join quality_region qr on qr.id = cp.quality_region_id
left join xz_checking_route_task xcrt on t.xz_checking_route_task_id = xcrt.id
left join xz_checking_route xcr on xcrt.xz_checking_route_id = xcr.id
left join xz_checking_route_to_point xcrtp on cp.id = xcrtp.checking_point_id and xcrtp.xz_checking_route_id =
xcr.id
where cp.project_sn = #{param.projectSn}
where 1=1
<if test="param.projectSn != null and param.projectSn != ''">
and cp.project_sn = #{param.projectSn}
</if>
<if test="param.checkingPointId != null and param.checkingPointId != ''">
and cp.id = #{param.checkingPointId}
</if>
<if test="param.queryStr != null and param.queryStr != ''">
and (cp.checking_point_name like concat('%', #{param.queryStr}, '%')
or cp.position like concat('%', #{param.queryStr}, '%')

30
src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml
View File

@ -1,34 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.checking.mapper.CheckingPointMapper">
<select id="selectCheckingPointPage" resultType="com.zhgd.xmgl.modules.checking.entity.CheckingPoint">
<select id="selectCheckingPointList" resultType="com.zhgd.xmgl.modules.checking.entity.CheckingPoint">
select t.*,
su.real_name createUserName,
(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, t.notice_user_ids ) )
noticeUserNames,
group_concat( ei.enterprise_name ) as enterprise_name,
<if test="param.xzCheckingRouteTaskId != null and param.xzCheckingRouteTaskId != ''">
(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,
ifnull(t1.inspectStatus,0) as inspectStatus,
xcrtp.sort,
</if>
qr.region_name
qr.region_name,
su.real_name as createUserName
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
left join system_user su on su.user_id=t.create_user_id
left join enterprise_info ei on find_in_set(ei.id,t.enterprise_id)
left join quality_region qr on qr.id=t.quality_region_id
<if test="param.xzCheckingRouteTaskId != null and param.xzCheckingRouteTaskId != ''">
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
</if>
<if test="param.xzCheckingRouteTaskId != null and param.xzCheckingRouteTaskId != ''">
left join (
select
(CASE WHEN count(*)=0 THEN 0 WHEN ifnull(sum(if(status = 2,1,0)),0) THEN 2 ELSE 1 END) as inspectStatus,
checking_point_id
from checking_point_info
where xz_checking_route_task_id=#{param.xzCheckingRouteTaskId}
group by checking_point_id
) as t1 on t1.checking_point_id=t.id
</if>
<where>
<if test="param.projectSn != null and param.projectSn != ''">
and t.project_sn = #{param.projectSn}
</if>
<if test="param.checkingPointId != null and param.checkingPointId != ''">
and t.id = #{param.checkingPointId}
</if>
<if test="param.checkingPointName != null and param.checkingPointName != ''">
and t.checking_point_name like CONCAT(CONCAT('%', #{param.checkingPointName}), '%')
</if>

5
src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointInfoService.java
View File

@ -15,11 +15,10 @@ import java.util.List;
*/
public interface CheckingPointInfoService extends IService<CheckingPointInfo> {
/**
* @return
*/
IPage<CheckingPointInfo> selectCheckingPointInfoPage(CheckingPointInfoPageDto dto);
List<CheckingPointInfo> selectCheckingPointInfoList(CheckingPointInfoPageDto dto);
List<CheckingPointInfo> selectAllList();
void add(CheckingPointInfo checkingPointInfo);

4
src/main/java/com/zhgd/xmgl/modules/checking/service/CheckingPointService.java
View File

@ -5,6 +5,8 @@ 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 java.util.List;
/**
* @author 邱平毅
* @ClassName CheckingPointService
@ -14,6 +16,8 @@ import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO;
public interface CheckingPointService extends IService<CheckingPoint> {
IPage<CheckingPoint> selectCheckingPointPage(ProjectSnQO projectSnQO);
List<CheckingPoint> selectCheckingPointList(ProjectSnQO projectSnQO);
/**
* @param id 巡检点id
* @param userId 用户id

69
src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointInfoServiceImpl.java
View File

@ -1,19 +1,23 @@
package com.zhgd.xmgl.modules.checking.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
import com.zhgd.xmgl.modules.checking.entity.dto.CheckingPointInfoPageDto;
import com.zhgd.xmgl.modules.checking.entity.CheckingPoint;
import com.zhgd.xmgl.modules.checking.entity.CheckingPointAlarm;
import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo;
import com.zhgd.xmgl.modules.checking.entity.dto.CheckingPointInfoPageDto;
import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO;
import com.zhgd.xmgl.modules.checking.enums.PointStatusEnum;
import com.zhgd.xmgl.modules.checking.mapper.CheckingPointInfoMapper;
import com.zhgd.xmgl.modules.checking.mapper.CheckingPointMapper;
@ -21,9 +25,12 @@ import com.zhgd.xmgl.modules.checking.service.CheckingPointAlarmService;
import com.zhgd.xmgl.modules.checking.service.CheckingPointInfoService;
import com.zhgd.xmgl.modules.checking.service.CheckingPointService;
import com.zhgd.xmgl.modules.project.service.IProjectService;
import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTask;
import com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskMapper;
import com.zhgd.xmgl.modules.x.service.impl.XzCheckingRouteTaskServiceImpl;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.MapBuilder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -32,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @author 邱平毅
@ -43,9 +51,13 @@ import java.util.Objects;
@Slf4j
@Transactional(rollbackFor = Exception.class)
public class CheckingPointInfoServiceImpl extends ServiceImpl<CheckingPointInfoMapper, CheckingPointInfo> implements CheckingPointInfoService {
@Autowired
XzCheckingRouteTaskServiceImpl xzCheckingRouteTaskService;
@Autowired
SystemUserMapper systemUserMapper;
@Autowired
CheckingPointInfoServiceImpl checkingPointInfoService;
@Autowired
INoticeService noticeService;
@Autowired
CheckingPointMapper checkingPointMapper;
@ -57,10 +69,17 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl<CheckingPointInfoM
IProjectService projectService;
@Autowired
CheckingPointService checkingPointService;
@Autowired
XzCheckingRouteTaskMapper xzCheckingRouteTaskMapper;
@Override
public IPage<CheckingPointInfo> selectCheckingPointInfoPage(CheckingPointInfoPageDto dto) {
return checkingPointInfoMapper.selectCheckingPointInfoPage(dto, new Page<>(dto.getPageNo(), dto.getPageSize()));
return checkingPointInfoMapper.selectCheckingPointInfoList(dto, new Page<>(dto.getPageNo(), dto.getPageSize()));
}
@Override
public List<CheckingPointInfo> selectCheckingPointInfoList(CheckingPointInfoPageDto dto) {
return checkingPointInfoMapper.selectCheckingPointInfoList(dto);
}
@Override
@ -72,18 +91,38 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl<CheckingPointInfoM
@Transactional(rollbackFor = Exception.class)
public void add(CheckingPointInfo checkingPointInfo) {
log.info("CheckingPointInfoServiceImpl#add param：{}", checkingPointInfo);
Long checkingPointId = checkingPointInfo.getCheckingPointId();
if (checkingPointService.getById(checkingPointId) == null) {
CheckingPoint old = checkingPointService.getById(checkingPointId);
if (old == null) {
log.error("CheckingPointInfoServiceImpl#add 当前打卡测点不存在！打卡信息为：{}", checkingPointInfo);
throw new NullPointerException("当前打卡测点不存在！");
}
checkingPointInfoMapper.insert(checkingPointInfo);
// 异常添加异常信息
if (checkingPointInfo.getStatus() == PointStatusEnum.ABNORMAL.getId()) {
checkingPointAlarmService.save(new CheckingPointAlarm(checkingPointId, checkingPointInfo.getAlarmDetails(), checkingPointInfo.getAlarmImage()));
}
CheckingPoint checkingPoint = checkingPointMapper.selectById(checkingPointInfo.getCheckingPointId());
if (checkingPointInfo.getXzCheckingRouteTaskId() != null) {
checkDuplicateAndPointExist(checkingPointInfo);
checkingPointInfoMapper.insert(checkingPointInfo);
//更新任务-检查人员信息
String xzCheckingRouteTaskId = String.valueOf(checkingPointInfo.getXzCheckingRouteTaskId());
ProjectSnQO qo = new ProjectSnQO();
qo.setXzCheckingRouteTaskId(xzCheckingRouteTaskId);
List<CheckingPoint> checkingPoints = checkingPointService.selectCheckingPointList(qo);
xzCheckingRouteTaskMapper.update(null, new LambdaUpdateWrapper<XzCheckingRouteTask>()
.set(XzCheckingRouteTask::getIsInspect, 1)
.set(XzCheckingRouteTask::getCheckingPointNum, checkingPoints.size())
.set(XzCheckingRouteTask::getNormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 1).collect(Collectors.toList()).size())
.set(XzCheckingRouteTask::getAbnormalCheckingPointNum, checkingPoints.stream().filter(checkingPoint1 -> checkingPoint1.getInspectStatus() == 2).collect(Collectors.toList()).size())
.eq(XzCheckingRouteTask::getId, xzCheckingRouteTaskId)
);
} else {
checkingPointInfoMapper.insert(checkingPointInfo);
}
//通知
List<String> userIds = StrUtil.split(checkingPoint.getInspectUserIds(), ",");
for (String userId : userIds) {
@ -95,6 +134,24 @@ public class CheckingPointInfoServiceImpl extends ServiceImpl<CheckingPointInfoM
}
}
private void checkDuplicateAndPointExist(CheckingPointInfo checkingPointInfo) {
CheckingPointInfoPageDto dto1 = new CheckingPointInfoPageDto();
dto1.setCheckingPointId(String.valueOf(checkingPointInfo.getCheckingPointId()));
dto1.setXzCheckingRouteTaskId(String.valueOf(checkingPointInfo.getXzCheckingRouteTaskId()));
List<CheckingPointInfo> checkingPointInfos = checkingPointInfoService.selectCheckingPointInfoList(dto1);
if (CollUtil.isNotEmpty(checkingPointInfos)) {
throw new OpenAlertException("该次任务的巡检点已提交巡检记录，请勿重复添加");
}
ProjectSnQO qo = new ProjectSnQO();
qo.setXzCheckingRouteTaskId(String.valueOf(checkingPointInfo.getXzCheckingRouteTaskId()));
qo.setCheckingPointId(String.valueOf(checkingPointInfo.getCheckingPointId()));
List<CheckingPoint> points = checkingPointService.selectCheckingPointList(qo);
if (CollUtil.isEmpty(points)) {
throw new OpenAlertException("该次任务不包含该巡检点，请检查后重试");
}
}
@Override
public void edit(CheckingPointInfo checkingPointInfo) {
if (Objects.equals(checkingPointInfo.getHandleDone(), 1)) {

7
src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java
View File

@ -51,7 +51,12 @@ public class CheckingPointServiceImpl extends ServiceImpl<CheckingPointMapper, C
@Override
public IPage<CheckingPoint> selectCheckingPointPage(ProjectSnQO projectSnQO) {
return checkingPointMapper.selectCheckingPointPage(projectSnQO, new Page<>(projectSnQO.getPageNo(), projectSnQO.getPageSize()));
return checkingPointMapper.selectCheckingPointList(projectSnQO, new Page<>(projectSnQO.getPageNo(), projectSnQO.getPageSize()));
}
@Override
public List<CheckingPoint> selectCheckingPointList(ProjectSnQO projectSnQO) {
return checkingPointMapper.selectCheckingPointList(projectSnQO);
}
@Override

51
src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTask.java
View File

@ -62,12 +62,59 @@ public class XzCheckingRouteTask implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private java.util.Date addTime;
/**
* 是否巡检
*/
@Excel(name = "是否巡检", width = 15)
@ApiModelProperty(value = "是否巡检")
private java.lang.Integer isInspect;
/**
* 巡检点数量
*/
@Excel(name = "巡检点数量", width = 15)
@ApiModelProperty(value = "巡检点数量")
private java.lang.Integer checkingPointNum;
/**
* 正常巡检点数量
*/
@Excel(name = "正常巡检点数量", width = 15)
@ApiModelProperty(value = "正常巡检点数量")
private java.lang.Integer normalCheckingPointNum;
/**
* 异常巡检点数量
*/
@Excel(name = "异常巡检点数量", width = 15)
@ApiModelProperty(value = "异常巡检点数量")
private java.lang.Integer abnormalCheckingPointNum;
/**
* 检查开始时间
*/
@Excel(name = "检查开始时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "检查开始时间")
private java.util.Date startTime;
/**
* 检查结束时间
*/
@Excel(name = "检查结束时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "检查结束时间")
private java.util.Date endTime;
@TableField(exist = false)
@ApiModelProperty(value = "星纵-巡检路线")
XzCheckingRoute xzCheckingRoute;
@TableField(exist = false)
@ApiModelProperty(value = "某个巡检人信息")
XzCheckingRouteTaskToInspectUser taskToInspectUser;
@ApiModelProperty(value = "巡检人名称")
private java.lang.Integer inspectUserName;
@TableField(exist = false)
@ApiModelProperty(value = "巡检状态：1未开始2进行中3已完成4已逾期")
private java.lang.Integer inspectStatus;
}

81
src/main/java/com/zhgd/xmgl/modules/x/entity/XzCheckingRouteTaskToInspectUser.java
View File

@ -1,81 +0,0 @@
package com.zhgd.xmgl.modules.x.entity;
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;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 星纵-巡检任务和巡检人中间表
* @author： pds
* @date： 2024-05-23
* @version： V1.0
*/
@Data
@TableName("xz_checking_route_task_to_inspect_user")
@ApiModel(value = "XzCheckingRouteTaskToInspectUser实体类", description = "XzCheckingRouteTaskToInspectUser")
public class XzCheckingRouteTaskToInspectUser implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 星纵-巡检路线的任务id
*/
@Excel(name = "星纵-巡检路线的任务id", width = 15)
@ApiModelProperty(value = "星纵-巡检路线的任务id")
private java.lang.Long xzCheckingRouteTaskId;
/**
* 巡检人id
*/
@Excel(name = "巡检人id", width = 15)
@ApiModelProperty(value = "巡检人id")
private java.lang.Long inspectUserId;
/**
* 是否巡检
*/
@Excel(name = "是否巡检", width = 15)
@ApiModelProperty(value = "是否巡检")
private java.lang.Integer isInspect;
/**
* 正常巡检点数量
*/
@Excel(name = "正常巡检点数量", width = 15)
@ApiModelProperty(value = "正常巡检点数量")
private java.lang.Integer normalCheckingPointNum;
/**
* 异常巡检点数量
*/
@Excel(name = "异常巡检点数量", width = 15)
@ApiModelProperty(value = "异常巡检点数量")
private java.lang.Integer abnormalCheckingPointNum;
/**
* 巡检点数量
*/
@Excel(name = "巡检点数量", width = 15)
@ApiModelProperty(value = "巡检点数量")
private java.lang.Integer checkingPointNum;
@TableField(exist = false)
@ApiModelProperty(value = "巡检人名称")
private java.lang.Integer inspectUserName;
@TableField(exist = false)
@ApiModelProperty(value = "巡检状态：1未开始2进行中3已完成4已逾期")
private java.lang.Integer inspectStatus;
}

2
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteMapper.java
View File

@ -6,6 +6,7 @@ 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.annotation.DataScope;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.x.entity.XzCheckingRoute;
@ -18,6 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @version： V1.0
*/
@Mapper
@DataScope(includeTable = "enterprise_info")
public interface XzCheckingRouteMapper extends BaseMapper<XzCheckingRoute> {
List<XzCheckingRoute> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzCheckingRoute> queryWrapper);

5
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskMapper.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.x.mapper;
import java.util.HashMap;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -20,7 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface XzCheckingRouteTaskMapper extends BaseMapper<XzCheckingRouteTask> {
List<XzCheckingRouteTask> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzCheckingRouteTask> queryWrapper);
List<XzCheckingRouteTask> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzCheckingRouteTask> queryWrapper, @Param("param") HashMap<String, Object> paramMap);
IPage<XzCheckingRouteTask> queryList(Page<XzCheckingRouteTask> page, @Param(Constants.WRAPPER) QueryWrapper<XzCheckingRouteTask> queryWrapper);
IPage<XzCheckingRouteTask> queryList(Page<XzCheckingRouteTask> page, @Param(Constants.WRAPPER) QueryWrapper<XzCheckingRouteTask> queryWrapper, @Param("param") HashMap<String, Object> paramMap);
}

19
src/main/java/com/zhgd/xmgl/modules/x/mapper/XzCheckingRouteTaskToInspectUserMapper.java
View File

@ -1,19 +0,0 @@
package com.zhgd.xmgl.modules.x.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.x.entity.XzCheckingRouteTaskToInspectUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 星纵-巡检任务和巡检人中间表
* @author： pds
* @date： 2024-05-23
* @version： V1.0
*/
@Mapper
public interface XzCheckingRouteTaskToInspectUserMapper extends BaseMapper<XzCheckingRouteTaskToInspectUser> {
}

24
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteMapper.xml
View File

@ -2,16 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteMapper">
<sql id="selectTable">
select t.*,
(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, t.notice_user_ids))
noticeUserNames,
group_concat(ei.enterprise_name) as enterprise_name,
qr.region_name
from xz_checking_route as t
join enterprise_info ei on find_in_set(ei.id, t.enterprise_id)
join quality_region qr on qr.id = t.quality_region_id
select t.*
from (select t.*,
(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, t.notice_user_ids))
noticeUserNames,
group_concat(ei.enterprise_name) as enterprise_name
from xz_checking_route as t
join enterprise_info ei on find_in_set(ei.id, t.enterprise_id)
group by t.id) as t
</sql>
<select id="queryList" resultType="com.zhgd.xmgl.modules.x.entity.XzCheckingRoute">
<include refid="selectTable">

2
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskMapper.xml
View File

@ -11,6 +11,8 @@
<select id="queryList" resultMap="queryListMap">
select t.*,
CASE WHEN t.is_inspect = 1 THEN 3 WHEN t.start_time > current_date THEN 1 WHEN t.end_time &lt; current_date THEN
4 ELSE 2 END as inspectStatus,
xcr.id as xcr_id,
xcr.route_name as xcr_route_name,
xcr.project_sn as xcr_project_sn,

4
src/main/java/com/zhgd/xmgl/modules/x/mapper/xml/XzCheckingRouteTaskToInspectUserMapper.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.x.mapper.XzCheckingRouteTaskToInspectUserMapper">
</mapper>

30
src/main/java/com/zhgd/xmgl/modules/x/service/IXzCheckingRouteTaskToInspectUserService.java
View File

@ -1,30 +0,0 @@
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<XzCheckingRouteTaskToInspectUser> {
IPage<XzCheckingRouteTaskToInspectUser> queryPageList(HashMap<String, Object> paramMap);
List<XzCheckingRouteTaskToInspectUser> queryList(HashMap<String, Object> paramMap);
void add(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser);
void edit(XzCheckingRouteTaskToInspectUser xzCheckingRouteTaskToInspectUser);
void delete(String id);
XzCheckingRouteTaskToInspectUser queryById(String id);
}

19
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.x.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -27,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @Description: 星纵-巡检路线
@ -62,7 +65,6 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMappe
private QueryWrapper<XzCheckingRoute> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "t.";
QueryWrapper<XzCheckingRoute> queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRoute.class, paramMap, alias);
queryWrapper.groupBy("t.id");
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getCreateDate));
return queryWrapper;
}
@ -124,8 +126,19 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMappe
itemRecord.setXzCheckingRouteId(route.getId());
if (StringUtils.isNotEmpty(title)) {
itemRecord.setItemName(title + "/第" + (i + 1) + "次");
boolean contains = title.contains("/");
if (contains) {
List<String> dateSplit = StrUtil.split(title, "/");
itemRecord.setStartTime(DateUtil.parseDate(dateSplit.get(0)));
itemRecord.setEndTime(DateUtil.parseDate(dateSplit.get(1)));
} else {
itemRecord.setStartTime(DateUtil.parseDate(title));
itemRecord.setEndTime(DateUtil.parseDate(title));
}
} else {
itemRecord.setItemName("第" + (i + 1) + "次");
itemRecord.setStartTime(route.getStartTime());
itemRecord.setEndTime(route.getEndTime());
}
itemRecord.setInspectOrder(i);
itemRecord.setAddTime(new Date());
@ -138,6 +151,10 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMappe
.eq(XzCheckingRouteToPoint::getXzCheckingRouteId, xzCheckingRoute.getId()));
List<XzCheckingRouteToPoint> routeToPointList = xzCheckingRoute.getRouteToPointList();
if (CollUtil.isNotEmpty(routeToPointList)) {
Set<Integer> sortSet = routeToPointList.stream().map(XzCheckingRouteToPoint::getSort).collect(Collectors.toSet());
if (sortSet.size() != routeToPointList.size()) {
throw new OpenAlertException("巡检路线中存在重复的排序号，请检查！");
}
for (XzCheckingRouteToPoint to : routeToPointList) {
to.setId(null);
to.setXzCheckingRouteId(xzCheckingRoute.getId());

33
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskServiceImpl.java
View File

@ -1,27 +1,25 @@
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 com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
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.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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
@ -38,7 +36,7 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl<XzCheckingRouteT
public IPage<XzCheckingRouteTask> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzCheckingRouteTask> queryWrapper = getQueryWrapper(paramMap);
Page<XzCheckingRouteTask> page = PageUtil.getPage(paramMap);
IPage<XzCheckingRouteTask> pageList = baseMapper.queryList(page, queryWrapper);
IPage<XzCheckingRouteTask> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@ -46,16 +44,21 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl<XzCheckingRouteT
@Override
public List<XzCheckingRouteTask> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzCheckingRouteTask> queryWrapper = getQueryWrapper(paramMap);
return dealList(baseMapper.queryList(queryWrapper));
return dealList(baseMapper.queryList(queryWrapper, paramMap));
}
private QueryWrapper<XzCheckingRouteTask> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "t.";
QueryWrapper<XzCheckingRouteTask> queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteTask.class, paramMap, alias);
String checkingPointUserId = MapUtils.getString(paramMap, "checkingPointUserId");
String date = MapUtils.getString(paramMap, "date");
if (StrUtil.isNotBlank(checkingPointUserId)) {
queryWrapper.apply("find_in_set({0},xcr.inspect_user_ids)", checkingPointUserId);
}
if (StrUtil.isNotBlank(date)) {
queryWrapper.le("xcr.start_time", date);
queryWrapper.ge("xcr.end_time", date);
}
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTask::getId));
return queryWrapper;
}

93
src/main/java/com/zhgd/xmgl/modules/x/service/impl/XzCheckingRouteTaskToInspectUserServiceImpl.java
View File

@ -1,93 +0,0 @@
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<XzCheckingRouteTaskToInspectUserMapper, XzCheckingRouteTaskToInspectUser> implements IXzCheckingRouteTaskToInspectUserService {
@Autowired
private XzCheckingRouteTaskToInspectUserMapper xzCheckingRouteTaskToInspectUserMapper;
@Override
public IPage<XzCheckingRouteTaskToInspectUser> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzCheckingRouteTaskToInspectUser> queryWrapper = getQueryWrapper(paramMap);
Page<XzCheckingRouteTaskToInspectUser> page = PageUtil.getPage(paramMap);
IPage<XzCheckingRouteTaskToInspectUser> pageList = this.page(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@Override
public List<XzCheckingRouteTaskToInspectUser> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzCheckingRouteTaskToInspectUser> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
}
private QueryWrapper<XzCheckingRouteTaskToInspectUser> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<XzCheckingRouteTaskToInspectUser> queryWrapper = QueryGenerator.initPageQueryWrapper(XzCheckingRouteTaskToInspectUser.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTaskToInspectUser::getId));
return queryWrapper;
}
private List<XzCheckingRouteTaskToInspectUser> dealList(List<XzCheckingRouteTaskToInspectUser> 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;
}
}