selectCurrentProducingPlan();
+}
+
diff --git a/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java b/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java
index cc74d2c..9124dcb 100644
--- a/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java
+++ b/business/src/main/java/com/fizz/business/mapper/SegmentTotalMapper.java
@@ -1,18 +1,16 @@
package com.fizz.business.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fizz.business.domain.SegmentTotal;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
- *
- * 各机张力，电流等架跟踪表 Mapper 接口
- *
- *
- * @author baomidou
- * @since 2023-10-26
+ * 带钢段工艺参数 Mapper（cpl_segment_total）
*/
@Mapper
-public interface SegmentTotalMapper extends BaseMapper {
- SegmentTotal getLatestRecord();
+public interface SegmentTotalMapper {
+
+ /**
+ * 根据入库钢卷号查询最新一段的 total_values_json
+ */
+ String selectLatestTotalValuesJsonByCoilId(@Param("coilId") String coilId);
}
diff --git a/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java b/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java
index 1bf6504..7690059 100644
--- a/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java
+++ b/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java
@@ -3,7 +3,6 @@ package com.fizz.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fizz.business.domain.StdAlloy;
-import com.fizz.business.domain.SteelGradeInfo;
import org.apache.ibatis.annotations.Mapper;
@Mapper
diff --git a/business/src/main/java/com/fizz/business/service/DashboardService.java b/business/src/main/java/com/fizz/business/service/DashboardService.java
new file mode 100644
index 0000000..e503e3c
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/DashboardService.java
@@ -0,0 +1,27 @@
+package com.fizz.business.service;
+
+import java.util.Map;
+
+/**
+ * 首页仪表板统计服务
+ */
+public interface DashboardService {
+
+ /**
+ * 当前生产中的计划信息（包含卷号、规格、时间等）
+ */
+ Map getCurrentProducingPlan();
+
+ /**
+ * 当前生产卷的关键工艺参数
+ * 结构说明（示例）：
+ * {
+ * "coilId": "...",
+ * "entrySection": { "POR1": { ... }, "POR2": { ... }, ... },
+ * "processSection":{ "CLEAN": { ... }, "FUR1": { ... }, ... },
+ * "exitSection": { "TR": { ... }, "CXL1": { ... }, ... }
+ * }
+ */
+ Map getCurrentProcessParams();
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/IBizSendTemplateItemService.java b/business/src/main/java/com/fizz/business/service/IBizSendTemplateItemService.java
new file mode 100644
index 0000000..edf2f2e
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/IBizSendTemplateItemService.java
@@ -0,0 +1,23 @@
+package com.fizz.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fizz.business.domain.BizSendTemplateItem;
+
+import java.util.List;
+
+/**
+ * 发送模板明细 Service
+ */
+public interface IBizSendTemplateItemService extends IService {
+
+ /**
+ * 批量更新模板明细（仅更新已有ID）
+ */
+ Boolean updateItemsBatch(List items);
+
+ /**
+ * 批量保存模板明细（新增/更新/删除）
+ */
+ Boolean batchSave(Integer templateId, List items, List deleteIds, String username);
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/IBizSendTemplateService.java b/business/src/main/java/com/fizz/business/service/IBizSendTemplateService.java
new file mode 100644
index 0000000..230e4d2
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/IBizSendTemplateService.java
@@ -0,0 +1,17 @@
+package com.fizz.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fizz.business.domain.BizSendTemplate;
+import com.fizz.business.domain.vo.BizSendTemplateVO;
+
+/**
+ * 发送默认模板 Service
+ */
+public interface IBizSendTemplateService extends IService {
+
+ /**
+ * 按模板编码获取模板（含明细）
+ */
+ BizSendTemplateVO getTemplateWithItems(String templateCode);
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/ISendJobQueryService.java b/business/src/main/java/com/fizz/business/service/ISendJobQueryService.java
new file mode 100644
index 0000000..2dcf5c8
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/ISendJobQueryService.java
@@ -0,0 +1,15 @@
+package com.fizz.business.service;
+
+import com.fizz.business.domain.vo.SendJobLastSuccessVO;
+
+/**
+ * 发送任务查询扩展（用于推荐值、上次发送时间）
+ */
+public interface ISendJobQueryService {
+
+ /**
+ * 查询最近一次成功发送（按 groupType 过滤：DRIVE / FURNACE）
+ */
+ SendJobLastSuccessVO getLastSuccess(String groupType);
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/ISendJobService.java b/business/src/main/java/com/fizz/business/service/ISendJobService.java
new file mode 100644
index 0000000..6403ced
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/ISendJobService.java
@@ -0,0 +1,41 @@
+package com.fizz.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fizz.business.domain.BizSendJob;
+import com.fizz.business.domain.dto.SendJobCreateDTO;
+import com.fizz.business.domain.dto.SendJobQueryDTO;
+import com.fizz.business.domain.vo.SendJobDetailVO;
+
+import java.util.List;
+
+/**
+ * 发送任务 Service
+ */
+public interface ISendJobService extends IService {
+
+ /**
+ * 创建发送任务（包含分组与明细）
+ */
+ Integer createSendJob(SendJobCreateDTO dto);
+
+ /**
+ * 查询发送任务列表（分页由 Controller 的 startPage() 控制）
+ */
+ List selectSendJobList(SendJobQueryDTO query);
+
+ /**
+ * 查询发送任务详情（包含分组与明细）
+ */
+ SendJobDetailVO selectSendJobDetail(Integer jobId);
+
+ /**
+ * 删除任务（逻辑删除：status=DELETED）
+ */
+ Boolean deleteSendJobByJobIds(Integer[] jobIds);
+
+ /**
+ * 执行发送：写入 OPC，并将发送结果保存为历史（更新 job/group/item 状态）
+ */
+ Boolean executeSendJob(Integer jobId);
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java b/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java
index 0e8b403..1821ac6 100644
--- a/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java
+++ b/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java
@@ -2,7 +2,6 @@ package com.fizz.business.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fizz.business.domain.StdAlloy;
-import com.fizz.business.domain.SteelGradeInfo;
public interface SteelGradeInfoService extends IService {
}
\ No newline at end of file
diff --git a/business/src/main/java/com/fizz/business/service/impl/BizSendTemplateItemServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/BizSendTemplateItemServiceImpl.java
new file mode 100644
index 0000000..864bb2f
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/impl/BizSendTemplateItemServiceImpl.java
@@ -0,0 +1,98 @@
+package com.fizz.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fizz.business.domain.BizSendTemplateItem;
+import com.fizz.business.mapper.BizSendTemplateItemMapper;
+import com.fizz.business.service.IBizSendTemplateItemService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+@Service
+public class BizSendTemplateItemServiceImpl extends ServiceImpl implements IBizSendTemplateItemService {
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateItemsBatch(List items) {
+ if (items == null || items.isEmpty()) {
+ return true;
+ }
+ // MyBatis-Plus 批量更新：这里简单循环 updateById（数量约40~100可接受）
+ for (BizSendTemplateItem it : items) {
+ this.updateById(it);
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean batchSave(Integer templateId, List items, List deleteIds, String username) {
+ Date now = new Date();
+
+ // 1) 删除（物理删除）。如果你们希望逻辑删除，可在此改为 enabled=0 / deleted 标记。
+ if (deleteIds != null && !deleteIds.isEmpty()) {
+ this.removeByIds(deleteIds);
+ }
+
+ // 2) 新增/更新
+ if (items == null) {
+ items = Collections.emptyList();
+ }
+
+ // 基础校验：templateId 必须一致
+ for (BizSendTemplateItem it : items) {
+ if (it.getTemplateId() == null) {
+ it.setTemplateId(templateId);
+ }
+ }
+
+ // 校验：同一 templateId 下 paramCode 唯一
+ // - 先校验本次提交内是否重复
+ Set seen = new HashSet<>();
+ for (BizSendTemplateItem it : items) {
+ if (it.getParamCode() == null || it.getParamCode().trim().isEmpty()) {
+ throw new IllegalArgumentException("paramCode is required");
+ }
+ String code = it.getParamCode().trim();
+ if (!seen.add(code)) {
+ throw new IllegalArgumentException("Duplicate paramCode in request: " + code);
+ }
+ it.setParamCode(code);
+ }
+
+ // - 再校验数据库里是否已存在同 paramCode（排除自身ID）
+ for (BizSendTemplateItem it : items) {
+ LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
+ qw.eq(BizSendTemplateItem::getTemplateId, templateId)
+ .eq(BizSendTemplateItem::getParamCode, it.getParamCode());
+ if (it.getTemplateItemId() != null) {
+ qw.ne(BizSendTemplateItem::getTemplateItemId, it.getTemplateItemId());
+ }
+ long cnt = this.count(qw);
+ if (cnt > 0) {
+ throw new IllegalArgumentException("paramCode already exists: " + it.getParamCode());
+ }
+ }
+
+ for (BizSendTemplateItem it : items) {
+ it.setTemplateId(templateId);
+ if (it.getTemplateItemId() == null) {
+ it.setCreateBy(username);
+ it.setCreateTime(now);
+ it.setUpdateBy(username);
+ it.setUpdateTime(now);
+ this.save(it);
+ } else {
+ it.setUpdateBy(username);
+ it.setUpdateTime(now);
+ this.updateById(it);
+ }
+ }
+
+ return true;
+ }
+}
+
+
diff --git a/business/src/main/java/com/fizz/business/service/impl/BizSendTemplateServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/BizSendTemplateServiceImpl.java
new file mode 100644
index 0000000..7a15983
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/impl/BizSendTemplateServiceImpl.java
@@ -0,0 +1,55 @@
+package com.fizz.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fizz.business.domain.BizSendTemplate;
+import com.fizz.business.domain.BizSendTemplateItem;
+import com.fizz.business.domain.vo.BizSendTemplateItemVO;
+import com.fizz.business.domain.vo.BizSendTemplateVO;
+import com.fizz.business.mapper.BizSendTemplateItemMapper;
+import com.fizz.business.mapper.BizSendTemplateMapper;
+import com.fizz.business.service.IBizSendTemplateService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class BizSendTemplateServiceImpl extends ServiceImpl implements IBizSendTemplateService {
+
+ @Autowired
+ private BizSendTemplateItemMapper templateItemMapper;
+
+ @Override
+ public BizSendTemplateVO getTemplateWithItems(String templateCode) {
+ BizSendTemplate template = this.lambdaQuery()
+ .eq(BizSendTemplate::getTemplateCode, templateCode)
+ .eq(BizSendTemplate::getEnabled, 1)
+ .one();
+
+ if (template == null) {
+ return null;
+ }
+
+ List items = templateItemMapper.selectList(
+ new LambdaQueryWrapper()
+ .eq(BizSendTemplateItem::getTemplateId, template.getTemplateId())
+ .eq(BizSendTemplateItem::getEnabled, 1)
+ .orderByAsc(BizSendTemplateItem::getItemNo)
+ );
+
+ BizSendTemplateVO vo = new BizSendTemplateVO();
+ BeanUtils.copyProperties(template, vo);
+
+ List itemVOs = items.stream().map(item -> {
+ BizSendTemplateItemVO it = new BizSendTemplateItemVO();
+ BeanUtils.copyProperties(item, it);
+ return it;
+ }).collect(Collectors.toList());
+
+ vo.setItems(itemVOs);
+ return vo;
+ }
+}
diff --git a/business/src/main/java/com/fizz/business/service/impl/DashboardServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/DashboardServiceImpl.java
new file mode 100644
index 0000000..5fbba29
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/impl/DashboardServiceImpl.java
@@ -0,0 +1,113 @@
+package com.fizz.business.service.impl;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fizz.business.constants.enums.DeviceEnum;
+import com.fizz.business.mapper.PlanDashboardMapper;
+import com.fizz.business.mapper.SegmentTotalMapper;
+import com.fizz.business.service.DashboardService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 首页仪表板统计服务实现
+ */
+@Service
+public class DashboardServiceImpl implements DashboardService {
+
+ @Resource
+ private PlanDashboardMapper planDashboardMapper;
+
+ @Resource
+ private SegmentTotalMapper segmentTotalMapper;
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Override
+ public Map getCurrentProducingPlan() {
+ // 查询当前 PRODUCING 的计划
+ Map plan = planDashboardMapper.selectCurrentProducingPlan();
+ if (plan == null) {
+ return Collections.emptyMap();
+ }
+ return plan;
+ }
+
+ @Override
+ public Map getCurrentProcessParams() {
+ Map result = new HashMap<>();
+
+ // 1. 当前生产计划
+ Map plan = planDashboardMapper.selectCurrentProducingPlan();
+ if (plan == null || plan.get("coilid") == null) {
+ return result;
+ }
+ String coilId = String.valueOf(plan.get("coilid"));
+ result.put("coilId", coilId);
+
+ // 2. 查询该卷最新一段的 total_values_json
+ String totalValuesJson = segmentTotalMapper.selectLatestTotalValuesJsonByCoilId(coilId);
+ if (totalValuesJson == null || totalValuesJson.isEmpty()) {
+ return result;
+ }
+
+ try {
+ // 3. 解析 JSON -> Map
+ Map valuesMap = objectMapper.readValue(
+ totalValuesJson,
+ new TypeReference>() {}
+ );
+
+ // 4. 按设备 + 段类型整理数据
+ Map entrySection = new LinkedHashMap<>();
+ Map processSection = new LinkedHashMap<>();
+ Map exitSection = new LinkedHashMap<>();
+
+ for (DeviceEnum device : DeviceEnum.values()) {
+ List fields = device.getParamFields();
+ if (fields == null || fields.isEmpty()) {
+ continue;
+ }
+
+ Map devData = new LinkedHashMap<>();
+ for (String field : fields) {
+ if (valuesMap.containsKey(field)) {
+ devData.put(field, valuesMap.get(field));
+ }
+ }
+
+ if (devData.isEmpty()) {
+ continue;
+ }
+
+ // key 用设备英文枚举名，如 POR1/FUR1/TM/TL/COAT 等
+ String key = device.name();
+ switch (device.getSectionType()) {
+ case ENTRY:
+ entrySection.put(key, devData);
+ break;
+ case PROCESS:
+ processSection.put(key, devData);
+ break;
+ case EXIT:
+ exitSection.put(key, devData);
+ break;
+ default:
+ break;
+ }
+ }
+
+ result.put("entrySection", entrySection);
+ result.put("processSection", processSection);
+ result.put("exitSection", exitSection);
+ } catch (Exception e) {
+ // 解析异常时，可按你项目的日志方案记录
+ e.printStackTrace();
+ }
+
+ return result;
+ }
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/impl/PdoExCoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/PdoExCoilServiceImpl.java
index 2f35f9e..3faae6a 100644
--- a/business/src/main/java/com/fizz/business/service/impl/PdoExCoilServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/PdoExCoilServiceImpl.java
@@ -50,7 +50,7 @@ public class PdoExCoilServiceImpl implements PdoExCoilService {
double aimWeightTop = 1;
double aimWeightBottom = 1;
-
+ pdoExCoilDTO.setZincCoatingThickness(plan.getZincCoatingThickness());
pdoExCoilDTO.setPlanOrigin(plan.getUnitCode());
pdoExCoilDTO.setUnitCode(plan.getUnitCode());
pdoExCoilDTO.setProcessCode(SYSTEM_MODULE);
diff --git a/business/src/main/java/com/fizz/business/service/impl/SendJobQueryServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SendJobQueryServiceImpl.java
new file mode 100644
index 0000000..976c6ed
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/impl/SendJobQueryServiceImpl.java
@@ -0,0 +1,196 @@
+package com.fizz.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fizz.business.domain.BizSendJob;
+import com.fizz.business.domain.BizSendJobGroup;
+import com.fizz.business.domain.BizSendJobItem;
+import com.fizz.business.domain.CrmPdiPlan;
+import com.fizz.business.domain.vo.BizSendTemplateItemVO;
+import com.fizz.business.domain.vo.BizSendTemplateVO;
+import com.fizz.business.domain.vo.SendJobLastSuccessVO;
+import com.fizz.business.mapper.BizSendJobGroupMapper;
+import com.fizz.business.mapper.BizSendJobItemMapper;
+import com.fizz.business.mapper.BizSendJobMapper;
+import com.fizz.business.mapper.CrmPdiPlanMapper;
+import com.fizz.business.service.IBizSendTemplateService;
+import com.fizz.business.service.ISendJobQueryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class SendJobQueryServiceImpl implements ISendJobQueryService {
+
+ @Autowired
+ private BizSendJobMapper jobMapper;
+
+ @Autowired
+ private BizSendJobGroupMapper groupMapper;
+
+ @Autowired
+ private BizSendJobItemMapper itemMapper;
+
+ @Autowired
+ private IBizSendTemplateService templateService;
+
+ @Autowired
+ private CrmPdiPlanMapper planMapper;
+
+ @Override
+ public SendJobLastSuccessVO getLastSuccess(String groupType) {
+ // 1. 根据 groupType 从 group 表中找到所有相关的 job_id
+ List groupsWithType = groupMapper.selectList(
+ new LambdaQueryWrapper().eq(BizSendJobGroup::getGroupType, groupType)
+ );
+
+ if (CollectionUtils.isEmpty(groupsWithType)) {
+ // 如果一个相关的 group 都没有，直接走 fallback 逻辑
+ return getFallbackValues(groupType);
+ }
+
+ List jobIds = groupsWithType.stream()
+ .map(BizSendJobGroup::getJobId)
+ .distinct()
+ .collect(Collectors.toList());
+
+ // 2. 在这些 job_id 中，找到状态为 COMPLETED 且时间最新的一个 job
+ BizSendJob lastJob = jobMapper.selectOne(
+ new LambdaQueryWrapper()
+ .in(BizSendJob::getJobId, jobIds)
+ .eq(BizSendJob::getStatus, "COMPLETED")
+ .orderByDesc(BizSendJob::getFinishTime)
+ .last("LIMIT 1")
+ );
+
+ // 如果找到了，直接返回上次成功的值
+ if (lastJob != null) {
+ List groups = groupMapper.selectList(
+ new LambdaQueryWrapper()
+ .eq(BizSendJobGroup::getJobId, lastJob.getJobId())
+ );
+ if (groups != null && !groups.isEmpty()) {
+ List groupIdsForJob = groups.stream().map(BizSendJobGroup::getGroupId).collect(Collectors.toList());
+ List items = itemMapper.selectList(
+ new LambdaQueryWrapper()
+ .in(BizSendJobItem::getGroupId, groupIdsForJob)
+ .eq(BizSendJobItem::getResultStatus, "SUCCESS")
+ .orderByAsc(BizSendJobItem::getItemId)
+ );
+
+ Map values = new HashMap<>();
+ for (BizSendJobItem it : items) {
+ if (it.getParamCode() == null) continue;
+ values.put(it.getParamCode(), it.getValueRaw());
+ }
+
+ SendJobLastSuccessVO vo = new SendJobLastSuccessVO();
+ vo.setJobId(lastJob.getJobId());
+ vo.setLastSendTime(lastJob.getFinishTime());
+ vo.setValues(values);
+ // 添加一个标志，告诉前端这是真实发送过的值
+ vo.setIsFromHistory(true);
+ return vo;
+ }
+ }
+
+ // 如果没找到符合条件的 job，走 fallback 逻辑
+ return getFallbackValues(groupType);
+ }
+
+ private SendJobLastSuccessVO getFallbackValues(String groupType) {
+ if ("FURNACE".equalsIgnoreCase(groupType)) {
+ return getFurnaceTemplateValues();
+ } else if ("DRIVE".equalsIgnoreCase(groupType)) {
+ return getDrivePlanValues();
+ }
+ return null; // 其他情况返回 null
+ }
+
+ /**
+ * 获取炉火工艺模板的默认值
+ */
+ private SendJobLastSuccessVO getFurnaceTemplateValues() {
+ // "FURNACE_DEFAULT" 是前端写死的模板编码
+ BizSendTemplateVO template = templateService.getTemplateWithItems("FURNACE_DEFAULT");
+ if (template == null || template.getItems() == null || template.getItems().isEmpty()) {
+ return createEmptyResponse("Furnace template 'FURNACE_DEFAULT' not found or is empty.");
+ }
+
+ Map values = new HashMap<>();
+ for (BizSendTemplateItemVO item : template.getItems()) {
+ if (item.getEnabled() && item.getParamCode() != null) {
+ values.put(item.getParamCode(), item.getDefaultValueRaw());
+ }
+ }
+
+ SendJobLastSuccessVO vo = new SendJobLastSuccessVO();
+ vo.setValues(values);
+ // 标志为非历史值
+ vo.setIsFromHistory(false);
+ return vo;
+ }
+
+ /**
+ * 获取当前计划的传动参数
+ */
+ private SendJobLastSuccessVO getDrivePlanValues() {
+ // 优先找 PRODUCING 或 ONLINE 状态的计划，按更新时间倒序取最新的一个
+ CrmPdiPlan currentPlan = planMapper.selectOne(
+ new LambdaQueryWrapper()
+ .in(CrmPdiPlan::getStatus, "PRODUCING", "ONLINE")
+ .orderByDesc(CrmPdiPlan::getUpdateTime)
+ .last("LIMIT 1")
+ );
+
+ // 如果没有正在生产的，就找第一个 READY 的计划
+ if (currentPlan == null) {
+ currentPlan = planMapper.selectOne(
+ new LambdaQueryWrapper()
+ .eq(CrmPdiPlan::getStatus, "READY")
+ .orderByAsc(CrmPdiPlan::getSeqid)
+ .last("LIMIT 1")
+ );
+ }
+
+ if (currentPlan == null) {
+ return createEmptyResponse("No active or ready plan found.");
+ }
+
+ // 将 CrmPdiPlan 对象的字段反射为 Map
+ Map values = new HashMap<>();
+ Field[] fields = CrmPdiPlan.class.getDeclaredFields();
+ for (Field field : fields) {
+ try {
+ field.setAccessible(true);
+ Object value = field.get(currentPlan);
+ if (value != null) {
+ values.put(field.getName(), String.valueOf(value));
+ }
+ } catch (IllegalAccessException e) {
+ // 忽略无法访问的字段
+ }
+ }
+
+ SendJobLastSuccessVO vo = new SendJobLastSuccessVO();
+ vo.setValues(values);
+ vo.setIsFromHistory(false); // 标志为非历史值
+ return vo;
+ }
+
+ /**
+ * 创建一个空的带消息的返回对象
+ */
+ private SendJobLastSuccessVO createEmptyResponse(String message) {
+ SendJobLastSuccessVO vo = new SendJobLastSuccessVO();
+ vo.setValues(Collections.singletonMap("_message", message));
+ vo.setIsFromHistory(false);
+ return vo;
+ }
+}
diff --git a/business/src/main/java/com/fizz/business/service/impl/SendJobServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/SendJobServiceImpl.java
new file mode 100644
index 0000000..ca267e8
--- /dev/null
+++ b/business/src/main/java/com/fizz/business/service/impl/SendJobServiceImpl.java
@@ -0,0 +1,344 @@
+package com.fizz.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fizz.business.domain.BizSendJob;
+import com.fizz.business.domain.BizSendJobGroup;
+import com.fizz.business.domain.BizSendJobItem;
+import com.fizz.business.domain.dto.SendJobCreateDTO;
+import com.fizz.business.domain.dto.SendJobQueryDTO;
+import com.fizz.business.domain.vo.SendJobDetailVO;
+import com.fizz.business.domain.vo.SendJobGroupVO;
+import com.fizz.business.domain.vo.SendJobItemVO;
+import com.fizz.business.mapper.BizSendJobGroupMapper;
+import com.fizz.business.mapper.BizSendJobItemMapper;
+import com.fizz.business.mapper.BizSendJobMapper;
+import com.fizz.business.service.ISendJobService;
+import com.fizz.business.service.manager.OpcMessageIdsManager;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class SendJobServiceImpl extends ServiceImpl implements ISendJobService {
+
+ @Autowired
+ private com.fizz.business.comm.OPC.OpcMessageSend opcMessageSend;
+
+
+ @Autowired
+ private BizSendJobGroupMapper jobGroupMapper;
+
+ @Autowired
+ private BizSendJobItemMapper jobItemMapper;
+
+ @Autowired
+ private OpcMessageIdsManager opcMessageIdsManager;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Integer createSendJob(SendJobCreateDTO dto) {
+ // 1. 创建批次
+ BizSendJob job = new BizSendJob();
+ BeanUtils.copyProperties(dto, job);
+
+ // 生成业务唯一键
+ String bizKey = opcMessageIdsManager.generateMessageId("SEND_JOB");
+ job.setBizKey(bizKey);
+ job.setStatus("PENDING");
+
+ // 设置操作人
+ String username = SecurityUtils.getUsername();
+ job.setCreateBy(username);
+ job.setCreateTime(new Date());
+
+ // 保存批次
+ baseMapper.insert(job);
+
+ // 2. 保存分组与明细
+ if (dto.getGroups() != null) {
+ for (SendJobCreateDTO.GroupDTO groupDTO : dto.getGroups()) {
+ // 2.1 保存分组
+ BizSendJobGroup group = new BizSendJobGroup();
+ BeanUtils.copyProperties(groupDTO, group);
+ group.setJobId(job.getJobId());
+ group.setStatus("PENDING");
+ group.setCreateBy(username);
+ group.setCreateTime(new Date());
+ jobGroupMapper.insert(group);
+
+ // 2.2 保存明细项
+ if (groupDTO.getItems() != null) {
+ for (SendJobCreateDTO.ItemDTO itemDTO : groupDTO.getItems()) {
+ BizSendJobItem item = new BizSendJobItem();
+ BeanUtils.copyProperties(itemDTO, item);
+ item.setJobId(job.getJobId());
+ item.setGroupId(group.getGroupId());
+ item.setResultStatus("PENDING");
+ item.setCreateBy(username);
+ item.setCreateTime(new Date());
+
+ // 尝试将valueRaw转为数值
+ try {
+ item.setValueNum(new BigDecimal(itemDTO.getValueRaw()));
+ } catch (Exception e) {
+ log.warn("转换数值失败: {}", itemDTO.getValueRaw(), e);
+ }
+
+ jobItemMapper.insert(item);
+ }
+ }
+ }
+ }
+
+ return job.getJobId();
+ }
+
+ @Override
+ public List selectSendJobList(SendJobQueryDTO query) {
+ LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
+ qw.eq(StringUtils.isNotBlank(query.getDeviceName()),
+ BizSendJob::getDeviceName, query.getDeviceName())
+ .eq(StringUtils.isNotBlank(query.getStatus()),
+ BizSendJob::getStatus, query.getStatus())
+ .orderByDesc(BizSendJob::getCreateTime);
+
+ List jobs = baseMapper.selectList(qw);
+ if (jobs == null || jobs.isEmpty()) {
+ return jobs;
+ }
+
+ // 如果传了 groupType（如 FURNACE），则仅保留包含该 groupType 的 job
+ if (StringUtils.isNotBlank(query.getGroupType())) {
+ String gt = query.getGroupType().trim();
+
+ List jobIds = jobs.stream().map(BizSendJob::getJobId).collect(Collectors.toList());
+ List groups = jobGroupMapper.selectList(
+ new LambdaQueryWrapper()
+ .in(BizSendJobGroup::getJobId, jobIds)
+ .eq(BizSendJobGroup::getGroupType, gt)
+ );
+ if (groups == null || groups.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ Set allowedJobIds = groups.stream().map(BizSendJobGroup::getJobId).collect(Collectors.toSet());
+ return jobs.stream().filter(j -> allowedJobIds.contains(j.getJobId())).collect(Collectors.toList());
+ }
+
+ return jobs;
+ }
+
+ @Override
+ public SendJobDetailVO selectSendJobDetail(Integer jobId) {
+ // 1. 查询任务
+ BizSendJob job = baseMapper.selectById(jobId);
+ if (job == null) {
+ return null;
+ }
+
+ // 2. 转换为VO
+ SendJobDetailVO detailVO = new SendJobDetailVO();
+ BeanUtils.copyProperties(job, detailVO);
+
+ // 3. 查询分组
+ List groups = jobGroupMapper.selectList(
+ new LambdaQueryWrapper()
+ .eq(BizSendJobGroup::getJobId, jobId)
+ .orderByAsc(BizSendJobGroup::getGroupNo)
+ );
+
+ if (groups.isEmpty()) {
+ return detailVO;
+ }
+
+ // 4. 查询所有明细项
+ List groupIds = groups.stream()
+ .map(BizSendJobGroup::getGroupId)
+ .collect(Collectors.toList());
+
+ List items = jobItemMapper.selectList(
+ new LambdaQueryWrapper()
+ .in(BizSendJobItem::getGroupId, groupIds)
+ );
+
+ // 5. 按groupId分组
+ Map> groupItemsMap = items.stream()
+ .collect(Collectors.groupingBy(BizSendJobItem::getGroupId));
+
+ // 6. 构建分组VO
+ List groupVOs = groups.stream().map(group -> {
+ SendJobGroupVO groupVO = new SendJobGroupVO();
+ BeanUtils.copyProperties(group, groupVO);
+
+ // 设置分组下的明细项
+ List groupItems = groupItemsMap
+ .getOrDefault(group.getGroupId(), Collections.emptyList());
+
+ List itemVOs = groupItems.stream().map(item -> {
+ SendJobItemVO itemVO = new SendJobItemVO();
+ BeanUtils.copyProperties(item, itemVO);
+ return itemVO;
+ }).collect(Collectors.toList());
+
+ groupVO.setItems(itemVOs);
+ return groupVO;
+ }).collect(Collectors.toList());
+
+ detailVO.setGroups(groupVOs);
+ return detailVO;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean deleteSendJobByJobIds(Integer[] jobIds) {
+ if (jobIds == null || jobIds.length == 0) {
+ return true;
+ }
+
+ // 1. 更新任务状态为已删除
+ BizSendJob updateJob = new BizSendJob();
+ updateJob.setStatus("DELETED");
+ updateJob.setUpdateBy(SecurityUtils.getUsername());
+ updateJob.setUpdateTime(new Date());
+
+ LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
+ qw.in(BizSendJob::getJobId, Arrays.asList(jobIds));
+
+ return update(updateJob, qw);
+ }
+
+ /**
+ * 执行发送：写入 OPC，并将发送结果保存为历史（更新 job/group/item 状态）
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean executeSendJob(Integer jobId) {
+ BizSendJob job = baseMapper.selectById(jobId);
+ if (job == null) {
+ return false;
+ }
+ if ("DELETED".equalsIgnoreCase(job.getStatus())) {
+ return false;
+ }
+
+ // 更新 job 状态为发送中
+ BizSendJob jobUpd = new BizSendJob();
+ jobUpd.setJobId(jobId);
+ jobUpd.setStatus("IN_PROGRESS");
+ jobUpd.setActualSendTime(new Date());
+ jobUpd.setUpdateBy(SecurityUtils.getUsername());
+ jobUpd.setUpdateTime(new Date());
+ baseMapper.updateById(jobUpd);
+
+ // 查询该job下所有 PENDING 的 item
+ List items = jobItemMapper.selectList(
+ new LambdaQueryWrapper()
+ .eq(BizSendJobItem::getJobId, jobId)
+ .eq(BizSendJobItem::getResultStatus, "PENDING")
+ );
+
+ // 如果没有 PENDING 的项，检查是否有其他状态的项
+ if (items == null || items.isEmpty()) {
+ boolean hasItems = jobItemMapper.selectCount(
+ new LambdaQueryWrapper().eq(BizSendJobItem::getJobId, jobId)
+ ) > 0;
+
+ BizSendJob finish = new BizSendJob();
+ finish.setJobId(jobId);
+ finish.setStatus(hasItems ? "COMPLETED" : "FAILED");
+ finish.setFinishTime(new Date());
+ finish.setUpdateBy(SecurityUtils.getUsername());
+ finish.setUpdateTime(new Date());
+ finish.setRemark(hasItems ? "没有待发送的项" : "没有找到任何发送项");
+ baseMapper.updateById(finish);
+ return hasItems;
+ }
+
+ // 查询该job下group
+ List groups = jobGroupMapper.selectList(
+ new LambdaQueryWrapper().eq(BizSendJobGroup::getJobId, jobId)
+ );
+ for (BizSendJobGroup g : groups) {
+ BizSendJobGroup gu = new BizSendJobGroup();
+ gu.setGroupId(g.getGroupId());
+ gu.setStatus("IN_PROGRESS");
+ gu.setUpdateBy(SecurityUtils.getUsername());
+ gu.setUpdateTime(new Date());
+ jobGroupMapper.updateById(gu);
+ }
+
+ boolean allSuccess = true;
+
+ // 按 address 分组，只发送最后一条记录
+ Map> itemsByAddr = items.stream()
+ .collect(Collectors.groupingBy(BizSendJobItem::getAddress));
+
+ for (Map.Entry> entry : itemsByAddr.entrySet()) {
+ List addrItems = entry.getValue();
+ // 取最后一条（按 itemId 最大 || createTime 最新）
+ addrItems.sort(Comparator.comparing(BizSendJobItem::getItemId));
+ BizSendJobItem last = addrItems.get(addrItems.size() - 1);
+ boolean success = true;
+ String failMsg = null;
+ try {
+ opcMessageSend.writeNode(last.getAddress(), last.getValueRaw());
+ } catch (Exception ex) {
+ success = false;
+ allSuccess = false;
+ failMsg = ex.getMessage();
+ }
+
+ // 更新该 address 下所有项的状态（统一）
+ for (BizSendJobItem it : addrItems) {
+ BizSendJobItem upd = new BizSendJobItem();
+ upd.setItemId(it.getItemId());
+ upd.setResultStatus(success ? "SUCCESS" : "FAILED");
+ upd.setResultMsg(success ? "OK" : failMsg);
+ upd.setUpdateBy(SecurityUtils.getUsername());
+ upd.setUpdateTime(new Date());
+ jobItemMapper.updateById(upd);
+ }
+ }
+
+ // 更新 group 状态（按 group 下 item 是否全部成功）
+ Map> itemByGroup = jobItemMapper.selectList(
+ new LambdaQueryWrapper().eq(BizSendJobItem::getJobId, jobId)
+ ).stream().collect(Collectors.groupingBy(BizSendJobItem::getGroupId));
+
+ for (BizSendJobGroup g : groups) {
+ List gi = itemByGroup.getOrDefault(g.getGroupId(), Collections.emptyList());
+ boolean groupOk = gi.stream().allMatch(x -> "SUCCESS".equalsIgnoreCase(x.getResultStatus()));
+
+ BizSendJobGroup gu = new BizSendJobGroup();
+ gu.setGroupId(g.getGroupId());
+ gu.setStatus(groupOk ? "COMPLETED" : "FAILED");
+ gu.setUpdateBy(SecurityUtils.getUsername());
+ gu.setUpdateTime(new Date());
+ jobGroupMapper.updateById(gu);
+ }
+
+ // 更新 job 最终状态
+ BizSendJob finish = new BizSendJob();
+ finish.setJobId(jobId);
+ finish.setFinishTime(new Date());
+ finish.setUpdateBy(SecurityUtils.getUsername());
+ finish.setUpdateTime(new Date());
+ finish.setStatus(allSuccess ? "COMPLETED" : "PARTIAL_SUCCESS");
+ finish.setRemark(allSuccess ? "全部发送成功" : "部分发送失败");
+ baseMapper.updateById(finish);
+
+ return true;
+ }
+}
+
diff --git a/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java b/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java
index a455779..d2a858a 100644
--- a/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java
+++ b/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java
@@ -14,6 +14,16 @@ import java.util.Map;
@Component
public class OpcMessageIdsManager {
+ /**
+ * 生成业务/消息唯一ID（用于发送批次 bizKey 等）
+ * 规则：PREFIX_时间戳_8位随机
+ */
+ public String generateMessageId(String prefix) {
+ String p = (prefix == null || prefix.trim().isEmpty()) ? "MSG" : prefix.trim();
+ String random = java.util.UUID.randomUUID().toString().replace("-", "").substring(0, 8);
+ return (p + "_" + System.currentTimeMillis() + "_" + random).toUpperCase();
+ }
+
public static List msgTriggers = Lists.newArrayList();
public static Map lineMeasureIds = Maps.newHashMap();
diff --git a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
index a3ae746..3e964e9 100644
--- a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
+++ b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
@@ -311,4 +311,7 @@ public class CrmPdiPlanVO {
@Schema(description = "原卷号")
private String originCoilid;
+
+ @Schema(description = "锌层厚度")
+ private BigDecimal zincCoatingThickness;
}
diff --git a/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java b/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
index ba4b075..ca6b5c3 100644
--- a/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
+++ b/business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -145,4 +146,7 @@ public class PdiPlanSetupInfoVO {
@Schema(description = "设定值列表")
List lists;
+ @Schema(description = "锌层厚度")
+ private BigDecimal zincCoatingThickness;
+
}
diff --git a/business/src/main/java/com/fizz/business/vo/PdiPlanVO.java b/business/src/main/java/com/fizz/business/vo/PdiPlanVO.java
index a46de98..7351998 100644
--- a/business/src/main/java/com/fizz/business/vo/PdiPlanVO.java
+++ b/business/src/main/java/com/fizz/business/vo/PdiPlanVO.java
@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -157,4 +158,7 @@ public class PdiPlanVO implements Serializable {
@Schema(description = "实验类别")
private String experimentType;
+
+ @Schema(description = "锌层厚度")
+ private BigDecimal zincCoatingThickness;
}
diff --git a/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java b/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
index 8290d3a..1c15195 100644
--- a/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
+++ b/business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java
@@ -3,6 +3,7 @@ package com.fizz.business.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -80,5 +81,8 @@ public class Plan2PdoVO {
@Schema(description = "热卷温度")
private Double hotCoilTemp;
+ @Schema(description = "锌层厚度")
+ private BigDecimal zincCoatingThickness;
+
}
diff --git a/business/src/main/resources/mapper/PlanDashboardMapper.xml b/business/src/main/resources/mapper/PlanDashboardMapper.xml
new file mode 100644
index 0000000..e339384
--- /dev/null
+++ b/business/src/main/resources/mapper/PlanDashboardMapper.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/business/src/main/resources/mapper/SegmentTotalMapper.xml b/business/src/main/resources/mapper/SegmentTotalMapper.xml
index 3c92be4..64bfd70 100644
--- a/business/src/main/resources/mapper/SegmentTotalMapper.xml
+++ b/business/src/main/resources/mapper/SegmentTotalMapper.xml
@@ -1,7 +1,21 @@
-
-
+
+
+
-
+
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index c7df6a3..05e7552 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -41,6 +41,7 @@
${log.path}/sys-error.%d{yyyy-MM-dd}.log
+ 100MB
0
0MB
diff --git a/ruoyi-admin/target/classes/logback.xml b/ruoyi-admin/target/classes/logback.xml
index 9998c41..c7df6a3 100644
--- a/ruoyi-admin/target/classes/logback.xml
+++ b/ruoyi-admin/target/classes/logback.xml
@@ -42,7 +42,8 @@
${log.path}/sys-error.%d{yyyy-MM-dd}.log
- 7
+ 0
+ 0MB
${log.pattern}
@@ -51,7 +52,8 @@
ERROR
- ACCEPT
+
+ DENY
DENY
@@ -83,7 +85,7 @@
-
+
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 15bf66b..7449305 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -7,10 +7,10 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
-
+import com.baomidou.mybatisplus.annotation.TableField;
/**
* Entity基类
- *
+ *
* @author ruoyi
*/
public class BaseEntity implements Serializable
@@ -19,6 +19,7 @@ public class BaseEntity implements Serializable
/** 搜索值 */
@JsonIgnore
+ @TableField(exist = false)
private String searchValue;
/** 创建者 */