From 8033eea1502d4cb0a91aa4b86c848ccb00ba8dc0 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期五, 13 三月 2020 09:31:46 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/MasterDataController.java | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
index 3f27bf8..0c732b0 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
@@ -181,50 +181,14 @@
@RequestMapping(value = "{tableName}/{operateStr}", method = RequestMethod.POST)
- public Result insert(@PathVariable String tableName,@PathVariable String operateStr, @RequestParam String datas, HttpServletRequest request) {
+ public Result insert(@PathVariable String tableName,@PathVariable String operateStr, @RequestParam String datas, @RequestParam String modify, HttpServletRequest request) {
String fields = request.getParameter("fields");
Operate operate = Operate.parse(operateStr);
-
- Maintain maintain = maintainService.getMaxVersion(tableName);
- Maintain unFlowMaxVersion = maintainService.getUnFlowMaxVersion(tableName);
- if (unFlowMaxVersion == null) {
- unFlowMaxVersion = new Maintain();
- if (maintain != null) {
- unFlowMaxVersion.setVersion(DbUtils.versionAddSub(maintain.getVersion()));
- int orderNo = maintain.getOrderNo();
- orderNo++;
- unFlowMaxVersion.setOrderNo(orderNo);
- } else {
- unFlowMaxVersion.setVersion(Constant.VERSION_Default);
- unFlowMaxVersion.setOrderNo(0);
- }
-
- unFlowMaxVersion.setId(DbUtils.getUUID());
- TUser user = (TUser) request.getSession().getAttribute("user");
- unFlowMaxVersion.setChargeId(user.getUserId());
- unFlowMaxVersion.setCreateTime(new Date());
- unFlowMaxVersion.setTableName(tableName);
- }
-
- Maintain nowMaintain = unFlowMaxVersion;
- if (DbUtils.compareVersion(maintain, unFlowMaxVersion) != 0) {
- nowMaintain = new Maintain();
- String maintanId = DbUtils.getUUID();
- nowMaintain.setId(maintanId);
- nowMaintain.setCreateTime(new Date());
- int orderNo = maintain.getOrderNo();
- orderNo++;
- nowMaintain.setVersion(DbUtils.versionAddSub(maintain.getVersion()));
- nowMaintain.setOrderNo(orderNo);
- nowMaintain.setTableName(tableName);
- }
-
TUser user = (TUser) request.getSession().getAttribute("user");
- nowMaintain.setChargeId(user.getUserId());
- String maintainId = nowMaintain.getId();
- if(StringUtils.isEmpty(maintainId)) {
- nowMaintain.setId(DbUtils.getUUID());
- }
+ String userId = user.getUserId();
+ Maintain maintain = maintainService.getMaxVersion(tableName);
+ Maintain nowMaintain = maintainService.getNextMaintain(tableName, userId);
+
Result result;
if (operate.equals(Operate.delete)) {
--
Gitblit v1.8.0