ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
79493 2022-11-21 10:30:31 +08:00
parent e2d4699a4a
commit 1480713e39
6 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

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

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

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

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

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

@ -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 ){