单机信息

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

@@ -1,91 +0,0 @@
-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.Aeroplane;
-import com.phm.manage.service.IAeroplaneService;
-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-22
- */
-@RestController
-@RequestMapping("/manage/aeroplane")
-public class AeroplaneController extends BaseController {
-    @Autowired
-    private IAeroplaneService aeroplaneService;
-
-    /**
-     * 查询单机信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('manage:aeroplane:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Aeroplane aeroplane) {
-        startPage();
-        List<Aeroplane> list = aeroplaneService.selectAeroplaneList(aeroplane);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出单机信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('manage:aeroplane:export')")
-    @Log(title = "单机信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, Aeroplane aeroplane) {
-        List<Aeroplane> list = aeroplaneService.selectAeroplaneList(aeroplane);
-        ExcelUtil<Aeroplane> util = new ExcelUtil<Aeroplane>(Aeroplane.class);
-        util.exportExcel(response, list, "单机信息数据");
-    }
-
-    /**
-     * 获取单机信息详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('manage:aeroplane:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(aeroplaneService.selectAeroplaneById(id));
-    }
-
-    /**
-     * 新增单机信息
-     */
-    @PreAuthorize("@ss.hasPermi('manage:aeroplane:add')")
-    @Log(title = "单机信息", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody Aeroplane aeroplane) {
-        return toAjax(aeroplaneService.insertAeroplane(aeroplane));
-    }
-
-    /**
-     * 修改单机信息
-     */
-    @PreAuthorize("@ss.hasPermi('manage:aeroplane:edit')")
-    @Log(title = "单机信息", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody Aeroplane aeroplane) {
-        return toAjax(aeroplaneService.updateAeroplane(aeroplane));
-    }
-
-    /**
-     * 删除单机信息
-     */
-    @PreAuthorize("@ss.hasPermi('manage:aeroplane:remove')")
-    @Log(title = "单机信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(aeroplaneService.deleteAeroplaneByIds(ids));
-    }
-}

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

@@ -0,0 +1,105 @@
+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.Aircraft;
+import com.phm.manage.domain.Fleet;
+import com.phm.manage.service.IAircraftService;
+import com.phm.manage.service.IFleetService;
+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-22
+ */
+@RestController
+@RequestMapping("/manage/aircraft")
+public class AircraftController extends BaseController {
+    @Autowired
+    private IAircraftService aircraftService;
+
+    @Autowired
+    private IFleetService fleetService;
+
+    /**
+     * 查询单机信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Aircraft aircraft) {
+        startPage();
+        List<Aircraft> list = aircraftService.selectAircraftList(aircraft);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出单机信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:export')")
+    @Log(title = "单机信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Aircraft aircraft) {
+        List<Aircraft> list = aircraftService.selectAircraftList(aircraft);
+        ExcelUtil<Aircraft> util = new ExcelUtil<Aircraft>(Aircraft.class);
+        util.exportExcel(response, list, "单机信息数据");
+    }
+
+    /**
+     * 获取单机信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(aircraftService.selectAircraftById(id));
+    }
+
+    /**
+     * 新增单机信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:add')")
+    @Log(title = "单机信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Aircraft aircraft) {
+        return toAjax(aircraftService.insertAircraft(aircraft));
+    }
+
+    /**
+     * 修改单机信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:edit')")
+    @Log(title = "单机信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Aircraft aircraft) {
+        return toAjax(aircraftService.updateAircraft(aircraft));
+    }
+
+    /**
+     * 删除单机信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:remove')")
+    @Log(title = "单机信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(aircraftService.deleteAircraftByIds(ids));
+    }
+
+    /**
+     * 获取机队信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aircraft:list')")
+    @GetMapping("/fleetList")
+    public AjaxResult fleetList(Fleet fleet) {
+        return success(fleetService.selectFleetList(fleet));
+    }
+}

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

@@ -5,7 +5,9 @@ import com.phm.common.core.controller.BaseController;
 import com.phm.common.core.domain.AjaxResult;
 import com.phm.common.enums.BusinessType;
 import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.Aircraft;
 import com.phm.manage.domain.Product;
+import com.phm.manage.service.IAircraftService;
 import com.phm.manage.service.IProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,6 +28,9 @@ public class ProductController extends BaseController {
     @Autowired
     private IProductService productService;
 
+    @Autowired
+    private IAircraftService aircraftService;
+
     /**
      * 查询产品树信息列表
      */
@@ -86,4 +91,13 @@ public class ProductController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(productService.deleteProductByIds(ids));
     }
+
+    /**
+     * 获取单机信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:aeroplane:list')")
+    @GetMapping("/aircraftList")
+    public AjaxResult fleetList(Aircraft aircraft) {
+        return success(aircraftService.selectAircraftList(aircraft));
+    }
 }

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

@@ -1,146 +0,0 @@
-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_aeroplane
- *
- * @author phm
- * @date 2023-08-22
- */
-public class Aeroplane extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一ID
-     */
-    private Long id;
-
-    /**
-     * 名称
-     */
-    @Excel(name = "名称")
-    private String name;
-
-    /**
-     * 型号
-     */
-    @Excel(name = "型号")
-    private String modelNumber;
-
-    /**
-     * 数据是否删除（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 setModelNumber(String modelNumber) {
-        this.modelNumber = modelNumber;
-    }
-
-    public String getModelNumber() {
-        return modelNumber;
-    }
-
-    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("modelNumber", getModelNumber())
-                .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

@@ -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_aeroplane
+ *
+ * @author phm
+ * @date 2023-09-01
+ */
+public class Aircraft extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @Excel(name = "名称")
+    private String name;
+
+    /**
+     * 机号
+     */
+    @Excel(name = "机号")
+    private String number;
+
+    /**
+     * 归属机队
+     */
+    @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 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)
+                .append("id", getId())
+                .append("name", getName())
+                .append("number", getNumber())
+                .append("fleetId", getFleetId())
+                .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,7 +1,7 @@
 package com.phm.manage.domain;
 
 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;
 
@@ -9,9 +9,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 产品树信息对象 phm_product
  *
  * @author phm
- * @date 2023-08-31
+ * @date 2023-09-01
  */
-public class Product extends TreeEntity {
+public class Product extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -19,6 +19,24 @@ public class Product extends TreeEntity {
      */
     private Long id;
 
+    /**
+     * 父ID
+     */
+    @Excel(name = "父ID")
+    private Long parentId;
+
+    /**
+     * 归属
+     */
+    @Excel(name = "归属")
+    private String parentName;
+
+    /**
+     * 祖父列表
+     */
+    @Excel(name = "祖父列表")
+    private String ancestors;
+
     /**
      * 产品名称
      */
@@ -34,6 +52,7 @@ public class Product extends TreeEntity {
     /**
      * 数据是否删除（1：删除，0有效）
      */
+    @Excel(name = "数据是否删除", readConverterExp = "1=：删除，0有效")
     private Long isDelete;
 
     public void setId(Long id) {
@@ -44,6 +63,30 @@ 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 setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() {
+        return ancestors;
+    }
+
     public void setName(String name) {
         this.name = name;
     }
@@ -73,6 +116,8 @@ public class Product extends TreeEntity {
         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())

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/AeroplaneMapper.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/AircraftMapper.java

@@ -1,6 +1,6 @@
 package com.phm.manage.mapper;
 
-import com.phm.manage.domain.Aeroplane;
+import com.phm.manage.domain.Aircraft;
 
 import java.util.List;
 
@@ -10,38 +10,38 @@ import java.util.List;
  * @author phm
  * @date 2023-08-22
  */
-public interface AeroplaneMapper {
+public interface AircraftMapper {
     /**
      * 查询单机信息
      *
      * @param id 单机信息主键
      * @return 单机信息
      */
-    public Aeroplane selectAeroplaneById(Long id);
+    public Aircraft selectAircraftById(Long id);
 
     /**
      * 查询单机信息列表
      *
-     * @param aeroplane 单机信息
+     * @param Aircraft 单机信息
      * @return 单机信息集合
      */
-    public List<Aeroplane> selectAeroplaneList(Aeroplane aeroplane);
+    public List<Aircraft> selectAircraftList(Aircraft Aircraft);
 
     /**
      * 新增单机信息
      *
-     * @param aeroplane 单机信息
+     * @param Aircraft 单机信息
      * @return 结果
      */
-    public int insertAeroplane(Aeroplane aeroplane);
+    public int insertAircraft(Aircraft Aircraft);
 
     /**
      * 修改单机信息
      *
-     * @param aeroplane 单机信息
+     * @param Aircraft 单机信息
      * @return 结果
      */
-    public int updateAeroplane(Aeroplane aeroplane);
+    public int updateAircraft(Aircraft Aircraft);
 
     /**
      * 删除单机信息
@@ -49,7 +49,7 @@ public interface AeroplaneMapper {
      * @param id 单机信息主键
      * @return 结果
      */
-    public int deleteAeroplaneById(Long id);
+    public int deleteAircraftById(Long id);
 
     /**
      * 批量删除单机信息
@@ -57,5 +57,5 @@ public interface AeroplaneMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAeroplaneByIds(Long[] ids);
+    public int deleteAircraftByIds(Long[] ids);
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IAeroplaneService.java → PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IAircraftService.java

@@ -1,6 +1,6 @@
 package com.phm.manage.service;
 
-import com.phm.manage.domain.Aeroplane;
+import com.phm.manage.domain.Aircraft;
 
 import java.util.List;
 
@@ -10,38 +10,38 @@ import java.util.List;
  * @author phm
  * @date 2023-08-22
  */
-public interface IAeroplaneService {
+public interface IAircraftService {
     /**
      * 查询单机信息
      *
      * @param id 单机信息主键
      * @return 单机信息
      */
-    public Aeroplane selectAeroplaneById(Long id);
+    public Aircraft selectAircraftById(Long id);
 
     /**
      * 查询单机信息列表
      *
-     * @param aeroplane 单机信息
+     * @param aircraft 单机信息
      * @return 单机信息集合
      */
-    public List<Aeroplane> selectAeroplaneList(Aeroplane aeroplane);
+    public List<Aircraft> selectAircraftList(Aircraft aircraft);
 
     /**
      * 新增单机信息
      *
-     * @param aeroplane 单机信息
+     * @param aircraft 单机信息
      * @return 结果
      */
-    public int insertAeroplane(Aeroplane aeroplane);
+    public int insertAircraft(Aircraft aircraft);
 
     /**
      * 修改单机信息
      *
-     * @param aeroplane 单机信息
+     * @param aircraft 单机信息
      * @return 结果
      */
-    public int updateAeroplane(Aeroplane aeroplane);
+    public int updateAircraft(Aircraft aircraft);
 
     /**
      * 批量删除单机信息
@@ -49,7 +49,7 @@ public interface IAeroplaneService {
      * @param ids 需要删除的单机信息主键集合
      * @return 结果
      */
-    public int deleteAeroplaneByIds(Long[] ids);
+    public int deleteAircraftByIds(Long[] ids);
 
     /**
      * 删除单机信息信息
@@ -57,5 +57,5 @@ public interface IAeroplaneService {
      * @param id 单机信息主键
      * @return 结果
      */
-    public int deleteAeroplaneById(Long id);
+    public int deleteAircraftById(Long id);
 }

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

@@ -1,87 +0,0 @@
-package com.phm.manage.service.impl;
-
-import com.phm.manage.domain.Aeroplane;
-import com.phm.manage.mapper.AeroplaneMapper;
-import com.phm.manage.service.IAeroplaneService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 单机信息Service业务层处理
- *
- * @author phm
- * @date 2023-08-22
- */
-@Service
-public class AeroplaneServiceImpl implements IAeroplaneService {
-    @Autowired
-    private AeroplaneMapper aeroplaneMapper;
-
-    /**
-     * 查询单机信息
-     *
-     * @param id 单机信息主键
-     * @return 单机信息
-     */
-    @Override
-    public Aeroplane selectAeroplaneById(Long id) {
-        return aeroplaneMapper.selectAeroplaneById(id);
-    }
-
-    /**
-     * 查询单机信息列表
-     *
-     * @param aeroplane 单机信息
-     * @return 单机信息
-     */
-    @Override
-    public List<Aeroplane> selectAeroplaneList(Aeroplane aeroplane) {
-        return aeroplaneMapper.selectAeroplaneList(aeroplane);
-    }
-
-    /**
-     * 新增单机信息
-     *
-     * @param aeroplane 单机信息
-     * @return 结果
-     */
-    @Override
-    public int insertAeroplane(Aeroplane aeroplane) {
-        return aeroplaneMapper.insertAeroplane(aeroplane);
-    }
-
-    /**
-     * 修改单机信息
-     *
-     * @param aeroplane 单机信息
-     * @return 结果
-     */
-    @Override
-    public int updateAeroplane(Aeroplane aeroplane) {
-        return aeroplaneMapper.updateAeroplane(aeroplane);
-    }
-
-    /**
-     * 批量删除单机信息
-     *
-     * @param ids 需要删除的单机信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAeroplaneByIds(Long[] ids) {
-        return aeroplaneMapper.deleteAeroplaneByIds(ids);
-    }
-
-    /**
-     * 删除单机信息信息
-     *
-     * @param id 单机信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAeroplaneById(Long id) {
-        return aeroplaneMapper.deleteAeroplaneById(id);
-    }
-}

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

@@ -0,0 +1,87 @@
+package com.phm.manage.service.impl;
+
+import com.phm.manage.domain.Aircraft;
+import com.phm.manage.mapper.AircraftMapper;
+import com.phm.manage.service.IAircraftService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 单机信息Service业务层处理
+ *
+ * @author phm
+ * @date 2023-08-22
+ */
+@Service
+public class AircraftServiceImpl implements IAircraftService {
+    @Autowired
+    private AircraftMapper aircraftMapper;
+
+    /**
+     * 查询单机信息
+     *
+     * @param id 单机信息主键
+     * @return 单机信息
+     */
+    @Override
+    public Aircraft selectAircraftById(Long id) {
+        return aircraftMapper.selectAircraftById(id);
+    }
+
+    /**
+     * 查询单机信息列表
+     *
+     * @param aircraft 单机信息
+     * @return 单机信息
+     */
+    @Override
+    public List<Aircraft> selectAircraftList(Aircraft aircraft) {
+        return aircraftMapper.selectAircraftList(aircraft);
+    }
+
+    /**
+     * 新增单机信息
+     *
+     * @param aircraft 单机信息
+     * @return 结果
+     */
+    @Override
+    public int insertAircraft(Aircraft aircraft) {
+        return aircraftMapper.insertAircraft(aircraft);
+    }
+
+    /**
+     * 修改单机信息
+     *
+     * @param aircraft 单机信息
+     * @return 结果
+     */
+    @Override
+    public int updateAircraft(Aircraft aircraft) {
+        return aircraftMapper.updateAircraft(aircraft);
+    }
+
+    /**
+     * 批量删除单机信息
+     *
+     * @param ids 需要删除的单机信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAircraftByIds(Long[] ids) {
+        return aircraftMapper.deleteAircraftByIds(ids);
+    }
+
+    /**
+     * 删除单机信息信息
+     *
+     * @param id 单机信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAircraftById(Long id) {
+        return aircraftMapper.deleteAircraftById(id);
+    }
+}

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

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.Product;
 import com.phm.manage.mapper.ProductMapper;
 import com.phm.manage.service.IProductService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +51,13 @@ public class ProductServiceImpl implements IProductService {
      */
     @Override
     public int insertProduct(Product product) {
-        product.setCreateTime(DateUtils.getNowDate());
+        Product pr = productMapper.selectProductById(product.getParentId());
+        if (ObjectUtils.isEmpty(pr)) {
+            product.setAncestors(String.valueOf(product.getParentId()));
+        } else {
+            product.setAncestors(pr.getAncestors() + "," + product.getParentId());
+        }
+        product.initCreatInfo();
         return productMapper.insertProduct(product);
     }
 
@@ -62,7 +69,7 @@ public class ProductServiceImpl implements IProductService {
      */
     @Override
     public int updateProduct(Product product) {
-        product.setUpdateTime(DateUtils.getNowDate());
+        product.initUpdateInfo();
         return productMapper.updateProduct(product);
     }
 

PHM-admin/phm-manage/src/main/resources/mapper/manage/AeroplaneMapper.xml → PHM-admin/phm-manage/src/main/resources/mapper/manage/AircraftMapper.xml

@@ -1,13 +1,14 @@
 <?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.AeroplaneMapper">
-    
-    <resultMap type="Aeroplane" id="AeroplaneResult">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.phm.manage.mapper.AircraftMapper">
+
+    <resultMap type="Aircraft" id="AircraftResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
-        <result property="modelNumber"    column="model_number"    />
+        <result property="number"    column="number"    />
+        <result property="fleetId"    column="fleet_id"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -15,55 +16,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectAeroplaneVo">
-        select id, name, model_number, is_delete, create_by, create_time, update_by, update_time from phm_aeroplane
+    <sql id="selectAircraftVo">
+        select id, name, number, fleet_id, is_delete, create_by, create_time, update_by, update_time from phm_aircraft
     </sql>
 
-    <select id="selectAeroplaneList" parameterType="Aeroplane" resultMap="AeroplaneResult">
-        <include refid="selectAeroplaneVo"/>
-        <where>  
+    <select id="selectAircraftList" parameterType="Aircraft" resultMap="AircraftResult">
+        <include refid="selectAircraftVo"/>
+        <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="modelNumber != null  and modelNumber != ''"> and model_number = #{modelNumber}</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>
+            <if test="number != null  and number != ''"> and number like concat('%', #{number}, '%')</if>
+            <if test="fleetId != null  and fleetId != ''"> and fleet_id = #{fleetId}</if>
         </where>
     </select>
-    
-    <select id="selectAeroplaneById" parameterType="Long" resultMap="AeroplaneResult">
-        <include refid="selectAeroplaneVo"/>
+
+    <select id="selectAircraftById" parameterType="Long" resultMap="AircraftResult">
+        <include refid="selectAircraftVo"/>
         where id = #{id}
     </select>
-        
-    <insert id="insertAeroplane" parameterType="Aeroplane" useGeneratedKeys="true" keyProperty="id">
-        insert into phm_aeroplane
+
+    <insert id="insertAircraft" parameterType="Aircraft" useGeneratedKeys="true" keyProperty="id">
+        insert into phm_aircraft
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
-            <if test="modelNumber != null">model_number,</if>
+            <if test="number != null">number,</if>
+            <if test="fleetId != null">fleet_id,</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>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
-            <if test="modelNumber != null">#{modelNumber},</if>
+            <if test="number != null">#{number},</if>
+            <if test="fleetId != null">#{fleetId},</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>
+        </trim>
     </insert>
 
-    <update id="updateAeroplane" parameterType="Aeroplane">
-        update phm_aeroplane
+    <update id="updateAircraft" parameterType="Aircraft">
+        update phm_aircraft
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
-            <if test="modelNumber != null">model_number = #{modelNumber},</if>
+            <if test="number != null">number = #{number},</if>
+            <if test="fleetId != null">fleet_id = #{fleetId},</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>
@@ -73,12 +73,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAeroplaneById" parameterType="Long">
-        delete from phm_aeroplane where id = #{id}
+    <delete id="deleteAircraftById" parameterType="Long">
+        delete
+        from phm_aircraft
+        where id = #{id}
     </delete>
 
-    <delete id="deleteAeroplaneByIds" parameterType="String">
-        delete from phm_aeroplane where id in 
+    <delete id="deleteAircraftByIds" parameterType="String">
+        delete from phm_aircraft where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -1,12 +1,14 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.manage.mapper.ProductMapper">
-    
+
     <resultMap type="Product" id="ProductResult">
         <result property="id"    column="id"    />
         <result property="parentId"    column="parent_id"    />
+        <result property="parentName"    column="parent_name"    />
+        <result property="ancestors"    column="ancestors"    />
         <result property="name"    column="name"    />
         <result property="snsId"    column="sns_id"    />
         <result property="isDelete"    column="is_delete"    />
@@ -17,27 +19,32 @@ 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, ancestors, 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>  
+        <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="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</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>
         </where>
     </select>
-    
+
     <select id="selectProductById" parameterType="Long" resultMap="ProductResult">
         <include refid="selectProductVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertProduct" parameterType="Product" useGeneratedKeys="true" keyProperty="id">
         insert into phm_product
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="parentId != null">parent_id,</if>
+            <if test="parentName != null">parent_name,</if>
+            <if test="ancestors != null">ancestors,</if>
             <if test="name != null">name,</if>
             <if test="snsId != null">sns_id,</if>
             <if test="isDelete != null">is_delete,</if>
@@ -45,9 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null">#{parentId},</if>
+            <if test="parentName != null">#{parentName},</if>
+            <if test="ancestors != null">#{ancestors},</if>
             <if test="name != null">#{name},</if>
             <if test="snsId != null">#{snsId},</if>
             <if test="isDelete != null">#{isDelete},</if>
@@ -55,13 +64,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateProduct" parameterType="Product">
         update phm_product
         <trim prefix="SET" suffixOverrides=",">
             <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="parentName != null">parent_name = #{parentName},</if>
+            <if test="ancestors != null">ancestors = #{ancestors},</if>
             <if test="name != null">name = #{name},</if>
             <if test="snsId != null">sns_id = #{snsId},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
@@ -74,11 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteProductById" parameterType="Long">
-        delete from phm_product where id = #{id}
+        delete
+        from phm_product
+        where id = #{id}
     </delete>
 
     <delete id="deleteProductByIds" parameterType="String">
-        delete from phm_product where id in 
+        delete from phm_product where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>