1 老化时间间隔配置功能实现

2 接收标定历史记录功能实现
3 不要 零点AD  零点AD状态  校准AD  校准AD状态  改成 标定浓度值和标定状态。
4 标定状态 只有是4(报警)的时候，才是正常的数据，其他的都是异常数据。

sql/addSql.sql

+CREATE TABLE `t_process_calibration_result_history` (
+    `f_id` BIGINT ( 20 ) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `f_create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `f_message` LONGTEXT DEFAULT NULL COMMENT '内容',
+    PRIMARY KEY ( `f_id` ) USING BTREE
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 ROW_FORMAT = DYNAMIC COMMENT = '标定结果数据接收历史记录';
\ No newline at end of file

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

+package com.zehong.web.controller.equipment;
+
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.ProcessCalibrationResultHistory;
+import com.zehong.system.service.IProcessCalibrationResultHistoryService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 标定结果数据接收历史记录Controller
+ * 
+ * @author zehong
+ * @date 2025-12-01
+ */
+@RestController
+@RequestMapping("/calibrationResult/history")
+public class ProcessCalibrationResultHistoryController extends BaseController
+{
+    @Resource
+    private IProcessCalibrationResultHistoryService processCalibrationResultHistoryService;
+
+    /**
+     * 查询标定结果数据接收历史记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        startPage();
+        List<ProcessCalibrationResultHistory> list = processCalibrationResultHistoryService.selectProcessCalibrationResultHistoryList(processCalibrationResultHistory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出标定结果数据接收历史记录列表
+     */
+    @GetMapping("/export")
+    public AjaxResult export(ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        List<ProcessCalibrationResultHistory> list = processCalibrationResultHistoryService.selectProcessCalibrationResultHistoryList(processCalibrationResultHistory);
+        ExcelUtil<ProcessCalibrationResultHistory> util = new ExcelUtil<ProcessCalibrationResultHistory>(ProcessCalibrationResultHistory.class);
+        return util.exportExcel(list, "标定结果数据接收历史记录数据");
+    }
+
+    /**
+     * 获取标定结果数据接收历史记录详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(processCalibrationResultHistoryService.selectProcessCalibrationResultHistoryById(id));
+    }
+
+    /**
+     * 新增标定结果数据接收历史记录
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        return toAjax(processCalibrationResultHistoryService.insertProcessCalibrationResultHistory(processCalibrationResultHistory));
+    }
+
+    /**
+     * 修改标定结果数据接收历史记录
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        return toAjax(processCalibrationResultHistoryService.updateProcessCalibrationResultHistory(processCalibrationResultHistory));
+    }
+
+    /**
+     * 删除标定结果数据接收历史记录
+     */
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(processCalibrationResultHistoryService.deleteProcessCalibrationResultHistoryByIds(ids));
+    }
+}

zhmes-agecal-admin/src/main/java/com/zehong/web/controller/system/SysConfigController.java

 package com.zehong.web.controller.system;
 
-import java.util.List;
-
-import com.zehong.system.netty.handler.NettyUdpServerHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-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.annotation.RepeatSubmit;
+import com.zehong.common.constant.RoboticArmConstans;
 import com.zehong.common.constant.UserConstants;
 import com.zehong.common.core.controller.BaseController;
 import com.zehong.common.core.domain.AjaxResult;
@@ -25,6 +12,12 @@ import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.SysConfig;
 import com.zehong.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 参数配置 信息操作处理
@@ -84,9 +77,26 @@ public class SysConfigController extends BaseController
      */
     @GetMapping(value = "/getUploadMesAddress")
     public AjaxResult getUploadMesAddress() {
-        return AjaxResult.success(configService.directSelectConfigByKey(NettyUdpServerHandler.UPLOAD_MES_ADDRESS));
+        return AjaxResult.success(configService.directSelectConfigByKey(RoboticArmConstans.UPLOAD_MES_ADDRESS));
     }
 
+    /**
+     * 获取老化阶段时间
+     */
+    @GetMapping(value = "/getAgingStageTime")
+    public AjaxResult getAgingStageTime() {
+        return AjaxResult.success(configService.selectAgingStageTime());
+    }
+
+    /**
+     * 修改老化阶段时间
+     */
+    @PostMapping(value = "/updateAgingStageTime")
+    public AjaxResult updateAgingStageTime(@RequestBody List<SysConfig> sysConfigs) {
+        return toAjax(configService.updateAgingStageTime(sysConfigs));
+    }
+
+
     /**
      * 修改上传mes地址
      */

zhmes-agecal-common/src/main/java/com/zehong/common/constant/RoboticArmConstans.java

+package com.zehong.common.constant;
+
+/**
+ * @author lenovo
+ * @date 2025/12/1
+ * @description 机械臂常亮类
+ */
+public class RoboticArmConstans {
+
+    // 上传MES地址的key
+    public static final String UPLOAD_MES_ADDRESS = "uploadMesAddress";
+    /**
+     * 老化流程第一阶段执行时间（单位：分钟）
+     */
+    public static final String AGING_STAGE1_TIME = "agingStage1Time";
+
+    /**
+     * 老化流程第二阶段执行时间（单位：分钟）
+     */
+    public static final String AGING_STAGE2_TIME = "agingStage2Time";
+
+    /**
+     * 老化流程第三阶段执行时间（单位：分钟）
+     */
+    public static final String AGING_STAGE3_TIME = "agingStage3Time";
+}

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

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lenovo
+ * @date 2025/12/1
+ * @description 设备数据内部类
+ */
+public class DeviceData {
+    /** 顺序号 */
+    private Integer sequenceNumber;
+
+    /** 标定状态 */
+    private String calibrationStatus;
+
+    /** 标定浓度值 */
+    private BigDecimal calibrationValue;
+
+    public Integer getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    public void setSequenceNumber(Integer sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public String getCalibrationStatus() {
+        return calibrationStatus;
+    }
+
+    public void setCalibrationStatus(String calibrationStatus) {
+        this.calibrationStatus = calibrationStatus;
+    }
+
+    public BigDecimal getCalibrationValue() {
+        return calibrationValue;
+    }
+
+    public void setCalibrationValue(BigDecimal calibrationValue) {
+        this.calibrationValue = calibrationValue;
+    }
+}

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

@@ -2,6 +2,8 @@ package com.zehong.system.domain;
 
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * @author lenovo
  * @date 2025/11/22
@@ -47,6 +49,16 @@ public class MesDeviceDomain extends BaseEntity {
      * 实时状态 0-异常;1-正常
      */
     private String realTimeStatus;
+    /**
+     * 标定浓度值
+     */
+    private BigDecimal calibrationConcentration;
+
+    /**
+     * 标定状态 4-正常，其他都是异常
+     * 0-预热；1-正常；3-传感器故障；4-报警；5-通讯故障； 只有是4的时候显示正常，其他的都是异常
+     */
+    private String calibrationConcentrationStatus;
 
     public String getMotherboardCode() {
         return motherboardCode;
@@ -111,4 +123,20 @@ public class MesDeviceDomain extends BaseEntity {
     public void setRealTimeStatus(String realTimeStatus) {
         this.realTimeStatus = realTimeStatus;
     }
+
+    public BigDecimal getCalibrationConcentration() {
+        return calibrationConcentration;
+    }
+
+    public void setCalibrationConcentration(BigDecimal calibrationConcentration) {
+        this.calibrationConcentration = calibrationConcentration;
+    }
+
+    public String getCalibrationConcentrationStatus() {
+        return calibrationConcentrationStatus;
+    }
+
+    public void setCalibrationConcentrationStatus(String calibrationConcentrationStatus) {
+        this.calibrationConcentrationStatus = calibrationConcentrationStatus;
+    }
 }

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

 package com.zehong.system.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -135,6 +136,16 @@ public class PalletDeviceBinding extends BaseEntity
      */
     private String realTimeStatus;
 
+    /**
+     * 标定浓度值
+     */
+    private BigDecimal calibrationConcentration;
+
+    /**
+     * 标定状态 4-正常，其他都是异常
+     * 0-预热；1-正常；3-传感器故障；4-报警；5-通讯故障； 只有是4的时候显示正常，其他的都是异常
+     */
+    private String calibrationConcentrationStatus;
     public String getStatus() {
         return status;
     }
@@ -343,6 +354,22 @@ public class PalletDeviceBinding extends BaseEntity
         this.calibrationAdStatus = calibrationAdStatus;
     }
 
+    public BigDecimal getCalibrationConcentration() {
+        return calibrationConcentration;
+    }
+
+    public void setCalibrationConcentration(BigDecimal calibrationConcentration) {
+        this.calibrationConcentration = calibrationConcentration;
+    }
+
+    public String getCalibrationConcentrationStatus() {
+        return calibrationConcentrationStatus;
+    }
+
+    public void setCalibrationConcentrationStatus(String calibrationConcentrationStatus) {
+        this.calibrationConcentrationStatus = calibrationConcentrationStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

 package com.zehong.system.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -117,6 +118,16 @@ public class PalletDeviceUploadHistory extends BaseEntity
     @Excel(name = "实时AD状态;0-异常;1-正常")
     private String realTimeAdStatus;
 
+    /**
+     * 传感器校准浓度
+     */
+    private BigDecimal calibrationConcentration;
+
+    /**
+     * 传感器校准状态 4-正常，其他都是异常
+     * 0-预热；1-正常；3-传感器故障；4-报警；5-通讯故障； 只有是4的时候显示正常，其他的都是异常
+     */
+    private String calibrationConcentrationStatus;
     public void setId(Long id) 
     {
         this.id = id;
@@ -342,6 +353,22 @@ public class PalletDeviceUploadHistory extends BaseEntity
         this.trayCode = trayCode;
     }
 
+    public BigDecimal getCalibrationConcentration() {
+        return calibrationConcentration;
+    }
+
+    public void setCalibrationConcentration(BigDecimal calibrationConcentration) {
+        this.calibrationConcentration = calibrationConcentration;
+    }
+
+    public String getCalibrationConcentrationStatus() {
+        return calibrationConcentrationStatus;
+    }
+
+    public void setCalibrationConcentrationStatus(String calibrationConcentrationStatus) {
+        this.calibrationConcentrationStatus = calibrationConcentrationStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

+package com.zehong.system.domain;
+
+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_process_calibration_result_history
+ * 
+ * @author zehong
+ * @date 2025-12-01
+ */
+public class ProcessCalibrationResultHistory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String message;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMessage(String message) 
+    {
+        this.message = message;
+    }
+
+    public String getMessage() 
+    {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createTime", getCreateTime())
+            .append("message", getMessage())
+            .toString();
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.ProcessCalibrationResultHistory;
+
+/**
+ * 标定结果数据接收历史记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2025-12-01
+ */
+public interface ProcessCalibrationResultHistoryMapper 
+{
+    /**
+     * 查询标定结果数据接收历史记录
+     * 
+     * @param id 标定结果数据接收历史记录ID
+     * @return 标定结果数据接收历史记录
+     */
+    public ProcessCalibrationResultHistory selectProcessCalibrationResultHistoryById(Long id);
+
+    /**
+     * 查询标定结果数据接收历史记录列表
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 标定结果数据接收历史记录集合
+     */
+    public List<ProcessCalibrationResultHistory> selectProcessCalibrationResultHistoryList(ProcessCalibrationResultHistory processCalibrationResultHistory);
+
+    /**
+     * 新增标定结果数据接收历史记录
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 结果
+     */
+    public int insertProcessCalibrationResultHistory(ProcessCalibrationResultHistory processCalibrationResultHistory);
+
+    /**
+     * 修改标定结果数据接收历史记录
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 结果
+     */
+    public int updateProcessCalibrationResultHistory(ProcessCalibrationResultHistory processCalibrationResultHistory);
+
+    /**
+     * 删除标定结果数据接收历史记录
+     * 
+     * @param id 标定结果数据接收历史记录ID
+     * @return 结果
+     */
+    public int deleteProcessCalibrationResultHistoryById(Long id);
+
+    /**
+     * 批量删除标定结果数据接收历史记录
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteProcessCalibrationResultHistoryByIds(Long[] ids);
+}

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

@@ -18,6 +18,8 @@ public interface SysConfigMapper
      */
     public SysConfig selectConfig(SysConfig config);
 
+    public List<SysConfig> selectAgingStageTime();
+
     /**
      * 查询参数配置列表
      * 

zhmes-agecal-system/src/main/java/com/zehong/system/netty/event/ProcessCalibrationResultsEvent.java

+package com.zehong.system.netty.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author lenovo
+ * @date 2025/12/1
+ * @description 处理标定结果event
+ */
+public class ProcessCalibrationResultsEvent extends ApplicationEvent {
+
+    private final String message;
+
+
+    public ProcessCalibrationResultsEvent(Object source,String message) {
+        super(source);
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.ProcessCalibrationResultHistory;
+
+/**
+ * 标定结果数据接收历史记录Service接口
+ * 
+ * @author zehong
+ * @date 2025-12-01
+ */
+public interface IProcessCalibrationResultHistoryService 
+{
+    /**
+     * 查询标定结果数据接收历史记录
+     * 
+     * @param id 标定结果数据接收历史记录ID
+     * @return 标定结果数据接收历史记录
+     */
+    public ProcessCalibrationResultHistory selectProcessCalibrationResultHistoryById(Long id);
+
+    /**
+     * 查询标定结果数据接收历史记录列表
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 标定结果数据接收历史记录集合
+     */
+    public List<ProcessCalibrationResultHistory> selectProcessCalibrationResultHistoryList(ProcessCalibrationResultHistory processCalibrationResultHistory);
+
+    /**
+     * 新增标定结果数据接收历史记录
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 结果
+     */
+    public int insertProcessCalibrationResultHistory(ProcessCalibrationResultHistory processCalibrationResultHistory);
+
+    /**
+     * 修改标定结果数据接收历史记录
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 结果
+     */
+    public int updateProcessCalibrationResultHistory(ProcessCalibrationResultHistory processCalibrationResultHistory);
+
+    /**
+     * 批量删除标定结果数据接收历史记录
+     * 
+     * @param ids 需要删除的标定结果数据接收历史记录ID
+     * @return 结果
+     */
+    public int deleteProcessCalibrationResultHistoryByIds(Long[] ids);
+
+    /**
+     * 删除标定结果数据接收历史记录信息
+     * 
+     * @param id 标定结果数据接收历史记录ID
+     * @return 结果
+     */
+    public int deleteProcessCalibrationResultHistoryById(Long id);
+}

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

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.SysConfig;
 
 /**
@@ -28,6 +30,10 @@ public interface ISysConfigService
 
     public String directSelectConfigByKey(String configKey);
 
+    public List<SysConfig>  selectAgingStageTime();
+
+    public int updateAgingStageTime(List<SysConfig> sysConfigs);
+
     /**
      * 查询参数配置列表
      * 

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

@@ -3,6 +3,7 @@ package com.zehong.system.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zehong.common.constant.RoboticArmConstans;
 import com.zehong.common.core.domain.AjaxResult;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.StringUtils;
@@ -157,10 +158,8 @@ public class PalletDeviceUploadHistoryServiceImpl implements IPalletDeviceUpload
         for (PalletDeviceUploadHistory palletDeviceBinding : palletDeviceUploadHistoryList) {
             MesDeviceDomain mesDeviceDomain = new MesDeviceDomain();
             if(StringUtils.isBlank(palletDeviceBinding.getDeviceCode())
-            || StringUtils.isBlank(palletDeviceBinding.getAdjustmentZeroAd())
-            || StringUtils.isBlank(palletDeviceBinding.getZeroStatus())
-            || StringUtils.isBlank(palletDeviceBinding.getCalibrationAd())
-            || StringUtils.isBlank(palletDeviceBinding.getCalibrationStatus())
+            || palletDeviceBinding.getCalibrationConcentration()!= null
+            || StringUtils.isBlank(palletDeviceBinding.getCalibrationConcentrationStatus())
             || StringUtils.isBlank(palletDeviceBinding.getConcentration())
             || palletDeviceBinding.getRealTimeAd() == null
             || StringUtils.isBlank(palletDeviceBinding.getRealTimeAdStatus())) {
@@ -168,14 +167,10 @@ public class PalletDeviceUploadHistoryServiceImpl implements IPalletDeviceUpload
             }
             // 主板码
             mesDeviceDomain.setMotherboardCode(palletDeviceBinding.getDeviceCode());
-            // 零点AD
-            mesDeviceDomain.setZeroAdValue(palletDeviceBinding.getAdjustmentZeroAd());
-            // 零点AD状态
-            mesDeviceDomain.setZeroStatus(palletDeviceBinding.getZeroStatus());
-            // 标定AD
-            mesDeviceDomain.setCalibratedAdValue(palletDeviceBinding.getCalibrationAd());
-            // 标定AD状态
-            mesDeviceDomain.setCalibrationStatus(palletDeviceBinding.getCalibrationStatus());
+            // 标定浓度值
+            mesDeviceDomain.setCalibrationConcentration(palletDeviceBinding.getCalibrationConcentration());
+            // 标定浓度结果
+            mesDeviceDomain.setCalibrationConcentrationStatus(palletDeviceBinding.getCalibrationConcentrationStatus());
             // 浓度
             mesDeviceDomain.setConcentration(palletDeviceBinding.getConcentration());
             // 实时AD
@@ -185,7 +180,7 @@ public class PalletDeviceUploadHistoryServiceImpl implements IPalletDeviceUpload
             mesDeviceDomains.add(mesDeviceDomain);
         }
 
-        String mesUploadAddress = sysConfigService.directSelectConfigByKey(NettyUdpServerHandler.UPLOAD_MES_ADDRESS);
+        String mesUploadAddress = sysConfigService.directSelectConfigByKey(RoboticArmConstans.UPLOAD_MES_ADDRESS);
         if (StringUtils.isBlank(mesUploadAddress)) {
             throw new RuntimeException("MES上传地址未配置");
         }

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

+package com.zehong.system.service.impl;
+
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.ProcessCalibrationResultHistory;
+import com.zehong.system.mapper.ProcessCalibrationResultHistoryMapper;
+import com.zehong.system.service.IProcessCalibrationResultHistoryService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 标定结果数据接收历史记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2025-12-01
+ */
+@Service
+public class ProcessCalibrationResultHistoryServiceImpl implements IProcessCalibrationResultHistoryService 
+{
+    @Resource
+    private ProcessCalibrationResultHistoryMapper processCalibrationResultHistoryMapper;
+
+    /**
+     * 查询标定结果数据接收历史记录
+     * 
+     * @param id 标定结果数据接收历史记录ID
+     * @return 标定结果数据接收历史记录
+     */
+    @Override
+    public ProcessCalibrationResultHistory selectProcessCalibrationResultHistoryById(Long id)
+    {
+        return processCalibrationResultHistoryMapper.selectProcessCalibrationResultHistoryById(id);
+    }
+
+    /**
+     * 查询标定结果数据接收历史记录列表
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 标定结果数据接收历史记录
+     */
+    @Override
+    public List<ProcessCalibrationResultHistory> selectProcessCalibrationResultHistoryList(ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        return processCalibrationResultHistoryMapper.selectProcessCalibrationResultHistoryList(processCalibrationResultHistory);
+    }
+
+    /**
+     * 新增标定结果数据接收历史记录
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 结果
+     */
+    @Override
+    public int insertProcessCalibrationResultHistory(ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        processCalibrationResultHistory.setCreateTime(DateUtils.getNowDate());
+        return processCalibrationResultHistoryMapper.insertProcessCalibrationResultHistory(processCalibrationResultHistory);
+    }
+
+    /**
+     * 修改标定结果数据接收历史记录
+     * 
+     * @param processCalibrationResultHistory 标定结果数据接收历史记录
+     * @return 结果
+     */
+    @Override
+    public int updateProcessCalibrationResultHistory(ProcessCalibrationResultHistory processCalibrationResultHistory)
+    {
+        return processCalibrationResultHistoryMapper.updateProcessCalibrationResultHistory(processCalibrationResultHistory);
+    }
+
+    /**
+     * 批量删除标定结果数据接收历史记录
+     * 
+     * @param ids 需要删除的标定结果数据接收历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteProcessCalibrationResultHistoryByIds(Long[] ids)
+    {
+        return processCalibrationResultHistoryMapper.deleteProcessCalibrationResultHistoryByIds(ids);
+    }
+
+    /**
+     * 删除标定结果数据接收历史记录信息
+     * 
+     * @param id 标定结果数据接收历史记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteProcessCalibrationResultHistoryById(Long id)
+    {
+        return processCalibrationResultHistoryMapper.deleteProcessCalibrationResultHistoryById(id);
+    }
+}

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

 package com.zehong.system.service.impl;
 
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
+import com.zehong.common.constant.RoboticArmConstans;
 import com.zehong.system.netty.handler.NettyUdpServerHandler;
 import org.springframework.stereotype.Service;
 import com.zehong.common.annotation.DataSource;
@@ -102,6 +102,38 @@ public class SysConfigServiceImpl implements ISysConfigService
         return StringUtils.EMPTY;
     }
 
+    /**
+     * 查询 agingStage1Time agingStage2Time agingStage3Time
+     *
+     * @return r
+     */
+    @Override
+    public List<SysConfig> selectAgingStageTime() {
+
+        List<SysConfig> sysConfigs = configMapper.selectAgingStageTime();
+        if(sysConfigs != null && sysConfigs.size() > 0) {
+            return sysConfigs;
+        }
+
+        return new ArrayList<>();
+    }
+
+    /**
+     * 更新 agingStage1Time agingStage2Time agingStage3Time
+     *
+     * @param sysConfigs s
+     * @return r
+     */
+    @Override
+    public int updateAgingStageTime(List<SysConfig> sysConfigs) {
+
+        for(SysConfig sysConfig : sysConfigs) {
+            configMapper.directUpdateConfigByKey(sysConfig);
+        }
+
+        return 1;
+    }
+
     /**
      * 查询参数配置列表
      * 
@@ -155,7 +187,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      */
     @Override
     public int updateUploadMesAddress(SysConfig sysConfig) {
-        sysConfig.setConfigKey(NettyUdpServerHandler.UPLOAD_MES_ADDRESS);
+        sysConfig.setConfigKey(RoboticArmConstans.UPLOAD_MES_ADDRESS);
         return configMapper.directUpdateConfigByKey(sysConfig);
     }
 

zhmes-agecal-system/src/main/java/com/zehong/system/task/DeviceTaskScheduler.java

 package com.zehong.system.task;
 
+import com.zehong.common.constant.RoboticArmConstans;
 import com.zehong.quartz.config.QuartzTaskMonitor;
+import com.zehong.system.service.ISysConfigService;
 import com.zehong.system.task.DeviceCommJob.DeviceComm501Device1Job;
 import com.zehong.system.task.DeviceCommJob.DeviceComm501Device2Job;
 import com.zehong.system.task.DeviceCommJob.DeviceComm501Device3Job;
@@ -36,6 +38,9 @@ public class DeviceTaskScheduler {
     public static final String JOB_GROUP = "DEVICE_TASKS";
     // 触发器组名（统一固定，与原有逻辑保持一致）
     public static final String TRIGGER_GROUP = "DEVICE_TRIGGERS";
+
+    @Resource
+    private ISysConfigService sysConfigService;
     // 新增：注入监控器
     @Autowired
     private QuartzTaskMonitor quartzTaskMonitor;
@@ -239,7 +244,16 @@ public class DeviceTaskScheduler {
                 .storeDurably(false)
                 .build();
 
-        Date executeTime = Date.from(Instant.now().plus(5, ChronoUnit.MINUTES));
+        String s = sysConfigService.directSelectConfigByKey(RoboticArmConstans.AGING_STAGE1_TIME);
+        int delayMin = 0;
+        if(s != null) {
+            delayMin = Integer.parseInt(s);
+        }
+        if(delayMin == 0) {
+            delayMin = 5;
+        }
+
+        Date executeTime = Date.from(Instant.now().plus(delayMin, ChronoUnit.MINUTES));
         // 关键修复：使用StartAt而不是StartNow
         SimpleTrigger trigger = TriggerBuilder.newTrigger()
                 .withIdentity(triggerKey)
@@ -286,7 +300,16 @@ public class DeviceTaskScheduler {
                 .storeDurably(false)
                 .build();
 
-        Date executeTime = Date.from(Instant.now().plus(10, ChronoUnit.MINUTES));
+        String s = sysConfigService.directSelectConfigByKey(RoboticArmConstans.AGING_STAGE2_TIME);
+        int delayMin = 0;
+        if(s != null) {
+            delayMin = Integer.parseInt(s);
+        }
+        if(delayMin == 0) {
+            delayMin = 10;
+        }
+
+        Date executeTime = Date.from(Instant.now().plus(delayMin, ChronoUnit.MINUTES));
         // 关键修复：使用StartAt而不是StartNow
         SimpleTrigger trigger = TriggerBuilder.newTrigger()
                 .withIdentity(triggerKey)
@@ -320,7 +343,15 @@ public class DeviceTaskScheduler {
                 .requestRecovery(true)
                 .build();
 
-        Date executeTime = Date.from(Instant.now().plus(15, ChronoUnit.MINUTES));
+        String s = sysConfigService.directSelectConfigByKey(RoboticArmConstans.AGING_STAGE3_TIME);
+        int delayMin = 0;
+        if(s != null) {
+            delayMin = Integer.parseInt(s);
+        }
+        if(delayMin == 0) {
+            delayMin = 15;
+        }
+        Date executeTime = Date.from(Instant.now().plus(delayMin, ChronoUnit.MINUTES));
         SimpleTrigger trigger = TriggerBuilder.newTrigger()
                 .withIdentity(triggerKey)
                 .forJob(jobKey)

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

@@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realTimeAd"    column="f_real_time_ad"    />
         <result property="realTimeStatus"    column="f_real_time_ad_status"    />
 
+        <result property="calibrationConcentration"    column="f_calibration_concentration"    />
+        <result property="calibrationConcentrationStatus"    column="f_calibration_concentration_status"    />
+
     </resultMap>
 
     <sql id="selectPalletDeviceBindingVo">
@@ -61,7 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_concentration,
                palDeviceBinding.f_run_time_status,
                palDeviceBinding.f_real_time_ad,
-               palDeviceBinding.f_real_time_ad_status
+               palDeviceBinding.f_real_time_ad_status,
+               palDeviceBinding.f_calibration_concentration,
+               palDeviceBinding.f_calibration_concentration_status
         from t_pallet_device_binding palDeviceBinding
         left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -136,7 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                f_concentration,
                f_run_time_status,
                f_real_time_ad,
-               f_real_time_ad_status
+               f_real_time_ad_status,
+               f_calibration_concentration,
+               f_calibration_concentration_status
         from t_pallet_device_binding palDeviceBinding where palDeviceBinding.f_tray_id = (
                     SELECT
                         trayInfo.f_tray_id
@@ -179,7 +186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_calibration_status = null,
             f_run_time_status = null,
             f_real_time_ad = null,
-            f_real_time_ad_status = null
+            f_real_time_ad_status = null,
+            f_calibration_concentration = null,
+            f_calibration_concentration_status = null
         where f_tray_id = #{trayId}
     </update>
     <insert id="insertPalletDeviceBinding" parameterType="PalletDeviceBinding" useGeneratedKeys="true" keyProperty="palletDeviceBindingId">
@@ -227,7 +236,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_concentration = null,
             f_run_time_status = null,
             f_real_time_ad = null,
-            f_real_time_ad_status = null
+            f_real_time_ad_status = null,
+            f_calibration_concentration = null,
+            f_calibration_concentration_status = null
         where f_pallet_device_binding_id = #{palletDeviceBindingId}
     </update>
     <update id="updatePalletDeviceBinding" parameterType="PalletDeviceBinding">
@@ -259,6 +270,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="runTimeStatus != null">f_run_time_status = #{runTimeStatus},</if>
             <if test="realTimeAd != null">f_real_time_ad = #{realTimeAd},</if>
             <if test="realTimeStatus != null">f_real_time_ad_status = #{realTimeStatus},</if>
+
+            <if test="calibrationConcentration != null">f_calibration_concentration = #{calibrationConcentration},</if>
+            <if test="calibrationConcentrationStatus != null">f_calibration_concentration_status = #{calibrationConcentrationStatus},</if>
         </trim>
         where f_pallet_device_binding_id = #{palletDeviceBindingId}
     </update>
@@ -303,7 +317,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 f_concentration = null,
                 f_run_time_status = null,
                 f_real_time_ad = null,
-                f_real_time_ad_status = null
+                f_real_time_ad_status = null,
+                f_calibration_concentration = null,
+                f_calibration_concentration_status = null
                 <if test="item.deviceCode != null">f_device_code = #{item.deviceCode},</if>
             </trim>
             WHERE f_pallet_device_binding_id = #{item.palletDeviceBindingId}
@@ -327,7 +343,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_concentration = null,
             f_run_time_status = null,
             f_real_time_ad = null,
-            f_real_time_ad_status = null
+            f_real_time_ad_status = null,
+            f_calibration_concentration = null,
+            f_calibration_concentration_status = null
         where f_tray_id = #{trayId}
     </update>
 

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

@@ -30,6 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="runTimeStatus"    column="f_run_time_status"    />
         <result property="realTimeAd"    column="f_real_time_ad"    />
         <result property="realTimeAdStatus"    column="f_real_time_ad_status"    />
+
+        <result property="calibrationConcentration"    column="f_calibration_concentration"    />
+        <result property="calibrationConcentrationStatus"    column="f_calibration_concentration_status"    />
     </resultMap>
 
     <sql id="selectPalletDeviceUploadHistoryVo">
@@ -58,7 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                palDeviceBinding.f_concentration,
                palDeviceBinding.f_run_time_status,
                palDeviceBinding.f_real_time_ad,
-               palDeviceBinding.f_real_time_ad_status
+               palDeviceBinding.f_real_time_ad_status,
+               palDeviceBinding.f_calibration_concentration,
+               palDeviceBinding.f_calibration_concentration_status
         from t_pallet_device_upload_history palDeviceBinding
                  left join t_tray_info trayInfo  on trayInfo.f_tray_id = palDeviceBinding.f_tray_id
     </sql>
@@ -103,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="list[0].runTimeStatus != null">f_run_time_status,</if>
                 <if test="list[0].realTimeAd != null">f_real_time_ad,</if>
                 <if test="list[0].realTimeAdStatus != null">f_real_time_ad_status,</if>
+                <if test="list[0].calibrationConcentration != null">f_calibration_concentration,</if>
+                <if test="list[0].calibrationConcentrationStatus != null">f_calibration_concentration_status,</if>
             </if>
         </trim>
         values
@@ -132,6 +139,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="item.runTimeStatus != null">#{item.runTimeStatus},</if>
                 <if test="item.realTimeAd != null">#{item.realTimeAd},</if>
                 <if test="item.realTimeAdStatus != null">#{item.realTimeAdStatus},</if>
+                <if test="item.calibrationConcentration != null">#{item.calibrationConcentration},</if>
+                <if test="item.calibrationConcentrationStatus != null">#{item.calibrationConcentrationStatus},</if>
             </trim>
         </foreach>
     </insert>
@@ -162,6 +171,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="runTimeStatus != null">f_run_time_status,</if>
             <if test="realTimeAd != null">f_real_time_ad,</if>
             <if test="realTimeAdStatus != null">f_real_time_ad_status,</if>
+            <if test="calibrationConcentration != null">#{calibrationConcentration},</if>
+            <if test="calibrationConcentrationStatus != null">#{calibrationConcentrationStatus},</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="trayId != null">#{trayId},</if>
@@ -188,6 +199,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="runTimeStatus != null">#{runTimeStatus},</if>
             <if test="realTimeAd != null">#{realTimeAd},</if>
             <if test="realTimeAdStatus != null">#{realTimeAdStatus},</if>
+            <if test="calibrationConcentration != null">#{calibrationConcentration},</if>
+            <if test="calibrationConcentrationStatus != null">#{calibrationConcentrationStatus},</if>
          </trim>
     </insert>
 
@@ -218,6 +231,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="runTimeStatus != null">f_run_time_status = #{runTimeStatus},</if>
             <if test="realTimeAd != null">f_real_time_ad = #{realTimeAd},</if>
             <if test="realTimeAdStatus != null">f_real_time_ad_status = #{realTimeAdStatus},</if>
+            <if test="calibrationConcentration != null">f_calibration_concentration = #{calibrationConcentration},</if>
+            <if test="calibrationConcentrationStatus != null">f_calibration_concentration_status = #{calibrationConcentrationStatus},</if>
         </trim>
         where f_id = #{id}
     </update>

zhmes-agecal-system/src/main/resources/mapper/system/ProcessCalibrationResultHistoryMapper.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.ProcessCalibrationResultHistoryMapper">
+    
+    <resultMap type="ProcessCalibrationResultHistory" id="ProcessCalibrationResultHistoryResult">
+        <result property="id"    column="f_id"    />
+        <result property="createTime"    column="f_create_time"    />
+        <result property="message"    column="f_message"    />
+    </resultMap>
+
+    <sql id="selectProcessCalibrationResultHistoryVo">
+        select f_id, f_create_time, f_message from t_process_calibration_result_history
+    </sql>
+
+    <select id="selectProcessCalibrationResultHistoryList" parameterType="ProcessCalibrationResultHistory" resultMap="ProcessCalibrationResultHistoryResult">
+        <include refid="selectProcessCalibrationResultHistoryVo"/>
+        <where>
+            <if test="message != null  and message != ''"> and f_message like concat ('%',  #{message}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectProcessCalibrationResultHistoryById" parameterType="Long" resultMap="ProcessCalibrationResultHistoryResult">
+        <include refid="selectProcessCalibrationResultHistoryVo"/>
+        where f_id = #{id}
+    </select>
+        
+    <insert id="insertProcessCalibrationResultHistory" parameterType="ProcessCalibrationResultHistory" useGeneratedKeys="true" keyProperty="id">
+        insert into t_process_calibration_result_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="createTime != null">f_create_time,</if>
+            <if test="message != null">f_message,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="createTime != null">#{createTime},</if>
+            <if test="message != null">#{message},</if>
+         </trim>
+    </insert>
+
+    <update id="updateProcessCalibrationResultHistory" parameterType="ProcessCalibrationResultHistory">
+        update t_process_calibration_result_history
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="createTime != null">f_create_time = #{createTime},</if>
+            <if test="message != null">f_message = #{message},</if>
+        </trim>
+        where f_id = #{id}
+    </update>
+
+    <delete id="deleteProcessCalibrationResultHistoryById" parameterType="Long">
+        delete from t_process_calibration_result_history where f_id = #{id}
+    </delete>
+
+    <delete id="deleteProcessCalibrationResultHistoryByIds" parameterType="String">
+        delete from t_process_calibration_result_history where f_id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

@@ -37,6 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectConfigVo"/>
         <include refid="sqlwhereSearch"/>
     </select>
+    <select id="selectAgingStageTime" resultMap="SysConfigResult">
+        <include refid="selectConfigVo"/>
+		where config_key in ('agingStage1Time','agingStage2Time','agingStage3Time')
+    </select>
     
     <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>

zhmes-agecal-web/src/api/calibrationResult/calibrationResultHistory.js

+import request from '@/utils/request'
+
+// 查询标定结果数据接收历史记录列表
+export function listHistory(query) {
+  return request({
+    url: '/calibrationResult/history/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询标定结果数据接收历史记录详细
+export function getHistory(id) {
+  return request({
+    url: '/calibrationResult/history/' + id,
+    method: 'get'
+  })
+}
+
+// 新增标定结果数据接收历史记录
+export function addHistory(data) {
+  return request({
+    url: '/calibrationResult/history',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改标定结果数据接收历史记录
+export function updateHistory(data) {
+  return request({
+    url: '/calibrationResult/history',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除标定结果数据接收历史记录
+export function delHistory(id) {
+  return request({
+    url: '/calibrationResult/history/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出标定结果数据接收历史记录
+export function exportHistory(query) {
+  return request({
+    url: '/calibrationResult/history/export',
+    method: 'get',
+    params: query
+  })
+}

zhmes-agecal-web/src/api/system/config.js

@@ -31,6 +31,22 @@ export function getUploadMesAddress() {
     method: 'get'
   })
 }
+
+export function getAgingStageTime() {
+  return request({
+    url: '/system/config/getAgingStageTime',
+    method: 'get'
+  })
+}
+
+export function updateAgingStageTime(data) {
+  return request({
+    url: '/system/config/updateAgingStageTime',
+    method: 'post',
+    data: data
+  })
+}
+
 export function updateUploadMesAddress(data) {
   return request({
     url: '/system/config/updateUploadMesAddress/',

zhmes-agecal-web/src/views/calibrationResult/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标定结果" prop="message">
+        <el-input v-model="queryParams.message" placeholder="请输入结果内容进行模糊搜索" clearable size="small" @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
+      <el-table-column label="接收时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+          >详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改标定结果数据接收历史记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="内容" prop="message">
+          <el-input v-model="form.message" type="textarea" rows="20" disabled/>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listHistory, getHistory, delHistory, addHistory, updateHistory, exportHistory } from "@/api/calibrationResult/calibrationResultHistory";
+
+export default {
+  name: "History",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 标定结果数据接收历史记录表格数据
+      historyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        createTime: null,
+        message: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询标定结果数据接收历史记录列表 */
+    getList() {
+      this.loading = true;
+      listHistory(this.queryParams).then(response => {
+        this.historyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        createTime: null,
+        message: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加标定结果数据接收历史记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getHistory(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "标定结果数据接收历史记录详情";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateHistory(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHistory(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除标定结果数据接收历史记录编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delHistory(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有标定结果数据接收历史记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportHistory(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

zhmes-agecal-web/src/views/palletDeviceUploadHistory/index.vue

@@ -100,20 +100,28 @@
           <el-tag type="success" v-if="scope.row.realTimeAdStatus === '1'">正常</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="调零AD" align="center" prop="adjustmentZeroAd" />
-      <el-table-column label="调零状态" align="center" prop="zeroStatus" >
+      <el-table-column label="标定浓度值" align="center" width="150" prop="calibrationConcentration"></el-table-column>
+      <el-table-column label="标定状态" align="center" width="120">
         <template slot-scope="scope">
-          <el-tag type="info" v-if="scope.row.zeroStatus === '0'">异常</el-tag>
-          <el-tag type="success" v-if="scope.row.zeroStatus === '1'">正常</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="标定AD" align="center" prop="calibrationAd" />
-      <el-table-column label="标定状态" align="center" prop="calibrationStatus" >
-        <template slot-scope="scope">
-          <el-tag type="info" v-if="scope.row.calibrationStatus === '0'">异常</el-tag>
-          <el-tag type="success" v-if="scope.row.calibrationStatus === '1'">正常</el-tag>
+          <el-tag type="success" v-if="scope.row.calibrationConcentrationStatus !== null && scope.row.calibrationConcentrationStatus === '4'">正常</el-tag>
+          <el-tag type="info" v-if="scope.row.calibrationConcentrationStatus !== null && scope.row.calibrationConcentrationStatus !== '4' ">异常</el-tag>
         </template>
       </el-table-column>
+
+<!--      <el-table-column label="调零AD" align="center" prop="adjustmentZeroAd" />-->
+<!--      <el-table-column label="调零状态" align="center" prop="zeroStatus" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag type="info" v-if="scope.row.zeroStatus === '0'">异常</el-tag>-->
+<!--          <el-tag type="success" v-if="scope.row.zeroStatus === '1'">正常</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="标定AD" align="center" prop="calibrationAd" />-->
+<!--      <el-table-column label="标定状态" align="center" prop="calibrationStatus" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag type="info" v-if="scope.row.calibrationStatus === '0'">异常</el-tag>-->
+<!--          <el-tag type="success" v-if="scope.row.calibrationStatus === '1'">正常</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="设置-年" align="center" prop="recordYear" />
       <el-table-column label="设置-月" align="center" prop="recordMonth" />
       <el-table-column label="设置-日" align="center" prop="recordDate" />
@@ -314,6 +322,22 @@ export default {
     this.getList();
   },
   methods: {
+    // 获取标定状态文本
+    getCalibrationText(status) {
+      if (status === '4') {
+        return '正常'
+      } else if (status) {
+        return '异常'
+      }
+    },
+// 获取标定状态的el-tag类型
+    getCalibrationTagType(status) {
+      if (status === '4') {
+        return 'success' // 正常 - 绿色
+      } else if (status) {
+        return 'info' // 异常 - 红色
+      }
+    },
     /** 查询未上传成功的历史数据列列表 */
     getList() {
       this.loading = true;

zhmes-agecal-web/src/views/screen/components/RealTimeData.vue

@@ -117,28 +117,28 @@
               <span v-else class="write-unknown">-</span>
             </template>
           </el-table-column>
-          <el-table-column label="零点AD" align="center" width="150">
+<!--          <el-table-column label="零点AD" align="center" width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div class="device-code">{{ scope.row.adjustmentZeroAd || '-' }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="零点AD状态" align="center" width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="scope.row.zeroStatus === '1'" class="write-success">正常</span>-->
+<!--              <span v-else-if="scope.row.zeroStatus === '0'" class="write-failed">异常</span>-->
+<!--              <span v-else class="write-unknown">-</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="标定浓度值" align="center" width="150">
             <template slot-scope="scope">
-              <div class="device-code">{{ scope.row.adjustmentZeroAd || '-' }}</div>
+              <div class="device-code">{{ scope.row.calibrationConcentration || '-' }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="零点AD状态" align="center" width="150">
+          <el-table-column label="标定状态" align="center" width="120">
             <template slot-scope="scope">
-              <span v-if="scope.row.zeroStatus === '1'" class="write-success">正常</span>
-              <span v-else-if="scope.row.zeroStatus === '0'" class="write-failed">异常</span>
-              <span v-else class="write-unknown">-</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="校准AD" align="center" width="120">
-            <template slot-scope="scope">
-              <div class="device-code">{{ scope.row.calibrationAd || '-' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="校准AD状态" align="center" width="120">
-            <template slot-scope="scope">
-              <span v-if="scope.row.calibrationAdStatus === '1'" class="write-success">正常</span>
-              <span v-else-if="scope.row.calibrationAdStatus === '0'" class="write-failed">异常</span>
-              <span v-else class="write-unknown">-</span>
+              <span :class="getCalibrationClass(scope.row.calibrationConcentrationStatus)">
+                {{ getCalibrationText(scope.row.calibrationConcentrationStatus) }}
+              </span>
             </template>
           </el-table-column>
 
@@ -237,6 +237,27 @@ export default {
     }
   },
   methods: {
+    // 获取标定状态文本
+    getCalibrationText(status) {
+      if (status === '4') {
+        return '正常'
+      } else if (status) {
+        return '异常'
+      } else {
+        return '-'
+      }
+    },
+
+    // 获取标定状态样式类
+    getCalibrationClass(status) {
+      if (status === '4') {
+        return 'write-success'
+      } else if (status) {
+        return 'write-failed'
+      } else {
+        return 'write-unknown'
+      }
+    },
     /** 获取数据列表 */
     getList() {
       this.loading = true;

zhmes-agecal-web/src/views/system/agingStageTimeSetting/index.vue

+<template>
+  <div class="app-container">
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      label-width="300px"
+      class="config-form"
+    >
+      <!-- 提示信息 -->
+      <el-alert
+        title="提示"
+        type="info"
+        :closable="false"
+        style="margin-bottom: 20px;"
+      >
+        <div>71小时是4260分钟，72小时是4320分钟</div>
+      </el-alert>
+
+      <!-- 第一阶段 -->
+      <el-form-item
+        label="老化流程第一阶段执行时间（单位：分钟）"
+        prop="agingStage1Time"
+      >
+        <el-input-number
+          v-model="form.agingStage1Time"
+          :min="5"
+          :max="4260"
+          placeholder="请输入第一阶段执行时间"
+          controls-position="right"
+          style="width: 300px;"
+          @change="validateStage1"
+        />
+        <div class="form-tips">必须大于等于5分钟</div>
+      </el-form-item>
+
+      <!-- 第二阶段 -->
+      <el-form-item
+        label="老化流程第二阶段执行时间（单位：分钟）"
+        prop="agingStage2Time"
+      >
+        <el-input-number
+          v-model="form.agingStage2Time"
+          :min="Math.max(10, form.agingStage1Time + 5)"
+          :max="4260"
+          placeholder="请输入第二阶段执行时间"
+          controls-position="right"
+          style="width: 300px;"
+          @change="validateStage2"
+        />
+        <div class="form-tips">必须大于等于第一阶段时间5分钟及以上，最大4260分钟</div>
+      </el-form-item>
+
+      <!-- 第三阶段 -->
+      <el-form-item
+        label="老化流程第三阶段执行时间（单位：分钟）"
+        prop="agingStage3Time"
+      >
+        <el-input-number
+          v-model="form.agingStage3Time"
+          :min="Math.max(15, form.agingStage2Time + 5)"
+          :max="4320"
+          placeholder="请输入第三阶段执行时间"
+          controls-position="right"
+          style="width: 300px;"
+          @change="validateStage3"
+        />
+        <div class="form-tips">必须大于等于第二阶段时间5分钟及以上，最大4320分钟</div>
+      </el-form-item>
+
+      <!-- 操作按钮 -->
+      <el-form-item>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="submitForm"
+        >
+          保存
+        </el-button>
+        <el-button @click="resetForm">
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getAgingStageTime, updateAgingStageTime } from "@/api/system/config";
+
+export default {
+  name: "AgingConfig",
+  data() {
+    // 第一阶段验证规则
+    const validateStage1 = (rule, value, callback) => {
+      if (value === null || value === undefined || value === '') {
+        callback(new Error("第一阶段时间不能为空"));
+      } else if (value < 5) {
+        callback(new Error("第一阶段时间必须大于等于5分钟"));
+      } else if (value > 4260) {
+        callback(new Error("第一阶段时间不能超过4260分钟"));
+      } else {
+        callback();
+      }
+    };
+
+    // 第二阶段验证规则
+    const validateStage2 = (rule, value, callback) => {
+      if (value === null || value === undefined || value === '') {
+        callback(new Error("第二阶段时间不能为空"));
+      } else if (value < this.form.agingStage1Time + 5) {
+        callback(new Error("第二阶段时间必须大于等于第一阶段时间5分钟及以上"));
+      } else if (value > 4260) {
+        callback(new Error("第二阶段时间不能超过4260分钟"));
+      } else {
+        callback();
+      }
+    };
+
+    // 第三阶段验证规则
+    const validateStage3 = (rule, value, callback) => {
+      if (value === null || value === undefined || value === '') {
+        callback(new Error("第三阶段时间不能为空"));
+      } else if (value < this.form.agingStage2Time + 5) {
+        callback(new Error("第三阶段时间必须大于等于第二阶段时间5分钟及以上"));
+      } else if (value > 4320) {
+        callback(new Error("第三阶段时间不能超过4320分钟"));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      // 表单数据
+      form: {
+        agingStage1Time: null,
+        agingStage2Time: null,
+        agingStage3Time: null,
+      },
+      // 验证规则
+      rules: {
+        agingStage1Time: [
+          { required: true, validator: validateStage1, trigger: ["blur", "change"] }
+        ],
+        agingStage2Time: [
+          { required: true, validator: validateStage2, trigger: ["blur", "change"] }
+        ],
+        agingStage3Time: [
+          { required: true, validator: validateStage3, trigger: ["blur", "change"] }
+        ],
+      },
+      // 加载状态
+      loading: false,
+      // 配置键名
+      configKeys: {
+        stage1: "agingStage1Time",
+        stage2: "agingStage2Time",
+        stage3: "agingStage3Time",
+      },
+    };
+  },
+  created() {
+    this.getConfigData();
+  },
+  methods: {
+    // 获取配置数据
+    async getConfigData() {
+      try {
+        this.loading = true;
+        const response = await getAgingStageTime();
+
+        if (response.code === 200 && response.data) {
+          // 假设返回的数据格式为数组，包含三个配置项
+          const configs = response.data;
+          configs.forEach(item => {
+            switch (item.configKey) {
+              case this.configKeys.stage1:
+                this.form.agingStage1Time = parseInt(item.configValue) || 5;
+                break;
+              case this.configKeys.stage2:
+                this.form.agingStage2Time = parseInt(item.configValue) || 10;
+                break;
+              case this.configKeys.stage3:
+                this.form.agingStage3Time = parseInt(item.configValue) || 15;
+                break;
+            }
+          });
+        }
+      } catch (error) {
+        console.error("获取配置失败:", error);
+        this.$message.error("获取配置失败");
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 提交表单
+    submitForm() {
+      this.$refs.formRef.validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+
+            // 构建请求数据
+            const requestData = [
+              {
+                configKey: this.configKeys.stage1,
+                configValue: this.form.agingStage1Time.toString(),
+              },
+              {
+                configKey: this.configKeys.stage2,
+                configValue: this.form.agingStage2Time.toString(),
+              },
+              {
+                configKey: this.configKeys.stage3,
+                configValue: this.form.agingStage3Time.toString(),
+              },
+            ];
+
+            const response = await updateAgingStageTime(requestData);
+
+            if (response.code === 200) {
+              this.$message.success("保存成功");
+              // 可以重新加载数据，也可以不清除表单状态
+              // this.getConfigData();
+            } else {
+              this.$message.error(response.msg || "保存失败");
+            }
+          } catch (error) {
+            console.error("保存失败:", error);
+            this.$message.error("保存失败");
+          } finally {
+            this.loading = false;
+          }
+        } else {
+          this.$message.warning("请检查表单填写是否正确");
+          return false;
+        }
+      });
+    },
+
+    // 重置表单
+    resetForm() {
+      this.getConfigData(); // 重置为服务器数据
+    },
+
+    // 第一阶段变化时触发验证
+    validateStage1() {
+      // 重新验证第二阶段和第三阶段
+      this.$refs.formRef.validateField("agingStage2Time");
+      this.$refs.formRef.validateField("agingStage3Time");
+    },
+
+    // 第二阶段变化时触发验证
+    validateStage2() {
+      // 重新验证第三阶段
+      this.$refs.formRef.validateField("agingStage3Time");
+    },
+
+    // 第三阶段变化时触发验证
+    validateStage3() {
+      // 不需要重新验证其他阶段
+    },
+
+    // 计算第二阶段的最小值
+    getStage2Min() {
+      return Math.max(10, (this.form.agingStage1Time || 5) + 5);
+    },
+
+    // 计算第三阶段的最小值
+    getStage3Min() {
+      return Math.max(15, (this.form.agingStage2Time || 10) + 5);
+    }
+  },
+  watch: {
+    'form.agingStage1Time': {
+      handler(newVal) {
+        // 当第一阶段变化时，确保第二阶段不小于第一阶段+5
+        if (newVal !== null && this.form.agingStage2Time !== null) {
+          const minStage2 = newVal + 5;
+          if (this.form.agingStage2Time < minStage2) {
+            this.form.agingStage2Time = minStage2;
+          }
+        }
+      },
+      immediate: true
+    },
+    'form.agingStage2Time': {
+      handler(newVal) {
+        // 当第二阶段变化时，确保第三阶段不小于第二阶段+5
+        if (newVal !== null && this.form.agingStage3Time !== null) {
+          const minStage3 = newVal + 5;
+          if (this.form.agingStage3Time < minStage3) {
+            this.form.agingStage3Time = minStage3;
+          }
+        }
+      },
+      immediate: true
+    }
+  }
+};
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+
+.config-form {
+  max-width: 800px;
+  margin: 0 auto;
+  padding: 30px;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+
+.form-tips {
+  font-size: 12px;
+  color: #909399;
+  margin-top: 5px;
+}
+
+.el-input-number {
+  width: 100%;
+}
+
+::v-deep .el-form-item__label {
+  font-weight: bold;
+  color: #606266;
+}
+</style>