通讯3次、托盘、点位

zhmes-agecal-admin/src/main/java/com/zehong/web/controller/equipment/TPointInfoController.java

 package com.zehong.web.controller.equipment;
 
 import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +24,7 @@ import com.zehong.common.core.page.TableDataInfo;
  * 老化层点位信息Controller
  * 
  * @author zehong
- * @date 2025-05-28
+ * @date 2025-06-06
  */
 @RestController
 @RequestMapping("/point")
@@ -35,6 +36,7 @@ public class TPointInfoController extends BaseController
     /**
      * 查询老化层点位信息列表
      */
+    @PreAuthorize("@ss.hasPermi('point:point:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPointInfo tPointInfo)
     {
@@ -46,6 +48,7 @@ public class TPointInfoController extends BaseController
     /**
      * 导出老化层点位信息列表
      */
+    @PreAuthorize("@ss.hasPermi('point:point:export')")
     @Log(title = "老化层点位信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPointInfo tPointInfo)
@@ -58,6 +61,7 @@ public class TPointInfoController extends BaseController
     /**
      * 获取老化层点位信息详细信息
      */
+    @PreAuthorize("@ss.hasPermi('point:point:query')")
     @GetMapping(value = "/{fPointId}")
     public AjaxResult getInfo(@PathVariable("fPointId") Long fPointId)
     {
@@ -67,6 +71,7 @@ public class TPointInfoController extends BaseController
     /**
      * 新增老化层点位信息
      */
+    @PreAuthorize("@ss.hasPermi('point:point:add')")
     @Log(title = "老化层点位信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPointInfo tPointInfo)
@@ -77,6 +82,7 @@ public class TPointInfoController extends BaseController
     /**
      * 修改老化层点位信息
      */
+    @PreAuthorize("@ss.hasPermi('point:point:edit')")
     @Log(title = "老化层点位信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPointInfo tPointInfo)
@@ -87,6 +93,7 @@ public class TPointInfoController extends BaseController
     /**
      * 删除老化层点位信息
      */
+    @PreAuthorize("@ss.hasPermi('point:point:remove')")
     @Log(title = "老化层点位信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{fPointIds}")
     public AjaxResult remove(@PathVariable Long[] fPointIds)

zhmes-agecal-admin/src/main/java/com/zehong/web/controller/equipment/TTrayInfoController.java

+package com.zehong.web.controller.equipment;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TTrayInfo;
+import com.zehong.system.service.ITTrayInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 托盘信息Controller
+ * 
+ * @author zehong
+ * @date 2025-06-06
+ */
+@RestController
+@RequestMapping("/tray")
+public class TTrayInfoController extends BaseController
+{
+    @Autowired
+    private ITTrayInfoService tTrayInfoService;
+
+    /**
+     * 查询托盘信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('tray:tray:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTrayInfo tTrayInfo)
+    {
+        startPage();
+        List<TTrayInfo> list = tTrayInfoService.selectTTrayInfoList(tTrayInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出托盘信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('tray:tray:export')")
+    @Log(title = "托盘信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTrayInfo tTrayInfo)
+    {
+        List<TTrayInfo> list = tTrayInfoService.selectTTrayInfoList(tTrayInfo);
+        ExcelUtil<TTrayInfo> util = new ExcelUtil<TTrayInfo>(TTrayInfo.class);
+        return util.exportExcel(list, "托盘信息数据");
+    }
+
+    /**
+     * 获取托盘信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('tray:tray:query')")
+    @GetMapping(value = "/{fTrayId}")
+    public AjaxResult getInfo(@PathVariable("fTrayId") Long fTrayId)
+    {
+        return AjaxResult.success(tTrayInfoService.selectTTrayInfoById(fTrayId));
+    }
+
+    /**
+     * 新增托盘信息
+     */
+    @PreAuthorize("@ss.hasPermi('tray:tray:add')")
+    @Log(title = "托盘信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTrayInfo tTrayInfo)
+    {
+        return toAjax(tTrayInfoService.insertTTrayInfo(tTrayInfo));
+    }
+
+    /**
+     * 修改托盘信息
+     */
+    @PreAuthorize("@ss.hasPermi('tray:tray:edit')")
+    @Log(title = "托盘信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTrayInfo tTrayInfo)
+    {
+        return toAjax(tTrayInfoService.updateTTrayInfo(tTrayInfo));
+    }
+
+    /**
+     * 删除托盘信息
+     */
+    @PreAuthorize("@ss.hasPermi('tray:tray:remove')")
+    @Log(title = "托盘信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fTrayIds}")
+    public AjaxResult remove(@PathVariable Long[] fTrayIds)
+    {
+        return toAjax(tTrayInfoService.deleteTTrayInfoByIds(fTrayIds));
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TPointInfo.java

@@ -11,7 +11,7 @@ import com.zehong.common.core.domain.BaseEntity;
  * 老化层点位信息对象 t_point_info
  * 
  * @author zehong
- * @date 2025-05-28
+ * @date 2025-06-06
  */
 public class TPointInfo extends BaseEntity
 {
@@ -20,9 +20,9 @@ public class TPointInfo extends BaseEntity
     /** 点位ID */
     private Long fPointId;
 
-    /** 所属层ID */
-    @Excel(name = "所属层ID")
-    private Long fStoreyId;
+    /** 所属托盘ID */
+    @Excel(name = "所属托盘ID")
+    private Long fTrayId;
 
     /** 点位编号 */
     @Excel(name = "点位编号")
@@ -30,7 +30,7 @@ public class TPointInfo extends BaseEntity
 
     /** 绑定PCBA设备号 */
     @Excel(name = "绑定PCBA设备号")
-    private Long fDeviceCode;
+    private String fPcbaCode;
 
     /** 点位状态：0在线，1离线，2故障 */
     @Excel(name = "点位状态：0在线，1离线，2故障")
@@ -41,15 +41,24 @@ public class TPointInfo extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fCreateTime;
 
-    /** 更新时间 */
+    /** 板子状态：0预热，1正常，3传感器故障，4报警，5通讯故障 */
+    @Excel(name = "板子状态：0预热，1正常，3传感器故障，4报警，5通讯故障")
+    private String fPcbaStatus;
+
+    /** 绑定时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBindingTime;
+
+    /** 解绑时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fUpdateTime;
+    @Excel(name = "解绑时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUnbindingTime;
 
-    /** 报警时间 */
+    /** 上料时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fAlarmTime;
+    @Excel(name = "上料时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fLoadingTime;
 
     public void setfPointId(Long fPointId) 
     {
@@ -60,14 +69,14 @@ public class TPointInfo extends BaseEntity
     {
         return fPointId;
     }
-    public void setfStoreyId(Long fStoreyId) 
+    public void setfTrayId(Long fTrayId) 
     {
-        this.fStoreyId = fStoreyId;
+        this.fTrayId = fTrayId;
     }
 
-    public Long getfStoreyId() 
+    public Long getfTrayId() 
     {
-        return fStoreyId;
+        return fTrayId;
     }
     public void setfPointCode(String fPointCode) 
     {
@@ -78,14 +87,14 @@ public class TPointInfo extends BaseEntity
     {
         return fPointCode;
     }
-    public void setfDeviceCode(Long fDeviceCode) 
+    public void setfPcbaCode(String fPcbaCode) 
     {
-        this.fDeviceCode = fDeviceCode;
+        this.fPcbaCode = fPcbaCode;
     }
 
-    public Long getfDeviceCode() 
+    public String getfPcbaCode() 
     {
-        return fDeviceCode;
+        return fPcbaCode;
     }
     public void setfStatus(String fStatus) 
     {
@@ -105,36 +114,56 @@ public class TPointInfo extends BaseEntity
     {
         return fCreateTime;
     }
-    public void setfUpdateTime(Date fUpdateTime) 
+    public void setfPcbaStatus(String fPcbaStatus) 
+    {
+        this.fPcbaStatus = fPcbaStatus;
+    }
+
+    public String getfPcbaStatus() 
+    {
+        return fPcbaStatus;
+    }
+    public void setfBindingTime(Date fBindingTime) 
+    {
+        this.fBindingTime = fBindingTime;
+    }
+
+    public Date getfBindingTime() 
+    {
+        return fBindingTime;
+    }
+    public void setfUnbindingTime(Date fUnbindingTime) 
     {
-        this.fUpdateTime = fUpdateTime;
+        this.fUnbindingTime = fUnbindingTime;
     }
 
-    public Date getfUpdateTime() 
+    public Date getfUnbindingTime() 
     {
-        return fUpdateTime;
+        return fUnbindingTime;
     }
-    public void setfAlarmTime(Date fAlarmTime) 
+    public void setfLoadingTime(Date fLoadingTime) 
     {
-        this.fAlarmTime = fAlarmTime;
+        this.fLoadingTime = fLoadingTime;
     }
 
-    public Date getfAlarmTime() 
+    public Date getfLoadingTime() 
     {
-        return fAlarmTime;
+        return fLoadingTime;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("fPointId", getfPointId())
-            .append("fStoreyId", getfStoreyId())
+            .append("fTrayId", getfTrayId())
             .append("fPointCode", getfPointCode())
-            .append("fDeviceCode", getfDeviceCode())
+            .append("fPcbaCode", getfPcbaCode())
             .append("fStatus", getfStatus())
             .append("fCreateTime", getfCreateTime())
-            .append("fUpdateTime", getfUpdateTime())
-            .append("fAlarmTime", getfAlarmTime())
+            .append("fPcbaStatus", getfPcbaStatus())
+            .append("fBindingTime", getfBindingTime())
+            .append("fUnbindingTime", getfUnbindingTime())
+            .append("fLoadingTime", getfLoadingTime())
             .toString();
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TStoreyInfo.java

@@ -28,10 +28,6 @@ public class TStoreyInfo extends BaseEntity
     @Excel(name = "层编号")
     private String fStoreyCode;
 
-    /** 绑定托盘编号 */
-    @Excel(name = "绑定托盘编号")
-    private String fTrayCode;
-
     /** IP地址 */
     @Excel(name = "IP地址")
     private String fIp;
@@ -40,8 +36,8 @@ public class TStoreyInfo extends BaseEntity
     @Excel(name = "端口号")
     private Integer fPort;
 
-    /** 状态：0空闲，1运行，2故障 */
-    @Excel(name = "状态：0空闲，1运行，2故障")
+    /** 状态：0空闲，1运行，2故障，3断电*/
+    @Excel(name = "状态：0空闲，1运行，2故障，3断电")
     private String fStatus;
 
     /** 更新时间 */
@@ -86,15 +82,7 @@ public class TStoreyInfo extends BaseEntity
     {
         return fStoreyCode;
     }
-    public void setfTrayCode(String fTrayCode)
-    {
-        this.fTrayCode = fTrayCode;
-    }
 
-    public String getfTrayCode()
-    {
-        return fTrayCode;
-    }
     public void setfIp(String fIp) 
     {
         this.fIp = fIp;
@@ -156,7 +144,6 @@ public class TStoreyInfo extends BaseEntity
             .append("fStoreyId", getfStoreyId())
             .append("fEquipmentId", getfEquipmentId())
             .append("fStoreyCode", getfStoreyCode())
-            .append("fTrayCode", getfTrayCode())
             .append("fIp", getfIp())
             .append("fStatus", getfStatus())
             .append("fPort", getfPort())

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TTrayInfo.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 托盘信息对象 t_tray_info
+ * 
+ * @author zehong
+ * @date 2025-06-06
+ */
+public class TTrayInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 托盘id */
+    private Long fTrayId;
+
+    /** 托盘编号 */
+    @Excel(name = "托盘编号")
+    private String fTrayCode;
+
+    /** 绑定层编号 */
+    @Excel(name = "绑定层编号")
+    private String fStoreyCode;
+
+    /** 状态：0.空闲 1.运行 */
+    @Excel(name = "状态：0.空闲 1.运行")
+    private String fStatus;
+
+    /** 绑定时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBindingTime;
+
+    /** 解绑时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "解绑时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUnbindingTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    public void setfTrayId(Long fTrayId) 
+    {
+        this.fTrayId = fTrayId;
+    }
+
+    public Long getfTrayId() 
+    {
+        return fTrayId;
+    }
+    public void setfTrayCode(String fTrayCode) 
+    {
+        this.fTrayCode = fTrayCode;
+    }
+
+    public String getfTrayCode() 
+    {
+        return fTrayCode;
+    }
+    public void setfStoreyCode(String fStoreyCode) 
+    {
+        this.fStoreyCode = fStoreyCode;
+    }
+
+    public String getfStoreyCode() 
+    {
+        return fStoreyCode;
+    }
+    public void setfStatus(String fStatus) 
+    {
+        this.fStatus = fStatus;
+    }
+
+    public String getfStatus() 
+    {
+        return fStatus;
+    }
+    public void setfBindingTime(Date fBindingTime) 
+    {
+        this.fBindingTime = fBindingTime;
+    }
+
+    public Date getfBindingTime() 
+    {
+        return fBindingTime;
+    }
+    public void setfUnbindingTime(Date fUnbindingTime) 
+    {
+        this.fUnbindingTime = fUnbindingTime;
+    }
+
+    public Date getfUnbindingTime() 
+    {
+        return fUnbindingTime;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fTrayId", getfTrayId())
+            .append("fTrayCode", getfTrayCode())
+            .append("fStoreyCode", getfStoreyCode())
+            .append("fStatus", getfStatus())
+            .append("fBindingTime", getfBindingTime())
+            .append("fUnbindingTime", getfUnbindingTime())
+            .append("fCreateTime", getfCreateTime())
+            .toString();
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/mapper/TPointInfoMapper.java

@@ -7,7 +7,7 @@ import com.zehong.system.domain.TPointInfo;
  * 老化层点位信息Mapper接口
  * 
  * @author zehong
- * @date 2025-05-28
+ * @date 2025-06-06
  */
 public interface TPointInfoMapper 
 {

zhmes-agecal-system/src/main/java/com/zehong/system/mapper/TTrayInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TTrayInfo;
+
+/**
+ * 托盘信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-06-06
+ */
+public interface TTrayInfoMapper 
+{
+    /**
+     * 查询托盘信息
+     * 
+     * @param fTrayId 托盘信息ID
+     * @return 托盘信息
+     */
+    public TTrayInfo selectTTrayInfoById(Long fTrayId);
+
+    /**
+     * 查询托盘信息列表
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 托盘信息集合
+     */
+    public List<TTrayInfo> selectTTrayInfoList(TTrayInfo tTrayInfo);
+
+    /**
+     * 新增托盘信息
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 结果
+     */
+    public int insertTTrayInfo(TTrayInfo tTrayInfo);
+
+    /**
+     * 修改托盘信息
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 结果
+     */
+    public int updateTTrayInfo(TTrayInfo tTrayInfo);
+
+    /**
+     * 删除托盘信息
+     * 
+     * @param fTrayId 托盘信息ID
+     * @return 结果
+     */
+    public int deleteTTrayInfoById(Long fTrayId);
+
+    /**
+     * 批量删除托盘信息
+     * 
+     * @param fTrayIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTrayInfoByIds(Long[] fTrayIds);
+}

zhmes-agecal-system/src/main/java/com/zehong/system/service/ITPointInfoService.java

@@ -7,7 +7,7 @@ import com.zehong.system.domain.TPointInfo;
  * 老化层点位信息Service接口
  * 
  * @author zehong
- * @date 2025-05-28
+ * @date 2025-06-06
  */
 public interface ITPointInfoService 
 {

zhmes-agecal-system/src/main/java/com/zehong/system/service/ITTrayInfoService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TTrayInfo;
+
+/**
+ * 托盘信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-06-06
+ */
+public interface ITTrayInfoService 
+{
+    /**
+     * 查询托盘信息
+     * 
+     * @param fTrayId 托盘信息ID
+     * @return 托盘信息
+     */
+    public TTrayInfo selectTTrayInfoById(Long fTrayId);
+
+    /**
+     * 查询托盘信息列表
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 托盘信息集合
+     */
+    public List<TTrayInfo> selectTTrayInfoList(TTrayInfo tTrayInfo);
+
+    /**
+     * 新增托盘信息
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 结果
+     */
+    public int insertTTrayInfo(TTrayInfo tTrayInfo);
+
+    /**
+     * 修改托盘信息
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 结果
+     */
+    public int updateTTrayInfo(TTrayInfo tTrayInfo);
+
+    /**
+     * 批量删除托盘信息
+     * 
+     * @param fTrayIds 需要删除的托盘信息ID
+     * @return 结果
+     */
+    public int deleteTTrayInfoByIds(Long[] fTrayIds);
+
+    /**
+     * 删除托盘信息信息
+     * 
+     * @param fTrayId 托盘信息ID
+     * @return 结果
+     */
+    public int deleteTTrayInfoById(Long fTrayId);
+}

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/TPointInfoServiceImpl.java

@@ -11,7 +11,7 @@ import com.zehong.system.service.ITPointInfoService;
  * 老化层点位信息Service业务层处理
  * 
  * @author zehong
- * @date 2025-05-28
+ * @date 2025-06-06
  */
 @Service
 public class TPointInfoServiceImpl implements ITPointInfoService 

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/TTrayInfoServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TTrayInfoMapper;
+import com.zehong.system.domain.TTrayInfo;
+import com.zehong.system.service.ITTrayInfoService;
+
+/**
+ * 托盘信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-06-06
+ */
+@Service
+public class TTrayInfoServiceImpl implements ITTrayInfoService 
+{
+    @Autowired
+    private TTrayInfoMapper tTrayInfoMapper;
+
+    /**
+     * 查询托盘信息
+     * 
+     * @param fTrayId 托盘信息ID
+     * @return 托盘信息
+     */
+    @Override
+    public TTrayInfo selectTTrayInfoById(Long fTrayId)
+    {
+        return tTrayInfoMapper.selectTTrayInfoById(fTrayId);
+    }
+
+    /**
+     * 查询托盘信息列表
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 托盘信息
+     */
+    @Override
+    public List<TTrayInfo> selectTTrayInfoList(TTrayInfo tTrayInfo)
+    {
+        return tTrayInfoMapper.selectTTrayInfoList(tTrayInfo);
+    }
+
+    /**
+     * 新增托盘信息
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 结果
+     */
+    @Override
+    public int insertTTrayInfo(TTrayInfo tTrayInfo)
+    {
+        return tTrayInfoMapper.insertTTrayInfo(tTrayInfo);
+    }
+
+    /**
+     * 修改托盘信息
+     * 
+     * @param tTrayInfo 托盘信息
+     * @return 结果
+     */
+    @Override
+    public int updateTTrayInfo(TTrayInfo tTrayInfo)
+    {
+        return tTrayInfoMapper.updateTTrayInfo(tTrayInfo);
+    }
+
+    /**
+     * 批量删除托盘信息
+     * 
+     * @param fTrayIds 需要删除的托盘信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrayInfoByIds(Long[] fTrayIds)
+    {
+        return tTrayInfoMapper.deleteTTrayInfoByIds(fTrayIds);
+    }
+
+    /**
+     * 删除托盘信息信息
+     * 
+     * @param fTrayId 托盘信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrayInfoById(Long fTrayId)
+    {
+        return tTrayInfoMapper.deleteTTrayInfoById(fTrayId);
+    }
+}

zhmes-agecal-system/src/main/resources/mapper/system/TPointInfoMapper.xml

@@ -6,29 +6,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TPointInfo" id="TPointInfoResult">
         <result property="fPointId"    column="f_point_id"    />
-        <result property="fStoreyId"    column="f_storey_id"    />
+        <result property="fTrayId"    column="f_tray_id"    />
         <result property="fPointCode"    column="f_point_code"    />
-        <result property="fDeviceCode"    column="f_device_code"    />
+        <result property="fPcbaCode"    column="f_pcba_code"    />
         <result property="fStatus"    column="f_status"    />
         <result property="fCreateTime"    column="f_create_time"    />
-        <result property="fUpdateTime"    column="f_update_time"    />
-        <result property="fAlarmTime"    column="f_alarm_time"    />
+        <result property="fPcbaStatus"    column="f_pcba_status"    />
+        <result property="fBindingTime"    column="f_binding_time"    />
+        <result property="fUnbindingTime"    column="f_unbinding_time"    />
+        <result property="fLoadingTime"    column="f_loading_time"    />
     </resultMap>
 
     <sql id="selectTPointInfoVo">
-        select f_point_id, f_storey_id, f_point_code, f_device_code, f_status, f_create_time, f_update_time, f_alarm_time from t_point_info
+        select f_point_id, f_tray_id, f_point_code, f_pcba_code, f_status, f_create_time, f_pcba_status, f_binding_time, f_unbinding_time, f_loading_time from t_point_info
     </sql>
 
     <select id="selectTPointInfoList" parameterType="TPointInfo" resultMap="TPointInfoResult">
         <include refid="selectTPointInfoVo"/>
         <where>  
-            <if test="fStoreyId != null "> and f_storey_id = #{fStoreyId}</if>
+            <if test="fTrayId != null "> and f_tray_id = #{fTrayId}</if>
             <if test="fPointCode != null  and fPointCode != ''"> and f_point_code = #{fPointCode}</if>
-            <if test="fDeviceCode != null "> and f_device_code = #{fDeviceCode}</if>
+            <if test="fPcbaCode != null  and fPcbaCode != ''"> and f_pcba_code = #{fPcbaCode}</if>
             <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
             <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
-            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
-            <if test="fAlarmTime != null "> and f_alarm_time = #{fAlarmTime}</if>
+            <if test="fPcbaStatus != null  and fPcbaStatus != ''"> and f_pcba_status = #{fPcbaStatus}</if>
+            <if test="fBindingTime != null "> and f_binding_time = #{fBindingTime}</if>
+            <if test="fUnbindingTime != null "> and f_unbinding_time = #{fUnbindingTime}</if>
+            <if test="fLoadingTime != null "> and f_loading_time = #{fLoadingTime}</if>
         </where>
     </select>
     
@@ -40,35 +44,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTPointInfo" parameterType="TPointInfo" useGeneratedKeys="true" keyProperty="fPointId">
         insert into t_point_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fStoreyId != null">f_storey_id,</if>
+            <if test="fTrayId != null">f_tray_id,</if>
             <if test="fPointCode != null">f_point_code,</if>
-            <if test="fDeviceCode != null">f_device_code,</if>
+            <if test="fPcbaCode != null">f_pcba_code,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="fCreateTime != null">f_create_time,</if>
-            <if test="fUpdateTime != null">f_update_time,</if>
-            <if test="fAlarmTime != null">f_alarm_time,</if>
+            <if test="fPcbaStatus != null">f_pcba_status,</if>
+            <if test="fBindingTime != null">f_binding_time,</if>
+            <if test="fUnbindingTime != null">f_unbinding_time,</if>
+            <if test="fLoadingTime != null">f_loading_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fStoreyId != null">#{fStoreyId},</if>
+            <if test="fTrayId != null">#{fTrayId},</if>
             <if test="fPointCode != null">#{fPointCode},</if>
-            <if test="fDeviceCode != null">#{fDeviceCode},</if>
+            <if test="fPcbaCode != null">#{fPcbaCode},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="fCreateTime != null">#{fCreateTime},</if>
-            <if test="fUpdateTime != null">#{fUpdateTime},</if>
-            <if test="fAlarmTime != null">#{fAlarmTime},</if>
+            <if test="fPcbaStatus != null">#{fPcbaStatus},</if>
+            <if test="fBindingTime != null">#{fBindingTime},</if>
+            <if test="fUnbindingTime != null">#{fUnbindingTime},</if>
+            <if test="fLoadingTime != null">#{fLoadingTime},</if>
          </trim>
     </insert>
 
     <update id="updateTPointInfo" parameterType="TPointInfo">
         update t_point_info
         <trim prefix="SET" suffixOverrides=",">
-            <if test="fStoreyId != null">f_storey_id = #{fStoreyId},</if>
+            <if test="fTrayId != null">f_tray_id = #{fTrayId},</if>
             <if test="fPointCode != null">f_point_code = #{fPointCode},</if>
-            <if test="fDeviceCode != null">f_device_code = #{fDeviceCode},</if>
+            <if test="fPcbaCode != null">f_pcba_code = #{fPcbaCode},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
-            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
-            <if test="fAlarmTime != null">f_alarm_time = #{fAlarmTime},</if>
+            <if test="fPcbaStatus != null">f_pcba_status = #{fPcbaStatus},</if>
+            <if test="fBindingTime != null">f_binding_time = #{fBindingTime},</if>
+            <if test="fUnbindingTime != null">f_unbinding_time = #{fUnbindingTime},</if>
+            <if test="fLoadingTime != null">f_loading_time = #{fLoadingTime},</if>
         </trim>
         where f_point_id = #{fPointId}
     </update>

zhmes-agecal-system/src/main/resources/mapper/system/TStoreyInfoMapper.xml

@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fStoreyId"    column="f_storey_id"    />
         <result property="fEquipmentId"    column="f_equipment_id"    />
         <result property="fStoreyCode"    column="f_storey_code"    />
-        <result property="fTrayCode"    column="f_tray_code"    />
         <result property="fIp"    column="f_ip"    />
         <result property="fStatus"    column="f_status"    />
         <result property="fPort"    column="f_port"    />
@@ -26,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="fEquipmentId != null "> and f_equipment_id = #{fEquipmentId}</if>
             <if test="fStoreyCode != null  and fStoreyCode != ''"> and f_storey_code = #{fStoreyCode}</if>
-            <if test="fTrayCode != null "> and f_tray_code = #{fTrayCode}</if>
             <if test="fIp != null  and fIp != ''"> and f_ip = #{fIp}</if>
             <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
             <if test="fPort != null "> and f_port = #{fPort}</if>
@@ -52,7 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fStoreyId != null">f_storey_id,</if>
             <if test="fEquipmentId != null">f_equipment_id,</if>
             <if test="fStoreyCode != null">f_storey_code,</if>
-            <if test="fTrayCode != null">f_tray_code,</if>
             <if test="fIp != null">f_ip,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="fPort != null">f_port,</if>
@@ -64,7 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fStoreyId != null">#{fStoreyId},</if>
             <if test="fEquipmentId != null">#{fEquipmentId},</if>
             <if test="fStoreyCode != null">#{fStoreyCode},</if>
-            <if test="fTrayCode != null">#{fTrayCode},</if>
             <if test="fIp != null">#{fIp},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="fPort != null">#{fPort},</if>
@@ -79,7 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="fEquipmentId != null">f_equipment_id = #{fEquipmentId},</if>
             <if test="fStoreyCode != null">f_storey_code = #{fStoreyCode},</if>
-            <if test="fTrayCode != null">f_tray_code = #{fTrayCode},</if>
             <if test="fIp != null">f_ip = #{fIp},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="fPort != null">f_port = #{fPort},</if>

zhmes-agecal-system/src/main/resources/mapper/system/TTrayInfoMapper.xml

+<?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.zehong.system.mapper.TTrayInfoMapper">
+    
+    <resultMap type="TTrayInfo" id="TTrayInfoResult">
+        <result property="fTrayId"    column="f_tray_id"    />
+        <result property="fTrayCode"    column="f_tray_code"    />
+        <result property="fStoreyCode"    column="f_storey_code"    />
+        <result property="fStatus"    column="f_status"    />
+        <result property="fBindingTime"    column="f_binding_time"    />
+        <result property="fUnbindingTime"    column="f_unbinding_time"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+    </resultMap>
+
+    <sql id="selectTTrayInfoVo">
+        select f_tray_id, f_tray_code, f_storey_code, f_status, f_binding_time, f_unbinding_time, f_create_time from t_tray_info
+    </sql>
+
+    <select id="selectTTrayInfoList" parameterType="TTrayInfo" resultMap="TTrayInfoResult">
+        <include refid="selectTTrayInfoVo"/>
+        <where>  
+            <if test="fTrayCode != null  and fTrayCode != ''"> and f_tray_code = #{fTrayCode}</if>
+            <if test="fStoreyCode != null  and fStoreyCode != ''"> and f_storey_code = #{fStoreyCode}</if>
+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
+            <if test="fBindingTime != null "> and f_binding_time = #{fBindingTime}</if>
+            <if test="fUnbindingTime != null "> and f_unbinding_time = #{fUnbindingTime}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTTrayInfoById" parameterType="Long" resultMap="TTrayInfoResult">
+        <include refid="selectTTrayInfoVo"/>
+        where f_tray_id = #{fTrayId}
+    </select>
+        
+    <insert id="insertTTrayInfo" parameterType="TTrayInfo" useGeneratedKeys="true" keyProperty="fTrayId">
+        insert into t_tray_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fTrayCode != null">f_tray_code,</if>
+            <if test="fStoreyCode != null">f_storey_code,</if>
+            <if test="fStatus != null">f_status,</if>
+            <if test="fBindingTime != null">f_binding_time,</if>
+            <if test="fUnbindingTime != null">f_unbinding_time,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fTrayCode != null">#{fTrayCode},</if>
+            <if test="fStoreyCode != null">#{fStoreyCode},</if>
+            <if test="fStatus != null">#{fStatus},</if>
+            <if test="fBindingTime != null">#{fBindingTime},</if>
+            <if test="fUnbindingTime != null">#{fUnbindingTime},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTrayInfo" parameterType="TTrayInfo">
+        update t_tray_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fTrayCode != null">f_tray_code = #{fTrayCode},</if>
+            <if test="fStoreyCode != null">f_storey_code = #{fStoreyCode},</if>
+            <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="fBindingTime != null">f_binding_time = #{fBindingTime},</if>
+            <if test="fUnbindingTime != null">f_unbinding_time = #{fUnbindingTime},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+        </trim>
+        where f_tray_id = #{fTrayId}
+    </update>
+
+    <delete id="deleteTTrayInfoById" parameterType="Long">
+        delete from t_tray_info where f_tray_id = #{fTrayId}
+    </delete>
+
+    <delete id="deleteTTrayInfoByIds" parameterType="String">
+        delete from t_tray_info where f_tray_id in 
+        <foreach item="fTrayId" collection="array" open="(" separator="," close=")">
+            #{fTrayId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zhmes-agecal-web/src/api/tray/tray.js

+import request from '@/utils/request'
+
+// 查询托盘信息列表
+export function listTray(query) {
+  return request({
+    url: '/tray/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询托盘信息详细
+export function getTray(fTrayId) {
+  return request({
+    url: '/tray/' + fTrayId,
+    method: 'get'
+  })
+}
+
+// 新增托盘信息
+export function addTray(data) {
+  return request({
+    url: '/tray',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改托盘信息
+export function updateTray(data) {
+  return request({
+    url: '/tray',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除托盘信息
+export function delTray(fTrayId) {
+  return request({
+    url: '/tray/' + fTrayId,
+    method: 'delete'
+  })
+}
+
+// 导出托盘信息
+export function exportTray(query) {
+  return request({
+    url: '/tray/export',
+    method: 'get',
+    params: query
+  })
+}