From 885d8364166b6e952e0af2eb4cf4e44c59544b96 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 16:36:25 +0800
Subject: [PATCH] 新增用户界面去掉岗位
---
Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml | 19 ++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java | 2
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java | 19 ++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 2
Source/UBCS-WEB/src/views/system/user.vue | 7 +-
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java | 22 +++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 12 +--
Source/UBCS/ubcs-service/ubcs-user/pom.xml | 6 ++
Source/UBCS/ubcs-ops-api/pom.xml | 1
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java | 34 +++++++++++
Source/UBCS/ubcs-ops/ubcs-log/pom.xml | 6 ++
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java | 23 +++++++
14 files changed, 143 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 8eb6b6f..bbd3232 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -294,6 +294,7 @@
viewBtn: true,
editBtn: true,
delBtn: true,
+ addBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
@@ -562,7 +563,7 @@
trigger: "click"
}]
},
- {
+ /*{
label: "鎵�灞炲矖浣�",
prop: "postId",
type: "tree",
@@ -577,7 +578,7 @@
message: "璇烽�夋嫨鎵�灞炲矖浣�",
trigger: "click"
}],
- },
+ },*/
]
},
]
@@ -930,7 +931,7 @@
rowSave(row, done, loading) {
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
- row.postId = row.postId.join(",");
+ //row.postId = row.postId.join(",");
// console.log('3',row)
add(row).then(() => {
this.initFlag = false;
diff --git a/Source/UBCS/ubcs-ops-api/pom.xml b/Source/UBCS/ubcs-ops-api/pom.xml
index 8271304..d4a6b78 100644
--- a/Source/UBCS/ubcs-ops-api/pom.xml
+++ b/Source/UBCS/ubcs-ops-api/pom.xml
@@ -18,6 +18,7 @@
<modules>
<module>ubcs-flow-api</module>
<module>ubcs-resource-api</module>
+ <module>ubcs-log-api</module>
</modules>
<dependencies>
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml b/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
new file mode 100644
index 0000000..0e5ba31
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>ubcs-ops-api</artifactId>
+ <groupId>com.vci.ubcs</groupId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>ubcs-log-api</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+</project>
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
new file mode 100644
index 0000000..2452f3a
--- /dev/null
+++ b/Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
@@ -0,0 +1,34 @@
+package com.vci.ubcs.log.entity;
+
+/**
+ * @author ludc
+ * @date 2023/10/31 15:43
+ */
+public class SystemLog {
+
+ /**
+ * 鏈嶅姟鍚嶇О
+ */
+ private String serviceName;
+
+ /**
+ * 鏈嶅姟id
+ */
+ private String serviceId;
+
+ /**
+ * 鏃ュ織璺緞
+ */
+ private String logPath;
+
+ /**
+ * 鏃ュ織鍚嶇О
+ */
+ private String logName;
+
+ /**
+ * 鏃ュ織绫诲瀷
+ */
+ private String logType;
+
+}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
index bf9c330..767979f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -38,6 +38,12 @@
<artifactId>orai18n</artifactId>
<version>${orai18n.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-log-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java
new file mode 100644
index 0000000..fdc11c8
--- /dev/null
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java
@@ -0,0 +1,22 @@
+package com.vci.ubcs.core.log.controller;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 鏈湴绯荤粺鏃ュ織
+ * @author ludc
+ * @date 2023/10/31 15:37
+ */
+@NonDS
+@RestController
+@AllArgsConstructor
+@RequestMapping("/systemLog")
+public class LogSystemController {
+
+
+
+
+}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java
new file mode 100644
index 0000000..1d4ed75
--- /dev/null
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java
@@ -0,0 +1,19 @@
+package com.vci.ubcs.core.log.service;
+
+import com.vci.ubcs.log.entity.SystemLog;
+
+import java.util.List;
+
+/**
+ * 鏈湴绯荤粺鏃ュ織
+ * @author ludc
+ * @date 2023/10/31 15:38
+ */
+public interface ILogSystemService {
+
+ /**
+ * 鑾峰彇鏈湴鏃ュ織鍒楄〃
+ */
+ List<SystemLog> getSystemLogList();
+
+}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java
new file mode 100644
index 0000000..90dbe91
--- /dev/null
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java
@@ -0,0 +1,23 @@
+package com.vci.ubcs.core.log.service.impl;
+
+import com.vci.ubcs.core.log.service.ILogSystemService;
+import com.vci.ubcs.log.entity.SystemLog;
+
+import java.util.List;
+
+/**
+ * 鏈湴绯荤粺鏃ュ織
+ * @author ludc
+ * @date 2023/10/31 15:39
+ */
+public class LogSystemServiceImpl implements ILogSystemService {
+
+ @Override
+ public List<SystemLog> getSystemLogList() {
+
+
+ return null;
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
index 1f620f3..2f23b1b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
@@ -57,7 +57,7 @@
});
tree.setOid((String)oidValues.stream().collect(Collectors.joining(wrapperOptions.getOidValueSep())));
tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
- tree.setCount("("+(String)VciBaseUtil.getValueFromField("total", doObject)+")");
+ tree.setCount("銆�"+(String)VciBaseUtil.getValueFromField("total", doObject)+"銆�");
if (f != null) {
tree.setText((String)f.apply(doObject));
} else {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index 16be325..4c18987 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -883,7 +883,7 @@
}
public static String getTableName(String btmname,Boolean isMdmTable) {
- return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toLowerCase();
+ return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toUpperCase(Locale.ROOT);
}
public static Field getTsField(Class c) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 50de8a3..e582061 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -585,7 +585,7 @@
if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栦笟鍔＄被鍨婭D锛�");
}
- return VciBaseUtil.getTableName(codeClassify.getBtmTypeId().toLowerCase(Locale.ROOT),true);
+ return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 84455f7..fafbdbf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -300,7 +300,7 @@
SELECT
COUNT(*)
FROM
- PLBT_CODE_part
+ ${tableName}
WHERE
CODECLSFID IN (
SELECT
diff --git a/Source/UBCS/ubcs-service/ubcs-user/pom.xml b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
index 412fd2d..711161d 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
@@ -47,6 +47,12 @@
<artifactId>orai18n</artifactId>
<version>${orai18n.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 92ef01f..f7418ec 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.cache.DictCache;
import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.cache.ParamCache;
@@ -77,16 +78,13 @@
private final IUserOauthService userOauthService;
private final ISysClient sysClient;
private final BladeTenantProperties tenantProperties;
- //鎷垮埌閰嶇疆鐨勮秴绠�
- private final NacosConfigCache nacosConfigCache;
@Override
@Transactional(rollbackFor = Exception.class)
public boolean submit(User user) {
if (StringUtil.isBlank(user.getTenantId())) {
- // user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
// 榛樿璁剧疆涓虹鐞嗙粍涓嬬殑鐢ㄦ埛
- user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
+ user.setTenantId(NacosConfigCache.getAdminUserInfo().getTenantId());
}
String tenantId = user.getTenantId();
//Tenant tenant = SysCache.getTenant(tenantId);
@@ -106,7 +104,7 @@
Boolean flag = true;
for (User user : users){
if (StringUtil.isBlank(user.getTenantId())) {
- user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
+ user.setTenantId(NacosConfigCache.getAdminUserInfo().getTenantId());
}
String tenantId = user.getTenantId();
if (Func.isNotEmpty(user.getPassword())) {
@@ -166,7 +164,7 @@
@Override
public List<User> selectAllUser(User user, Long deptId){
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? StringPool.EMPTY : AuthUtil.getTenantId()));
+ List<User> users = baseMapper.selectUserPage(user, deptIdList, (VciBaseUtil.checkAdminTenant() ? StringPool.EMPTY : AuthUtil.getTenantId()));
return users;
}
@@ -514,7 +512,7 @@
@Override
public Long checkRenAndExpr(Long userId) {
//瓒呯骇绠＄悊鍛樼洿鎺ヨ繑鍥炰笉闇�瑕佹彁閱掑瘑鐮佷慨鏀�
- if(nacosConfigCache.getAdminUserInfo().getUserId().equals(userId)){
+ if(NacosConfigCache.getAdminUserInfo().getUserId().equals(userId)){
return 0L;
}
QueryWrapper<User> wrapper = Wrappers.<User>query().eq("ID", userId);
--
Gitblit v1.9.3