通用属性 类型修改

PHM-admin/phm-common/src/main/java/com/phm/common/core/domain/BaseEntity.java

@@ -56,7 +56,7 @@ public class BaseEntity implements Serializable {
     /**
      * 数据是否删除（1：删除，0有效）
      */
-    private Long isDelete;
+    private Integer isDelete;
 
     /**
      * 请求参数
@@ -112,11 +112,11 @@ public class BaseEntity implements Serializable {
         this.remark = remark;
     }
 
-    public void setIsDelete(Long isDelete) {
+    public void setIsDelete(Integer isDelete) {
         this.isDelete = isDelete;
     }
 
-    public Long getIsDelete() {
+    public Integer getIsDelete() {
         return isDelete;
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/ProcessController.java

@@ -32,7 +32,7 @@ public class ProcessController {
      */
     @PostMapping("/execute")
     public CommonResult execute() {
-        // TODO
+        // TODO 1.执行下载   2.
         return CommonResult.buildSuccess();
     }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/externalInter/ExternalInterfaceController.java

@@ -1,12 +1,17 @@
 package com.phm.manage.controller.externalInter;
 
+import com.alibaba.fastjson2.JSON;
 import com.phm.common.annotation.Anonymous;
 import com.phm.common.core.domain.entity.SysDictData;
 import com.phm.common.utils.StringUtils;
+import com.phm.common.utils.bean.BeanUtils;
+import com.phm.manage.domain.OrderInfo;
 import com.phm.manage.domain.common.CommonResult;
 import com.phm.manage.domain.common.CommonResultXML;
 import com.phm.manage.domain.common.OrderXmlVO;
 import com.phm.manage.domain.Sortie;
+import com.phm.manage.enums.OrderStatus;
+import com.phm.manage.service.IOrderInfoService;
 import com.phm.manage.service.ISortieService;
 import com.phm.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +40,9 @@ public class ExternalInterfaceController {
     @Autowired
     private ISortieService sortieService;
 
+    @Autowired
+    private IOrderInfoService orderInfoService;
+
     /**
      * 指令接收API
      *
@@ -43,8 +51,14 @@ public class ExternalInterfaceController {
      */
     @PostMapping(value = "/receive", consumes = {MediaType.APPLICATION_XML_VALUE, MediaType.TEXT_XML_VALUE},
             produces = MediaType.APPLICATION_XML_VALUE)
-    public CommonResultXML<OrderXmlVO> receive(@RequestBody OrderXmlVO orderXmlVO) {
+    public CommonResultXML<OrderInfo> receive(@RequestBody OrderXmlVO orderXmlVO) {
         log.info("指令入参：{}", orderXmlVO.toString());
+        OrderInfo orderInfo = new OrderInfo();
+        BeanUtils.copyBeanProp(orderInfo, orderXmlVO);
+        orderInfo.setContent(JSON.toJSONString(orderXmlVO));
+        // set待执行状态
+        orderInfo.setStatus(OrderStatus.S_0.getCode());
+        // TODO orderInfo 入库
         return CommonResultXML.buildSuccess();
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AfterAnalysisResult.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class AfterAnalysisResult extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -21,96 +25,4 @@ public class AfterAnalysisResult extends BaseEntity {
      * 唯一ID
      */
     private Long id;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Aircraft.java

@@ -2,6 +2,8 @@ package com.phm.manage.domain;
 
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author phm
  * @date 2023-09-01
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class Aircraft extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -42,60 +46,6 @@ public class Aircraft extends BaseEntity {
      */
     @Excel(name = "归属机队")
     private String fleetId;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    private Long isDelete;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public Long getAircraftTypeId() {
-        return aircraftTypeId;
-    }
-
-    public void setAircraftTypeId(Long aircraftTypeId) {
-        this.aircraftTypeId = aircraftTypeId;
-    }
-
-    public void setFleetId(String fleetId) {
-        this.fleetId = fleetId;
-    }
-
-    public String getFleetId() {
-        return fleetId;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AnalyzeCourseLog.java

@@ -2,6 +2,8 @@ package com.phm.manage.domain;
 
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author phm
  * @date 2023-08-31
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class AnalyzeCourseLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -42,73 +46,4 @@ public class AnalyzeCourseLog extends BaseEntity {
      */
     @Excel(name = "分析结果状态")
     private String status;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    private Long isDelete;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setModuleName(String moduleName) {
-        this.moduleName = moduleName;
-    }
-
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    public void setModuleType(String moduleType) {
-        this.moduleType = moduleType;
-    }
-
-    public String getModuleType() {
-        return moduleType;
-    }
-
-    public void setCourseContent(String courseContent) {
-        this.courseContent = courseContent;
-    }
-
-    public String getCourseContent() {
-        return courseContent;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("moduleName", getModuleName())
-                .append("moduleType", getModuleType())
-                .append("courseContent", getCourseContent())
-                .append("status", getStatus())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AnalyzeDownLog.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class AnalyzeDownLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -45,132 +49,4 @@ public class AnalyzeDownLog extends BaseEntity {
      */
     @Excel(name = "故障数据")
     private String fault;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setFault(String fault) {
-        this.fault = fault;
-    }
-
-    public String getFault() {
-        return fault;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("path", getPath())
-                .append("status", getStatus())
-                .append("fault", getFault())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AnalyzeResult.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class AnalyzeResult extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -21,96 +25,4 @@ public class AnalyzeResult extends BaseEntity {
      * 唯一ID
      */
     private Long id;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DataDownResult.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.phm.common.annotation.Excel;
@@ -11,6 +13,8 @@ import com.phm.common.core.domain.BaseEntity;
  * @author phm
  * @date 2023-08-24
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class DataDownResult extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -29,69 +33,4 @@ public class DataDownResult extends BaseEntity
     /** 保存路径 */
     @Excel(name = "保存路径")
     private String path;
-
-    /** 数据是否删除（1：删除，0有效） */
-    private Long isDelete;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setOrder(String order) 
-    {
-        this.order = order;
-    }
-
-    public String getOrder() 
-    {
-        return order;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setPath(String path) 
-    {
-        this.path = path;
-    }
-
-    public String getPath() 
-    {
-        return path;
-    }
-    public void setIsDelete(Long isDelete) 
-    {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() 
-    {
-        return isDelete;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("order", getOrder())
-            .append("name", getName())
-            .append("path", getPath())
-            .append("remark", getRemark())
-            .append("isDelete", getIsDelete())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DeepIsolationModel.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class DeepIsolationModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -39,123 +43,4 @@ public class DeepIsolationModel extends BaseEntity {
      */
     @Excel(name = "故障LRU")
     private String faultLru;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setFaultEquation(String faultEquation) {
-        this.faultEquation = faultEquation;
-    }
-
-    public String getFaultEquation() {
-        return faultEquation;
-    }
-
-    public void setFaultLru(String faultLru) {
-        this.faultLru = faultLru;
-    }
-
-    public String getFaultLru() {
-        return faultLru;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("code", getCode())
-                .append("faultEquation", getFaultEquation())
-                .append("faultLru", getFaultLru())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DeriveParameter.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class DeriveParameter extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -33,114 +37,4 @@ public class DeriveParameter extends BaseEntity {
      */
     @Excel(name = "表达式文件")
     private String expression;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setExpression(String expression) {
-        this.expression = expression;
-    }
-
-    public String getExpression() {
-        return expression;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("expression", getExpression())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DiagnoseResult.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-31
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class DiagnoseResult extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -58,91 +62,4 @@ public class DiagnoseResult extends BaseEntity {
      */
     @Excel(name = "批注注解")
     private String comment;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    private Long isDelete;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setFaultMode(String faultMode) {
-        this.faultMode = faultMode;
-    }
-
-    public String getFaultMode() {
-        return faultMode;
-    }
-
-    public void setFaultObject(String faultObject) {
-        this.faultObject = faultObject;
-    }
-
-    public String getFaultObject() {
-        return faultObject;
-    }
-
-    public void setFaultCode(String faultCode) {
-        this.faultCode = faultCode;
-    }
-
-    public String getFaultCode() {
-        return faultCode;
-    }
-
-    public void setFaultSource(String faultSource) {
-        this.faultSource = faultSource;
-    }
-
-    public String getFaultSource() {
-        return faultSource;
-    }
-
-    public void setAnalysisTime(Date analysisTime) {
-        this.analysisTime = analysisTime;
-    }
-
-    public Date getAnalysisTime() {
-        return analysisTime;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("faultMode", getFaultMode())
-                .append("faultObject", getFaultObject())
-                .append("faultCode", getFaultCode())
-                .append("faultSource", getFaultSource())
-                .append("analysisTime", getAnalysisTime())
-                .append("comment", getComment())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ExternalInterfaceLog.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class ExternalInterfaceLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -39,123 +43,4 @@ public class ExternalInterfaceLog extends BaseEntity {
      */
     @Excel(name = "接口路径")
     private String url;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("result", getResult())
-                .append("name", getName())
-                .append("url", getUrl())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FalseAlarmRestrainModel.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class FalseAlarmRestrainModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -39,123 +43,4 @@ public class FalseAlarmRestrainModel extends BaseEntity {
      */
     @Excel(name = "最少持续时间")
     private String minDuration;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setRestrainCriteria(String restrainCriteria) {
-        this.restrainCriteria = restrainCriteria;
-    }
-
-    public String getRestrainCriteria() {
-        return restrainCriteria;
-    }
-
-    public void setMinDuration(String minDuration) {
-        this.minDuration = minDuration;
-    }
-
-    public String getMinDuration() {
-        return minDuration;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("code", getCode())
-                .append("restrainCriteria", getRestrainCriteria())
-                .append("minDuration", getMinDuration())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FaultAnalyzeResult.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class FaultAnalyzeResult extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -45,132 +49,4 @@ public class FaultAnalyzeResult extends BaseEntity {
      */
     @Excel(name = "批注，注解")
     private String comment;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setModuleName(String moduleName) {
-        this.moduleName = moduleName;
-    }
-
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    public void setModuleType(String moduleType) {
-        this.moduleType = moduleType;
-    }
-
-    public String getModuleType() {
-        return moduleType;
-    }
-
-    public void setAnalyzeInfo(String analyzeInfo) {
-        this.analyzeInfo = analyzeInfo;
-    }
-
-    public String getAnalyzeInfo() {
-        return analyzeInfo;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("moduleName", getModuleName())
-                .append("moduleType", getModuleType())
-                .append("analyzeInfo", getAnalyzeInfo())
-                .append("comment", getComment())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FaultCase.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class FaultCase extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -45,176 +49,4 @@ public class FaultCase extends BaseEntity {
      */
     @Excel(name = "案例编号")
     private String caseNumber;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    /**
-     * 案例特征参数
-     */
-    @Excel(name = "案例特征参数")
-    private String parameter;
-
-    /**
-     * 故障定位
-     */
-    @Excel(name = "故障定位")
-    private String location;
-
-    /**
-     * 解决措施
-     */
-    @Excel(name = "解决措施")
-    private String solution;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getCaseFileName() {
-        return caseFileName;
-    }
-
-    public void setCaseFileName(String caseFileName) {
-        this.caseFileName = caseFileName;
-    }
-
-    public void setCaseName(String caseName) {
-        this.caseName = caseName;
-    }
-
-    public String getCaseName() {
-        return caseName;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setCaseNumber(String caseNumber) {
-        this.caseNumber = caseNumber;
-    }
-
-    public String getCaseNumber() {
-        return caseNumber;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    public void setParameter(String parameter) {
-        this.parameter = parameter;
-    }
-
-    public String getParameter() {
-        return parameter;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setSolution(String solution) {
-        this.solution = solution;
-    }
-
-    public String getSolution() {
-        return solution;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("caseName", getCaseName())
-                .append("description", getDescription())
-                .append("caseNumber", getCaseNumber())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .append("parameter", getParameter())
-                .append("location", getLocation())
-                .append("solution", getSolution())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FeedbackRawData.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class FeedbackRawData extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -21,96 +25,4 @@ public class FeedbackRawData extends BaseEntity {
      * 唯一ID
      */
     private Long id;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Fleet.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class Fleet extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -39,123 +43,4 @@ public class Fleet extends BaseEntity {
      */
     @Excel(name = "飞机集合")
     private String gather;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setFleetName(String fleetName) {
-        this.fleetName = fleetName;
-    }
-
-    public String getFleetName() {
-        return fleetName;
-    }
-
-    public void setFleetCode(String fleetCode) {
-        this.fleetCode = fleetCode;
-    }
-
-    public String getFleetCode() {
-        return fleetCode;
-    }
-
-    public void setGather(String gather) {
-        this.gather = gather;
-    }
-
-    public String getGather() {
-        return gather;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("fleetName", getFleetName())
-                .append("fleetCode", getFleetCode())
-                .append("gather", getGather())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ForecastModel.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class ForecastModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -45,132 +49,4 @@ public class ForecastModel extends BaseEntity {
      */
     @Excel(name = "预测精度")
     private String accuracy;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setObject(String object) {
-        this.object = object;
-    }
-
-    public String getObject() {
-        return object;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setTrainsRange(String trainsRange) {
-        this.trainsRange = trainsRange;
-    }
-
-    public String getTrainsRange() {
-        return trainsRange;
-    }
-
-    public void setAccuracy(String accuracy) {
-        this.accuracy = accuracy;
-    }
-
-    public String getAccuracy() {
-        return accuracy;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("object", getObject())
-                .append("method", getMethod())
-                .append("trainsRange", getTrainsRange())
-                .append("accuracy", getAccuracy())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ForecastResult.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-31
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class ForecastResult extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -58,92 +62,4 @@ public class ForecastResult extends BaseEntity {
      */
     @Excel(name = "批注注解")
     private String comment;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setUnitName(String unitName) {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() {
-        return unitName;
-    }
-
-    public void setStudyObject(String studyObject) {
-        this.studyObject = studyObject;
-    }
-
-    public String getStudyObject() {
-        return studyObject;
-    }
-
-    public void setSnsCode(String snsCode) {
-        this.snsCode = snsCode;
-    }
-
-    public String getSnsCode() {
-        return snsCode;
-    }
-
-    public void setForecastFault(String forecastFault) {
-        this.forecastFault = forecastFault;
-    }
-
-    public String getForecastFault() {
-        return forecastFault;
-    }
-
-    public void setAnalysisTime(Date analysisTime) {
-        this.analysisTime = analysisTime;
-    }
-
-    public Date getAnalysisTime() {
-        return analysisTime;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("unitName", getUnitName())
-                .append("studyObject", getStudyObject())
-                .append("snsCode", getSnsCode())
-                .append("forecastFault", getForecastFault())
-                .append("analysisTime", getAnalysisTime())
-                .append("comment", getComment())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/GroundDiagnosisModel.java

@@ -1,12 +1,9 @@
 package com.phm.manage.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 地面诊断模型信息对象 phm_ground_diagnosis_model
@@ -14,6 +11,9 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class GroundDiagnosisModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -51,141 +51,4 @@ public class GroundDiagnosisModel extends BaseEntity {
      */
     @Excel(name = "所属LRU")
     private String lruSource;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCriteria(String criteria) {
-        this.criteria = criteria;
-    }
-
-    public String getCriteria() {
-        return criteria;
-    }
-
-    public void setMinDuration(String minDuration) {
-        this.minDuration = minDuration;
-    }
-
-    public String getMinDuration() {
-        return minDuration;
-    }
-
-    public void setSystemSource(String systemSource) {
-        this.systemSource = systemSource;
-    }
-
-    public String getSystemSource() {
-        return systemSource;
-    }
-
-    public void setLruSource(String lruSource) {
-        this.lruSource = lruSource;
-    }
-
-    public String getLruSource() {
-        return lruSource;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("code", getCode())
-                .append("criteria", getCriteria())
-                .append("minDuration", getMinDuration())
-                .append("systemSource", getSystemSource())
-                .append("lruSource", getLruSource())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ImportExportLog.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class ImportExportLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -45,132 +49,4 @@ public class ImportExportLog extends BaseEntity {
      */
     @Excel(name = "状态")
     private Long status;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setModelName(String modelName) {
-        this.modelName = modelName;
-    }
-
-    public String getModelName() {
-        return modelName;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setStatus(Long status) {
-        this.status = status;
-    }
-
-    public Long getStatus() {
-        return status;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("modelName", getModelName())
-                .append("name", getName())
-                .append("error", getError())
-                .append("status", getStatus())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/InstructionInfo.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class InstructionInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -33,114 +37,4 @@ public class InstructionInfo extends BaseEntity {
      */
     @Excel(name = "指令内容")
     private String content;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("attribute", getAttribute())
-                .append("content", getContent())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/LifePartConfig.java

@@ -2,6 +2,7 @@ package com.phm.manage.domain;
 
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author phm
  * @date 2023-08-23
  */
+@Data
 public class LifePartConfig extends BaseEntity {
     private static final long serialVersionUID = 1L;
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Maintenance.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class Maintenance extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -57,150 +61,4 @@ public class Maintenance extends BaseEntity {
      */
     @Excel(name = "故障代码")
     private String faultCode;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setFaultSource(String faultSource) {
-        this.faultSource = faultSource;
-    }
-
-    public String getFaultSource() {
-        return faultSource;
-    }
-
-    public void setTreatmentMeasure(String treatmentMeasure) {
-        this.treatmentMeasure = treatmentMeasure;
-    }
-
-    public String getTreatmentMeasure() {
-        return treatmentMeasure;
-    }
-
-    public void setFaultCode(String faultCode) {
-        this.faultCode = faultCode;
-    }
-
-    public String getFaultCode() {
-        return faultCode;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("code", getCode())
-                .append("description", getDescription())
-                .append("grade", getGrade())
-                .append("faultSource", getFaultSource())
-                .append("treatmentMeasure", getTreatmentMeasure())
-                .append("faultCode", getFaultCode())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/MaintenanceTestControl.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class MaintenanceTestControl extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -57,150 +61,4 @@ public class MaintenanceTestControl extends BaseEntity {
      */
     @Excel(name = "版本")
     private String version;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setMaintenanceControl(String maintenanceControl) {
-        this.maintenanceControl = maintenanceControl;
-    }
-
-    public String getMaintenanceControl() {
-        return maintenanceControl;
-    }
-
-    public void setObject(String object) {
-        this.object = object;
-    }
-
-    public String getObject() {
-        return object;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setApplicationDoc(String applicationDoc) {
-        this.applicationDoc = applicationDoc;
-    }
-
-    public String getApplicationDoc() {
-        return applicationDoc;
-    }
-
-    public void setFaultData(String faultData) {
-        this.faultData = faultData;
-    }
-
-    public String getFaultData() {
-        return faultData;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("maintenanceControl", getMaintenanceControl())
-                .append("object", getObject())
-                .append("name", getName())
-                .append("applicationDoc", getApplicationDoc())
-                .append("faultData", getFaultData())
-                .append("version", getVersion())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/MonitorParameterConfig.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class MonitorParameterConfig extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -45,132 +49,4 @@ public class MonitorParameterConfig extends BaseEntity {
      */
     @Excel(name = "数据字")
     private String dataWord;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setBusRotocol(String busRotocol) {
-        this.busRotocol = busRotocol;
-    }
-
-    public String getBusRotocol() {
-        return busRotocol;
-    }
-
-    public void setDataBlock(String dataBlock) {
-        this.dataBlock = dataBlock;
-    }
-
-    public String getDataBlock() {
-        return dataBlock;
-    }
-
-    public void setDataWord(String dataWord) {
-        this.dataWord = dataWord;
-    }
-
-    public String getDataWord() {
-        return dataWord;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("busRotocol", getBusRotocol())
-                .append("dataBlock", getDataBlock())
-                .append("dataWord", getDataWord())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/OrderInfo.java

@@ -43,12 +43,8 @@ public class OrderInfo extends BaseEntity {
 
     /** 指令状态，0：待执行，1：完成，99：执行异常 */
     @Excel(name = "指令状态")
-    private Long status;
+    private Integer status;
 
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    private Long isDelete;
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/PerformanceMonitorModel.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class PerformanceMonitorModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -57,150 +61,4 @@ public class PerformanceMonitorModel extends BaseEntity {
      */
     @Excel(name = "门限值")
     private String thresholdValue;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setObject(String object) {
-        this.object = object;
-    }
-
-    public String getObject() {
-        return object;
-    }
-
-    public void setParameter(String parameter) {
-        this.parameter = parameter;
-    }
-
-    public String getParameter() {
-        return parameter;
-    }
-
-    public void setStateCondition(String stateCondition) {
-        this.stateCondition = stateCondition;
-    }
-
-    public String getStateCondition() {
-        return stateCondition;
-    }
-
-    public void setValueMethod(String valueMethod) {
-        this.valueMethod = valueMethod;
-    }
-
-    public String getValueMethod() {
-        return valueMethod;
-    }
-
-    public void setAlarmValue(String alarmValue) {
-        this.alarmValue = alarmValue;
-    }
-
-    public String getAlarmValue() {
-        return alarmValue;
-    }
-
-    public void setThresholdValue(String thresholdValue) {
-        this.thresholdValue = thresholdValue;
-    }
-
-    public String getThresholdValue() {
-        return thresholdValue;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("object", getObject())
-                .append("parameter", getParameter())
-                .append("stateCondition", getStateCondition())
-                .append("valueMethod", getValueMethod())
-                .append("alarmValue", getAlarmValue())
-                .append("thresholdValue", getThresholdValue())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/PreHandleResult.java

@@ -3,6 +3,8 @@ package com.phm.manage.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +16,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class PreHandleResult extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -21,96 +25,4 @@ public class PreHandleResult extends BaseEntity {
      * 唯一ID
      */
     private Long id;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Product.java

@@ -2,6 +2,8 @@ package com.phm.manage.domain;
 
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author phm
  * @date 2023-09-01
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class Product extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -53,91 +57,4 @@ public class Product extends BaseEntity {
      */
     @Excel(name = "SNS编号")
     private String snsId;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public Long getAircraftId() {
-        return aircraftId;
-    }
-
-    public void setAircraftId(Long aircraftId) {
-        this.aircraftId = aircraftId;
-    }
-
-    public void setParentName(String parentName) {
-        this.parentName = parentName;
-    }
-
-    public String getParentName() {
-        return parentName;
-    }
-
-    public void setAncestors(String ancestors) {
-        this.ancestors = ancestors;
-    }
-
-    public String getAncestors() {
-        return ancestors;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setSnsId(String snsId) {
-        this.snsId = snsId;
-    }
-
-    public String getSnsId() {
-        return snsId;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("parentId", getParentId())
-                .append("parentName", getParentName())
-                .append("ancestors", getAncestors())
-                .append("name", getName())
-                .append("snsId", getSnsId())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/SoftwareConfig.java

@@ -1,12 +1,9 @@
 package com.phm.manage.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 软件配置库信息对象 phm_software_config
@@ -14,6 +11,8 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-22
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class SoftwareConfig extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -34,113 +33,4 @@ public class SoftwareConfig extends BaseEntity {
     @Excel(name = "软件名称")
     private String name;
 
-    /**
-     * 数据是否删除（1：删除，0有效）
-     */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("serialNumber", getSerialNumber())
-                .append("name", getName())
-                .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/FeatureModuleEnum.java

@@ -0,0 +1,38 @@
+package com.phm.manage.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description FeatureModuleEnum
+ * @Author WGK
+ * @Date 2023/9/7 14:23
+ */
+@AllArgsConstructor
+@Getter
+public enum FeatureModuleEnum {
+
+    /*
+     * 综合数据管理模块
+     */
+    COMPREHENSIVE_DATA("综合数据管理", "COMPREHENSIVE_DATA"),
+
+    /*
+     * 增强故障诊断模块
+     */
+    ENHANCED_FAILURE_DIAGNOSIS("增强故障诊断", "ENHANCED_FAILURE_DIAGNOSIS"),
+
+    /*
+     * 故障预测模块
+     */
+    FAULT_PREDICTION("故障预测", "FAULT_PREDICTION"),
+
+    /*
+     * 维修测试控制模块
+     */
+    MAINTENANCE_CONTROL("维修测试控制", "MAINTENANCE_CONTROL");
+
+    private final String name;
+
+    private final String type;
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/ModelEnum.java

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @Description ModelEnum
+ * @Description 模型类型
  *
  * @Author WGK
  * @Date 2023/9/6 15:19

PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/OrderStatus.java

@@ -0,0 +1,19 @@
+package com.phm.manage.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 指令状态
+ * @Author WGK
+ * @Date 2023/9/7 17:13
+ */
+@AllArgsConstructor
+@Getter
+public enum OrderStatus {
+    S_0(0,"待执行"),
+    S_1(1,"完成"),
+    S_99(99,"执行异常");
+    private final Integer code;
+    private final String name;
+}