老化柜、老化层、点位

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

+package com.zehong.web.controller.equipment;
+
+import com.zehong.common.utils.TCP.TCPClient;
+import com.zehong.system.domain.TEquipmentAlarmData;
+import com.zehong.system.domain.TEquipmentInfo;
+import com.zehong.system.domain.TStoreyInfo;
+import com.zehong.system.service.ITEquipmentAlarmDataService;
+import com.zehong.system.service.ITEquipmentInfoService;
+import com.zehong.system.service.ITStoreyInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 生产设备数据采集
+ *
+ * @author zehong
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/equipmentData")
+public class EquipmentDataCollection {
+    private static final Logger log = LoggerFactory.getLogger(EquipmentDataCollection.class);
+    @Autowired
+    private ITEquipmentInfoService tEquipmentInfoService;
+    @Autowired
+    private ITStoreyInfoService tStoreyInfoService;
+    @Autowired
+    private ITEquipmentAlarmDataService tEquipmentAlarmDataService;
+
+    /**
+     * 老化柜、标定柜巡查
+     */
+    @GetMapping("/equipmentPatrol")
+    public void equipmentPatrol(){
+        String ip = null;
+        Integer port = null;
+
+        // 老化柜通讯
+        String sendMsg = "00010000000601040000000A";
+        String receiveMsg = null;
+
+        TEquipmentInfo equipment = new TEquipmentInfo();
+        equipment.setfEquipmentType("1");
+        List<TEquipmentInfo> equipmentInfos = tEquipmentInfoService.selectTEquipmentInfoList(equipment);
+        try{
+            if(equipmentInfos.size() == 0){
+                log.error("设备列表查询结果为空");
+                throw new Exception("无设备信息！");
+            }
+            if(equipmentInfos.size() > 0){
+                TEquipmentAlarmData alarmData = new TEquipmentAlarmData();
+                for(TEquipmentInfo info : equipmentInfos){
+                    ip = info.getfIp();
+                    port = info.getfPort();
+                    if(ip == null || port == null){
+                        log.error(info.getfEquipmentCode() + "号老化柜ip或端口号为空");
+                    } else {
+                        // 发送并接收数据
+                        receiveMsg = TCPClient.PLCConnect(ip, port, sendMsg);
+                        if(receiveMsg == null){
+                            // 记录异常数据
+                            alarmData.setfAlarmType("01"); //01.老化柜 02.标定柜 03.机械臂 04.老化层
+                            alarmData.setfEquipmentCode(info.getfEquipmentCode());
+                            alarmData.setfAlarmData("2");
+                            tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
+                            // 更新老化柜状态（“0”空闲，“1”运行，“2”故障）
+                            info.setfStatus("2");
+                            tEquipmentInfoService.updateTEquipmentInfo(info);
+                        } else if (receiveMsg.length() == 58){
+                            // 解析服务器返回信息
+                            // 示例：00 01 00 00 00 17 01 04 14 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                            String flag = receiveMsg.substring(18, 58);
+                            if("0000000000000000000000000000000000000000".equals(flag) && !"0".equals(info.getfStatus())){
+                                // 更新老化柜状态（“0”空闲，“1”运行，“2”故障）
+                                info.setfStatus("0");
+                                info.setfUpdateTime(new Date());
+                                tEquipmentInfoService.updateTEquipmentInfo(info);
+                            }else if(!"0000000000000000000000000000000000000000".equals(flag) && "0".equals(info.getfStatus())){
+                                info.setfStatus("1");
+                                info.setfUpdateTime(new Date());
+                                tEquipmentInfoService.updateTEquipmentInfo(info);
+
+                                // 解析层状态
+//                                int startIndex;
+//                                int endIndex;
+//                                int code; //组成老化层编号
+//                                for(startIndex = 18,endIndex = 22,code = 1; endIndex <= receiveMsg.length(); startIndex += 4,endIndex += 4,code++){
+//
+//                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 老化层数据采集
+     */
+    @GetMapping("/agingCabinet")
+    public void agingCabinetData(){
+        String ip = null;
+        Integer port = null;
+
+        // 1.老化层通讯
+        String sendMsg1 = "00010000000601030000000A";
+        String receiveMsg = null;
+
+        // 获取老化层信息
+        Long id = Long.valueOf(1);
+        TStoreyInfo storeyInfo = tStoreyInfoService.selectTStoreyInfoById(id);
+//        List<TStoreyInfo> storeys = tStoreyInfoService.selectTStoreyInfoList(new TStoreyInfo());
+
+        // 获取老化柜信息
+//        TEquipmentInfo equipmentInfo = tEquipmentInfoService.selectTEquipmentInfoById(storeyInfo.getfEquipmentId());
+        try {
+            if (storeyInfo == null) {
+                throw new Exception("无老化层信息！");
+            }
+            ip = storeyInfo.getfIp();
+            port = storeyInfo.getfPort();
+            if(ip == null || port == null){
+                throw new Exception("请确认老化层的IP和端口号是否正确！");
+            }
+            // 发送并接收数据
+            receiveMsg = TCPClient.PLCConnect(ip, port, sendMsg1);
+            if(receiveMsg == null){
+                // 记录异常日志
+
+                throw new Exception(storeyInfo.getfStoreyCode() + "号老化柜通讯故障！");
+            }
+            if (receiveMsg.length() == 58) {
+                // 解析服务器返回信息
+                // 示例：000100000017010314 浓度0000 状态0001 AD值01F7 标定AD值01F7 年07E9 月0005 日0004 时000E 分000F 秒0015
+
+                String value = receiveMsg.substring(22, 26); //板子状态
+                if("0000".equals(value)){
+                    String senMsg2 = "";
+                }
+                Integer.parseInt(value,16);
+
+//                int startIndex;
+//                int endIndex;
+//                int code = 1; //组成老化层编号
+//                for(startIndex = 18,endIndex = 22; endIndex <= receiveMsg.length(); startIndex += 4,endIndex += 4,code++){
+//                    value = receiveMsg.substring(startIndex, endIndex);
+//
+//                        Integer.parseInt(value,16);
+//
+//                }
+            }
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

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

+package com.zehong.web.controller.equipment;
+
+import java.util.List;
+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.TEquipmentInfo;
+import com.zehong.system.service.ITEquipmentInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 生产设备信息Controller
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/equipment")
+public class TEquipmentInfoController extends BaseController
+{
+    @Autowired
+    private ITEquipmentInfoService tEquipmentInfoService;
+
+    /**
+     * 查询生产设备信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TEquipmentInfo tEquipmentInfo)
+    {
+        startPage();
+        List<TEquipmentInfo> list = tEquipmentInfoService.selectTEquipmentInfoList(tEquipmentInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出生产设备信息列表
+     */
+    @Log(title = "生产设备信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEquipmentInfo tEquipmentInfo)
+    {
+        List<TEquipmentInfo> list = tEquipmentInfoService.selectTEquipmentInfoList(tEquipmentInfo);
+        ExcelUtil<TEquipmentInfo> util = new ExcelUtil<TEquipmentInfo>(TEquipmentInfo.class);
+        return util.exportExcel(list, "生产设备信息数据");
+    }
+
+    /**
+     * 获取生产设备信息详细信息
+     */
+    @GetMapping(value = "/{fEquipmentId}")
+    public AjaxResult getInfo(@PathVariable("fEquipmentId") Long fEquipmentId)
+    {
+        return AjaxResult.success(tEquipmentInfoService.selectTEquipmentInfoById(fEquipmentId));
+    }
+
+    /**
+     * 新增生产设备信息
+     */
+    @Log(title = "生产设备信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEquipmentInfo tEquipmentInfo)
+    {
+        return toAjax(tEquipmentInfoService.insertTEquipmentInfo(tEquipmentInfo));
+    }
+
+    /**
+     * 修改生产设备信息
+     */
+    @Log(title = "生产设备信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEquipmentInfo tEquipmentInfo)
+    {
+        return toAjax(tEquipmentInfoService.updateTEquipmentInfo(tEquipmentInfo));
+    }
+
+    /**
+     * 删除生产设备信息
+     */
+    @Log(title = "生产设备信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fEquipmentIds}")
+    public AjaxResult remove(@PathVariable Long[] fEquipmentIds)
+    {
+        return toAjax(tEquipmentInfoService.deleteTEquipmentInfoByIds(fEquipmentIds));
+    }
+}

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.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.TPointInfo;
+import com.zehong.system.service.ITPointInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 老化层点位信息Controller
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/point")
+public class TPointInfoController extends BaseController
+{
+    @Autowired
+    private ITPointInfoService tPointInfoService;
+
+    /**
+     * 查询老化层点位信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TPointInfo tPointInfo)
+    {
+        startPage();
+        List<TPointInfo> list = tPointInfoService.selectTPointInfoList(tPointInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老化层点位信息列表
+     */
+    @Log(title = "老化层点位信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPointInfo tPointInfo)
+    {
+        List<TPointInfo> list = tPointInfoService.selectTPointInfoList(tPointInfo);
+        ExcelUtil<TPointInfo> util = new ExcelUtil<TPointInfo>(TPointInfo.class);
+        return util.exportExcel(list, "老化层点位信息数据");
+    }
+
+    /**
+     * 获取老化层点位信息详细信息
+     */
+    @GetMapping(value = "/{fPointId}")
+    public AjaxResult getInfo(@PathVariable("fPointId") Long fPointId)
+    {
+        return AjaxResult.success(tPointInfoService.selectTPointInfoById(fPointId));
+    }
+
+    /**
+     * 新增老化层点位信息
+     */
+    @Log(title = "老化层点位信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPointInfo tPointInfo)
+    {
+        return toAjax(tPointInfoService.insertTPointInfo(tPointInfo));
+    }
+
+    /**
+     * 修改老化层点位信息
+     */
+    @Log(title = "老化层点位信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPointInfo tPointInfo)
+    {
+        return toAjax(tPointInfoService.updateTPointInfo(tPointInfo));
+    }
+
+    /**
+     * 删除老化层点位信息
+     */
+    @Log(title = "老化层点位信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fPointIds}")
+    public AjaxResult remove(@PathVariable Long[] fPointIds)
+    {
+        return toAjax(tPointInfoService.deleteTPointInfoByIds(fPointIds));
+    }
+}

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

+package com.zehong.web.controller.equipment;
+
+import java.util.List;
+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.TStoreyInfo;
+import com.zehong.system.service.ITStoreyInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 老化层信息Controller
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/storey")
+public class TStoreyInfoController extends BaseController
+{
+    @Autowired
+    private ITStoreyInfoService tStoreyInfoService;
+
+    /**
+     * 查询老化层信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TStoreyInfo tStoreyInfo)
+    {
+        startPage();
+        List<TStoreyInfo> list = tStoreyInfoService.selectTStoreyInfoList(tStoreyInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老化层信息列表
+     */
+    @Log(title = "老化层信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TStoreyInfo tStoreyInfo)
+    {
+        List<TStoreyInfo> list = tStoreyInfoService.selectTStoreyInfoList(tStoreyInfo);
+        ExcelUtil<TStoreyInfo> util = new ExcelUtil<TStoreyInfo>(TStoreyInfo.class);
+        return util.exportExcel(list, "老化层信息数据");
+    }
+
+    /**
+     * 获取老化层信息详细信息
+     */
+    @GetMapping(value = "/{fStoreyId}")
+    public AjaxResult getInfo(@PathVariable("fStoreyId") Long fStoreyId)
+    {
+        return AjaxResult.success(tStoreyInfoService.selectTStoreyInfoById(fStoreyId));
+    }
+
+    /**
+     * 新增老化层信息
+     */
+    @Log(title = "老化层信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TStoreyInfo tStoreyInfo)
+    {
+        return toAjax(tStoreyInfoService.insertTStoreyInfo(tStoreyInfo));
+    }
+
+    /**
+     * 修改老化层信息
+     */
+    @Log(title = "老化层信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TStoreyInfo tStoreyInfo)
+    {
+        return toAjax(tStoreyInfoService.updateTStoreyInfo(tStoreyInfo));
+    }
+
+    /**
+     * 删除老化层信息
+     */
+    @Log(title = "老化层信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fStoreyIds}")
+    public AjaxResult remove(@PathVariable Long[] fStoreyIds)
+    {
+        return toAjax(tStoreyInfoService.deleteTStoreyInfoByIds(fStoreyIds));
+    }
+}

zhmes-agecal-common/src/main/java/com/zehong/common/utils/HexUtils.java

+package com.zehong.common.utils;
+
+public class HexUtils {
+
+    // 十六进制字符串转字节数组
+    public static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i+1), 16));
+        }
+        return data;
+    }
+
+    public static String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02X", b));
+        }
+        return sb.toString();
+    }
+}

zhmes-agecal-common/src/main/java/com/zehong/common/utils/TCP/ReceiverThread.java

+package com.zehong.common.utils.TCP;
+
+import com.zehong.common.utils.HexUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+
+/**
+ * 接收线程类
+ *
+ * @author zehong
+ */
+public class ReceiverThread extends Thread implements Runnable {
+    private static final Logger log = LoggerFactory.getLogger(ReceiverThread.class);
+    public static String hexResponse;
+    private final Socket socket;
+    public ReceiverThread(Socket socket) {
+        this.socket = socket;
+    }
+
+    @Override
+    public void run() {
+        try {
+            InputStream in = socket.getInputStream();
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+
+            while ((bytesRead = in.read(buffer)) != -1) {
+                byte[] responseBytes = new byte[bytesRead];
+                System.arraycopy(buffer, 0, responseBytes, 0, bytesRead);
+
+                // 将接收到的字节转换为十六进制字符串显示
+                hexResponse = HexUtils.bytesToHex(responseBytes);
+                log.info("收到服务器响应: " + hexResponse);
+            }
+        } catch (IOException e) {
+            log.error("接收数据失败: " + e.getMessage());
+        }
+    }
+
+}

zhmes-agecal-common/src/main/java/com/zehong/common/utils/TCP/TCPClient.java

+package com.zehong.common.utils.TCP;
+
+import com.zehong.common.utils.HexUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+
+/**
+ * TCP客户端
+ * 发送指令并接收信息
+ * @author zehong
+ */
+public class TCPClient {
+    private static final Logger log = LoggerFactory.getLogger(TCPClient.class);
+
+    public static String hexResponse;
+
+    public static String PLCConnect(String host, int port, String sendMsg){
+        Socket socket = null;
+        ReceiverThread receiverThread = null;
+        try {
+            socket = new Socket(host, port);
+            log.info("连接到服务器: " + host + ":" + port);
+
+            // 将十六进制字符串转换为字节数组
+            byte[] sendData = HexUtils.hexStringToByteArray(sendMsg);
+
+            // 获取输出流并发送数据
+            OutputStream out = socket.getOutputStream();
+            out.write(sendData);
+            out.flush();
+            log.info("已发送数据: " + sendMsg);
+
+            receiverThread = new ReceiverThread(socket);
+            hexResponse = receiverThread.hexResponse;
+            receiverThread.start();
+//            receiverThread.join();
+
+        } catch (IOException e) {
+            System.err.println("通信异常: " + e.getMessage());
+            e.printStackTrace();
+        }
+
+        return hexResponse;
+    }
+}
\ No newline at end of file

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TEquipmentAlarmData.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_equipment_alarm_data
+ * 
+ * @author zehong
+ * @date 2025-06-03
+ */
+public class TEquipmentAlarmData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long fEquipmentAlarmDataId;
+
+    /** 报警设备编号 */
+    @Excel(name = "报警设备编号")
+    private String fEquipmentCode;
+
+    /** 报警类型 */
+    @Excel(name = "报警类型")
+    private String fAlarmType;
+
+    /** 报警数据 */
+    @Excel(name = "报警数据")
+    private String fAlarmData;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    public void setfEquipmentAlarmDataId(Long fEquipmentAlarmDataId) 
+    {
+        this.fEquipmentAlarmDataId = fEquipmentAlarmDataId;
+    }
+
+    public Long getfEquipmentAlarmDataId() 
+    {
+        return fEquipmentAlarmDataId;
+    }
+    public void setfEquipmentCode(String fEquipmentCode)
+    {
+        this.fEquipmentCode = fEquipmentCode;
+    }
+
+    public String getfEquipmentCode() 
+    {
+        return fEquipmentCode;
+    }
+    public void setfAlarmType(String fAlarmType) 
+    {
+        this.fAlarmType = fAlarmType;
+    }
+
+    public String getfAlarmType() 
+    {
+        return fAlarmType;
+    }
+    public void setfAlarmData(String fAlarmData) 
+    {
+        this.fAlarmData = fAlarmData;
+    }
+
+    public String getfAlarmData() 
+    {
+        return fAlarmData;
+    }
+    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("fEquipmentAlarmDataId", getfEquipmentAlarmDataId())
+            .append("fEquipmentCode", getfEquipmentCode())
+            .append("fAlarmType", getfAlarmType())
+            .append("fAlarmData", getfAlarmData())
+            .append("fCreateTime", getfCreateTime())
+            .toString();
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TEquipmentInfo.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_equipment_info
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public class TEquipmentInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 生产设备id */
+    private Long fEquipmentId;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String fEquipmentCode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String fEquipmentName;
+
+    /** 设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备 */
+    @Excel(name = "设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备")
+    private String fEquipmentType;
+
+    /** 厂家 */
+    @Excel(name = "厂家")
+    private String fEquipmentFactory;
+
+    /** 所属部门 */
+    @Excel(name = "所属部门")
+    private String fBeyongDepartment;
+
+    /** IP地址 */
+    @Excel(name = "IP地址")
+    private String fIp;
+
+    /** 端口号 */
+    @Excel(name = "端口号")
+    private Integer fPort;
+
+    /** 安装位置 */
+    @Excel(name = "安装位置")
+    private String fInstallLocation;
+
+    /** 是否巡查点：1.是，2.否 */
+    @Excel(name = "是否巡查点：1.是，2.否")
+    private String fIsInspect;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String fResponsiblePerson;
+
+    /** 负责人电话 */
+    @Excel(name = "负责人电话")
+    private String fResponsiblePersonMobile;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 状态：0空闲，1运行，2故障 */
+    @Excel(name = "状态：0空闲，1运行，2故障")
+    private String fStatus;
+
+    /** 报警时间 */
+    @Excel(name = "报警时间")
+    private String fAlarmTime;
+
+    public void setfEquipmentId(Long fEquipmentId) 
+    {
+        this.fEquipmentId = fEquipmentId;
+    }
+
+    public Long getfEquipmentId() 
+    {
+        return fEquipmentId;
+    }
+    public void setfEquipmentCode(String fEquipmentCode) 
+    {
+        this.fEquipmentCode = fEquipmentCode;
+    }
+
+    public String getfEquipmentCode() 
+    {
+        return fEquipmentCode;
+    }
+    public void setfEquipmentName(String fEquipmentName) 
+    {
+        this.fEquipmentName = fEquipmentName;
+    }
+
+    public String getfEquipmentName() 
+    {
+        return fEquipmentName;
+    }
+    public void setfEquipmentType(String fEquipmentType) 
+    {
+        this.fEquipmentType = fEquipmentType;
+    }
+
+    public String getfEquipmentType() 
+    {
+        return fEquipmentType;
+    }
+    public void setfEquipmentFactory(String fEquipmentFactory) 
+    {
+        this.fEquipmentFactory = fEquipmentFactory;
+    }
+
+    public String getfEquipmentFactory() 
+    {
+        return fEquipmentFactory;
+    }
+    public void setfBeyongDepartment(String fBeyongDepartment) 
+    {
+        this.fBeyongDepartment = fBeyongDepartment;
+    }
+
+    public String getfBeyongDepartment() 
+    {
+        return fBeyongDepartment;
+    }
+    public void setfIp(String fIp) 
+    {
+        this.fIp = fIp;
+    }
+
+    public String getfIp() 
+    {
+        return fIp;
+    }
+    public void setfPort(Integer fPort)
+    {
+        this.fPort = fPort;
+    }
+
+    public Integer getfPort()
+    {
+        return fPort;
+    }
+    public void setfInstallLocation(String fInstallLocation) 
+    {
+        this.fInstallLocation = fInstallLocation;
+    }
+
+    public String getfInstallLocation() 
+    {
+        return fInstallLocation;
+    }
+    public void setfIsInspect(String fIsInspect) 
+    {
+        this.fIsInspect = fIsInspect;
+    }
+
+    public String getfIsInspect() 
+    {
+        return fIsInspect;
+    }
+    public void setfResponsiblePerson(String fResponsiblePerson) 
+    {
+        this.fResponsiblePerson = fResponsiblePerson;
+    }
+
+    public String getfResponsiblePerson() 
+    {
+        return fResponsiblePerson;
+    }
+    public void setfResponsiblePersonMobile(String fResponsiblePersonMobile) 
+    {
+        this.fResponsiblePersonMobile = fResponsiblePersonMobile;
+    }
+
+    public String getfResponsiblePersonMobile() 
+    {
+        return fResponsiblePersonMobile;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfStatus(String fStatus) 
+    {
+        this.fStatus = fStatus;
+    }
+
+    public String getfStatus() 
+    {
+        return fStatus;
+    }
+    public void setfAlarmTime(String fAlarmTime) 
+    {
+        this.fAlarmTime = fAlarmTime;
+    }
+
+    public String getfAlarmTime() 
+    {
+        return fAlarmTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fEquipmentId", getfEquipmentId())
+            .append("fEquipmentCode", getfEquipmentCode())
+            .append("fEquipmentName", getfEquipmentName())
+            .append("fEquipmentType", getfEquipmentType())
+            .append("fEquipmentFactory", getfEquipmentFactory())
+            .append("fBeyongDepartment", getfBeyongDepartment())
+            .append("fIp", getfIp())
+            .append("fPort", getfPort())
+            .append("fInstallLocation", getfInstallLocation())
+            .append("fIsInspect", getfIsInspect())
+            .append("fResponsiblePerson", getfResponsiblePerson())
+            .append("fResponsiblePersonMobile", getfResponsiblePersonMobile())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fStatus", getfStatus())
+            .append("fAlarmTime", getfAlarmTime())
+            .toString();
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TPointInfo.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_point_info
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public class TPointInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 点位ID */
+    private Long fPointId;
+
+    /** 所属层ID */
+    @Excel(name = "所属层ID")
+    private Long fStoreyId;
+
+    /** 点位编号 */
+    @Excel(name = "点位编号")
+    private String fPointCode;
+
+    /** 绑定PCBA设备号 */
+    @Excel(name = "绑定PCBA设备号")
+    private Long fDeviceCode;
+
+    /** 点位状态：0在线，1离线，2故障 */
+    @Excel(name = "点位状态：0在线，1离线，2故障")
+    private String fStatus;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 报警时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fAlarmTime;
+
+    public void setfPointId(Long fPointId) 
+    {
+        this.fPointId = fPointId;
+    }
+
+    public Long getfPointId() 
+    {
+        return fPointId;
+    }
+    public void setfStoreyId(Long fStoreyId) 
+    {
+        this.fStoreyId = fStoreyId;
+    }
+
+    public Long getfStoreyId() 
+    {
+        return fStoreyId;
+    }
+    public void setfPointCode(String fPointCode) 
+    {
+        this.fPointCode = fPointCode;
+    }
+
+    public String getfPointCode() 
+    {
+        return fPointCode;
+    }
+    public void setfDeviceCode(Long fDeviceCode) 
+    {
+        this.fDeviceCode = fDeviceCode;
+    }
+
+    public Long getfDeviceCode() 
+    {
+        return fDeviceCode;
+    }
+    public void setfStatus(String fStatus) 
+    {
+        this.fStatus = fStatus;
+    }
+
+    public String getfStatus() 
+    {
+        return fStatus;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfAlarmTime(Date fAlarmTime) 
+    {
+        this.fAlarmTime = fAlarmTime;
+    }
+
+    public Date getfAlarmTime() 
+    {
+        return fAlarmTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fPointId", getfPointId())
+            .append("fStoreyId", getfStoreyId())
+            .append("fPointCode", getfPointCode())
+            .append("fDeviceCode", getfDeviceCode())
+            .append("fStatus", getfStatus())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fAlarmTime", getfAlarmTime())
+            .toString();
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TStoreyInfo.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_storey_info
+ * 
+ * @author zehong
+ * @date 2025-05-29
+ */
+public class TStoreyInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 层ID */
+    private Long fStoreyId;
+
+    /** 所属老化柜ID */
+    @Excel(name = "所属老化柜ID")
+    private Long fEquipmentId;
+
+    /** 层编号 */
+    @Excel(name = "层编号")
+    private String fStoreyCode;
+
+    /** 绑定托盘编号 */
+    @Excel(name = "绑定托盘编号")
+    private String fTrayCode;
+
+    /** IP地址 */
+    @Excel(name = "IP地址")
+    private String fIp;
+
+    /** 端口号 */
+    @Excel(name = "端口号")
+    private Integer fPort;
+
+    /** 状态：0空闲，1运行，2故障 */
+    @Excel(name = "状态：0空闲，1运行，2故障")
+    private String fStatus;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fUpdateTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fCreateTime;
+
+    /** 报警时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fAlarmTime;
+
+    public void setfStoreyId(Long fStoreyId) 
+    {
+        this.fStoreyId = fStoreyId;
+    }
+
+    public Long getfStoreyId() 
+    {
+        return fStoreyId;
+    }
+    public void setfEquipmentId(Long fEquipmentId) 
+    {
+        this.fEquipmentId = fEquipmentId;
+    }
+
+    public Long getfEquipmentId() 
+    {
+        return fEquipmentId;
+    }
+    public void setfStoreyCode(String fStoreyCode) 
+    {
+        this.fStoreyCode = fStoreyCode;
+    }
+
+    public String getfStoreyCode() 
+    {
+        return fStoreyCode;
+    }
+    public void setfTrayCode(String fTrayCode)
+    {
+        this.fTrayCode = fTrayCode;
+    }
+
+    public String getfTrayCode()
+    {
+        return fTrayCode;
+    }
+    public void setfIp(String fIp) 
+    {
+        this.fIp = fIp;
+    }
+
+    public String getfIp() 
+    {
+        return fIp;
+    }
+    public void setfStatus(String fStatus) 
+    {
+        this.fStatus = fStatus;
+    }
+
+    public String getfStatus() 
+    {
+        return fStatus;
+    }
+    public void setfPort(Integer fPort)
+    {
+        this.fPort = fPort;
+    }
+
+    public Integer getfPort()
+    {
+        return fPort;
+    }
+    public void setfUpdateTime(Date fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public Date getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfCreateTime(Date fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public Date getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfAlarmTime(Date fAlarmTime) 
+    {
+        this.fAlarmTime = fAlarmTime;
+    }
+
+    public Date getfAlarmTime() 
+    {
+        return fAlarmTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fStoreyId", getfStoreyId())
+            .append("fEquipmentId", getfEquipmentId())
+            .append("fStoreyCode", getfStoreyCode())
+            .append("fTrayCode", getfTrayCode())
+            .append("fIp", getfIp())
+            .append("fStatus", getfStatus())
+            .append("fPort", getfPort())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fCreateTime", getfCreateTime())
+            .append("fAlarmTime", getfAlarmTime())
+            .toString();
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEquipmentAlarmData;
+
+/**
+ * 生产设备报警信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-06-03
+ */
+public interface TEquipmentAlarmDataMapper 
+{
+    /**
+     * 查询生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataId 生产设备报警信息ID
+     * @return 生产设备报警信息
+     */
+    public TEquipmentAlarmData selectTEquipmentAlarmDataById(Long fEquipmentAlarmDataId);
+
+    /**
+     * 查询生产设备报警信息列表
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 生产设备报警信息集合
+     */
+    public List<TEquipmentAlarmData> selectTEquipmentAlarmDataList(TEquipmentAlarmData tEquipmentAlarmData);
+
+    /**
+     * 新增生产设备报警信息
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 结果
+     */
+    public int insertTEquipmentAlarmData(TEquipmentAlarmData tEquipmentAlarmData);
+
+    /**
+     * 修改生产设备报警信息
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 结果
+     */
+    public int updateTEquipmentAlarmData(TEquipmentAlarmData tEquipmentAlarmData);
+
+    /**
+     * 删除生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataId 生产设备报警信息ID
+     * @return 结果
+     */
+    public int deleteTEquipmentAlarmDataById(Long fEquipmentAlarmDataId);
+
+    /**
+     * 批量删除生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEquipmentAlarmDataByIds(Long[] fEquipmentAlarmDataIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEquipmentInfo;
+
+/**
+ * 生产设备信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public interface TEquipmentInfoMapper 
+{
+    /**
+     * 查询生产设备信息
+     * 
+     * @param fEquipmentId 生产设备信息ID
+     * @return 生产设备信息
+     */
+    public TEquipmentInfo selectTEquipmentInfoById(Long fEquipmentId);
+
+    /**
+     * 查询生产设备信息列表
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 生产设备信息集合
+     */
+    public List<TEquipmentInfo> selectTEquipmentInfoList(TEquipmentInfo tEquipmentInfo);
+
+    /**
+     * 新增生产设备信息
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 结果
+     */
+    public int insertTEquipmentInfo(TEquipmentInfo tEquipmentInfo);
+
+    /**
+     * 修改生产设备信息
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 结果
+     */
+    public int updateTEquipmentInfo(TEquipmentInfo tEquipmentInfo);
+
+    /**
+     * 删除生产设备信息
+     * 
+     * @param fEquipmentId 生产设备信息ID
+     * @return 结果
+     */
+    public int deleteTEquipmentInfoById(Long fEquipmentId);
+
+    /**
+     * 批量删除生产设备信息
+     * 
+     * @param fEquipmentIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEquipmentInfoByIds(Long[] fEquipmentIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPointInfo;
+
+/**
+ * 老化层点位信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public interface TPointInfoMapper 
+{
+    /**
+     * 查询老化层点位信息
+     * 
+     * @param fPointId 老化层点位信息ID
+     * @return 老化层点位信息
+     */
+    public TPointInfo selectTPointInfoById(Long fPointId);
+
+    /**
+     * 查询老化层点位信息列表
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 老化层点位信息集合
+     */
+    public List<TPointInfo> selectTPointInfoList(TPointInfo tPointInfo);
+
+    /**
+     * 新增老化层点位信息
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 结果
+     */
+    public int insertTPointInfo(TPointInfo tPointInfo);
+
+    /**
+     * 修改老化层点位信息
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 结果
+     */
+    public int updateTPointInfo(TPointInfo tPointInfo);
+
+    /**
+     * 删除老化层点位信息
+     * 
+     * @param fPointId 老化层点位信息ID
+     * @return 结果
+     */
+    public int deleteTPointInfoById(Long fPointId);
+
+    /**
+     * 批量删除老化层点位信息
+     * 
+     * @param fPointIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPointInfoByIds(Long[] fPointIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TStoreyInfo;
+
+/**
+ * 老化层信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public interface TStoreyInfoMapper 
+{
+    /**
+     * 查询老化层信息
+     * 
+     * @param fStoreyId 老化层信息ID
+     * @return 老化层信息
+     */
+    public TStoreyInfo selectTStoreyInfoById(Long fStoreyId);
+
+    /**
+     * 查询老化层信息列表
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 老化层信息集合
+     */
+    public List<TStoreyInfo> selectTStoreyInfoList(TStoreyInfo tStoreyInfo);
+
+    /**
+     * 新增老化层信息
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 结果
+     */
+    public int insertTStoreyInfo(TStoreyInfo tStoreyInfo);
+
+    /**
+     * 修改老化层信息
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 结果
+     */
+    public int updateTStoreyInfo(TStoreyInfo tStoreyInfo);
+
+    /**
+     * 删除老化层信息
+     * 
+     * @param fStoreyId 老化层信息ID
+     * @return 结果
+     */
+    public int deleteTStoreyInfoById(Long fStoreyId);
+
+    /**
+     * 批量删除老化层信息
+     * 
+     * @param fStoreyIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTStoreyInfoByIds(Long[] fStoreyIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEquipmentAlarmData;
+
+/**
+ * 生产设备报警信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-06-03
+ */
+public interface ITEquipmentAlarmDataService 
+{
+    /**
+     * 查询生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataId 生产设备报警信息ID
+     * @return 生产设备报警信息
+     */
+    public TEquipmentAlarmData selectTEquipmentAlarmDataById(Long fEquipmentAlarmDataId);
+
+    /**
+     * 查询生产设备报警信息列表
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 生产设备报警信息集合
+     */
+    public List<TEquipmentAlarmData> selectTEquipmentAlarmDataList(TEquipmentAlarmData tEquipmentAlarmData);
+
+    /**
+     * 新增生产设备报警信息
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 结果
+     */
+    public int insertTEquipmentAlarmData(TEquipmentAlarmData tEquipmentAlarmData);
+
+    /**
+     * 修改生产设备报警信息
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 结果
+     */
+    public int updateTEquipmentAlarmData(TEquipmentAlarmData tEquipmentAlarmData);
+
+    /**
+     * 批量删除生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataIds 需要删除的生产设备报警信息ID
+     * @return 结果
+     */
+    public int deleteTEquipmentAlarmDataByIds(Long[] fEquipmentAlarmDataIds);
+
+    /**
+     * 删除生产设备报警信息信息
+     * 
+     * @param fEquipmentAlarmDataId 生产设备报警信息ID
+     * @return 结果
+     */
+    public int deleteTEquipmentAlarmDataById(Long fEquipmentAlarmDataId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEquipmentInfo;
+
+/**
+ * 生产设备信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public interface ITEquipmentInfoService 
+{
+    /**
+     * 查询生产设备信息
+     * 
+     * @param fEquipmentId 生产设备信息ID
+     * @return 生产设备信息
+     */
+    public TEquipmentInfo selectTEquipmentInfoById(Long fEquipmentId);
+
+    /**
+     * 查询生产设备信息列表
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 生产设备信息集合
+     */
+    public List<TEquipmentInfo> selectTEquipmentInfoList(TEquipmentInfo tEquipmentInfo);
+
+    /**
+     * 新增生产设备信息
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 结果
+     */
+    public int insertTEquipmentInfo(TEquipmentInfo tEquipmentInfo);
+
+    /**
+     * 修改生产设备信息
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 结果
+     */
+    public int updateTEquipmentInfo(TEquipmentInfo tEquipmentInfo);
+
+    /**
+     * 批量删除生产设备信息
+     * 
+     * @param fEquipmentIds 需要删除的生产设备信息ID
+     * @return 结果
+     */
+    public int deleteTEquipmentInfoByIds(Long[] fEquipmentIds);
+
+    /**
+     * 删除生产设备信息信息
+     * 
+     * @param fEquipmentId 生产设备信息ID
+     * @return 结果
+     */
+    public int deleteTEquipmentInfoById(Long fEquipmentId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TPointInfo;
+
+/**
+ * 老化层点位信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public interface ITPointInfoService 
+{
+    /**
+     * 查询老化层点位信息
+     * 
+     * @param fPointId 老化层点位信息ID
+     * @return 老化层点位信息
+     */
+    public TPointInfo selectTPointInfoById(Long fPointId);
+
+    /**
+     * 查询老化层点位信息列表
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 老化层点位信息集合
+     */
+    public List<TPointInfo> selectTPointInfoList(TPointInfo tPointInfo);
+
+    /**
+     * 新增老化层点位信息
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 结果
+     */
+    public int insertTPointInfo(TPointInfo tPointInfo);
+
+    /**
+     * 修改老化层点位信息
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 结果
+     */
+    public int updateTPointInfo(TPointInfo tPointInfo);
+
+    /**
+     * 批量删除老化层点位信息
+     * 
+     * @param fPointIds 需要删除的老化层点位信息ID
+     * @return 结果
+     */
+    public int deleteTPointInfoByIds(Long[] fPointIds);
+
+    /**
+     * 删除老化层点位信息信息
+     * 
+     * @param fPointId 老化层点位信息ID
+     * @return 结果
+     */
+    public int deleteTPointInfoById(Long fPointId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TStoreyInfo;
+
+/**
+ * 老化层信息Service接口
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+public interface ITStoreyInfoService 
+{
+    /**
+     * 查询老化层信息
+     * 
+     * @param fStoreyId 老化层信息ID
+     * @return 老化层信息
+     */
+    public TStoreyInfo selectTStoreyInfoById(Long fStoreyId);
+
+    /**
+     * 查询老化层信息列表
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 老化层信息集合
+     */
+    public List<TStoreyInfo> selectTStoreyInfoList(TStoreyInfo tStoreyInfo);
+
+    /**
+     * 新增老化层信息
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 结果
+     */
+    public int insertTStoreyInfo(TStoreyInfo tStoreyInfo);
+
+    /**
+     * 修改老化层信息
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 结果
+     */
+    public int updateTStoreyInfo(TStoreyInfo tStoreyInfo);
+
+    /**
+     * 批量删除老化层信息
+     * 
+     * @param fStoreyIds 需要删除的老化层信息ID
+     * @return 结果
+     */
+    public int deleteTStoreyInfoByIds(Long[] fStoreyIds);
+
+    /**
+     * 删除老化层信息信息
+     * 
+     * @param fStoreyId 老化层信息ID
+     * @return 结果
+     */
+    public int deleteTStoreyInfoById(Long fStoreyId);
+}

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/TEquipmentAlarmDataServiceImpl.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.TEquipmentAlarmDataMapper;
+import com.zehong.system.domain.TEquipmentAlarmData;
+import com.zehong.system.service.ITEquipmentAlarmDataService;
+
+/**
+ * 生产设备报警信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-06-03
+ */
+@Service
+public class TEquipmentAlarmDataServiceImpl implements ITEquipmentAlarmDataService 
+{
+    @Autowired
+    private TEquipmentAlarmDataMapper tEquipmentAlarmDataMapper;
+
+    /**
+     * 查询生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataId 生产设备报警信息ID
+     * @return 生产设备报警信息
+     */
+    @Override
+    public TEquipmentAlarmData selectTEquipmentAlarmDataById(Long fEquipmentAlarmDataId)
+    {
+        return tEquipmentAlarmDataMapper.selectTEquipmentAlarmDataById(fEquipmentAlarmDataId);
+    }
+
+    /**
+     * 查询生产设备报警信息列表
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 生产设备报警信息
+     */
+    @Override
+    public List<TEquipmentAlarmData> selectTEquipmentAlarmDataList(TEquipmentAlarmData tEquipmentAlarmData)
+    {
+        return tEquipmentAlarmDataMapper.selectTEquipmentAlarmDataList(tEquipmentAlarmData);
+    }
+
+    /**
+     * 新增生产设备报警信息
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 结果
+     */
+    @Override
+    public int insertTEquipmentAlarmData(TEquipmentAlarmData tEquipmentAlarmData)
+    {
+        return tEquipmentAlarmDataMapper.insertTEquipmentAlarmData(tEquipmentAlarmData);
+    }
+
+    /**
+     * 修改生产设备报警信息
+     * 
+     * @param tEquipmentAlarmData 生产设备报警信息
+     * @return 结果
+     */
+    @Override
+    public int updateTEquipmentAlarmData(TEquipmentAlarmData tEquipmentAlarmData)
+    {
+        return tEquipmentAlarmDataMapper.updateTEquipmentAlarmData(tEquipmentAlarmData);
+    }
+
+    /**
+     * 批量删除生产设备报警信息
+     * 
+     * @param fEquipmentAlarmDataIds 需要删除的生产设备报警信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEquipmentAlarmDataByIds(Long[] fEquipmentAlarmDataIds)
+    {
+        return tEquipmentAlarmDataMapper.deleteTEquipmentAlarmDataByIds(fEquipmentAlarmDataIds);
+    }
+
+    /**
+     * 删除生产设备报警信息信息
+     * 
+     * @param fEquipmentAlarmDataId 生产设备报警信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEquipmentAlarmDataById(Long fEquipmentAlarmDataId)
+    {
+        return tEquipmentAlarmDataMapper.deleteTEquipmentAlarmDataById(fEquipmentAlarmDataId);
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/TEquipmentInfoServiceImpl.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.TEquipmentInfoMapper;
+import com.zehong.system.domain.TEquipmentInfo;
+import com.zehong.system.service.ITEquipmentInfoService;
+
+/**
+ * 生产设备信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+@Service
+public class TEquipmentInfoServiceImpl implements ITEquipmentInfoService 
+{
+    @Autowired
+    private TEquipmentInfoMapper tEquipmentInfoMapper;
+
+    /**
+     * 查询生产设备信息
+     * 
+     * @param fEquipmentId 生产设备信息ID
+     * @return 生产设备信息
+     */
+    @Override
+    public TEquipmentInfo selectTEquipmentInfoById(Long fEquipmentId)
+    {
+        return tEquipmentInfoMapper.selectTEquipmentInfoById(fEquipmentId);
+    }
+
+    /**
+     * 查询生产设备信息列表
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 生产设备信息
+     */
+    @Override
+    public List<TEquipmentInfo> selectTEquipmentInfoList(TEquipmentInfo tEquipmentInfo)
+    {
+        return tEquipmentInfoMapper.selectTEquipmentInfoList(tEquipmentInfo);
+    }
+
+    /**
+     * 新增生产设备信息
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 结果
+     */
+    @Override
+    public int insertTEquipmentInfo(TEquipmentInfo tEquipmentInfo)
+    {
+        return tEquipmentInfoMapper.insertTEquipmentInfo(tEquipmentInfo);
+    }
+
+    /**
+     * 修改生产设备信息
+     * 
+     * @param tEquipmentInfo 生产设备信息
+     * @return 结果
+     */
+    @Override
+    public int updateTEquipmentInfo(TEquipmentInfo tEquipmentInfo)
+    {
+        return tEquipmentInfoMapper.updateTEquipmentInfo(tEquipmentInfo);
+    }
+
+    /**
+     * 批量删除生产设备信息
+     * 
+     * @param fEquipmentIds 需要删除的生产设备信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEquipmentInfoByIds(Long[] fEquipmentIds)
+    {
+        return tEquipmentInfoMapper.deleteTEquipmentInfoByIds(fEquipmentIds);
+    }
+
+    /**
+     * 删除生产设备信息信息
+     * 
+     * @param fEquipmentId 生产设备信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEquipmentInfoById(Long fEquipmentId)
+    {
+        return tEquipmentInfoMapper.deleteTEquipmentInfoById(fEquipmentId);
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/TPointInfoServiceImpl.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.TPointInfoMapper;
+import com.zehong.system.domain.TPointInfo;
+import com.zehong.system.service.ITPointInfoService;
+
+/**
+ * 老化层点位信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+@Service
+public class TPointInfoServiceImpl implements ITPointInfoService 
+{
+    @Autowired
+    private TPointInfoMapper tPointInfoMapper;
+
+    /**
+     * 查询老化层点位信息
+     * 
+     * @param fPointId 老化层点位信息ID
+     * @return 老化层点位信息
+     */
+    @Override
+    public TPointInfo selectTPointInfoById(Long fPointId)
+    {
+        return tPointInfoMapper.selectTPointInfoById(fPointId);
+    }
+
+    /**
+     * 查询老化层点位信息列表
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 老化层点位信息
+     */
+    @Override
+    public List<TPointInfo> selectTPointInfoList(TPointInfo tPointInfo)
+    {
+        return tPointInfoMapper.selectTPointInfoList(tPointInfo);
+    }
+
+    /**
+     * 新增老化层点位信息
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 结果
+     */
+    @Override
+    public int insertTPointInfo(TPointInfo tPointInfo)
+    {
+        return tPointInfoMapper.insertTPointInfo(tPointInfo);
+    }
+
+    /**
+     * 修改老化层点位信息
+     * 
+     * @param tPointInfo 老化层点位信息
+     * @return 结果
+     */
+    @Override
+    public int updateTPointInfo(TPointInfo tPointInfo)
+    {
+        return tPointInfoMapper.updateTPointInfo(tPointInfo);
+    }
+
+    /**
+     * 批量删除老化层点位信息
+     * 
+     * @param fPointIds 需要删除的老化层点位信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPointInfoByIds(Long[] fPointIds)
+    {
+        return tPointInfoMapper.deleteTPointInfoByIds(fPointIds);
+    }
+
+    /**
+     * 删除老化层点位信息信息
+     * 
+     * @param fPointId 老化层点位信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPointInfoById(Long fPointId)
+    {
+        return tPointInfoMapper.deleteTPointInfoById(fPointId);
+    }
+}

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/TStoreyInfoServiceImpl.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.TStoreyInfoMapper;
+import com.zehong.system.domain.TStoreyInfo;
+import com.zehong.system.service.ITStoreyInfoService;
+
+/**
+ * 老化层信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-05-28
+ */
+@Service
+public class TStoreyInfoServiceImpl implements ITStoreyInfoService 
+{
+    @Autowired
+    private TStoreyInfoMapper tStoreyInfoMapper;
+
+    /**
+     * 查询老化层信息
+     * 
+     * @param fStoreyId 老化层信息ID
+     * @return 老化层信息
+     */
+    @Override
+    public TStoreyInfo selectTStoreyInfoById(Long fStoreyId)
+    {
+        return tStoreyInfoMapper.selectTStoreyInfoById(fStoreyId);
+    }
+
+    /**
+     * 查询老化层信息列表
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 老化层信息
+     */
+    @Override
+    public List<TStoreyInfo> selectTStoreyInfoList(TStoreyInfo tStoreyInfo)
+    {
+        return tStoreyInfoMapper.selectTStoreyInfoList(tStoreyInfo);
+    }
+
+    /**
+     * 新增老化层信息
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 结果
+     */
+    @Override
+    public int insertTStoreyInfo(TStoreyInfo tStoreyInfo)
+    {
+        return tStoreyInfoMapper.insertTStoreyInfo(tStoreyInfo);
+    }
+
+    /**
+     * 修改老化层信息
+     * 
+     * @param tStoreyInfo 老化层信息
+     * @return 结果
+     */
+    @Override
+    public int updateTStoreyInfo(TStoreyInfo tStoreyInfo)
+    {
+        return tStoreyInfoMapper.updateTStoreyInfo(tStoreyInfo);
+    }
+
+    /**
+     * 批量删除老化层信息
+     * 
+     * @param fStoreyIds 需要删除的老化层信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTStoreyInfoByIds(Long[] fStoreyIds)
+    {
+        return tStoreyInfoMapper.deleteTStoreyInfoByIds(fStoreyIds);
+    }
+
+    /**
+     * 删除老化层信息信息
+     * 
+     * @param fStoreyId 老化层信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTStoreyInfoById(Long fStoreyId)
+    {
+        return tStoreyInfoMapper.deleteTStoreyInfoById(fStoreyId);
+    }
+}

zhmes-agecal-system/src/main/resources/mapper/system/TEquipmentAlarmDataMapper.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.TEquipmentAlarmDataMapper">
+    
+    <resultMap type="TEquipmentAlarmData" id="TEquipmentAlarmDataResult">
+        <result property="fEquipmentAlarmDataId"    column="f_equipment_alarm_data_id"    />
+        <result property="fEquipmentCode"    column="f_equipment_code"    />
+        <result property="fAlarmType"    column="f_alarm_type"    />
+        <result property="fAlarmData"    column="f_alarm_data"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+    </resultMap>
+
+    <sql id="selectTEquipmentAlarmDataVo">
+        select f_equipment_alarm_data_id, f_equipment_code, f_alarm_type, f_alarm_data, f_create_time from t_equipment_alarm_data
+    </sql>
+
+    <select id="selectTEquipmentAlarmDataList" parameterType="TEquipmentAlarmData" resultMap="TEquipmentAlarmDataResult">
+        <include refid="selectTEquipmentAlarmDataVo"/>
+        <where>  
+            <if test="fEquipmentCode != null  and fEquipmentCode != ''"> and f_equipment_code = #{fEquipmentCode}</if>
+            <if test="fAlarmType != null  and fAlarmType != ''"> and f_alarm_type = #{fAlarmType}</if>
+            <if test="fAlarmData != null  and fAlarmData != ''"> and f_alarm_data = #{fAlarmData}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEquipmentAlarmDataById" parameterType="Long" resultMap="TEquipmentAlarmDataResult">
+        <include refid="selectTEquipmentAlarmDataVo"/>
+        where f_equipment_alarm_data_id = #{fEquipmentAlarmDataId}
+    </select>
+        
+    <insert id="insertTEquipmentAlarmData" parameterType="TEquipmentAlarmData">
+        insert into t_equipment_alarm_data
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fEquipmentAlarmDataId != null">f_equipment_alarm_data_id,</if>
+            <if test="fEquipmentCode != null">f_equipment_code,</if>
+            <if test="fAlarmType != null">f_alarm_type,</if>
+            <if test="fAlarmData != null">f_alarm_data,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fEquipmentAlarmDataId != null">#{fEquipmentAlarmDataId},</if>
+            <if test="fEquipmentCode != null">#{fEquipmentCode},</if>
+            <if test="fAlarmType != null">#{fAlarmType},</if>
+            <if test="fAlarmData != null">#{fAlarmData},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEquipmentAlarmData" parameterType="TEquipmentAlarmData">
+        update t_equipment_alarm_data
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fEquipmentCode != null">f_equipment_code = #{fEquipmentCode},</if>
+            <if test="fAlarmType != null">f_alarm_type = #{fAlarmType},</if>
+            <if test="fAlarmData != null">f_alarm_data = #{fAlarmData},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+        </trim>
+        where f_equipment_alarm_data_id = #{fEquipmentAlarmDataId}
+    </update>
+
+    <delete id="deleteTEquipmentAlarmDataById" parameterType="Long">
+        delete from t_equipment_alarm_data where f_equipment_alarm_data_id = #{fEquipmentAlarmDataId}
+    </delete>
+
+    <delete id="deleteTEquipmentAlarmDataByIds" parameterType="String">
+        delete from t_equipment_alarm_data where f_equipment_alarm_data_id in 
+        <foreach item="fEquipmentAlarmDataId" collection="array" open="(" separator="," close=")">
+            #{fEquipmentAlarmDataId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zhmes-agecal-system/src/main/resources/mapper/system/TEquipmentInfoMapper.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.TEquipmentInfoMapper">
+    
+    <resultMap type="TEquipmentInfo" id="TEquipmentInfoResult">
+        <result property="fEquipmentId"    column="f_equipment_id"    />
+        <result property="fEquipmentCode"    column="f_equipment_code"    />
+        <result property="fEquipmentName"    column="f_equipment_name"    />
+        <result property="fEquipmentType"    column="f_equipment_type"    />
+        <result property="fEquipmentFactory"    column="f_equipment_factory"    />
+        <result property="fBeyongDepartment"    column="f_beyong_department"    />
+        <result property="fIp"    column="f_ip"    />
+        <result property="fPort"    column="f_port"    />
+        <result property="fInstallLocation"    column="f_install_location"    />
+        <result property="fIsInspect"    column="f_is_inspect"    />
+        <result property="fResponsiblePerson"    column="f_responsible_person"    />
+        <result property="fResponsiblePersonMobile"    column="f_responsible_person_mobile"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fStatus"    column="f_status"    />
+        <result property="fAlarmTime"    column="f_alarm_time"    />
+    </resultMap>
+
+    <sql id="selectTEquipmentInfoVo">
+        select f_equipment_id, f_equipment_code, f_equipment_name, f_equipment_type, f_equipment_factory, f_beyong_department, f_ip, f_port, f_install_location, f_is_inspect, f_responsible_person, f_responsible_person_mobile, f_create_time, f_update_time, f_status, f_alarm_time from t_equipment_info
+    </sql>
+
+    <select id="selectTEquipmentInfoList" parameterType="TEquipmentInfo" resultMap="TEquipmentInfoResult">
+        <include refid="selectTEquipmentInfoVo"/>
+        <where>  
+            <if test="fEquipmentCode != null  and fEquipmentCode != ''"> and f_equipment_code = #{fEquipmentCode}</if>
+            <if test="fEquipmentName != null  and fEquipmentName != ''"> and f_equipment_name like concat('%', #{fEquipmentName}, '%')</if>
+            <if test="fEquipmentType != null  and fEquipmentType != ''"> and f_equipment_type = #{fEquipmentType}</if>
+            <if test="fEquipmentFactory != null  and fEquipmentFactory != ''"> and f_equipment_factory = #{fEquipmentFactory}</if>
+            <if test="fBeyongDepartment != null  and fBeyongDepartment != ''"> and f_beyong_department = #{fBeyongDepartment}</if>
+            <if test="fIp != null  and fIp != ''"> and f_ip = #{fIp}</if>
+            <if test="fPort != null "> and f_port = #{fPort}</if>
+            <if test="fInstallLocation != null  and fInstallLocation != ''"> and f_install_location = #{fInstallLocation}</if>
+            <if test="fIsInspect != null  and fIsInspect != ''"> and f_is_inspect = #{fIsInspect}</if>
+            <if test="fResponsiblePerson != null  and fResponsiblePerson != ''"> and f_responsible_person = #{fResponsiblePerson}</if>
+            <if test="fResponsiblePersonMobile != null  and fResponsiblePersonMobile != ''"> and f_responsible_person_mobile = #{fResponsiblePersonMobile}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
+            <if test="fAlarmTime != null  and fAlarmTime != ''"> and f_alarm_time = #{fAlarmTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEquipmentInfoById" parameterType="Long" resultMap="TEquipmentInfoResult">
+        <include refid="selectTEquipmentInfoVo"/>
+        where f_equipment_id = #{fEquipmentId}
+    </select>
+        
+    <insert id="insertTEquipmentInfo" parameterType="TEquipmentInfo" useGeneratedKeys="true" keyProperty="fEquipmentId">
+        insert into t_equipment_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fEquipmentCode != null">f_equipment_code,</if>
+            <if test="fEquipmentName != null">f_equipment_name,</if>
+            <if test="fEquipmentType != null">f_equipment_type,</if>
+            <if test="fEquipmentFactory != null">f_equipment_factory,</if>
+            <if test="fBeyongDepartment != null">f_beyong_department,</if>
+            <if test="fIp != null">f_ip,</if>
+            <if test="fPort != null">f_port,</if>
+            <if test="fInstallLocation != null">f_install_location,</if>
+            <if test="fIsInspect != null">f_is_inspect,</if>
+            <if test="fResponsiblePerson != null">f_responsible_person,</if>
+            <if test="fResponsiblePersonMobile != null">f_responsible_person_mobile,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fStatus != null">f_status,</if>
+            <if test="fAlarmTime != null">f_alarm_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fEquipmentCode != null">#{fEquipmentCode},</if>
+            <if test="fEquipmentName != null">#{fEquipmentName},</if>
+            <if test="fEquipmentType != null">#{fEquipmentType},</if>
+            <if test="fEquipmentFactory != null">#{fEquipmentFactory},</if>
+            <if test="fBeyongDepartment != null">#{fBeyongDepartment},</if>
+            <if test="fIp != null">#{fIp},</if>
+            <if test="fPort != null">#{fPort},</if>
+            <if test="fInstallLocation != null">#{fInstallLocation},</if>
+            <if test="fIsInspect != null">#{fIsInspect},</if>
+            <if test="fResponsiblePerson != null">#{fResponsiblePerson},</if>
+            <if test="fResponsiblePersonMobile != null">#{fResponsiblePersonMobile},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fStatus != null">#{fStatus},</if>
+            <if test="fAlarmTime != null">#{fAlarmTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEquipmentInfo" parameterType="TEquipmentInfo">
+        update t_equipment_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fEquipmentCode != null">f_equipment_code = #{fEquipmentCode},</if>
+            <if test="fEquipmentName != null">f_equipment_name = #{fEquipmentName},</if>
+            <if test="fEquipmentType != null">f_equipment_type = #{fEquipmentType},</if>
+            <if test="fEquipmentFactory != null">f_equipment_factory = #{fEquipmentFactory},</if>
+            <if test="fBeyongDepartment != null">f_beyong_department = #{fBeyongDepartment},</if>
+            <if test="fIp != null">f_ip = #{fIp},</if>
+            <if test="fPort != null">f_port = #{fPort},</if>
+            <if test="fInstallLocation != null">f_install_location = #{fInstallLocation},</if>
+            <if test="fIsInspect != null">f_is_inspect = #{fIsInspect},</if>
+            <if test="fResponsiblePerson != null">f_responsible_person = #{fResponsiblePerson},</if>
+            <if test="fResponsiblePersonMobile != null">f_responsible_person_mobile = #{fResponsiblePersonMobile},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="fAlarmTime != null">f_alarm_time = #{fAlarmTime},</if>
+        </trim>
+        where f_equipment_id = #{fEquipmentId}
+    </update>
+
+    <delete id="deleteTEquipmentInfoById" parameterType="Long">
+        delete from t_equipment_info where f_equipment_id = #{fEquipmentId}
+    </delete>
+
+    <delete id="deleteTEquipmentInfoByIds" parameterType="String">
+        delete from t_equipment_info where f_equipment_id in 
+        <foreach item="fEquipmentId" collection="array" open="(" separator="," close=")">
+            #{fEquipmentId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zhmes-agecal-system/src/main/resources/mapper/system/TPointInfoMapper.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.TPointInfoMapper">
+    
+    <resultMap type="TPointInfo" id="TPointInfoResult">
+        <result property="fPointId"    column="f_point_id"    />
+        <result property="fStoreyId"    column="f_storey_id"    />
+        <result property="fPointCode"    column="f_point_code"    />
+        <result property="fDeviceCode"    column="f_device_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"    />
+    </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
+    </sql>
+
+    <select id="selectTPointInfoList" parameterType="TPointInfo" resultMap="TPointInfoResult">
+        <include refid="selectTPointInfoVo"/>
+        <where>  
+            <if test="fStoreyId != null "> and f_storey_id = #{fStoreyId}</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="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>
+        </where>
+    </select>
+    
+    <select id="selectTPointInfoById" parameterType="Long" resultMap="TPointInfoResult">
+        <include refid="selectTPointInfoVo"/>
+        where f_point_id = #{fPointId}
+    </select>
+        
+    <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="fPointCode != null">f_point_code,</if>
+            <if test="fDeviceCode != null">f_device_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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fStoreyId != null">#{fStoreyId},</if>
+            <if test="fPointCode != null">#{fPointCode},</if>
+            <if test="fDeviceCode != null">#{fDeviceCode},</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>
+         </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="fPointCode != null">f_point_code = #{fPointCode},</if>
+            <if test="fDeviceCode != null">f_device_code = #{fDeviceCode},</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>
+        </trim>
+        where f_point_id = #{fPointId}
+    </update>
+
+    <delete id="deleteTPointInfoById" parameterType="Long">
+        delete from t_point_info where f_point_id = #{fPointId}
+    </delete>
+
+    <delete id="deleteTPointInfoByIds" parameterType="String">
+        delete from t_point_info where f_point_id in 
+        <foreach item="fPointId" collection="array" open="(" separator="," close=")">
+            #{fPointId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zhmes-agecal-system/src/main/resources/mapper/system/TStoreyInfoMapper.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.TStoreyInfoMapper">
+    
+    <resultMap type="TStoreyInfo" id="TStoreyInfoResult">
+        <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"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fAlarmTime"    column="f_alarm_time"    />
+    </resultMap>
+
+    <sql id="selectTStoreyInfoVo">
+        select f_storey_id, f_equipment_id, f_storey_code, f_tray_code, f_ip, f_status, f_port, f_update_time, f_create_time, f_alarm_time from t_storey_info
+    </sql>
+
+    <select id="selectTStoreyInfoList" parameterType="TStoreyInfo" resultMap="TStoreyInfoResult">
+        <include refid="selectTStoreyInfoVo"/>
+        <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>
+            <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
+            <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
+            <if test="fAlarmTime != null "> and f_alarm_time = #{fAlarmTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectTStoreyInfoById" parameterType="Long" resultMap="TStoreyInfoResult">
+        <include refid="selectTStoreyInfoVo"/>
+        where f_storey_id = #{fStoreyId}
+    </select>
+        
+    <insert id="insertTStoreyInfo" parameterType="TStoreyInfo">
+        insert into t_storey_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <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>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fAlarmTime != null">f_alarm_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <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>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fAlarmTime != null">#{fAlarmTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTStoreyInfo" parameterType="TStoreyInfo">
+        update t_storey_info
+        <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>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fAlarmTime != null">f_alarm_time = #{fAlarmTime},</if>
+        </trim>
+        where f_storey_id = #{fStoreyId}
+    </update>
+
+    <delete id="deleteTStoreyInfoById" parameterType="Long">
+        delete from t_storey_info where f_storey_id = #{fStoreyId}
+    </delete>
+
+    <delete id="deleteTStoreyInfoByIds" parameterType="String">
+        delete from t_storey_info where f_storey_id in 
+        <foreach item="fStoreyId" collection="array" open="(" separator="," close=")">
+            #{fStoreyId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

+import request from '@/utils/request'
+
+// 查询生产设备信息列表
+export function listEquipment(query) {
+  return request({
+    url: '/equipment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产设备信息详细
+export function getEquipment(fEquipmentId) {
+  return request({
+    url: '/equipment/' + fEquipmentId,
+    method: 'get'
+  })
+}
+
+// 新增生产设备信息
+export function addEquipment(data) {
+  return request({
+    url: '/equipment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产设备信息
+export function updateEquipment(data) {
+  return request({
+    url: '/equipment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产设备信息
+export function delEquipment(fEquipmentId) {
+  return request({
+    url: '/equipment/' + fEquipmentId,
+    method: 'delete'
+  })
+}
+
+// 导出生产设备信息
+export function exportEquipment(query) {
+  return request({
+    url: '/equipment/export',
+    method: 'get',
+    params: query
+  })
+}

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

+import request from '@/utils/request'
+
+// 查询生产设备报警信息列表
+export function listEquipmentAlarmData(query) {
+  return request({
+    url: '/equipmentAlarmData/equipmentAlarmData/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产设备报警信息详细
+export function getEquipmentAlarmData(fEquipmentAlarmDataId) {
+  return request({
+    url: '/equipmentAlarmData/equipmentAlarmData/' + fEquipmentAlarmDataId,
+    method: 'get'
+  })
+}
+
+// 新增生产设备报警信息
+export function addEquipmentAlarmData(data) {
+  return request({
+    url: '/equipmentAlarmData/equipmentAlarmData',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产设备报警信息
+export function updateEquipmentAlarmData(data) {
+  return request({
+    url: '/equipmentAlarmData/equipmentAlarmData',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产设备报警信息
+export function delEquipmentAlarmData(fEquipmentAlarmDataId) {
+  return request({
+    url: '/equipmentAlarmData/equipmentAlarmData/' + fEquipmentAlarmDataId,
+    method: 'delete'
+  })
+}
+
+// 导出生产设备报警信息
+export function exportEquipmentAlarmData(query) {
+  return request({
+    url: '/equipmentAlarmData/equipmentAlarmData/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

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

+import request from '@/utils/request'
+
+// 查询老化层点位信息列表
+export function listPoint(query) {
+  return request({
+    url: '/point/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询老化层点位信息详细
+export function getPoint(fPointId) {
+  return request({
+    url: '/point/' + fPointId,
+    method: 'get'
+  })
+}
+
+// 新增老化层点位信息
+export function addPoint(data) {
+  return request({
+    url: '/point',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改老化层点位信息
+export function updatePoint(data) {
+  return request({
+    url: '/point',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除老化层点位信息
+export function delPoint(fPointId) {
+  return request({
+    url: '/point/' + fPointId,
+    method: 'delete'
+  })
+}
+
+// 导出老化层点位信息
+export function exportPoint(query) {
+  return request({
+    url: '/point/export',
+    method: 'get',
+    params: query
+  })
+}

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

+import request from '@/utils/request'
+
+// 查询老化层信息列表
+export function listStorey(query) {
+  return request({
+    url: '/storey/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询老化层信息详细
+export function getStorey(fStoreyId) {
+  return request({
+    url: '/storey/' + fStoreyId,
+    method: 'get'
+  })
+}
+
+// 新增老化层信息
+export function addStorey(data) {
+  return request({
+    url: '/storey',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改老化层信息
+export function updateStorey(data) {
+  return request({
+    url: '/storey',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除老化层信息
+export function delStorey(fStoreyId) {
+  return request({
+    url: '/storey/' + fStoreyId,
+    method: 'delete'
+  })
+}
+
+// 导出老化层信息
+export function exportStorey(query) {
+  return request({
+    url: '/storey/export',
+    method: 'get',
+    params: query
+  })
+}