diff --git a/src/main/java/com/gaotao/common/log/Utf8RollingFileAppender.java b/src/main/java/com/gaotao/common/log/Utf8RollingFileAppender.java new file mode 100644 index 0000000..a414811 --- /dev/null +++ b/src/main/java/com/gaotao/common/log/Utf8RollingFileAppender.java @@ -0,0 +1,57 @@ +package com.gaotao.common.log; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.rolling.RollingFileAppender; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; + +/** + * 日志文件按 UTF-8 写,并在新文件开头加 BOM,记事本才能认出中文。 + * 没有 BOM 的旧文件(例如按 GBK 写的)先挪开,避免两种编码接在同一个文件里。 + */ +public class Utf8RollingFileAppender extends RollingFileAppender { + + private static final byte[] UTF8_BOM = new byte[] {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF}; + + @Override + public void openFile(String fileName) throws IOException { + moveFileWithoutBomAside(fileName); + super.openFile(fileName); + File file = new File(fileName); + if (!file.exists() || file.length() == 0) { + OutputStream os = getOutputStream(); + if (os != null) { + os.write(UTF8_BOM); + os.flush(); + } + } + } + + private void moveFileWithoutBomAside(String fileName) { + File file = new File(fileName); + if (!file.exists() || file.length() < 3 || startsWithBom(file)) { + return; + } + File rotated = new File(file.getParentFile(), file.getName() + ".gbk"); + if (rotated.exists()) { + rotated = new File(file.getParentFile(), file.getName() + "." + System.currentTimeMillis() + ".gbk"); + } + if (!file.renameTo(rotated)) { + addWarn("Failed to move non-UTF-8 log aside: " + file.getAbsolutePath()); + } + } + + private boolean startsWithBom(File file) { + try (FileInputStream in = new FileInputStream(file)) { + byte[] head = new byte[3]; + int read = in.read(head); + return read == 3 && head[0] == UTF8_BOM[0] && head[1] == UTF8_BOM[1] && head[2] == UTF8_BOM[2]; + } catch (IOException e) { + addWarn("Failed to check log file header: " + file.getAbsolutePath(), e); + return true; + } + } +} diff --git a/src/main/java/com/gaotao/modules/schedule/CreateSplitRollTiming.java b/src/main/java/com/gaotao/modules/schedule/CreateSplitRollTiming.java new file mode 100644 index 0000000..2771a95 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/CreateSplitRollTiming.java @@ -0,0 +1,63 @@ +package com.gaotao.modules.schedule; + +import java.util.ArrayList; +import java.util.List; + +/** + * Collects create-split step timings on the current request thread and prints one summary. + */ +public final class CreateSplitRollTiming { + + private static final ThreadLocal SESSION = new ThreadLocal<>(); + + private CreateSplitRollTiming() { + } + + public static void begin() { + SESSION.set(new Session()); + } + + public static void record(String step, long elapsedMs) { + Session session = SESSION.get(); + if (session == null || step == null) { + return; + } + long cost = Math.max(elapsedMs, 0); + session.steps.add(step + "=" + cost + "毫秒"); + session.stepTotal += cost; + } + + public static String summary(String api, long totalMs, String context, String failedMessage) { + Session session = SESSION.get(); + long cost = Math.max(totalMs, 0); + StringBuilder sb = new StringBuilder(); + sb.append("[创建分卷] 汇总 接口=").append(api) + .append(" 总耗时=").append(cost).append("毫秒"); + if (context != null && !context.isEmpty()) { + sb.append(" ").append(context); + } + if (session != null && !session.steps.isEmpty()) { + long otherMs = cost - session.stepTotal; + if (otherMs < 0) { + otherMs = 0; + } + sb.append(" 提交及间隙=").append(otherMs).append("毫秒"); + for (String step : session.steps) { + sb.append(" | ").append(step); + } + } + if (failedMessage != null && !failedMessage.isEmpty()) { + sb.append(" | 失败=").append(failedMessage); + } + return sb.toString(); + } + + public static void clear() { + SESSION.remove(); + } + + private static final class Session { + private final List steps = new ArrayList<>(); + private long stepTotal; + } +} diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 5b2c0e4..df10b52 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -7,6 +7,7 @@ import com.gaotao.common.exception.XJException; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData; +import com.gaotao.modules.schedule.CreateSplitRollTiming; import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto; import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto; @@ -1335,11 +1336,22 @@ public class ScheduleController extends AbstractController { */ @PostMapping(value = "checkSplitRollExceptionRule") public R checkSplitRollExceptionRule(@RequestBody SearchScheduleData inData) { - Map resultMap = scheduleService.checkSplitRollExceptionRule(inData); - return R.ok() - .put("code", 200) - .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) - .put("resultMap", resultMap); + long start = System.currentTimeMillis(); + CreateSplitRollTiming.begin(); + String failedMessage = null; + try { + Map resultMap = scheduleService.checkSplitRollExceptionRule(inData); + return R.ok() + .put("code", 200) + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) + .put("resultMap", resultMap); + } catch (RuntimeException e) { + failedMessage = e.getMessage(); + throw e; + } finally { + logger.info(CreateSplitRollTiming.summary("异常规则校验", System.currentTimeMillis() - start, createSplitLogContext(inData), failedMessage)); + CreateSplitRollTiming.clear(); + } } /** @@ -1359,10 +1371,21 @@ public class ScheduleController extends AbstractController { */ @PostMapping(value = "completeSplitRuleTodoOperation") public R completeSplitRuleTodoOperation(@RequestBody SearchScheduleData inData) { - scheduleService.completeSplitRuleTodoOperation(inData); - return R.ok() - .put("code", 200) - .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); + long start = System.currentTimeMillis(); + CreateSplitRollTiming.begin(); + String failedMessage = null; + try { + scheduleService.completeSplitRuleTodoOperation(inData); + return R.ok() + .put("code", 200) + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); + } catch (RuntimeException e) { + failedMessage = e.getMessage(); + throw e; + } finally { + logger.info(CreateSplitRollTiming.summary("回写代办操作", System.currentTimeMillis() - start, createSplitLogContext(inData), failedMessage)); + CreateSplitRollTiming.clear(); + } } /** @@ -1422,11 +1445,35 @@ public class ScheduleController extends AbstractController { @RequestMapping(value = "createSplitSfdcRoll") // @RepeatSubmit // 注释掉重复提交校验,因为创建分卷时需要循环调用多次 public R createSplitSfdcRoll(@RequestBody SearchScheduleData inData) { - List> printList = scheduleService.createSplitSfdcRoll(inData); - return R.ok() - .put("code", 200) - .put("printList", printList) - .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); + long start = System.currentTimeMillis(); + CreateSplitRollTiming.begin(); + String failedMessage = null; + try { + List> printList = scheduleService.createSplitSfdcRoll(inData); + return R.ok() + .put("code", 200) + .put("printList", printList) + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); + } catch (RuntimeException e) { + failedMessage = e.getMessage(); + throw e; + } finally { + logger.info(CreateSplitRollTiming.summary("创建分卷", System.currentTimeMillis() - start, createSplitLogContext(inData), failedMessage)); + CreateSplitRollTiming.clear(); + } + } + + private String createSplitLogContext(SearchScheduleData inData) { + if (inData == null) { + return ""; + } + return "工厂=" + inData.getSite() + + " 工单=" + inData.getOrderNo() + + " 行号=" + inData.getItemNo() + + " 工序=" + inData.getSeqNo() + + " 卷号=" + inData.getRollNo() + + " 操作员=" + inData.getOperatorId() + + " 登录账号=" + inData.getUsername(); } /** diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 45627dd..4bef7de 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -10,6 +10,7 @@ import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; import com.gaotao.modules.inboundNotification.service.impl.InboundNotificationServiceImpl; import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData; +import com.gaotao.modules.schedule.CreateSplitRollTiming; import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto; import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto; @@ -3764,7 +3765,9 @@ public class ScheduleServiceImpl implements ScheduleService { return resultMap; } + long stepStart = System.currentTimeMillis(); ScheduleTodoMessageEntity pendingLockTodo = getLatestPendingLockTodo(inData); + logCreateSplitStep("异常规则-查询未审核代办", stepStart, createSplitContext(inData)); if (pendingLockTodo != null) { resultMap.put("todoInfoCode", pendingLockTodo.getInfoCode()); resultMap.put("warningLevel", pendingLockTodo.getWarningLevel()); @@ -3790,8 +3793,10 @@ public class ScheduleServiceImpl implements ScheduleService { } } + stepStart = System.currentTimeMillis(); List ruleList = sysSceneExceptionRuleMapper.getEnabledRuleListByApply( inData.getSite(), inData.getBuNo(), SPLIT_RULE_APPLY_PAGE, SPLIT_RULE_APPLY_BUTTON); + logCreateSplitStep("异常规则-加载规则", stepStart, createSplitContext(inData) + " ruleCount=" + (ruleList == null ? 0 : ruleList.size())); if (CollectionUtils.isEmpty(ruleList)) { return resultMap; } @@ -3806,7 +3811,9 @@ public class ScheduleServiceImpl implements ScheduleService { return resultMap; } + stepStart = System.currentTimeMillis(); List metricContextList = buildSplitRollMetricContexts(inData); + logCreateSplitStep("异常规则-计算指标", stepStart, createSplitContext(inData) + " metricCount=" + (metricContextList == null ? 0 : metricContextList.size())); for (SysSceneExceptionRuleEntity rule : ruleList) { if (!matchesTriggerWorkCenter(rule.getTriggerWorkCenter(), currentWorkCenterNo)) { continue; @@ -4907,9 +4914,10 @@ public class ScheduleServiceImpl implements ScheduleService { params.add(rollNums); params.add(username); params.add(defectQty); - //调用存储过程 + long start = System.currentTimeMillis(); List> resultList = procedureMapper.getProcedureData("checkSplitRollWithSfdcRollAndSecurity", params); - //处理返回的结果 + logCreateSplitStep("校验分卷数量及权限", start, + "site=" + site + " orderNo=" + orderNo + " itemNo=" + itemNo + " seqNo=" + seqNo + " rollNo=" + rollNo + " username=" + username); return resultList.get(0); } @@ -4929,16 +4937,20 @@ public class ScheduleServiceImpl implements ScheduleService { params.add(rollQty); params.add(rollNo); params.add(username); - //调用存储过程 + long start = System.currentTimeMillis(); List> resultList = procedureMapper.getProcedureData("workbench_createslittingroll_check", params); - //处理返回的结果 + logCreateSplitStep("创建分卷前置校验", start, + "site=" + site + " orderNo=" + orderNo + " itemNo=" + itemNo + " seqNo=" + seqNo + " rollNo=" + rollNo + " username=" + username); return resultList.get(0); } @Override @Transactional public List> createSplitSfdcRoll(SearchScheduleData inData) { + String context = createSplitContext(inData); + long stepStart = System.currentTimeMillis(); ScheduleTodoMessageEntity pendingLockTodo = getLatestPendingLockTodo(inData); + logCreateSplitStep("检查未审核代办锁定", stepStart, context + " locked=" + (pendingLockTodo != null && FLAG_N.equalsIgnoreCase(pendingLockTodo.getAuditFlag()))); if (pendingLockTodo != null && FLAG_N.equalsIgnoreCase(pendingLockTodo.getAuditFlag())) { throw new XJException("当前异常代办尚未审核,创建分卷操作已锁定。"); } @@ -4962,7 +4974,9 @@ public class ScheduleServiceImpl implements ScheduleService { // 更新 SOScheduledRouting 表的 carrier_no 字段 //if (fixture != null && !fixture.trim().isEmpty()) { + stepStart = System.currentTimeMillis(); schedulingMapper.updateCarrierNo(site, seqNo, fixture); + logCreateSplitStep("更新载具", stepStart, context + " fixture=" + fixture); // } //存储过程 调用存储过程 创建分卷 @@ -4970,7 +4984,9 @@ public class ScheduleServiceImpl implements ScheduleService { Float defectQty = inData.getDefectQty(); String packingList = inData.getPackingList(); String tidRollType = StringUtils.hasText(inData.getTidRollType()) ? inData.getTidRollType().trim() : "正常卷"; + stepStart = System.currentTimeMillis(); Map resultMap = this.workBenchCreateSlittingRollAction(site, orderNo, itemNo, seqNo, rollNo, rollQty, rollNums, operatorId, remark, defectQty, packingList, tidRollType); + logCreateSplitStep("执行创建分卷", stepStart, context + " tidRollType=" + tidRollType); //判断结果是否成功 String resultCode = String.valueOf(resultMap.get("resultCode")); if ("400".equalsIgnoreCase(resultCode)) { @@ -4990,7 +5006,9 @@ public class ScheduleServiceImpl implements ScheduleService { tempData.setOrderNo(orderNo); tempData.setRollNo(rollNoArr[i]); //查询当前的打印的数据 + stepStart = System.currentTimeMillis(); Map printMap = schedulingMapper.getSfdcFlowLabelData(tempData); + logCreateSplitStep("查询流转标签数据", stepStart, context + " createdRollNo=" + rollNoArr[i] + " index=" + (i + 1) + "/" + rollNoArr.length); //添加打印的数据 printList.add(printMap); @@ -5063,6 +5081,23 @@ public class ScheduleServiceImpl implements ScheduleService { return resultList.get(0); } + private String createSplitContext(SearchScheduleData inData) { + if (inData == null) { + return ""; + } + return "site=" + inData.getSite() + + " orderNo=" + inData.getOrderNo() + + " itemNo=" + inData.getItemNo() + + " seqNo=" + inData.getSeqNo() + + " rollNo=" + inData.getRollNo() + + " operatorId=" + inData.getOperatorId() + + " username=" + inData.getUsername(); + } + + private void logCreateSplitStep(String step, long startMs, String detail) { + CreateSplitRollTiming.record(step, System.currentTimeMillis() - startMs); + } + private void checkTidSplitControl(SearchScheduleData inData) { checkTidRollsControl(inData, TID_SPLIT_CONTROL_NO, "TID分卷校验"); } @@ -5072,11 +5107,17 @@ public class ScheduleServiceImpl implements ScheduleService { } private void checkTidRollsControl(SearchScheduleData inData, String controlNo, String failLabel) { + String context = createSplitContext(inData) + " controlNo=" + controlNo; String workCenterNo = inData.getWorkCenterNo() == null ? "" : inData.getWorkCenterNo().trim(); - if (!sysSceneDynamicControlModelService.isAnyCheckedDimensionEnabled(inData.getSite(), controlNo, buildTidControlContext(inData))) { + long stepStart = System.currentTimeMillis(); + boolean tidEnabled = sysSceneDynamicControlModelService.isAnyCheckedDimensionEnabled(inData.getSite(), controlNo, buildTidControlContext(inData)); + logCreateSplitStep("TID控制-检查是否启用", stepStart, context + " enabled=" + tidEnabled); + if (!tidEnabled) { return; } + stepStart = System.currentTimeMillis(); List rollNos = scheduleMapper.listTidPendingNormalRolls(inData.getSite(), inData.getSeqNo()); + logCreateSplitStep("TID控制-查询待校验卷", stepStart, context + " rollCount=" + (rollNos == null ? 0 : rollNos.size())); if (rollNos == null || rollNos.isEmpty()) { return; } @@ -5095,7 +5136,9 @@ public class ScheduleServiceImpl implements ScheduleService { logger.info("{}请求: site={}, orderNo={}, seqNo={}", failLabel, inData.getSite(), inData.getOrderNo(), inData.getSeqNo()); postMesLogs("/checkRolls", body, failLabel); + stepStart = System.currentTimeMillis(); scheduleMapper.updateTidPassFlag(inData.getSite(), inData.getSeqNo(), rollNos); + logCreateSplitStep("TID控制-回写通过标记", stepStart, context + " rollCount=" + rollNos.size()); } private Map buildTidControlContext(SearchScheduleData inData) { @@ -5201,9 +5244,12 @@ public class ScheduleServiceImpl implements ScheduleService { logger.info("{}请求: url={}, contentType=multipart/form-data, form={}", failLabel, requestUrl, JSON.toJSONString(formLog)); ResponseEntity response; + long remoteStart = System.currentTimeMillis(); try { response = restTemplate.exchange(requestUrl, HttpMethod.POST, new HttpEntity<>(form, headers), String.class); + logCreateSplitStep("TID远程校验", remoteStart, "path=" + path + " label=" + failLabel); } catch (Exception e) { + logCreateSplitStep("TID远程校验失败", remoteStart, "path=" + path + " label=" + failLabel + " message=" + e.getMessage()); logger.error("{}调用失败", failLabel, e); throw new XJException(failLabel + "失败: " + e.getMessage()); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java index 5ec772d..de1b37a 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java @@ -13,6 +13,7 @@ import com.gaotao.modules.pda.dao.TransNoDao; import com.gaotao.modules.pms.data.QcMethodData; import com.gaotao.modules.purchasingManagement.entity.CRollInfoData; import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData; +import com.gaotao.modules.schedule.CreateSplitRollTiming; import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.entity.ProductionReportData; import com.gaotao.modules.schedule.entity.SfdcDefectHistData; @@ -1373,8 +1374,10 @@ public class SchedulingServiceImpl implements SchedulingService { report.setSeqNo(String.valueOf(seqNo)); } + long stepStart = System.currentTimeMillis(); // 批量插入排数据 schedulingMapper.batchInsertProductionReport(reportList); + CreateSplitRollTiming.record("保存产量排数据", System.currentTimeMillis() - stepStart); // 计算不良总数和面损总数 float totalDefectQty = 0; @@ -1390,8 +1393,10 @@ public class SchedulingServiceImpl implements SchedulingService { // 如果有不良数量,插入不良历史记录 if (totalDefectQty > 0) { + stepStart = System.currentTimeMillis(); // 获取下一个HistSeqNo Integer nextHistSeqNo = schedulingMapper.getNextHistSeqNo(site, orderNo, itemNo, seqNo); + CreateSplitRollTiming.record("获取不良历史序号", System.currentTimeMillis() - stepStart); if (nextHistSeqNo == null) { nextHistSeqNo = 1; } @@ -1471,8 +1476,10 @@ public class SchedulingServiceImpl implements SchedulingService { } } + stepStart = System.currentTimeMillis(); // 批量插入不良历史数据 schedulingMapper.batchInsertSfdcDefectHist(defectList); + CreateSplitRollTiming.record("保存不良历史", System.currentTimeMillis() - stepStart); // 调用存储过程处理不良品处置(更新SFDC_MaterialHist的NetIssueQty) List params = new ArrayList<>(); @@ -1481,7 +1488,9 @@ public class SchedulingServiceImpl implements SchedulingService { params.add(String.valueOf(seqNo)); params.add(rollNo2); // 原卷号 params.add(totalDefectQty); // 不良品总数 + stepStart = System.currentTimeMillis(); procedureMapper.getProcedureData("GetDefectiveProductDisposal", params); + CreateSplitRollTiming.record("不良品处置", System.currentTimeMillis() - stepStart); } } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index b96a2d6..c82d125 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -10,12 +10,14 @@ - %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n + %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n + + GBK - + logs/xujie-erp/xujie2021.log @@ -26,10 +28,11 @@ ${log.max.size} - - - %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n - + + + %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]%logger{56}.%method:%L -%msg%n + UTF-8 + diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 4bd15d4..f294e52 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -462,13 +462,17 @@ '系统数据' as ul, pt.DefaultLocationID locationId, st.SiteName siteName - FROM SFDC_Rolls sfr, ShopOrder so, Part pt - + FROM SFDC_Rolls sfr + INNER JOIN ShopOrder so ON sfr.Site = so.Site AND sfr.OrderNo = so.OrderNo + INNER JOIN Part pt ON so.Site = pt.Site AND so.PartNo = pt.PartNo LEFT JOIN Site st ON st.SiteID = pt.Site - AND sfr.Site = so.Site AND sfr.OrderNo = so.OrderNo - AND so.Site = pt.Site AND so.PartNo = pt.PartNo AND sfr.Site = #{site} - AND sfr.RollNo = #{rollNo} AND sfr.VirtualRollFlag = 'N' + AND sfr.Site = #{site} + + AND sfr.OrderNo = #{orderNo} + + AND sfr.RollNo = #{rollNo} + AND sfr.VirtualRollFlag = 'N'