From 0f2d419d4002c7d5297f418b6707d3348e80e75d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 10 九月 2024 15:05:59 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java | 2 +-
zy-acs-flow/src/config/setting.js | 2 +-
zy-acs-flow/src/page/config/ConfigCreate.jsx | 6 +++---
zy-acs-flow/src/page/config/ConfigEdit.jsx | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/ConfigController.java | 4 ++++
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/config/setting.js b/zy-acs-flow/src/config/setting.js
index 9dcf6c0..a509b35 100644
--- a/zy-acs-flow/src/config/setting.js
+++ b/zy-acs-flow/src/config/setting.js
@@ -29,4 +29,4 @@
export const OPERATE_MODE = 'undoable'; // pessimistic | optimistic(tip) | undoable
-export const EDIT_MODE = 'undoable'; // pessimistic | undoable
\ No newline at end of file
+export const EDIT_MODE = 'pessimistic'; // pessimistic | undoable
\ No newline at end of file
diff --git a/zy-acs-flow/src/page/config/ConfigCreate.jsx b/zy-acs-flow/src/page/config/ConfigCreate.jsx
index 2ddfa10..90b5b4f 100644
--- a/zy-acs-flow/src/page/config/ConfigCreate.jsx
+++ b/zy-acs-flow/src/page/config/ConfigCreate.jsx
@@ -81,14 +81,14 @@
</DialogTitle>
<DialogContent>
<Grid container rowSpacing={2} columnSpacing={2}>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.config.uuid"
source="uuid"
parse={v => v}
autoFocus
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.config.name"
@@ -116,7 +116,7 @@
]}
/>
</Grid>
- <Grid item xs={12} display="flex" gap={1}>
+ <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.config.val"
source="val"
diff --git a/zy-acs-flow/src/page/config/ConfigEdit.jsx b/zy-acs-flow/src/page/config/ConfigEdit.jsx
index 3231345..b7e0254 100644
--- a/zy-acs-flow/src/page/config/ConfigEdit.jsx
+++ b/zy-acs-flow/src/page/config/ConfigEdit.jsx
@@ -65,7 +65,7 @@
label="table.field.config.uuid"
source="uuid"
parse={v => v}
- autoFocus
+ disabled
/>
<TextInput
label="table.field.config.name"
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java
index 947f809..6eff33b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java
@@ -13,7 +13,7 @@
@Data
public class TaskPosDto {
- public static final Integer INF = 100000;
+ public static final Integer INF = 999999999;
private Long taskId;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/ConfigController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/ConfigController.java
index f21cdd5..2e7fc99 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/ConfigController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/ConfigController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
+import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
@@ -24,6 +25,8 @@
@Autowired
private ConfigService configService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@PreAuthorize("hasAuthority('system:config:list')")
@PostMapping("/config/page")
@@ -55,6 +58,7 @@
@OperationLog("Create Config")
@PostMapping("/config/save")
public R save(@RequestBody Config config) {
+ config.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
config.setCreateBy(getLoginUserId());
config.setCreateTime(new Date());
config.setUpdateBy(getLoginUserId());
--
Gitblit v1.9.1