From 4ee71cd7bebbdf60e538913f5f5de4ecb0de1473 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 05 一月 2024 10:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/api/docking/info.js | 4 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 3 +--
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/EnumController.java | 5 ++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 2 +-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/EnumServiceImpl.java | 19 +++++++++++++++++++
Source/UBCS-WEB/src/api/omd/enum.js | 2 +-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IEnumService.java | 15 +++++++++++++++
7 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/docking/info.js b/Source/UBCS-WEB/src/api/docking/info.js
index 2af4194..7d8be15 100644
--- a/Source/UBCS-WEB/src/api/docking/info.js
+++ b/Source/UBCS-WEB/src/api/docking/info.js
@@ -1,13 +1,13 @@
import request from '@/router/axios';
-export const getList = (page, size, params) => {
+export const getList = (page, limit, params) => {
return request({
url: '/api/ubcs-code/dockingManagement/gridSystemConfig',
method: 'get',
params: {
...params,
page,
- size
+ limit
}
})
}
diff --git a/Source/UBCS-WEB/src/api/omd/enum.js b/Source/UBCS-WEB/src/api/omd/enum.js
index b471140..994f0f4 100644
--- a/Source/UBCS-WEB/src/api/omd/enum.js
+++ b/Source/UBCS-WEB/src/api/omd/enum.js
@@ -75,7 +75,7 @@
export const update = (row) => {
return request({
- url: '/api/ubcs-omd/enum/submit',
+ url: '/api/ubcs-omd/enum/update',
method: 'post',
data: row
})
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 16dfcc0..49df39d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -130,7 +130,7 @@
}
query.setCurrent(queryObject.getPage());
query.setSize(queryObject.getLimit());
- IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query);
+ IPage<DockingSystemConfigVO> pages= dockingSystemConfigService.page(condtionMap,query);
return R.data(pages);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index cd69a4d..9b0d5a3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -137,7 +137,6 @@
@Override
public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
-
IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap));
List<DockingSystemConfig> dockingSystemConfigList= pages.getRecords();
dockingSystemConfigList.stream().forEach(dockingSystemConfig -> {
@@ -152,7 +151,7 @@
// dockingSystemConfig.setSourceSysName("");
//dockingSystemConfig.setTargetSysName("");
});
- return DockingSystemConfigWrapper.build().pageVO(pages);
+ return DockingSystemConfigWrapper.build().pageVO(pages);
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/EnumController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/EnumController.java
index cba83cd..2db7e08 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/EnumController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/EnumController.java
@@ -102,7 +102,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "淇敼", notes = "浼犲叆omdEnum")
public R update(@Valid @RequestBody Enum omdEnum) {
- return R.status(omdEnumService.updateById(omdEnum));
+ return R.status(omdEnumService.updateOmdEnum(omdEnum));
}
/**
@@ -112,7 +112,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆omdEnum")
public R submit(@Valid @RequestBody Enum omdEnum) {
- return R.status(omdEnumService.saveOrUpdate(omdEnum));
+ return R.status(omdEnumService.submit(omdEnum));
}
/**
@@ -158,6 +158,5 @@
List<EnumVO> tree = omdEnumService.getList(code);
return R.data(tree);
}
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IEnumService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IEnumService.java
index d9232d4..2a44a80 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IEnumService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IEnumService.java
@@ -17,9 +17,11 @@
package com.vci.ubcs.omd.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.omd.entity.Enum;
import com.vci.ubcs.omd.vo.EnumVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.mp.support.Query;
import java.util.List;
@@ -42,9 +44,22 @@
*/
IPage<EnumVO> selectOmdEnumPage(IPage<EnumVO> page, EnumVO omdEnum);
+ /**
+ * TableId 娉ㄨВ瀛樺湪鏇存柊璁板綍锛屽惁鎻掑叆涓�鏉¤褰�
+ *
+ * @param omdEnum 瀹炰綋瀵硅薄
+ */
+ boolean submit(Enum omdEnum);
boolean deleteLogic(List<String> toStringList);
+ /**
+ * 鏍规嵁 ID 閫夋嫨淇敼
+ *
+ * @param omdEnum 瀹炰綋瀵硅薄
+ */
+ boolean updateOmdEnum(Enum omdEnum);
+
IPage<EnumVO> parentList(Map<String, Object> dict, Query query);
/**
* 鏍戝舰缁撴瀯
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/EnumServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/EnumServiceImpl.java
index 56c6a1a..60902f9 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/EnumServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/EnumServiceImpl.java
@@ -28,6 +28,7 @@
import com.vci.ubcs.omd.wrapper.EnumWrapper;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.beans.BeanUtils;
@@ -54,11 +55,29 @@
}
@Override
+ public boolean submit(Enum omdEnum) {
+ Date date = new Date();
+ omdEnum.setCreator(AuthUtil.getUserAccount());
+ omdEnum.setCreatetime(date);
+ omdEnum.setModifier(AuthUtil.getUserAccount());
+ omdEnum.setModifytime(date);
+ omdEnum.setTs(date);
+ return this.saveOrUpdate(omdEnum);
+ }
+
+ @Override
public boolean deleteLogic(List<String> toStringList) {
return SqlHelper.retBool(baseMapper.deleteBatchIds(toStringList));
}
@Override
+ public boolean updateOmdEnum(Enum omdEnum) {
+ omdEnum.setModifier(AuthUtil.getUserAccount());
+ omdEnum.setModifytime(new Date());
+ return this.updateById(omdEnum);
+ }
+
+ @Override
public IPage<EnumVO> parentList(Map<String, Object> dict, Query query) {
IPage<Enum> page = this.page(Condition.getPage(query),
Condition.getQueryWrapper(dict, Enum.class).lambda()
--
Gitblit v1.9.3