[配套设备模块]添加配套设备维修

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -10,10 +10,12 @@ import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.domin.DeviceLog;
 import com.tykj.dev.device.library.subject.vo.DeviceLogUserVo;
 import com.tykj.dev.device.library.subject.vo.FileVo;
+import com.tykj.dev.device.matching.repository.MatchingRepairBillDao;
 import com.tykj.dev.device.matching.service.MatchingDeviceBillService;
 import com.tykj.dev.device.matching.service.MatchingDeviceLibraryService;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceBill;
 import com.tykj.dev.device.matching.subject.domin.MatchingDeviceLibrary;
+import com.tykj.dev.device.matching.subject.domin.MatchingRepairBill;
 import com.tykj.dev.device.matching.subject.vo.*;
 import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
@@ -25,6 +27,7 @@ import com.tykj.dev.misc.utils.StringSplitUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
@@ -75,6 +78,9 @@ public class MatchingDeviceController {
     @Autowired
     private MyWebSocket myWebSocket;
 
+    @Autowired
+    private MatchingRepairBillDao matchingRepairBillDao;
+
     @ApiOperation(value = "添加配套设备", notes = "可以通过这个接口添加配套设备")
     @PostMapping(value = "/add")
     @Transactional(rollbackFor = Exception.class)
@@ -292,4 +298,12 @@ public class MatchingDeviceController {
     public ResponseEntity selectAllName() {
         return ResponseEntity.ok(matchingDeviceLibraryService.getAllName());
     }
+
+    @ApiOperation(value = "上传维修单", notes = "上传维修单")
+    @PostMapping(value = "/repair")
+    public ResponseEntity uploadRepairBill(@RequestBody @Validated MatchingRepairVo matchingRepairVo){
+        MatchingRepairBill matchingRepairBill = new MatchingRepairBill();
+        BeanUtils.copyProperties(matchingRepairVo,matchingRepairBill);
+        return ResponseEntity.ok(matchingRepairBillDao.save(matchingRepairBill));
+    }
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/repository/MatchingRepairBillDao.java

+package com.tykj.dev.device.matching.repository;
+
+import com.tykj.dev.device.matching.subject.domin.MatchingRepairBill;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * @author dengdiyi
+ */
+public interface MatchingRepairBillDao extends JpaRepository<MatchingRepairBill,Integer>, JpaSpecificationExecutor<MatchingRepairBill> {
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingRepairBill.java

+package com.tykj.dev.device.matching.subject.domin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@SQLDelete(sql = "update matching_repair_bill set delete_tag = 1 where id = ?")
+@Where(clause = "delete_tag = 0")
+@ApiModel("配套维修单")
+public class MatchingRepairBill {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(name = "主键id")
+    private Integer id;
+
+    @ApiModelProperty(name = "配套设备id")
+    private Integer deviceId;
+
+    @ApiModelProperty(name = "维修描述")
+    private String remark;
+
+    @ApiModelProperty(name = "维修单名字")
+    private String fileName;
+
+    @ApiModelProperty(name = "维修单URL")
+    private String fileUrl;
+
+    /**
+     * 创建用户id
+     */
+    @ApiModelProperty(value = "创建用户id")
+    @CreatedBy
+    private Integer createUserId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @CreatedDate
+    private Date createTime;
+    /**
+     * 更新用户id
+     */
+    @ApiModelProperty(value = "更新用户id")
+    @LastModifiedBy
+    private Integer updateUserId;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @LastModifiedDate
+    private Date updateTime;
+    /**
+     * 删除标记(0:未删除，1:已删除)
+     */
+    @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
+    private Integer deleteTag = 0;
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingRepairVo.java

+package com.tykj.dev.device.matching.subject.vo;
+
+import com.tykj.dev.device.matching.subject.domin.MatchingDeviceBill;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("配套设备上传维修单类")
+public class MatchingRepairVo {
+
+    @NotNull(message = "deviceId不能为空")
+    @ApiModelProperty(name = "配套设备id")
+    private Integer deviceId;
+
+    @ApiModelProperty(name = "维修描述")
+    private String remark;
+
+    @NotNull(message = "fileName不能为空")
+    @ApiModelProperty(name = "维修单名字")
+    private String fileName;
+
+    @NotNull(message = "fileUrl不能为空")
+    @ApiModelProperty(name = "维修单URL")
+    private String fileUrl;
+}