新增模块

1.系统指令信息
2.诊断结果
3.预测结果
4.产品树信息
5.分析过程日志

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

@@ -19,7 +19,7 @@ import java.util.List;
  * 分析过程日志Controller
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 @RestController
 @RequestMapping("/manage/analyzeCourseLog")

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

@@ -0,0 +1,91 @@
+package com.phm.manage.controller;
+
+import com.phm.common.annotation.Log;
+import com.phm.common.core.controller.BaseController;
+import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
+import com.phm.common.enums.BusinessType;
+import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.DiagnoseResult;
+import com.phm.manage.service.IDiagnoseResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 诊断结果Controller
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+@RestController
+@RequestMapping("/manage/diagnoseResult")
+public class DiagnoseResultController extends BaseController {
+    @Autowired
+    private IDiagnoseResultService diagnoseResultService;
+
+    /**
+     * 查询诊断结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:diagnoseResult:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DiagnoseResult diagnoseResult) {
+        startPage();
+        List<DiagnoseResult> list = diagnoseResultService.selectDiagnoseResultList(diagnoseResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出诊断结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:diagnoseResult:export')")
+    @Log(title = "诊断结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DiagnoseResult diagnoseResult) {
+        List<DiagnoseResult> list = diagnoseResultService.selectDiagnoseResultList(diagnoseResult);
+        ExcelUtil<DiagnoseResult> util = new ExcelUtil<DiagnoseResult>(DiagnoseResult.class);
+        util.exportExcel(response, list, "诊断结果数据");
+    }
+
+    /**
+     * 获取诊断结果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:diagnoseResult:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(diagnoseResultService.selectDiagnoseResultById(id));
+    }
+
+    /**
+     * 新增诊断结果
+     */
+    @PreAuthorize("@ss.hasPermi('manage:diagnoseResult:add')")
+    @Log(title = "诊断结果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DiagnoseResult diagnoseResult) {
+        return toAjax(diagnoseResultService.insertDiagnoseResult(diagnoseResult));
+    }
+
+    /**
+     * 修改诊断结果
+     */
+    @PreAuthorize("@ss.hasPermi('manage:diagnoseResult:edit')")
+    @Log(title = "诊断结果", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DiagnoseResult diagnoseResult) {
+        return toAjax(diagnoseResultService.updateDiagnoseResult(diagnoseResult));
+    }
+
+    /**
+     * 删除诊断结果
+     */
+    @PreAuthorize("@ss.hasPermi('manage:diagnoseResult:remove')")
+    @Log(title = "诊断结果", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(diagnoseResultService.deleteDiagnoseResultByIds(ids));
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.phm.manage.controller;
+
+import com.phm.common.annotation.Log;
+import com.phm.common.core.controller.BaseController;
+import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
+import com.phm.common.enums.BusinessType;
+import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.ForecastResult;
+import com.phm.manage.service.IForecastResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 预测结果Controller
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+@RestController
+@RequestMapping("/manage/forecastResult")
+public class ForecastResultController extends BaseController {
+    @Autowired
+    private IForecastResultService forecastResultService;
+
+    /**
+     * 查询预测结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:forecastResult:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ForecastResult forecastResult) {
+        startPage();
+        List<ForecastResult> list = forecastResultService.selectForecastResultList(forecastResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出预测结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:forecastResult:export')")
+    @Log(title = "预测结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ForecastResult forecastResult) {
+        List<ForecastResult> list = forecastResultService.selectForecastResultList(forecastResult);
+        ExcelUtil<ForecastResult> util = new ExcelUtil<ForecastResult>(ForecastResult.class);
+        util.exportExcel(response, list, "预测结果数据");
+    }
+
+    /**
+     * 获取预测结果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:forecastResult:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(forecastResultService.selectForecastResultById(id));
+    }
+
+    /**
+     * 新增预测结果
+     */
+    @PreAuthorize("@ss.hasPermi('manage:forecastResult:add')")
+    @Log(title = "预测结果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ForecastResult forecastResult) {
+        return toAjax(forecastResultService.insertForecastResult(forecastResult));
+    }
+
+    /**
+     * 修改预测结果
+     */
+    @PreAuthorize("@ss.hasPermi('manage:forecastResult:edit')")
+    @Log(title = "预测结果", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ForecastResult forecastResult) {
+        return toAjax(forecastResultService.updateForecastResult(forecastResult));
+    }
+
+    /**
+     * 删除预测结果
+     */
+    @PreAuthorize("@ss.hasPermi('manage:forecastResult:remove')")
+    @Log(title = "预测结果", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(forecastResultService.deleteForecastResultByIds(ids));
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.phm.manage.controller;
+
+import com.phm.common.annotation.Log;
+import com.phm.common.core.controller.BaseController;
+import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
+import com.phm.common.enums.BusinessType;
+import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.OrderInfo;
+import com.phm.manage.service.IOrderInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 系统指令信息Controller
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+@RestController
+@RequestMapping("/manage/orderInfo")
+public class OrderInfoController extends BaseController {
+    @Autowired
+    private IOrderInfoService orderInfoService;
+
+    /**
+     * 查询系统指令信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OrderInfo orderInfo) {
+        startPage();
+        List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出系统指令信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderInfo:export')")
+    @Log(title = "系统指令信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OrderInfo orderInfo) {
+        List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
+        ExcelUtil<OrderInfo> util = new ExcelUtil<OrderInfo>(OrderInfo.class);
+        util.exportExcel(response, list, "系统指令信息数据");
+    }
+
+    /**
+     * 获取系统指令信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(orderInfoService.selectOrderInfoById(id));
+    }
+
+    /**
+     * 新增系统指令信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderInfo:add')")
+    @Log(title = "系统指令信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OrderInfo orderInfo) {
+        return toAjax(orderInfoService.insertOrderInfo(orderInfo));
+    }
+
+    /**
+     * 修改系统指令信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderInfo:edit')")
+    @Log(title = "系统指令信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OrderInfo orderInfo) {
+        return toAjax(orderInfoService.updateOrderInfo(orderInfo));
+    }
+
+    /**
+     * 删除系统指令信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderInfo:remove')")
+    @Log(title = "系统指令信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(orderInfoService.deleteOrderInfoByIds(ids));
+    }
+}

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

@@ -3,6 +3,7 @@ package com.phm.manage.controller;
 import com.phm.common.annotation.Log;
 import com.phm.common.core.controller.BaseController;
 import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
 import com.phm.common.enums.BusinessType;
 import com.phm.common.utils.poi.ExcelUtil;
 import com.phm.manage.domain.Product;
@@ -18,7 +19,7 @@ import java.util.List;
  * 产品树信息Controller
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 @RestController
 @RequestMapping("/manage/product")
@@ -31,9 +32,10 @@ public class ProductController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('manage:product:list')")
     @GetMapping("/list")
-    public AjaxResult list(Product product) {
+    public TableDataInfo list(Product product) {
+        startPage();
         List<Product> list = productService.selectProductList(product);
-        return success(list);
+        return getDataTable(list);
     }
 
     /**

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

@@ -1,18 +1,15 @@
 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;
-
 /**
  * 分析过程日志对象 phm_analyze_course_log
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 public class AnalyzeCourseLog extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -49,35 +46,8 @@ public class AnalyzeCourseLog extends BaseEntity {
     /**
      * 数据是否删除（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;
     }
@@ -126,38 +96,6 @@ public class AnalyzeCourseLog extends BaseEntity {
         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)
@@ -167,10 +105,10 @@ public class AnalyzeCourseLog extends BaseEntity {
                 .append("courseContent", getCourseContent())
                 .append("status", getStatus())
                 .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
                 .toString();
     }
 }

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

@@ -0,0 +1,148 @@
+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;
+
+/**
+ * 诊断结果对象 phm_diagnose_result
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public class DiagnoseResult extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一ID
+     */
+    private Long id;
+
+    /**
+     * 故障模式
+     */
+    @Excel(name = "故障模式")
+    private String faultMode;
+
+    /**
+     * 故障对象
+     */
+    @Excel(name = "故障对象")
+    private String faultObject;
+
+    /**
+     * 故障编码
+     */
+    @Excel(name = "故障编码")
+    private String faultCode;
+
+    /**
+     * 故障源
+     */
+    @Excel(name = "故障源")
+    private String faultSource;
+
+    /**
+     * 分析时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分析时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date analysisTime;
+
+    /**
+     * 批注注解
+     */
+    @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/ForecastResult.java

@@ -0,0 +1,149 @@
+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;
+
+/**
+ * 预测结果对象 phm_forecast_result
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public class ForecastResult extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一ID
+     */
+    private Long id;
+
+    /**
+     * 部件名称
+     */
+    @Excel(name = "部件名称")
+    private String unitName;
+
+    /**
+     * 研究对象
+     */
+    @Excel(name = "研究对象")
+    private String studyObject;
+
+    /**
+     * SNS 编码
+     */
+    @Excel(name = "SNS 编码")
+    private String snsCode;
+
+    /**
+     * 预测故障
+     */
+    @Excel(name = "预测故障")
+    private String forecastFault;
+
+    /**
+     * 分析时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分析时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date analysisTime;
+
+    /**
+     * 批注注解
+     */
+    @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/OrderInfo.java

@@ -0,0 +1,99 @@
+package com.phm.manage.domain;
+
+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;
+
+/**
+ * 系统指令信息对象 phm_order_info
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public class OrderInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一ID
+     */
+    private Long id;
+
+    /**
+     * 指令名称
+     */
+    @Excel(name = "指令名称")
+    private String orderName;
+
+    /**
+     * 指令类型
+     */
+    @Excel(name = "指令类型")
+    private String orderType;
+
+    /**
+     * 参数内容：JSON格式
+     */
+    @Excel(name = "参数内容：JSON格式")
+    private String content;
+
+    /**
+     * 数据是否删除（1：删除，0有效）
+     */
+    private Long isDelete;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("orderName", getOrderName())
+                .append("orderType", getOrderType())
+                .append("content", getContent())
+                .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/Product.java

@@ -1,20 +1,17 @@
 package com.phm.manage.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.phm.common.annotation.Excel;
-import com.phm.common.core.domain.TreeEntity;
+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;
-
 /**
  * 产品树信息对象 phm_product
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
-public class Product extends TreeEntity {
+public class Product extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -23,48 +20,32 @@ public class Product extends TreeEntity {
     private Long id;
 
     /**
-     * 产品名称
-     */
-    @Excel(name = "产品名称")
-    private String name;
-
-    /**
-     * SNS编号
-     */
-    @Excel(name = "SNS编号")
-    private String snsId;
-
-    /**
-     * 数据是否删除（1：删除，0有效）
+     * 父ID
      */
-    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
-    private Long isDelete;
+    private Long parentId;
 
     /**
-     * 创建人
+     * 归属
      */
-    @Excel(name = "创建人")
-    private String createdBy;
+    @Excel(name = "归属")
+    private String parentName;
 
     /**
-     * 创建时间
+     * 名称
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdTime;
+    @Excel(name = "名称")
+    private String name;
 
     /**
-     * 更新人
+     * SNS编号
      */
-    @Excel(name = "更新人")
-    private String updatedBy;
+    @Excel(name = "SNS编号")
+    private String snsId;
 
     /**
-     * 更新时间
+     * 数据是否删除（1：删除，0有效）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedTime;
+    private Long isDelete;
 
     public void setId(Long id) {
         this.id = id;
@@ -74,6 +55,22 @@ public class Product extends TreeEntity {
         return id;
     }
 
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
     public void setName(String name) {
         this.name = name;
     }
@@ -98,50 +95,19 @@ public class Product extends TreeEntity {
         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("parentId", getParentId())
+                .append("parentName", getParentName())
                 .append("name", getName())
                 .append("snsId", getSnsId())
                 .append("isDelete", getIsDelete())
-                .append("createdBy", getCreatedBy())
-                .append("createdTime", getCreatedTime())
-                .append("updatedBy", getUpdatedBy())
-                .append("updatedTime", getUpdatedTime())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
                 .toString();
     }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/AnalyzeCourseLogMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 分析过程日志Mapper接口
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 public interface AnalyzeCourseLogMapper {
     /**

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/DiagnoseResultMapper.java

@@ -0,0 +1,61 @@
+package com.phm.manage.mapper;
+
+import com.phm.manage.domain.DiagnoseResult;
+
+import java.util.List;
+
+/**
+ * 诊断结果Mapper接口
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public interface DiagnoseResultMapper {
+    /**
+     * 查询诊断结果
+     *
+     * @param id 诊断结果主键
+     * @return 诊断结果
+     */
+    public DiagnoseResult selectDiagnoseResultById(Long id);
+
+    /**
+     * 查询诊断结果列表
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 诊断结果集合
+     */
+    public List<DiagnoseResult> selectDiagnoseResultList(DiagnoseResult diagnoseResult);
+
+    /**
+     * 新增诊断结果
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 结果
+     */
+    public int insertDiagnoseResult(DiagnoseResult diagnoseResult);
+
+    /**
+     * 修改诊断结果
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 结果
+     */
+    public int updateDiagnoseResult(DiagnoseResult diagnoseResult);
+
+    /**
+     * 删除诊断结果
+     *
+     * @param id 诊断结果主键
+     * @return 结果
+     */
+    public int deleteDiagnoseResultById(Long id);
+
+    /**
+     * 批量删除诊断结果
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDiagnoseResultByIds(Long[] ids);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/ForecastResultMapper.java

@@ -0,0 +1,61 @@
+package com.phm.manage.mapper;
+
+import com.phm.manage.domain.ForecastResult;
+
+import java.util.List;
+
+/**
+ * 预测结果Mapper接口
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public interface ForecastResultMapper {
+    /**
+     * 查询预测结果
+     *
+     * @param id 预测结果主键
+     * @return 预测结果
+     */
+    public ForecastResult selectForecastResultById(Long id);
+
+    /**
+     * 查询预测结果列表
+     *
+     * @param forecastResult 预测结果
+     * @return 预测结果集合
+     */
+    public List<ForecastResult> selectForecastResultList(ForecastResult forecastResult);
+
+    /**
+     * 新增预测结果
+     *
+     * @param forecastResult 预测结果
+     * @return 结果
+     */
+    public int insertForecastResult(ForecastResult forecastResult);
+
+    /**
+     * 修改预测结果
+     *
+     * @param forecastResult 预测结果
+     * @return 结果
+     */
+    public int updateForecastResult(ForecastResult forecastResult);
+
+    /**
+     * 删除预测结果
+     *
+     * @param id 预测结果主键
+     * @return 结果
+     */
+    public int deleteForecastResultById(Long id);
+
+    /**
+     * 批量删除预测结果
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteForecastResultByIds(Long[] ids);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/OrderInfoMapper.java

@@ -0,0 +1,61 @@
+package com.phm.manage.mapper;
+
+import com.phm.manage.domain.OrderInfo;
+
+import java.util.List;
+
+/**
+ * 系统指令信息Mapper接口
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public interface OrderInfoMapper {
+    /**
+     * 查询系统指令信息
+     *
+     * @param id 系统指令信息主键
+     * @return 系统指令信息
+     */
+    public OrderInfo selectOrderInfoById(Long id);
+
+    /**
+     * 查询系统指令信息列表
+     *
+     * @param orderInfo 系统指令信息
+     * @return 系统指令信息集合
+     */
+    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
+
+    /**
+     * 新增系统指令信息
+     *
+     * @param orderInfo 系统指令信息
+     * @return 结果
+     */
+    public int insertOrderInfo(OrderInfo orderInfo);
+
+    /**
+     * 修改系统指令信息
+     *
+     * @param orderInfo 系统指令信息
+     * @return 结果
+     */
+    public int updateOrderInfo(OrderInfo orderInfo);
+
+    /**
+     * 删除系统指令信息
+     *
+     * @param id 系统指令信息主键
+     * @return 结果
+     */
+    public int deleteOrderInfoById(Long id);
+
+    /**
+     * 批量删除系统指令信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteOrderInfoByIds(Long[] ids);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/ProductMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 产品树信息Mapper接口
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 public interface ProductMapper {
     /**

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IAnalyzeCourseLogService.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 分析过程日志Service接口
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 public interface IAnalyzeCourseLogService {
     /**

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IDiagnoseResultService.java

@@ -0,0 +1,61 @@
+package com.phm.manage.service;
+
+import com.phm.manage.domain.DiagnoseResult;
+
+import java.util.List;
+
+/**
+ * 诊断结果Service接口
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public interface IDiagnoseResultService {
+    /**
+     * 查询诊断结果
+     *
+     * @param id 诊断结果主键
+     * @return 诊断结果
+     */
+    public DiagnoseResult selectDiagnoseResultById(Long id);
+
+    /**
+     * 查询诊断结果列表
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 诊断结果集合
+     */
+    public List<DiagnoseResult> selectDiagnoseResultList(DiagnoseResult diagnoseResult);
+
+    /**
+     * 新增诊断结果
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 结果
+     */
+    public int insertDiagnoseResult(DiagnoseResult diagnoseResult);
+
+    /**
+     * 修改诊断结果
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 结果
+     */
+    public int updateDiagnoseResult(DiagnoseResult diagnoseResult);
+
+    /**
+     * 批量删除诊断结果
+     *
+     * @param ids 需要删除的诊断结果主键集合
+     * @return 结果
+     */
+    public int deleteDiagnoseResultByIds(Long[] ids);
+
+    /**
+     * 删除诊断结果信息
+     *
+     * @param id 诊断结果主键
+     * @return 结果
+     */
+    public int deleteDiagnoseResultById(Long id);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IForecastResultService.java

@@ -0,0 +1,61 @@
+package com.phm.manage.service;
+
+import com.phm.manage.domain.ForecastResult;
+
+import java.util.List;
+
+/**
+ * 预测结果Service接口
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public interface IForecastResultService {
+    /**
+     * 查询预测结果
+     *
+     * @param id 预测结果主键
+     * @return 预测结果
+     */
+    public ForecastResult selectForecastResultById(Long id);
+
+    /**
+     * 查询预测结果列表
+     *
+     * @param forecastResult 预测结果
+     * @return 预测结果集合
+     */
+    public List<ForecastResult> selectForecastResultList(ForecastResult forecastResult);
+
+    /**
+     * 新增预测结果
+     *
+     * @param forecastResult 预测结果
+     * @return 结果
+     */
+    public int insertForecastResult(ForecastResult forecastResult);
+
+    /**
+     * 修改预测结果
+     *
+     * @param forecastResult 预测结果
+     * @return 结果
+     */
+    public int updateForecastResult(ForecastResult forecastResult);
+
+    /**
+     * 批量删除预测结果
+     *
+     * @param ids 需要删除的预测结果主键集合
+     * @return 结果
+     */
+    public int deleteForecastResultByIds(Long[] ids);
+
+    /**
+     * 删除预测结果信息
+     *
+     * @param id 预测结果主键
+     * @return 结果
+     */
+    public int deleteForecastResultById(Long id);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IOrderInfoService.java

@@ -0,0 +1,61 @@
+package com.phm.manage.service;
+
+import com.phm.manage.domain.OrderInfo;
+
+import java.util.List;
+
+/**
+ * 系统指令信息Service接口
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+public interface IOrderInfoService {
+    /**
+     * 查询系统指令信息
+     *
+     * @param id 系统指令信息主键
+     * @return 系统指令信息
+     */
+    public OrderInfo selectOrderInfoById(Long id);
+
+    /**
+     * 查询系统指令信息列表
+     *
+     * @param orderInfo 系统指令信息
+     * @return 系统指令信息集合
+     */
+    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
+
+    /**
+     * 新增系统指令信息
+     *
+     * @param orderInfo 系统指令信息
+     * @return 结果
+     */
+    public int insertOrderInfo(OrderInfo orderInfo);
+
+    /**
+     * 修改系统指令信息
+     *
+     * @param orderInfo 系统指令信息
+     * @return 结果
+     */
+    public int updateOrderInfo(OrderInfo orderInfo);
+
+    /**
+     * 批量删除系统指令信息
+     *
+     * @param ids 需要删除的系统指令信息主键集合
+     * @return 结果
+     */
+    public int deleteOrderInfoByIds(Long[] ids);
+
+    /**
+     * 删除系统指令信息信息
+     *
+     * @param id 系统指令信息主键
+     * @return 结果
+     */
+    public int deleteOrderInfoById(Long id);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IProductService.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 产品树信息Service接口
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 public interface IProductService {
     /**

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeCourseLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.phm.manage.service.impl;
 
+import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.AnalyzeCourseLog;
 import com.phm.manage.mapper.AnalyzeCourseLogMapper;
 import com.phm.manage.service.IAnalyzeCourseLogService;
@@ -12,7 +13,7 @@ import java.util.List;
  * 分析过程日志Service业务层处理
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 @Service
 public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
@@ -49,6 +50,7 @@ public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
      */
     @Override
     public int insertAnalyzeCourseLog(AnalyzeCourseLog analyzeCourseLog) {
+        analyzeCourseLog.setCreateTime(DateUtils.getNowDate());
         return analyzeCourseLogMapper.insertAnalyzeCourseLog(analyzeCourseLog);
     }
 
@@ -60,6 +62,7 @@ public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
      */
     @Override
     public int updateAnalyzeCourseLog(AnalyzeCourseLog analyzeCourseLog) {
+        analyzeCourseLog.setUpdateTime(DateUtils.getNowDate());
         return analyzeCourseLogMapper.updateAnalyzeCourseLog(analyzeCourseLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DiagnoseResultServiceImpl.java

@@ -0,0 +1,90 @@
+package com.phm.manage.service.impl;
+
+import com.phm.common.utils.DateUtils;
+import com.phm.manage.domain.DiagnoseResult;
+import com.phm.manage.mapper.DiagnoseResultMapper;
+import com.phm.manage.service.IDiagnoseResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 诊断结果Service业务层处理
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+@Service
+public class DiagnoseResultServiceImpl implements IDiagnoseResultService {
+    @Autowired
+    private DiagnoseResultMapper diagnoseResultMapper;
+
+    /**
+     * 查询诊断结果
+     *
+     * @param id 诊断结果主键
+     * @return 诊断结果
+     */
+    @Override
+    public DiagnoseResult selectDiagnoseResultById(Long id) {
+        return diagnoseResultMapper.selectDiagnoseResultById(id);
+    }
+
+    /**
+     * 查询诊断结果列表
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 诊断结果
+     */
+    @Override
+    public List<DiagnoseResult> selectDiagnoseResultList(DiagnoseResult diagnoseResult) {
+        return diagnoseResultMapper.selectDiagnoseResultList(diagnoseResult);
+    }
+
+    /**
+     * 新增诊断结果
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 结果
+     */
+    @Override
+    public int insertDiagnoseResult(DiagnoseResult diagnoseResult) {
+        diagnoseResult.setCreateTime(DateUtils.getNowDate());
+        return diagnoseResultMapper.insertDiagnoseResult(diagnoseResult);
+    }
+
+    /**
+     * 修改诊断结果
+     *
+     * @param diagnoseResult 诊断结果
+     * @return 结果
+     */
+    @Override
+    public int updateDiagnoseResult(DiagnoseResult diagnoseResult) {
+        diagnoseResult.setUpdateTime(DateUtils.getNowDate());
+        return diagnoseResultMapper.updateDiagnoseResult(diagnoseResult);
+    }
+
+    /**
+     * 批量删除诊断结果
+     *
+     * @param ids 需要删除的诊断结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDiagnoseResultByIds(Long[] ids) {
+        return diagnoseResultMapper.deleteDiagnoseResultByIds(ids);
+    }
+
+    /**
+     * 删除诊断结果信息
+     *
+     * @param id 诊断结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDiagnoseResultById(Long id) {
+        return diagnoseResultMapper.deleteDiagnoseResultById(id);
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ForecastResultServiceImpl.java

@@ -0,0 +1,90 @@
+package com.phm.manage.service.impl;
+
+import com.phm.common.utils.DateUtils;
+import com.phm.manage.domain.ForecastResult;
+import com.phm.manage.mapper.ForecastResultMapper;
+import com.phm.manage.service.IForecastResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 预测结果Service业务层处理
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+@Service
+public class ForecastResultServiceImpl implements IForecastResultService {
+    @Autowired
+    private ForecastResultMapper forecastResultMapper;
+
+    /**
+     * 查询预测结果
+     *
+     * @param id 预测结果主键
+     * @return 预测结果
+     */
+    @Override
+    public ForecastResult selectForecastResultById(Long id) {
+        return forecastResultMapper.selectForecastResultById(id);
+    }
+
+    /**
+     * 查询预测结果列表
+     *
+     * @param forecastResult 预测结果
+     * @return 预测结果
+     */
+    @Override
+    public List<ForecastResult> selectForecastResultList(ForecastResult forecastResult) {
+        return forecastResultMapper.selectForecastResultList(forecastResult);
+    }
+
+    /**
+     * 新增预测结果
+     *
+     * @param forecastResult 预测结果
+     * @return 结果
+     */
+    @Override
+    public int insertForecastResult(ForecastResult forecastResult) {
+        forecastResult.setCreateTime(DateUtils.getNowDate());
+        return forecastResultMapper.insertForecastResult(forecastResult);
+    }
+
+    /**
+     * 修改预测结果
+     *
+     * @param forecastResult 预测结果
+     * @return 结果
+     */
+    @Override
+    public int updateForecastResult(ForecastResult forecastResult) {
+        forecastResult.setUpdateTime(DateUtils.getNowDate());
+        return forecastResultMapper.updateForecastResult(forecastResult);
+    }
+
+    /**
+     * 批量删除预测结果
+     *
+     * @param ids 需要删除的预测结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteForecastResultByIds(Long[] ids) {
+        return forecastResultMapper.deleteForecastResultByIds(ids);
+    }
+
+    /**
+     * 删除预测结果信息
+     *
+     * @param id 预测结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteForecastResultById(Long id) {
+        return forecastResultMapper.deleteForecastResultById(id);
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/OrderInfoServiceImpl.java

@@ -0,0 +1,90 @@
+package com.phm.manage.service.impl;
+
+import com.phm.common.utils.DateUtils;
+import com.phm.manage.domain.OrderInfo;
+import com.phm.manage.mapper.OrderInfoMapper;
+import com.phm.manage.service.IOrderInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 系统指令信息Service业务层处理
+ *
+ * @author phm
+ * @date 2023-08-31
+ */
+@Service
+public class OrderInfoServiceImpl implements IOrderInfoService {
+    @Autowired
+    private OrderInfoMapper orderInfoMapper;
+
+    /**
+     * 查询系统指令信息
+     *
+     * @param id 系统指令信息主键
+     * @return 系统指令信息
+     */
+    @Override
+    public OrderInfo selectOrderInfoById(Long id) {
+        return orderInfoMapper.selectOrderInfoById(id);
+    }
+
+    /**
+     * 查询系统指令信息列表
+     *
+     * @param orderInfo 系统指令信息
+     * @return 系统指令信息
+     */
+    @Override
+    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo) {
+        return orderInfoMapper.selectOrderInfoList(orderInfo);
+    }
+
+    /**
+     * 新增系统指令信息
+     *
+     * @param orderInfo 系统指令信息
+     * @return 结果
+     */
+    @Override
+    public int insertOrderInfo(OrderInfo orderInfo) {
+        orderInfo.setCreateTime(DateUtils.getNowDate());
+        return orderInfoMapper.insertOrderInfo(orderInfo);
+    }
+
+    /**
+     * 修改系统指令信息
+     *
+     * @param orderInfo 系统指令信息
+     * @return 结果
+     */
+    @Override
+    public int updateOrderInfo(OrderInfo orderInfo) {
+        orderInfo.setUpdateTime(DateUtils.getNowDate());
+        return orderInfoMapper.updateOrderInfo(orderInfo);
+    }
+
+    /**
+     * 批量删除系统指令信息
+     *
+     * @param ids 需要删除的系统指令信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderInfoByIds(Long[] ids) {
+        return orderInfoMapper.deleteOrderInfoByIds(ids);
+    }
+
+    /**
+     * 删除系统指令信息信息
+     *
+     * @param id 系统指令信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderInfoById(Long id) {
+        return orderInfoMapper.deleteOrderInfoById(id);
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ProductServiceImpl.java

@@ -1,5 +1,6 @@
 package com.phm.manage.service.impl;
 
+import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.Product;
 import com.phm.manage.mapper.ProductMapper;
 import com.phm.manage.service.IProductService;
@@ -12,7 +13,7 @@ import java.util.List;
  * 产品树信息Service业务层处理
  *
  * @author phm
- * @date 2023-08-22
+ * @date 2023-08-31
  */
 @Service
 public class ProductServiceImpl implements IProductService {
@@ -49,6 +50,7 @@ public class ProductServiceImpl implements IProductService {
      */
     @Override
     public int insertProduct(Product product) {
+        product.setCreateTime(DateUtils.getNowDate());
         return productMapper.insertProduct(product);
     }
 
@@ -60,6 +62,7 @@ public class ProductServiceImpl implements IProductService {
      */
     @Override
     public int updateProduct(Product product) {
+        product.setUpdateTime(DateUtils.getNowDate());
         return productMapper.updateProduct(product);
     }
 

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeCourseLogMapper.xml

@@ -28,11 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moduleType != null  and moduleType != ''"> and module_type = #{moduleType}</if>
             <if test="courseContent != null  and courseContent != ''"> and course_content = #{courseContent}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     

PHM-admin/phm-manage/src/main/resources/mapper/manage/DiagnoseResultMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.phm.manage.mapper.DiagnoseResultMapper">
+    
+    <resultMap type="DiagnoseResult" id="DiagnoseResultResult">
+        <result property="id"    column="id"    />
+        <result property="faultMode"    column="fault_mode"    />
+        <result property="faultObject"    column="fault_object"    />
+        <result property="faultCode"    column="fault_code"    />
+        <result property="faultSource"    column="fault_source"    />
+        <result property="analysisTime"    column="analysis_time"    />
+        <result property="comment"    column="comment"    />
+        <result property="isDelete"    column="is_delete"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectDiagnoseResultVo">
+        select id, fault_mode, fault_object, fault_code, fault_source, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from phm_diagnose_result
+    </sql>
+
+    <select id="selectDiagnoseResultList" parameterType="DiagnoseResult" resultMap="DiagnoseResultResult">
+        <include refid="selectDiagnoseResultVo"/>
+        <where>  
+            <if test="faultMode != null  and faultMode != ''"> and fault_mode = #{faultMode}</if>
+            <if test="faultObject != null  and faultObject != ''"> and fault_object = #{faultObject}</if>
+            <if test="faultCode != null  and faultCode != ''"> and fault_code = #{faultCode}</if>
+            <if test="faultSource != null  and faultSource != ''"> and fault_source = #{faultSource}</if>
+            <if test="analysisTime != null "> and analysis_time = #{analysisTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectDiagnoseResultById" parameterType="Long" resultMap="DiagnoseResultResult">
+        <include refid="selectDiagnoseResultVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDiagnoseResult" parameterType="DiagnoseResult" useGeneratedKeys="true" keyProperty="id">
+        insert into phm_diagnose_result
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="faultMode != null">fault_mode,</if>
+            <if test="faultObject != null">fault_object,</if>
+            <if test="faultCode != null">fault_code,</if>
+            <if test="faultSource != null">fault_source,</if>
+            <if test="analysisTime != null">analysis_time,</if>
+            <if test="comment != null">comment,</if>
+            <if test="isDelete != null">is_delete,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="faultMode != null">#{faultMode},</if>
+            <if test="faultObject != null">#{faultObject},</if>
+            <if test="faultCode != null">#{faultCode},</if>
+            <if test="faultSource != null">#{faultSource},</if>
+            <if test="analysisTime != null">#{analysisTime},</if>
+            <if test="comment != null">#{comment},</if>
+            <if test="isDelete != null">#{isDelete},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDiagnoseResult" parameterType="DiagnoseResult">
+        update phm_diagnose_result
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="faultMode != null">fault_mode = #{faultMode},</if>
+            <if test="faultObject != null">fault_object = #{faultObject},</if>
+            <if test="faultCode != null">fault_code = #{faultCode},</if>
+            <if test="faultSource != null">fault_source = #{faultSource},</if>
+            <if test="analysisTime != null">analysis_time = #{analysisTime},</if>
+            <if test="comment != null">comment = #{comment},</if>
+            <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDiagnoseResultById" parameterType="Long">
+        delete from phm_diagnose_result where id = #{id}
+    </delete>
+
+    <delete id="deleteDiagnoseResultByIds" parameterType="String">
+        delete from phm_diagnose_result where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastResultMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.phm.manage.mapper.ForecastResultMapper">
+    
+    <resultMap type="ForecastResult" id="ForecastResultResult">
+        <result property="id"    column="id"    />
+        <result property="unitName"    column="unit_name"    />
+        <result property="studyObject"    column="study_object"    />
+        <result property="snsCode"    column="sns_code"    />
+        <result property="forecastFault"    column="forecast_fault"    />
+        <result property="analysisTime"    column="analysis_time"    />
+        <result property="comment"    column="comment"    />
+        <result property="isDelete"    column="is_delete"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectForecastResultVo">
+        select id, unit_name, study_object, sns_code, forecast_fault, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from phm_forecast_result
+    </sql>
+
+    <select id="selectForecastResultList" parameterType="ForecastResult" resultMap="ForecastResultResult">
+        <include refid="selectForecastResultVo"/>
+        <where>  
+            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="studyObject != null  and studyObject != ''"> and study_object = #{studyObject}</if>
+            <if test="snsCode != null  and snsCode != ''"> and sns_code = #{snsCode}</if>
+            <if test="forecastFault != null  and forecastFault != ''"> and forecast_fault = #{forecastFault}</if>
+            <if test="analysisTime != null "> and analysis_time = #{analysisTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectForecastResultById" parameterType="Long" resultMap="ForecastResultResult">
+        <include refid="selectForecastResultVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertForecastResult" parameterType="ForecastResult" useGeneratedKeys="true" keyProperty="id">
+        insert into phm_forecast_result
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="unitName != null">unit_name,</if>
+            <if test="studyObject != null">study_object,</if>
+            <if test="snsCode != null">sns_code,</if>
+            <if test="forecastFault != null">forecast_fault,</if>
+            <if test="analysisTime != null">analysis_time,</if>
+            <if test="comment != null">comment,</if>
+            <if test="isDelete != null">is_delete,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="unitName != null">#{unitName},</if>
+            <if test="studyObject != null">#{studyObject},</if>
+            <if test="snsCode != null">#{snsCode},</if>
+            <if test="forecastFault != null">#{forecastFault},</if>
+            <if test="analysisTime != null">#{analysisTime},</if>
+            <if test="comment != null">#{comment},</if>
+            <if test="isDelete != null">#{isDelete},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateForecastResult" parameterType="ForecastResult">
+        update phm_forecast_result
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="unitName != null">unit_name = #{unitName},</if>
+            <if test="studyObject != null">study_object = #{studyObject},</if>
+            <if test="snsCode != null">sns_code = #{snsCode},</if>
+            <if test="forecastFault != null">forecast_fault = #{forecastFault},</if>
+            <if test="analysisTime != null">analysis_time = #{analysisTime},</if>
+            <if test="comment != null">comment = #{comment},</if>
+            <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteForecastResultById" parameterType="Long">
+        delete from phm_forecast_result where id = #{id}
+    </delete>
+
+    <delete id="deleteForecastResultByIds" parameterType="String">
+        delete from phm_forecast_result where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.phm.manage.mapper.OrderInfoMapper">
+    
+    <resultMap type="OrderInfo" id="OrderInfoResult">
+        <result property="id"    column="id"    />
+        <result property="orderName"    column="order_name"    />
+        <result property="orderType"    column="order_type"    />
+        <result property="content"    column="content"    />
+        <result property="isDelete"    column="is_delete"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectOrderInfoVo">
+        select id, order_name, order_type, content, is_delete, create_by, create_time, update_by, update_time from phm_order_info
+    </sql>
+
+    <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
+        <include refid="selectOrderInfoVo"/>
+        <where>  
+            <if test="orderName != null  and orderName != ''"> and order_name like concat('%', #{orderName}, '%')</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+        </where>
+    </select>
+    
+    <select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoResult">
+        <include refid="selectOrderInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertOrderInfo" parameterType="OrderInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into phm_order_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderName != null">order_name,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="content != null">content,</if>
+            <if test="isDelete != null">is_delete,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderName != null">#{orderName},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="content != null">#{content},</if>
+            <if test="isDelete != null">#{isDelete},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateOrderInfo" parameterType="OrderInfo">
+        update phm_order_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderName != null">order_name = #{orderName},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteOrderInfoById" parameterType="Long">
+        delete from phm_order_info where id = #{id}
+    </delete>
+
+    <delete id="deleteOrderInfoByIds" parameterType="String">
+        delete from phm_order_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ProductMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="Product" id="ProductResult">
         <result property="id"    column="id"    />
         <result property="parentId"    column="parent_id"    />
+        <result property="parentName"    column="parent_name"    />
         <result property="name"    column="name"    />
         <result property="snsId"    column="sns_id"    />
         <result property="isDelete"    column="is_delete"    />
@@ -17,20 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProductVo">
-        select id, parent_id, name, sns_id, is_delete, create_by, create_time, update_by, update_time from phm_product
+        select id, parent_id, parent_name, name, sns_id, is_delete, create_by, create_time, update_by, update_time from phm_product
     </sql>
 
     <select id="selectProductList" parameterType="Product" resultMap="ProductResult">
         <include refid="selectProductVo"/>
         <where>  
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="parentName != null  and parentName != ''"> and parent_name like concat('%', #{parentName}, '%')</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="snsId != null  and snsId != ''"> and sns_id = #{snsId}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     
@@ -43,7 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into phm_product
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="parentId != null">parent_id,</if>
-            <if test="name != null and name != ''">name,</if>
+            <if test="parentName != null">parent_name,</if>
+            <if test="name != null">name,</if>
             <if test="snsId != null">sns_id,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createBy != null">create_by,</if>
@@ -53,7 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null">#{parentId},</if>
-            <if test="name != null and name != ''">#{name},</if>
+            <if test="parentName != null">#{parentName},</if>
+            <if test="name != null">#{name},</if>
             <if test="snsId != null">#{snsId},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -67,7 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update phm_product
         <trim prefix="SET" suffixOverrides=",">
             <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="parentName != null">parent_name = #{parentName},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="snsId != null">sns_id = #{snsId},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createBy != null">create_by = #{createBy},</if>