liyong
昨天 bf92790ad1941d52fbb22585119df06b941a1aff
2025-06-23 设备报修接口
已修改1个文件
已添加5个文件
258 ■■■■■ 文件已修改
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/device/DeviceRepairMapper.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.ruoyi.device.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@Api(tags = "设备报修管理")
@RequestMapping("/device/reppair")
@RestController
public class DeviceRepairController {
    @Autowired
    private IDeviceRepairService deviceRepairService;
    @ApiModelProperty("设备报修列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
        return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
    }
    @PostMapping()
    @ApiModelProperty("添加设备报修")
    public AjaxResult add(DeviceRepair deviceRepair) {
        return deviceRepairService.saveDeviceRepair(deviceRepair);
    }
    @ApiModelProperty("根据id查询设备报修")
    @GetMapping("/{id}")
    public AjaxResult detail(@PathVariable Long id) {
        return AjaxResult.success(deviceRepairService.getById(id));
    }
    @PutMapping ()
    @ApiModelProperty("修改设备报修")
    public AjaxResult update(DeviceRepair deviceRepair) {
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    }
    @DeleteMapping("/{id}")
    @ApiModelProperty("删除设备报修")
    public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
        boolean b = deviceRepairService.removeBatchByIds(ids);
        if (!b) {
            return AjaxResult.error("删除失败");
        }
        return AjaxResult.success();
    }
    @PostMapping("export")
    @ApiModelProperty("导出设备报修")
    public void export(HttpServletResponse response, Long[] ids) {
        deviceRepairService.export(response, ids);
    }
}
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package com.ruoyi.device.dto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class DeviceRepairDto {
    @ApiModelProperty("设备报修id")
    private Long id;
    @ApiModelProperty("设备台账id")
    private String deviceLedgerId;
    @ApiModelProperty("设备名称")
    private String deviceName;
    @ApiModelProperty("设备型号")
    private String deviceModel;
    @ApiModelProperty("报修时间")
    private Date repairTime;
    @ApiModelProperty("报修人")
    private String repairName;
    @ApiModelProperty("报修内容")
    private String remark;
    @ApiModelProperty("维修人")
    private String maintenanceName;
    @ApiModelProperty("维修时间")
    private Date maintenanceTime;
    @ApiModelProperty("维修结果")
    private String maintenanceResult;
    @ApiModelProperty("状态")
    private Integer status;
    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;
    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.UPDATE)
    private LocalDateTime updateTime;
    @ApiModelProperty("创建人")
    @TableField(fill = FieldFill.INSERT)
    private String createUser;
    @ApiModelProperty("更新人")
    @TableField(fill = FieldFill.UPDATE)
    private String updateUser;
    @ApiModelProperty("租户id")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
}
src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.ruoyi.device.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
    IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);
}
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -16,53 +16,52 @@
@TableName("device_repair")
public class DeviceRepair {
    @ApiModelProperty("设备报修id")
    private Long id;
    @TableField(value = "device_ledger_id")
    @ApiModelProperty("设备台账id")
    private String deviceLedgerId;
    @TableField(value = "repair_time")
    @ApiModelProperty("维修时间")
    @ApiModelProperty("报修时间")
    private Date repairTime;
    @TableField(value = "repair_name")
    @ApiModelProperty("维修人")
    @ApiModelProperty("报修人")
    private String repairName;
    @TableField(value = "remark")
    @ApiModelProperty("备注")
    @ApiModelProperty("报修内容")
    private String remark;
    @TableField(value = "maintenance_name")
    @ApiModelProperty("维修人")
    private String maintenanceName;
    @TableField(value = "maintenance_time")
    @ApiModelProperty("维修时间")
    private LocalDateTime maintenanceTime;
    private Date maintenanceTime;
    @TableField(value = "maintenance_result")
    @ApiModelProperty("维修结果")
    private String maintenanceResult;
    @ApiModelProperty("状态")
    @ApiModelProperty("状态 0 å¾…ç»´ä¿® 1完结")
    private Integer status;
    @TableField(value = "create_time" ,fill = FieldFill.INSERT)
    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;
    @ApiModelProperty("修改时间")
    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.UPDATE)
    private LocalDateTime updateTime;
    @ApiModelProperty("创建人")
    @TableField(fill = FieldFill.INSERT)
    private String createUser;
    @ApiModelProperty("修改人")
    @ApiModelProperty("更新人")
    @TableField(fill = FieldFill.UPDATE)
    private String updateUser;
    @ApiModelProperty("租户id")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
}
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.ruoyi.device.service.impl;
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.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
@Service
@AllArgsConstructor
@Slf4j
public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, DeviceRepair> implements IDeviceRepairService {
    @Autowired
    private DeviceRepairMapper deviceRepairMapper;
    @Override
    public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
        return deviceRepairMapper.queryPage(page, deviceRepairDto);
    }
    @Override
    public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
        boolean save = this.save(deviceRepair);
        if (save){
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }
    @Override
    public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
        if (this.updateById(deviceRepair)) {
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }
    @Override
    public void export(HttpServletResponse response, Long[] ids) {
    }
}
src/main/resources/mapper/device/DeviceRepairMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
<?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.ruoyi.device.mapper.DeviceRepairMapper">
    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.*,
               dl.device_name,
               dl.device_model
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
            <if test="deviceRepairDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
            </if>
            <if test="deviceRepairDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
        </where>
    </select>
</mapper>