新增设备维修保养过程描述，上传对应附件

yaowanxin

5 天以前 377900a395f0238c98c5fbc945c2bea302b964f1

新增设备维修保养过程描述，上传对应附件

 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
package com.ruoyi.device.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.pojo.DeviceRepairFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.ruoyi.device.service.DeviceRepairFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * è®¾å¤‡ä¿å…»é™„件
 */
@RestController
@RequestMapping("/device/deviceMaintenanceFile")
@Api(tags = "设备保养附件")
public class DeviceMaintenanceFileController {


    @Resource
    private DeviceMaintenanceFileService deviceMaintenanceFileService;


    /**
     * æ–°å¢ž
     * @param deviceMaintenanceFile
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
    }

    /**
     * åˆ é™¤
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除")
    public AjaxResult delDeviceMaintenanceFile(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除保养附件
        return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
    }

    /**
     *分页查询
     * @param page
     * @param deviceMaintenanceFile
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("分页查询")
    public AjaxResult deviceMaintenanceFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.deviceMaintenanceFileListPage(page, deviceMaintenanceFile));
    }




}

 src/main/java/com/ruoyi/device/controller/DeviceRepairFileController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.ruoyi.device.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceRepairFile;
import com.ruoyi.device.service.DeviceRepairFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * è®¾å¤‡æŠ¥ä¿®é™„件
 */
@RestController
@RequestMapping("/device/deviceRepairFile")
@Api(tags = "设备报修附件")
public class DeviceRepairFileController {


    @Resource
    private DeviceRepairFileService deviceRepairFileService;


    /**
     * æ–°å¢ž
     * @param deviceRepairFile
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody DeviceRepairFile deviceRepairFile) {
        return AjaxResult.success(deviceRepairFileService.save(deviceRepairFile));
    }

    /**
     * åˆ é™¤
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除")
    public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return AjaxResult.success(deviceRepairFileService.removeBatchByIds(ids));
    }

    /**
     *分页查询
     * @param page
     * @param deviceRepairFile
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("分页查询")
    public AjaxResult deviceRepairFileListPage(Page page, DeviceRepairFile deviceRepairFile) {
        return AjaxResult.success(deviceRepairFileService.deviceRepairFileListPage(page, deviceRepairFile));
    }




}

 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -68,4 +68,6 @@

    @ApiModelProperty("创建人名称")
    private String createUserName;
     @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;
}

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -34,6 +34,8 @@

    @ApiModelProperty("报修内容")
    private String remark;
    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;

    @ApiModelProperty("维修人")
    private String maintenanceName;

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceFileMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
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.pojo.DeviceMaintenanceFile;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@Mapper
public interface DeviceMaintenanceFileMapper extends BaseMapper<DeviceMaintenanceFile> {



    IPage<DeviceMaintenanceFile> deviceMaintenanceFileListPage(Page page, @Param("deviceMaintenanceFile") DeviceMaintenanceFile deviceMaintenanceFile);
}

 src/main/java/com/ruoyi/device/mapper/DeviceRepairFileMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
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.pojo.DeviceRepairFile;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@Mapper
public interface DeviceRepairFileMapper extends BaseMapper<DeviceRepairFile> {



    IPage<DeviceRepairFile> deviceRepairFileListPage(Page page, @Param("deviceRepairFile") DeviceRepairFile deviceRepairFile);
}

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -69,4 +69,6 @@
    @ApiModelProperty("租户id")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;
}

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * è®¾å¤‡ä¿å…»é™„件
 * device_maintenance_file
 */
@TableName(value = "device_maintenance_file")
@Data
public class DeviceMaintenanceFile implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * åºå·
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "文件名称")
    private String name;

    @ApiModelProperty(value = "文件路径")
    private String url;

    @ApiModelProperty(value = "文件大小")
    private int fileSize;

    @ApiModelProperty(value = "设备保养ID")
    @NotBlank(message = "设备保养id不能为空!")
    private Long deviceMaintenanceId;
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty(value = "修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


}

 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -37,7 +37,8 @@

    @ApiModelProperty("报修内容")
    private String remark;

    @ApiModelProperty("保养进度描述")
    private String maintenanceProcessDesc;
    @ApiModelProperty("维修人")
    private String maintenanceName;


 src/main/java/com/ruoyi/device/pojo/DeviceRepairFile.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * è®¾å¤‡æŠ¥ä¿®é™„件
 * device_repair_file
 */
@TableName(value = "device_repair_file")
@Data
public class DeviceRepairFile implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * åºå·
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "文件名称")
    private String name;

    @ApiModelProperty(value = "文件路径")
    private String url;

    @ApiModelProperty(value = "文件大小")
    private int fileSize;

    @ApiModelProperty(value = "设备报修ID")
    @NotBlank(message = "设备报修id不能为空!")
    private Long deviceRepairId;
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty(value = "修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


}

 src/main/java/com/ruoyi/device/service/DeviceMaintenanceFileService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.ruoyi.device.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;


public interface DeviceMaintenanceFileService extends IService<DeviceMaintenanceFile> {

    IPage<DeviceMaintenanceFile> deviceMaintenanceFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile);
}

 src/main/java/com/ruoyi/device/service/DeviceRepairFileService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.ruoyi.device.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.DeviceRepairFile;


public interface DeviceRepairFileService extends IService<DeviceRepairFile> {

    IPage<DeviceRepairFile> deviceRepairFileListPage(Page page, DeviceRepairFile deviceRepairFile);
}

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceFileServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
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.mapper.DeviceMaintenanceFileMapper;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

@AllArgsConstructor
@Service
public class DeviceMaintenanceFileServiceImpl extends ServiceImpl<DeviceMaintenanceFileMapper, DeviceMaintenanceFile> implements DeviceMaintenanceFileService {

    private DeviceMaintenanceFileMapper deviceMaintenanceFileMapper;


    @Override
    public IPage<DeviceMaintenanceFile> deviceMaintenanceFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
        return deviceMaintenanceFileMapper.deviceMaintenanceFileListPage(page,deviceMaintenanceFile);
    }
}

 src/main/java/com/ruoyi/device/service/impl/DeviceRepairFileServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
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.mapper.DeviceRepairFileMapper;
import com.ruoyi.device.pojo.DeviceRepairFile;
import com.ruoyi.device.service.DeviceRepairFileService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

@AllArgsConstructor
@Service
public class DeviceRepairFileServiceImpl extends ServiceImpl<DeviceRepairFileMapper, DeviceRepairFile> implements DeviceRepairFileService {

    private DeviceRepairFileMapper deviceRepairFileMapper;


    @Override
    public IPage<DeviceRepairFile> deviceRepairFileListPage(Page page, DeviceRepairFile deviceRepairFile) {
        return deviceRepairFileMapper.deviceRepairFileListPage(page,deviceRepairFile);
    }
}

 src/main/resources/mapper/device/DeviceMaintenanceFileMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?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.DeviceMaintenanceFileMapper">
    <select id="deviceMaintenanceFileListPage" resultType="com.ruoyi.device.pojo.DeviceMaintenanceFile">
        SELECT
        *
        FROM device_maintenance_file
        where
        1=1
        <if test="deviceMaintenanceFile.deviceMaintenanceId != null and deviceMaintenanceFile.deviceMaintenanceId != ''">
            AND device_maintenance_id = #{deviceMaintenanceFile.deviceMaintenanceId}
        </if>
        <if test="deviceMaintenanceFile.name != null and deviceMaintenanceFile.name != '' ">
            AND name = #{deviceMaintenanceFile.name}
        </if>
    </select>
</mapper>

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -18,6 +18,7 @@
        dm.update_user,
        dm.tenant_id,
        dm.maintenance_actually_name,
        dm.maintenance_process_desc,
        dl.device_name,
        dl.device_model,
        su.user_name as create_user_name
@@ -56,6 +57,7 @@
               dm.update_user,
               dm.tenant_id,
               dm.maintenance_actually_name,
               dm.maintenance_process_desc,
               dl.device_name,
               dl.device_model,
               su.user_name as create_user_name

 src/main/resources/mapper/device/DeviceRepairFileMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?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.DeviceRepairFileMapper">
    <select id="deviceRepairFileListPage" resultType="com.ruoyi.device.pojo.DeviceRepairFile">
        SELECT
        *
        FROM device_repair_file
        where
        1=1
        <if test="deviceRepairFile.deviceRepairId != null and deviceRepairFile.deviceRepairId != ''">
            AND device_repair_id = #{deviceRepairFile.deviceRepairId}
        </if>
        <if test="deviceRepairFile.name != null and deviceRepairFile.name != '' ">
            AND name = #{deviceRepairFile.name}
        </if>
    </select>
</mapper>

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -21,7 +21,8 @@
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
               dl.device_model,
               dr.maintenance_process_desc
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
@@ -63,7 +64,8 @@
               dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
               dl.device_model,
               dr.maintenance_process_desc
        from device_repair dr
                 left join device_ledger dl on dr.device_ledger_id = dl.id
        where dr.id = #{id}