From 5dd33a7b7895aea43bed61071ceb5295aa16e8a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 12:53:00 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java | 2 +-
zy-acs-flow/src/i18n/core/chineseMessages.js | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 9 ++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 25 ++++++++++---------------
4 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/zy-acs-flow/src/i18n/core/chineseMessages.js b/zy-acs-flow/src/i18n/core/chineseMessages.js
index cb0638d..e573955 100644
--- a/zy-acs-flow/src/i18n/core/chineseMessages.js
+++ b/zy-acs-flow/src/i18n/core/chineseMessages.js
@@ -100,7 +100,7 @@
details: 'Details',
error: "A client error occurred and your request couldn't be completed.",
- invalid_form: 'The form is not valid. Please check for errors',
+ invalid_form: '琛ㄥ崟鏃犳晥 璇锋鏌ユ槸鍚︽湁閿欒!',
loading: 'Please wait',
no: 'No',
not_found:
@@ -159,7 +159,7 @@
application_update_available: 'A new version is available.',
},
validation: {
- required: 'Required',
+ required: '蹇呭～椤�',
minLength: 'Must be %{min} characters at least',
maxLength: 'Must be %{max} characters or less',
minValue: 'Must be at least %{min}',
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
index 9a93dd6..dc8b6df 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
@@ -9,7 +9,7 @@
public interface TaskService extends IService<Task> {
- void buildActionList(Task task);
+ String generateSeqNum();
Task pick(TaskStsType taskStsType);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
index 591f875..e424ff3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -10,7 +10,9 @@
import com.zy.acs.manager.manager.mapper.BusMapper;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.manager.service.TaskService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -19,6 +21,9 @@
@Slf4j
@Service("busService")
public class BusServiceImpl extends ServiceImpl<BusMapper, Bus> implements BusService {
+
+ @Autowired
+ private TaskService taskService;
@Override
public Bus selectByUuid(String uuid) {
@@ -51,7 +56,9 @@
return "Origin cannot be empty!";
}
}
-
+ if (Cools.isEmpty(dto.getSeqNum())) {
+ dto.setSeqNum(taskService.generateSeqNum());
+ }
}
return null;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index 7e5a71f..dceb718 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -1,17 +1,20 @@
package com.zy.acs.manager.manager.service.impl;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.exception.BusinessException;
-import com.zy.acs.manager.manager.entity.*;
+import com.zy.acs.manager.manager.entity.FuncSta;
+import com.zy.acs.manager.manager.entity.Loc;
+import com.zy.acs.manager.manager.entity.Sta;
+import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.TaskMapper;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.FuncStaService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.TaskService;
-import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,20 +32,12 @@
private LocService locService;
@Autowired
private FuncStaService funcStaService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Override
- public void buildActionList(Task task) {
- List<String> codeList = JSONArray.parseArray(task.getPhase(), String.class);
- if (Cools.isEmpty(codeList)) {
- throw new BusinessException(task.getSeqNum() + "浠诲姟瑙ｆ瀽姝ラ澶辫触");
- }
- for (String data : codeList) {
- Code code = codeService.selectByData(data);
-
-
- }
-
-
+ public synchronized String generateSeqNum() {
+ return String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19);
}
@Override
--
Gitblit v1.9.1