From 8815f6efc65a4eaec8ce530af2ead0f01169c632 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Wed, 10 Jan 2024 09:47:13 +0800
Subject: [PATCH] =?UTF-8?q?jx=20=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/jx/JxCenterWorkingBoardController.java           | 15 +++++++++++++++
 .../busi/jx/JxCenterWorkingBoardCenterThreeService.java   |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java
index 2f03baa..0e623eb 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java
@@ -11,6 +11,7 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,4 +71,18 @@ public class JxCenterWorkingBoardController extends MesBaseController {
         }
     }
 
+    @PostMapping(value = "/ext/jx/center-working-board/get-cached-data")
+    @ApiOperation(value = "嘉兴产线运行看板缓存数据清除")
+    public ResultBean getCachedCenterWorkingBoardData(String organizeCode, String item) {
+        try {
+            if (StringUtils.isEmpty(organizeCode)) organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+            Object obj = centerWorkingBoardService.execCachedCenterWorkingBoardData(organizeCode, MesExtConstWords.ZERO_STR, item, null);
+            return ResultBean.success("操作成功").setResultObject(null == obj ? null : JSONObject.toJSONString(obj)).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java
index cc400fd..1f1122d 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java
@@ -243,6 +243,7 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard
         Map<String, List<SxWorkCellTaktCollect>> filterMap = getWorkCellTaktCollectList2Filter(workCellTaktCollectList, limitCfg);
 
         Map<String, String> partStandardWorkMap = (Map<String, String>) dataMap.get(MesExtConstWords.STANDARD_WORK);
+
         Double workStandard = (null != curWorkOrder && curWorkOrder.isPresent() && !CollectionUtils.isEmpty(partStandardWorkMap) && partStandardWorkMap.containsKey(curWorkOrder.get().getPartNo())) ? Double.parseDouble(partStandardWorkMap.get(curWorkOrder.get().getPartNo())) : new Double(0);
 
         log.info("嘉兴产线运行看板 --- center03 --- curTime:{} --- lastHourTime:{} --- THREAD:{}", curTime, lastHourTime, Thread.currentThread().getName());
@@ -253,6 +254,10 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard
 
         BigDecimal standardTakt = getStandardTakt(workStandard, workCenterExtDb);
 
+        log.info("嘉兴产线运行看板 --- center03 --- curWorkOrder:{} --- THREAD:{}", null == curWorkOrder ? null : curWorkOrder.get().getPartNo(), Thread.currentThread().getName());
+
+        log.info("嘉兴产线运行看板 --- center03 --- partStandardWorkMap:{} --- THREAD:{}", CollectionUtils.isEmpty(partStandardWorkMap) ? null : JSONObject.toJSONString(partStandardWorkMap), Thread.currentThread().getName());
+
         log.info("嘉兴产线运行看板 --- center03 --- workStandard:{} --- standardTakt:{} --- THREAD:{}", workStandard, standardTakt, Thread.currentThread().getName());
 
         for (MesWorkCell workCell : workCellList) {