企业端设备模块->企业端PC,小程序接口调试

inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java

@@ -91,6 +91,17 @@ public class EntDeviceMaintenanceRecord implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @ApiModelProperty(value = "设备id")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getRecordId() {
         return recordId;
     }

inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java

@@ -62,6 +62,18 @@ public class EntInspectionRecord implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @ApiModelProperty("设备id")
+    @TableField("device_id")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public Integer getInspectionId() {
         return inspectionId;
     }

inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java

@@ -45,6 +45,18 @@ public class EntOperatingInstruction implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @ApiModelProperty("设备id")
+    @TableField(value = "device_id")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getOpInstructionId() {
         return opInstructionId;
     }

inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java

@@ -61,6 +61,10 @@ public class EntRepairPlan implements Serializable {
     @TableField("modify_by")
     private String modifyBy;
 
+
+
+
+
     public String getRepairPlanId() {
         return repairPlanId;
     }

inventory-dao/src/main/java/com/rzyc/model/dto/InspectionRecordDto.java

@@ -36,6 +36,8 @@ public class InspectionRecordDto {
     @ApiModelProperty(value = "检查结果")
     private String inspectionText;
 
+
+
     public Integer getInspectionId() {
         return inspectionId;
     }

inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java

@@ -579,6 +579,7 @@ public class PcBusinessService extends BaseController {
         if (null != entDeviceMaintenanceRecordDto && null != entDeviceMaintenanceRecord.getRecordId()){
             result = entDeviceMaintenanceRecordMapper.UpdateEntDeviceMaintenanceRecord(entDeviceMaintenanceRecord);
         }else {
+            entDeviceMaintenanceRecord.setRecordId(RandomNumber.getUUid());
             result = entDeviceMaintenanceRecordMapper.insert(entDeviceMaintenanceRecord);
         }
         if (result != 1 ){
@@ -696,6 +697,7 @@ public class PcBusinessService extends BaseController {
         if (null != operatingInstructionsDto && null != entOperatingInstruction.getOpInstructionId()){
             result = entOperatingInstructionMapper.updateEntOperatingInstruction(entOperatingInstruction);
         }else {
+            entOperatingInstruction.setOpInstructionId(RandomNumber.getUUid());
             result = entOperatingInstructionMapper.insert(entOperatingInstruction);
         }
         if (result != 1 ){