机械维护与故障

This commit is contained in:
lg
2025-12-02 19:07:26 +08:00
parent f0802432ed
commit 3efa899a97
20 changed files with 307 additions and 5 deletions

View File

@ -10,6 +10,7 @@ import org.dromara.device.domain.bo.DeviceInfoBo;
import org.dromara.device.domain.vo.DeviceInfoVo;
import org.dromara.device.service.IDeviceInfoService;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.springframework.web.bind.annotation.*;
@ -68,6 +69,16 @@ public class JxGzwxController extends BaseController {
return jxGzwxService.queryPageList(bo, pageQuery);
}
/**
* 根据故障id查询机械故障维修记录列表
*/
@SaCheckPermission("jxgl:gzwx:list")
@GetMapping("/getlistById/{id}")
public List<JxGzwxJlVo> getlistById(@PathVariable("id") Long id) {
return jxGzwxService.getlistById(id);
}
/**
* 导出机械故障维修列表
*/

View File

@ -6,7 +6,10 @@ import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo;
import org.dromara.mechanical.jxgl.service.IJxGzwxService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -37,6 +40,20 @@ public class JxGzwxJlController extends BaseController {
private final IJxGzwxJlService jxGzwxJlService;
private final IJxGzwxService jxGzwxService;
/**
* 查询机械故障维修列表
*/
@SaCheckPermission("jxgl:gzwxJl:list")
@GetMapping("/getlist")
public TableDataInfo<JxGzwxVo> list(JxGzwxBo bo, PageQuery pageQuery) {
return jxGzwxService.queryPageList(bo, pageQuery);
}
/**
* 查询机械故障维修记录列表
*/

View File

@ -9,7 +9,10 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.device.domain.bo.DeviceInfoBo;
import org.dromara.device.domain.vo.DeviceInfoVo;
import org.dromara.device.service.IDeviceInfoService;
import org.dromara.mechanical.jxgl.domain.JxWhjl;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
import org.dromara.mechanical.jxgl.service.IJxWhjlService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -40,6 +43,8 @@ public class JxWhjhController extends BaseController {
private final IJxWhjhService jxWhjhService;
private final IDeviceInfoService deviceInfoService;
@ -56,6 +61,16 @@ public class JxWhjhController extends BaseController {
}
/**
* 根据计划id查询记录信息列表
*/
@SaCheckPermission("jxgl:whjh:list")
@GetMapping("/getlistById/{id}")
public List<JxWhjlVo> getlistById(@PathVariable("id") Long id) {
return jxWhjhService.getlistById(id);
}
/**
* 查询机械维护计划列表
*/

View File

@ -32,6 +32,12 @@ public class JxGzwx extends BaseEntity {
@TableId(value = "fault_id")
private Long faultId;
/**
* 故障名称
*/
private String faultName;
/**
* 台账ID
*/

View File

@ -38,6 +38,16 @@ public class JxGzwxJl extends BaseEntity {
*/
private Long faultId;
/**
* 故障名称
*/
private String faultName;
/**
* 故障记录名称
*/
private String faultjlName;
/**
* 台账ID

View File

@ -39,6 +39,11 @@ public class JxWhjh extends BaseEntity {
*/
private String equipmentName;
/**
* 维修计划名称
*/
private String wxjhName;
/**
* 计划类型 字典
*/

View File

@ -82,6 +82,16 @@ public class JxWhjl extends BaseEntity {
*/
private String maintenanceResult;
/**
* 维修计划名称
*/
private String wxjhName;
/**
* 维修记录名称
*/
private String wxjlName;
/**
* 备注
*/

View File

@ -91,5 +91,16 @@ public class JxGzwxBo extends BaseEntity {
*/
private String fileId;
/**
* 故障名称
*/
private String faultName;
private LocalDate startTime;
private LocalDate endTime;
}

View File

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -33,6 +34,17 @@ public class JxGzwxJlBo extends BaseEntity {
@NotNull(message = "故障ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long faultId;
/**
* 故障名称
*/
private String faultName;
/**
* 故障记录名称
*/
private String faultjlName;
/**
* 台账ID
*/
@ -108,4 +120,9 @@ public class JxGzwxJlBo extends BaseEntity {
private String fileId;
private LocalDate startTime;
private LocalDate endTime;
}

View File

@ -56,6 +56,12 @@ public class JxWhjhBo extends BaseEntity {
*/
private String maintenanceItems;
/**
* 维修计划名称
*/
private String wxjhName;
/**
* 周期类型 字典
*/

View File

@ -32,6 +32,16 @@ public class JxWhjlBo extends BaseEntity {
*/
private Long whjhId;
/**
* 维修计划名称
*/
private String wxjhName;
/**
* 维修记录名称
*/
private String wxjlName;
/**
* 台账ID
*/

View File

@ -2,10 +2,14 @@ package org.dromara.mechanical.jxgl.domain.vo;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -52,6 +56,16 @@ public class JxGzwxJlVo implements Serializable {
*/
private String equipmentName;
/**
* 故障名称
*/
private String faultName;
/**
* 故障记录名称
*/
private String faultjlName;
/**
* 故障ID
*/
@ -76,6 +90,14 @@ public class JxGzwxJlVo implements Serializable {
@ExcelProperty(value = "维修人员")
private Long repairPerson;
/**
* 维修人员
*/
@ExcelProperty(value = "维修人员")
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "repairPerson")
private String repairPersonName;
/**
* 维修内容
*/
@ -91,8 +113,8 @@ public class JxGzwxJlVo implements Serializable {
/**
* 维修费用(材料费 + 工时费)
*/
@ExcelProperty(value = "维修费用", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "材=料费,+=,工=时费")
@ExcelProperty(value = "维修费用")
// @ExcelDictFormat(readConverterExp = "材料费和工时费")
private BigDecimal repairCost;
/**
@ -110,8 +132,8 @@ public class JxGzwxJlVo implements Serializable {
/**
* 状态 维修中 已恢复 关闭
*/
@ExcelProperty(value = "状态 维修中 已恢复 关闭", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "jx_gzwxzt")
@ExcelProperty(value = "状态 维修中 已恢复 关闭")
// @ExcelDictFormat(dictType = "jx_gzwxzt")
private String status;
/**
@ -133,5 +155,26 @@ public class JxGzwxJlVo implements Serializable {
@ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
private String fileId;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 创建者
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
@TableField(fill = FieldFill.INSERT)
private Long createByname;
}

View File

@ -1,8 +1,12 @@
package org.dromara.mechanical.jxgl.domain.vo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import jakarta.validation.constraints.NotBlank;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.mechanical.jxgl.domain.JxGzwx;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -39,6 +43,11 @@ public class JxGzwxVo implements Serializable {
@ExcelProperty(value = "故障ID")
private Long faultId;
/**
* 故障名称
*/
private String faultName;
/**
* 台账ID
*/
@ -109,4 +118,19 @@ public class JxGzwxVo implements Serializable {
private String fileId;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 创建者
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
@TableField(fill = FieldFill.INSERT)
private Long createByname;
}

View File

@ -1,6 +1,11 @@
package org.dromara.mechanical.jxgl.domain.vo;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.mechanical.jxgl.domain.JxWhjh;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -102,6 +107,19 @@ public class JxWhjhVo implements Serializable {
@ExcelProperty(value = "负责人员")
private Long responsiblePerson;
/**
* 负责人员
*/
@ExcelProperty(value = "负责人员")
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "responsiblePerson")
private String responsiblePersonname;
/**
* 维修计划名称
*/
private String wxjhName;
/**
* 状态 (未开始/进行中/已完成/逾期)
*/
@ -129,4 +147,19 @@ public class JxWhjhVo implements Serializable {
private String fileId;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 创建者
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
@TableField(fill = FieldFill.INSERT)
private Long createByname;
}

View File

@ -2,9 +2,13 @@ package org.dromara.mechanical.jxgl.domain.vo;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import jakarta.validation.constraints.NotBlank;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.mechanical.jxgl.domain.JxWhjl;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -98,6 +102,13 @@ public class JxWhjlVo implements Serializable {
@ExcelProperty(value = "执行人")
private Long maintainer;
/**
* 执行人
*/
@ExcelProperty(value = "执行人")
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "maintainer")
private String maintainername;
/**
* 保养结果(正常/异常/需复检)
*/
@ -118,5 +129,33 @@ public class JxWhjlVo implements Serializable {
@ExcelDictFormat(readConverterExp = "多=个文件逗号分隔")
private String fileId;
/**
* 维修计划名称
*/
private String wxjhName;
/**
* 维修记录名称
*/
private String wxjlName;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 创建者
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
@TableField(fill = FieldFill.INSERT)
private Long createByname;
}

View File

@ -1,6 +1,7 @@
package org.dromara.mechanical.jxgl.service;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo;
import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo;
import org.dromara.mechanical.jxgl.domain.JxGzwx;
@ -70,4 +71,6 @@ public interface IJxGzwxService extends IService<JxGzwx>{
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
JxGzwxHeadVo jxgzwx();
List<JxGzwxJlVo> getlistById(Long id);
}

View File

@ -1,5 +1,6 @@
package org.dromara.mechanical.jxgl.service;
import org.dromara.mechanical.jxgl.domain.JxWhjl;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo;
@ -8,6 +9,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
import java.util.Collection;
import java.util.List;
@ -70,4 +73,6 @@ public interface IJxWhjhService extends IService<JxWhjh>{
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
JxWhjhHeadVo jxwhHead();
List<JxWhjlVo> getlistById(Long id);
}

View File

@ -82,11 +82,14 @@ public class JxGzwxJlServiceImpl extends ServiceImpl<JxGzwxJlMapper, JxGzwxJl> i
LambdaQueryWrapper<JxGzwxJl> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(JxGzwxJl::getId);
lqw.eq(bo.getFaultId() != null, JxGzwxJl::getFaultId, bo.getFaultId());
lqw.ge(bo.getStartTime() != null, JxGzwxJl::getCreateTime, bo.getStartTime());
lqw.le(bo.getEndTime() != null, JxGzwxJl::getCreateTime, bo.getEndTime());
lqw.eq(bo.getRepairStartTime() != null, JxGzwxJl::getRepairStartTime, bo.getRepairStartTime());
lqw.eq(bo.getRepairEndTime() != null, JxGzwxJl::getRepairEndTime, bo.getRepairEndTime());
lqw.eq(bo.getRepairPerson() != null, JxGzwxJl::getRepairPerson, bo.getRepairPerson());
lqw.eq(StringUtils.isNotBlank(bo.getRepairContent()), JxGzwxJl::getRepairContent, bo.getRepairContent());
lqw.eq(StringUtils.isNotBlank(bo.getPartsUsed()), JxGzwxJl::getPartsUsed, bo.getPartsUsed());
lqw.like(StringUtils.isNotBlank(bo.getFaultjlName()), JxGzwxJl::getFaultjlName, bo.getFaultjlName());
lqw.eq(bo.getRepairCost() != null, JxGzwxJl::getRepairCost, bo.getRepairCost());
lqw.eq(StringUtils.isNotBlank(bo.getFaultCause()), JxGzwxJl::getFaultCause, bo.getFaultCause());
lqw.eq(StringUtils.isNotBlank(bo.getPreventiveActions()), JxGzwxJl::getPreventiveActions, bo.getPreventiveActions());

View File

@ -9,10 +9,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.mechanical.jxgl.domain.JxGzwxJl;
import org.dromara.mechanical.jxgl.domain.JxWhjh;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
import org.dromara.mechanical.jxgl.service.IJxGzwxJlService;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo;
import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo;
@ -36,6 +41,10 @@ public class JxGzwxServiceImpl extends ServiceImpl<JxGzwxMapper, JxGzwx> impleme
private final JxGzwxMapper baseMapper;
@Lazy
@Autowired
private IJxGzwxJlService jxGzwxJlService;
private final SysOssServiceImpl sysOssService;
/**
@ -48,7 +57,6 @@ public class JxGzwxServiceImpl extends ServiceImpl<JxGzwxMapper, JxGzwx> impleme
public JxGzwxVo queryById(Long faultId){
return baseMapper.selectVoById(faultId);
}
/**
* 分页查询机械故障维修列表
*
@ -81,6 +89,8 @@ public class JxGzwxServiceImpl extends ServiceImpl<JxGzwxMapper, JxGzwx> impleme
lqw.orderByDesc(JxGzwx::getFaultId);
lqw.eq(bo.getEquipmentId() != null, JxGzwx::getEquipmentId, bo.getEquipmentId());
lqw.eq(bo.getFaultTime() != null, JxGzwx::getFaultTime, bo.getFaultTime());
lqw.gt(bo.getStartTime() != null, JxGzwx::getFaultTime, bo.getStartTime());
lqw.le(bo.getEndTime() != null, JxGzwx::getFaultTime, bo.getEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getFaultType()), JxGzwx::getFaultType, bo.getFaultType());
lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), JxGzwx::getFaultDescription, bo.getFaultDescription());
lqw.eq(StringUtils.isNotBlank(bo.getSeverity()), JxGzwx::getSeverity, bo.getSeverity());
@ -175,4 +185,10 @@ public class JxGzwxServiceImpl extends ServiceImpl<JxGzwxMapper, JxGzwx> impleme
return jxGzwxHeadVo;
}
@Override
public List<JxGzwxJlVo> getlistById(Long id) {
List<JxGzwxJl> jxGzwxJls = jxGzwxJlService.getBaseMapper().selectList(new LambdaQueryWrapper<JxGzwxJl>().eq(JxGzwxJl::getFaultId, id));
return MapstructUtils.convert(jxGzwxJls, JxGzwxJlVo.class);
}
}

View File

@ -9,9 +9,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.mechanical.jxgl.domain.JxWhjl;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
import org.dromara.mechanical.jxgl.service.IJxWhjlService;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.settlement.domain.vo.XzdJsSjJungonVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
@ -34,6 +39,12 @@ import java.util.*;
public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> implements IJxWhjhService {
private final JxWhjhMapper baseMapper;
@Lazy
@Autowired
private IJxWhjlService jxWhjlService;
private final SysOssServiceImpl sysOssService;
/**
@ -174,4 +185,11 @@ public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> impleme
}
return jxWhjhHeadVo;
}
@Override
public List<JxWhjlVo> getlistById(Long id) {
List<JxWhjl> jxWhjls = jxWhjlService.getBaseMapper().selectList(new LambdaQueryWrapper<JxWhjl>().eq(JxWhjl::getWhjhId, id));
return MapstructUtils.convert(jxWhjls, JxWhjlVo.class);
}
}