修改内存溢出的BUG

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowOperatingServiceImpl.java

@@ -141,7 +141,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
         }
         if (CollectionUtil.isNotEmpty(nodeRelyDtoSet)) {
             //构建等待队列
-            List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, nodeRelyDtoSet.size(), operator, repairTimeList, newPublicParam);
+            List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, nodeRelyDtoSet.size(), operator, repairTimeList, JSON.toJSONString(newPublicParam));
             waitingRecords.forEach(waitingRecordMapper::insertSelective);
             List<RunRecording> runRecordings = buildRunRecordingList(waitingRecords);
             List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet, specialJobParam.getPublicParam(), timeFormatName, nowTimeFormatName);
@@ -287,20 +287,21 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
      * @param repairTimeList 补时间
      * @return 等待队列集合
      */
-    private List<WaitingRecord> buildWaitingRecordList(Flow flow, Integer nodeCount, String operator, List<RepairTimeParam> repairTimeList, Map<String,String> publicParam) {
+    private List<WaitingRecord> buildWaitingRecordList(Flow flow, Integer nodeCount, String operator, List<RepairTimeParam> repairTimeList, String publicParam) {
         //查看当前排队的工作流最大排队序号
         Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId());
         if (order == null) {
             order = 0;
         }
         //传递过来的公共参数格式化
-        if(CollectionUtil.isEmpty(publicParam)){
-            publicParam = new HashMap<>(8);
+        Map<String,String> publicMap = JSON.parseObject(publicParam, Map.class);
+        if(CollectionUtil.isEmpty(publicMap)){
+            publicMap = new HashMap<>(8);
         }
         List<WaitingRecord> waitingRecords = new ArrayList<>(2);
         for (RepairTimeParam repairTimeParam : repairTimeList) {
-            publicParam.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime());
-            publicParam.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime());
+            publicMap.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime());
+            publicMap.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime());
             String repeatTime = repairTimeParam.getRepairTime();
             String timeTypeName = repairTimeParam.getTimeTypeName();
             WaitingRecord waitingRecord = new WaitingRecord();
@@ -314,11 +315,11 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
                 if(flowPublicParamMap == null){
                     flowPublicParamMap = new HashMap<>();
                 }
-                flowPublicParamMap.putAll(publicParam);
+                flowPublicParamMap.putAll(publicMap);
                 flowExtendedConfiguration.setPublicParam(JSON.toJSONString(flowPublicParamMap));
             } else {
                 flowExtendedConfiguration = new FlowExtendedConfiguration();
-                flowExtendedConfiguration.setPublicParam(JSON.toJSONString(publicParam));
+                flowExtendedConfiguration.setPublicParam(JSON.toJSONString(publicMap));
             }
             waitingRecord.setExtendedConfiguration(JSON.toJSONString(flowExtendedConfiguration));
             waitingRecord.setFlowVersionName(flow.getVersionName());

byit-myth-core/myth-web-core/src/main/java/com/byit/web/advice/ExceptionHandle.java

@@ -33,7 +33,8 @@ public class ExceptionHandle {
             return ResponseResult.error(TransferResultEnum.ERROR.getCode(), e.getMessage());
         }
         log.error(MythLogUtils.getMessage(e));
-        return ResponseResult.error("调度中心走神了，请稍后再试~~！");
+        //return ResponseResult.error("调度中心走神了，请稍后再试~~！");
+        return ResponseResult.error(MythLogUtils.getMessage(e));
     }
 
     /**