企业设备接口，周期巡检，巡检记录，保养计划，数据库建表

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

@@ -4,56 +4,81 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 企业岗位新增和修改Dto
+ * 企业设备新增和修改Dto
  * @author Xuwanxin
- * @date 2022/10/19
+ * @date 2022/10/20
  * */
 public class AddOrUpdateEntEquipmentDto {
+    @ApiModelProperty(value = "设备id")
+    private String deviceId;
 
+    @ApiModelProperty(value = "设备名称",required = true)
+    private String name;
+
+    @ApiModelProperty(value = "设备编号",required = true)
+    private String number;
+
+    @ApiModelProperty(value = "规格型号")
+    private String modelNum;
+
+    @ApiModelProperty(value = "设备状态")
+    private Integer modelState;
+
+    @ApiModelProperty(value = "购买时间")
+    private Date buyTime;
+
+    @ApiModelProperty(value = "出厂日期")
+    private Date dateProduction;
+
+    @ApiModelProperty(value = "安装时间")
+    private Date installationTime;
+
+    @ApiModelProperty(value = "启用时间")
+    private Date enableTime;
+
+    @ApiModelProperty(value = "报废时间")
+    private Date scrapTime;
 
     @ApiModelProperty(value = "设备分类id")
     private String typeId;
 
-    @NotNull
+    @ApiModelProperty(value = "设备分类路径")
+    private String typePath;
+
     @ApiModelProperty(value = "企业id")
     private String enterpriseId;
 
-    @NotNull
+    @ApiModelProperty(value = "二维码地址")
-    @ApiModelProperty(value = "分类名")
+    private String qrCode;
-    private String name;
 
-    @ApiModelProperty(value = "分类logo")
+    @ApiModelProperty(value = "经度")
-    private String logo;
+    private BigDecimal longitude;
 
-    @ApiModelProperty(value = "父级分类")
+    @ApiModelProperty(value = "纬度")
-    private String parentId;
+    private BigDecimal latitude;
 
-    @ApiModelProperty(value = "所有父级分类")
+    @ApiModelProperty(value = "出厂编号")
-    private String parentPath;
+    private String factoryNumber;
 
-    @ApiModelProperty(value = "父级分类名")
+    @ApiModelProperty(value = "设备负责人")
-    private String parentName;
+    private String eqChargePerson;
 
-    @ApiModelProperty(value = "排序")
+    @ApiModelProperty(value = "制造厂商")
-    private Integer sortId;
+    private String manufacturer;
 
-    public String getTypeId() {
+    @ApiModelProperty(value = "设备具体位置")
-        return typeId;
+    private String specialLocation;
+
+    public String getDeviceId() {
+        return deviceId;
     }
 
-    public void setTypeId(String typeId) {
+    public void setDeviceId(String deviceId) {
-        this.typeId = typeId;
+        this.deviceId = deviceId;
-    }
-
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
     }
 
     public String getName() {
@@ -64,43 +89,147 @@ public class AddOrUpdateEntEquipmentDto {
         this.name = name;
     }
 
-    public String getLogo() {
+    public String getNumber() {
-        return logo;
+        return number;
     }
 
-    public void setLogo(String logo) {
+    public void setNumber(String number) {
-        this.logo = logo;
+        this.number = number;
     }
 
-    public String getParentId() {
+    public String getModelNum() {
-        return parentId;
+        return modelNum;
     }
 
-    public void setParentId(String parentId) {
+    public void setModelNum(String modelNum) {
-        this.parentId = parentId;
+        this.modelNum = modelNum;
     }
 
-    public String getParentPath() {
+    public Integer getModelState() {
-        return parentPath;
+        return modelState;
     }
 
-    public void setParentPath(String parentPath) {
+    public void setModelState(Integer modelState) {
-        this.parentPath = parentPath;
+        this.modelState = modelState;
     }
 
-    public String getParentName() {
+    public Date getBuyTime() {
-        return parentName;
+        return buyTime;
     }
 
-    public void setParentName(String parentName) {
+    public void setBuyTime(Date buyTime) {
-        this.parentName = parentName;
+        this.buyTime = buyTime;
     }
 
-    public Integer getSortId() {
+    public Date getDateProduction() {
-        return sortId;
+        return dateProduction;
     }
 
-    public void setSortId(Integer sortId) {
+    public void setDateProduction(Date dateProduction) {
-        this.sortId = sortId;
+        this.dateProduction = dateProduction;
+    }
+
+    public Date getInstallationTime() {
+        return installationTime;
+    }
+
+    public void setInstallationTime(Date installationTime) {
+        this.installationTime = installationTime;
+    }
+
+    public Date getEnableTime() {
+        return enableTime;
+    }
+
+    public void setEnableTime(Date enableTime) {
+        this.enableTime = enableTime;
+    }
+
+    public Date getScrapTime() {
+        return scrapTime;
+    }
+
+    public void setScrapTime(Date scrapTime) {
+        this.scrapTime = scrapTime;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getTypePath() {
+        return typePath;
+    }
+
+    public void setTypePath(String typePath) {
+        this.typePath = typePath;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getFactoryNumber() {
+        return factoryNumber;
+    }
+
+    public void setFactoryNumber(String factoryNumber) {
+        this.factoryNumber = factoryNumber;
+    }
+
+    public String getEqChargePerson() {
+        return eqChargePerson;
+    }
+
+    public void setEqChargePerson(String eqChargePerson) {
+        this.eqChargePerson = eqChargePerson;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public String getSpecialLocation() {
+        return specialLocation;
+    }
+
+    public void setSpecialLocation(String specialLocation) {
+        this.specialLocation = specialLocation;
     }
 }

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

@@ -0,0 +1,106 @@
+package com.rzyc.model.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 企业设备分类新增和修改Dto
+ * @author Xuwanxin
+ * @date 2022/10/19
+ * */
+public class AddOrUpdateEntEquipmentTypeDto {
+
+
+    @ApiModelProperty(value = "设备分类id")
+    private String typeId;
+
+    @NotNull
+    @ApiModelProperty(value = "企业id")
+    private String enterpriseId;
+
+    @NotNull
+    @ApiModelProperty(value = "分类名")
+    private String name;
+
+    @ApiModelProperty(value = "分类logo")
+    private String logo;
+
+    @ApiModelProperty(value = "父级分类")
+    private String parentId;
+
+    @ApiModelProperty(value = "所有父级分类")
+    private String parentPath;
+
+    @ApiModelProperty(value = "父级分类名")
+    private String parentName;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sortId;
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentPath() {
+        return parentPath;
+    }
+
+    public void setParentPath(String parentPath) {
+        this.parentPath = parentPath;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+}