ci4s
/
ci4sManagement-cloud
Not watched
1
0
Fork 0
Code
Releases 1 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

dev-active_learn
somunslotus 10 months ago
parent
eee099925c eed3bebaf0
commit
02f5aa8bcc
20 changed files with 239 additions and 286 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -1
      k8s/deploy.sh
  2. +4
    -6
      react-ui/src/app.tsx
  3. +0
    -0
      react-ui/src/components/CopyingText/clipboard.js
  4. +0
    -0
      react-ui/src/components/CopyingText/index.less
  5. +26
    -0
      react-ui/src/components/CopyingText/index.tsx
  6. +0
    -26
      react-ui/src/pages/AutoML/components/CopyingText/index.tsx
  7. +6
    -9
      react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
  8. +8
    -1
      react-ui/src/pages/CodeConfig/List/index.tsx
  9. +8
    -1
      react-ui/src/pages/Dataset/components/ResourceList/index.tsx
  10. +6
    -9
      react-ui/src/pages/DevelopmentEnvironment/List/index.tsx
  11. +27
    -16
      react-ui/src/pages/Experiment/index.jsx
  12. +6
    -9
      react-ui/src/pages/Mirror/Info/index.tsx
  13. +6
    -9
      react-ui/src/pages/Mirror/List/index.tsx
  14. +6
    -9
      react-ui/src/pages/ModelDeployment/List/index.tsx
  15. +7
    -11
      react-ui/src/pages/ModelDeployment/ServiceInfo/index.tsx
  16. +27
    -22
      react-ui/src/pages/Pipeline/index.jsx
  17. +2
    -3
      react-ui/src/pages/Workspace/components/TotalStatistics/index.less
  18. +2
    -1
      react-ui/src/pages/Workspace/index.less
  19. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java
  20. +94
    -152
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

+ 3
- 1
k8s/deploy.sh View File

@@ -34,7 +34,7 @@ if [[ ! " ${valid_services[@]} " =~ " $service " ]]; then
exit 1
fi

valid_envs=("dev" "test")
valid_envs=("dev" "test" "test1")
if [[ ! " ${valid_envs[@]} " =~ " $env " ]]; then
echo "Invalid environment: $env" >&2
echo "Valid environments are: ${valid_envs[*]}"
@@ -46,6 +46,8 @@ if [ "$env" == "dev" ]; then
remote_ip="172.20.32.197"
elif [ "$env" == "test" ]; then
remote_ip="172.20.32.185"
elif [ "$env" == "test1" ]; then
remote_ip="172.20.32.235"
else
echo "Invalid environment - $env"
exit 1


+ 4
- 6
react-ui/src/app.tsx View File

@@ -1,11 +1,14 @@
import RightContent from '@/components/RightContent';
import themes from '@/styles/theme.less';
import { type GlobalInitialState } from '@/types';
import { menuItemRender } from '@/utils/menuRender';
import type { Settings as LayoutSettings } from '@ant-design/pro-components';
import { RuntimeConfig, history } from '@umijs/max';
import { RuntimeAntdConfig } from 'umi';
import defaultSettings from '../config/defaultSettings';
import '../public/fonts/font.css';
import { getAccessToken } from './access';
import ErrorBoundary from './components/ErrorBoundary';
import './dayjsConfig';
import { removeAllPageCacheState } from './hooks/pageCacheState';
import {
@@ -16,14 +19,9 @@ import {
setRemoteMenu,
} from './services/session';
import './styles/menu.less';
export { requestConfig as request } from './requestConfig';
// const isDev = process.env.NODE_ENV === 'development';
import { type GlobalInitialState } from '@/types';
// import '@/utils/clipboard';
import { menuItemRender } from '@/utils/menuRender';
import ErrorBoundary from './components/ErrorBoundary';
import { needAuth } from './utils';
import { gotoLoginPage } from './utils/ui';
export { requestConfig as request } from './requestConfig';

/**
* @see https://umijs.org/zh-CN/plugins/plugin-initial-state


react-ui/src/utils/clipboard.js → react-ui/src/components/CopyingText/clipboard.js View File


react-ui/src/pages/AutoML/components/CopyingText/index.less → react-ui/src/components/CopyingText/index.less View File


+ 26
- 0
react-ui/src/components/CopyingText/index.tsx View File

@@ -0,0 +1,26 @@
import KFIcon from '@/components/KFIcon';
import { Tooltip } from 'antd';
import styles from './index.less';

export type CopyingTextProps = {
text: string;
};

function CopyingText({ text }: CopyingTextProps) {
return (
<div className={styles['copying-text']}>
<span className={styles['copying-text__text']}>{text}</span>
<Tooltip title="复制">
<KFIcon
id="copying"
data-clipboard-text={text}
type="icon-fuzhi2"
className={styles['copying-text__icon']}
color="#606b7a"
/>
</Tooltip>
</div>
);
}

export default CopyingText;

+ 0
- 26
react-ui/src/pages/AutoML/components/CopyingText/index.tsx View File

@@ -1,26 +0,0 @@
import KFIcon from '@/components/KFIcon';
import { Typography } from 'antd';
import styles from './index.less';

export type CopyingTextProps = {
text: string;
};

function CopyingText({ text }: CopyingTextProps) {
return (
<div className={styles['copying-text']}>
<Typography.Text ellipsis={{ tooltip: text }} className={styles['copying-text__text']}>
{text}
</Typography.Text>
<KFIcon
id="copying"
data-clipboard-text={text}
type="icon-fuzhi2"
className={styles['copying-text__icon']}
color="#606b7a"
/>
</div>
);
}

export default CopyingText;

+ 6
- 9
react-ui/src/pages/AutoML/components/ExperimentList/index.tsx View File

@@ -93,17 +93,14 @@ function ExperimentList({ type }: ExperimentListProps) {
const [res] = await to(request(record.id));
if (res) {
message.success('删除成功');
// 如果是一页的唯一数据，删除时，请求第一页的数据
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
// 避免回到第一页
if (tableData.length > 1) {
setPagination((prev) => ({
setPagination((prev) => {
return {
...prev,
current: 1,
}));
} else {
getAutoMLList();
}
current: tableData.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 8
- 1
react-ui/src/pages/CodeConfig/List/index.tsx View File

@@ -75,8 +75,15 @@ function CodeConfigList() {
const deleteRecord = async (id: number) => {
const [res] = await to(deleteCodeConfigReq(id));
if (res) {
getDataList();
message.success('删除成功');
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
setPagination((prev) => {
return {
...prev,
current: dataList!.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 8
- 1
react-ui/src/pages/Dataset/components/ResourceList/index.tsx View File

@@ -107,8 +107,15 @@ function ResourceList(
const request = config.deleteRecord;
const [res] = await to(request(params));
if (res) {
getDataList();
message.success('删除成功');
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
setPagination((prev) => {
return {
...prev,
current: dataList!.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 6
- 9
react-ui/src/pages/DevelopmentEnvironment/List/index.tsx View File

@@ -80,17 +80,14 @@ function EditorList() {
const [res] = await to(deleteEditorReq(id));
if (res) {
message.success('删除成功');
// 如果是一页的唯一数据，删除时，请求第一页的数据
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
// 避免回到第一页
if (tableData.length > 1) {
setPagination((prev) => ({
setPagination((prev) => {
return {
...prev,
current: 1,
}));
} else {
getEditorList();
}
current: tableData.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 27
- 16
react-ui/src/pages/Experiment/index.jsx View File

@@ -378,6 +378,31 @@ function Experiment() {
getQueryByExperiment(expandedRowKeys, page);
};

// 处理删除
const handleExperimentDelete = (record) => {
modalConfirm({
title: '删除后，该实验将不可恢复',
content: '是否确认删除?',
onOk: () => {
deleteExperimentById(record.id).then((ret) => {
if (ret.code === 200) {
message.success('删除成功');
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
setPagination((prev) => {
return {
...prev,
current: experimentList.length === 1 ? Math.max(1, prev.current - 1) : prev.current,
};
});
} else {
message.error(ret.msg);
}
});
},
});
};

const columns = [
{
title: '实验名称',
@@ -476,22 +501,7 @@ function Experiment() {
size="small"
key="batchRemove"
icon={<KFIcon type="icon-shanchu" />}
onClick={() => {
modalConfirm({
title: '删除后，该实验将不可恢复',
content: '是否确认删除?',
onOk: () => {
deleteExperimentById(record.id).then((ret) => {
if (ret.code === 200) {
message.success('删除成功');
getExperimentList();
} else {
message.error(ret.msg);
}
});
},
});
}}
onClick={() => handleExperimentDelete(record)}
>
删除
</Button>
@@ -500,6 +510,7 @@ function Experiment() {
),
},
];

return (
<div className={styles['experiment-list']}>
<PageTitle title="实验列表"></PageTitle>


+ 6
- 9
react-ui/src/pages/Mirror/Info/index.tsx View File

@@ -117,17 +117,14 @@ function MirrorInfo() {
const [res] = await to(deleteMirrorVersionReq(id));
if (res) {
message.success('删除成功');
// 如果是一页的唯一数据，删除时，请求第一页的数据
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
// 避免回到第一页
if (tableData.length === 1) {
setPagination((prev) => ({
setPagination((prev) => {
return {
...prev,
current: 1,
}));
} else {
getMirrorVersionList();
}
current: tableData.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 6
- 9
react-ui/src/pages/Mirror/List/index.tsx View File

@@ -103,17 +103,14 @@ function MirrorList() {
const [res] = await to(deleteMirrorReq(id));
if (res) {
message.success('删除成功');
// 如果是一页的唯一数据，删除时，请求第一页的数据
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
// 避免回到第一页
if (tableData.length > 1) {
setPagination((prev) => ({
setPagination((prev) => {
return {
...prev,
current: 1,
}));
} else {
getMirrorList();
}
current: tableData.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 6
- 9
react-ui/src/pages/ModelDeployment/List/index.tsx View File

@@ -119,17 +119,14 @@ function ModelDeployment() {
const [res] = await to(deleteServiceReq(record.id));
if (res) {
message.success('删除成功');
// 如果是一页的唯一数据，删除时，请求第一页的数据
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
// 避免回到第一页
if (tableData.length > 1) {
setPagination((prev) => ({
setPagination((prev) => {
return {
...prev,
current: 1,
}));
} else {
getServiceList();
}
current: tableData.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
}
};



+ 7
- 11
react-ui/src/pages/ModelDeployment/ServiceInfo/index.tsx View File

@@ -132,18 +132,14 @@ function ServiceInfo() {
const [res] = await to(deleteServiceVersionReq(record.id));
if (res) {
message.success('删除成功');
// 如果是一页的唯一数据，删除时，请求第一页的数据
// 否则直接刷新这一页的数据，避免回到第一页
if (tableData.length === 1) {
setPagination((prev) => ({
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
setPagination((prev) => {
return {
...prev,
current: 1,
}));
} else {
setPagination((prev) => ({
...prev,
}));
}
current: tableData.length === 1 ? Math.max(1, prev.current! - 1) : prev.current,
};
});
getServiceInfo();
}
};


+ 27
- 22
react-ui/src/pages/Pipeline/index.jsx View File

@@ -127,6 +127,32 @@ const Pipeline = () => {
}
};

// 处理删除
const handlePipelineDelete = (record) => {
modalConfirm({
title: '删除后，该流水线将不可恢复',
content: '是否确认删除?',
onOk: () => {
removeWorkflow(record.id).then((ret) => {
if (ret.code === 200) {
message.success('删除成功');
// 如果是一页的唯一数据，删除后，请求第一页的数据
// 否则直接刷新这一页的数据
setPagination((prev) => {
return {
...prev,
current: pipeList.length === 1 ? Math.max(1, prev.current - 1) : prev.current,
};
});
getList();
} else {
message.error(ret.msg);
}
});
},
});
};

// 当前页面切换
const paginationChange = async (current, pageSize) => {
setPagination({
@@ -238,28 +264,7 @@ const Pipeline = () => {
size="small"
key="batchRemove"
icon={<KFIcon type="icon-shanchu" />}
onClick={() => {
modalConfirm({
title: '删除后，该流水线将不可恢复',
content: '是否确认删除?',
onOk: () => {
removeWorkflow(record.id).then((ret) => {
if (ret.code === 200) {
message.success('删除成功');
getList();
} else {
message.error(ret.msg);
}
});

// if (success) {
// if (actionRef.current) {
// actionRef.current.reload();
// }
// }
},
});
}}
onClick={() => handlePipelineDelete(record)}
>
删除
</Button>


+ 2
- 3
react-ui/src/pages/Workspace/components/TotalStatistics/index.less View File

@@ -7,7 +7,7 @@

// 媒体查询
@media screen and (max-width: 1600px) {
flex: 1 1 content;
flex: auto;
}

&__icon {
@@ -24,8 +24,7 @@

&__count {
color: @text-color;
font-weight: 700;
font-size: 25px;
font-size: 26px;
font-family: DingTalk-JinBuTi;
}
}

+ 2
- 1
react-ui/src/pages/Workspace/index.less View File

@@ -27,6 +27,7 @@

&__statistics {
flex: none;
min-width: 431px;
background: linear-gradient(
123.08deg,
rgba(138, 138, 138, 0.06) 1.32%,
@@ -36,7 +37,7 @@

// 媒体查询
@media screen and (max-width: 1600px) {
flex: 1 1 content;
flex: 1;
}
}
}


+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageVersionServiceImpl.java View File

@@ -96,7 +96,7 @@ public class ImageVersionServiceImpl implements ImageVersionService {
return "无权限删除该版本下模型信息";
}

imageVersion.setState(0);
imageVersion.setState(Constant.State_invalid);
return this.imageVersionDao.update(imageVersion) > 0 ? "删除成功" : "删除失败";

}


+ 94
- 152
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java View File

@@ -1,15 +1,5 @@
package com.ruoyi.system.service.impl;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
@@ -22,22 +12,28 @@ import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
* 用户 业务层处理
*
*
* @author ruoyi
*/
@Service
public class SysUserServiceImpl implements ISysUserService
{
public class SysUserServiceImpl implements ISysUserService {
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);

@Autowired
@@ -63,79 +59,72 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 根据条件分页查询用户列表
*
*
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList(SysUser user)
{
public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
}

/**
* 根据条件分页查询已分配用户角色列表
*
*
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectAllocatedList(SysUser user)
{
public List<SysUser> selectAllocatedList(SysUser user) {
return userMapper.selectAllocatedList(user);
}

/**
* 根据条件分页查询未分配用户角色列表
*
*
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUnallocatedList(SysUser user)
{
public List<SysUser> selectUnallocatedList(SysUser user) {
return userMapper.selectUnallocatedList(user);
}

/**
* 通过用户名查询用户
*
*
* @param userName 用户名
* @return 用户对象信息
*/
@Override
public SysUser selectUserByUserName(String userName)
{
public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
}

/**
* 通过用户ID查询用户
*
*
* @param userId 用户ID
* @return 用户对象信息
*/
@Override
public SysUser selectUserById(Long userId)
{
public SysUser selectUserById(Long userId) {
return userMapper.selectUserById(userId);
}

/**
* 查询用户所属角色组
*
*
* @param userName 用户名
* @return 结果
*/
@Override
public String selectUserRoleGroup(String userName)
{
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
if (CollectionUtils.isEmpty(list))
{
if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
}
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -143,16 +132,14 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 查询用户所属岗位组
*
*
* @param userName 用户名
* @return 结果
*/
@Override
public String selectUserPostGroup(String userName)
{
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
if (CollectionUtils.isEmpty(list))
{
if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
}
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@@ -160,17 +147,15 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 校验用户名称是否唯一
*
*
* @param user 用户信息
* @return 结果
*/
@Override
public boolean checkUserNameUnique(SysUser user)
{
public boolean checkUserNameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -183,12 +168,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return
*/
@Override
public boolean checkPhoneUnique(SysUser user)
{
public boolean checkPhoneUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -201,12 +184,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return
*/
@Override
public boolean checkEmailUnique(SysUser user)
{
public boolean checkEmailUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -216,8 +197,7 @@ public class SysUserServiceImpl implements ISysUserService
public boolean checktGitLinkUsernameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checktGitLinkUsernameUnique(user.getGitLinkUsername());
if(StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -225,33 +205,28 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 校验用户是否允许操作
*
*
* @param user 用户信息
*/
@Override
public void checkUserAllowed(SysUser user)
{
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
{
public void checkUserAllowed(SysUser user) {
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin() && !SecurityUtils.getUserId().equals(user.getUserId())) {
throw new ServiceException("不允许操作超级管理员用户");
}
}

/**
* 校验用户是否有数据权限
*
*
* @param userId 用户id
*/
@Override
public void checkUserDataScope(Long userId)
{
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
{
public void checkUserDataScope(Long userId) {
if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users))
{
if (StringUtils.isEmpty(users)) {
throw new ServiceException("没有权限访问用户数据！");
}
}
@@ -259,14 +234,13 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 新增保存用户信息
*
*
* @param user 用户信息
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int insertUser(SysUser user)
{
public int insertUser(SysUser user) {
// 新增用户信息
int rows = userMapper.insertUser(user);
// 新增用户岗位关联
@@ -278,26 +252,24 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 注册用户信息
*
*
* @param user 用户信息
* @return 结果
*/
@Override
public boolean registerUser(SysUser user)
{
public boolean registerUser(SysUser user) {
return userMapper.insertUser(user) > 0;
}

/**
* 修改保存用户信息
*
*
* @param user 用户信息
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int updateUser(SysUser user)
{
public int updateUser(SysUser user) {
Long userId = user.getUserId();
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId);
@@ -312,104 +284,94 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 用户授权角色
*
* @param userId 用户ID
*
* @param userId 用户ID
* @param roleIds 角色组
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void insertUserAuth(Long userId, Long[] roleIds)
{
public void insertUserAuth(Long userId, Long[] roleIds) {
userRoleMapper.deleteUserRoleByUserId(userId);
insertUserRole(userId, roleIds);
}

/**
* 修改用户状态
*
*
* @param user 用户信息
* @return 结果
*/
@Override
public int updateUserStatus(SysUser user)
{
public int updateUserStatus(SysUser user) {
return userMapper.updateUser(user);
}

/**
* 修改用户基本信息
*
*
* @param user 用户信息
* @return 结果
*/
@Override
public int updateUserProfile(SysUser user)
{
public int updateUserProfile(SysUser user) {
return userMapper.updateUser(user);
}

/**
* 修改用户头像
*
*
* @param userName 用户名
* @param avatar 头像地址
* @param avatar 头像地址
* @return 结果
*/
@Override
public boolean updateUserAvatar(String userName, String avatar)
{
public boolean updateUserAvatar(String userName, String avatar) {
return userMapper.updateUserAvatar(userName, avatar) > 0;
}

/**
* 重置用户密码
*
*
* @param user 用户信息
* @return 结果
*/
@Override
public int resetPwd(SysUser user)
{
public int resetPwd(SysUser user) {
return userMapper.updateUser(user);
}

/**
* 重置用户密码
*
*
* @param userName 用户名
* @param password 密码
* @return 结果
*/
@Override
public int resetUserPwd(String userName, String password)
{
public int resetUserPwd(String userName, String password) {
return userMapper.resetUserPwd(userName, password);
}

/**
* 新增用户角色信息
*
*
* @param user 用户对象
*/
public void insertUserRole(SysUser user)
{
public void insertUserRole(SysUser user) {
this.insertUserRole(user.getUserId(), user.getRoleIds());
}

/**
* 新增用户岗位信息
*
*
* @param user 用户对象
*/
public void insertUserPost(SysUser user)
{
public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
if (StringUtils.isNotEmpty(posts))
{
if (StringUtils.isNotEmpty(posts)) {
// 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>();
for (Long postId : posts)
{
for (Long postId : posts) {
SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId());
up.setPostId(postId);
@@ -421,18 +383,15 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 新增用户角色信息
*
* @param userId 用户ID
*
* @param userId 用户ID
* @param roleIds 角色组
*/
public void insertUserRole(Long userId, Long[] roleIds)
{
if (StringUtils.isNotEmpty(roleIds))
{
public void insertUserRole(Long userId, Long[] roleIds) {
if (StringUtils.isNotEmpty(roleIds)) {
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
for (Long roleId : roleIds)
{
for (Long roleId : roleIds) {
SysUserRole ur = new SysUserRole();
ur.setUserId(userId);
ur.setRoleId(roleId);
@@ -444,14 +403,13 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 通过用户ID删除用户
*
*
* @param userId 用户ID
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteUserById(Long userId)
{
public int deleteUserById(Long userId) {
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表
@@ -461,16 +419,14 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 批量删除用户信息
*
*
* @param userIds 需要删除的用户ID
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteUserByIds(Long[] userIds)
{
for (Long userId : userIds)
{
public int deleteUserByIds(Long[] userIds) {
for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
@@ -483,17 +439,15 @@ public class SysUserServiceImpl implements ISysUserService

/**
* 导入用户数据
*
* @param userList 用户数据列表
*
* @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
* @param operName 操作用户
* @param operName 操作用户
* @return 结果
*/
@Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
{
if (StringUtils.isNull(userList) || userList.size() == 0)
{
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
if (StringUtils.isNull(userList) || userList.size() == 0) {
throw new ServiceException("导入用户数据不能为空！");
}
int successNum = 0;
@@ -501,23 +455,18 @@ public class SysUserServiceImpl implements ISysUserService
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword");
for (SysUser user : userList)
{
try
{
for (SysUser user : userList) {
try {
// 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName());
if (StringUtils.isNull(u))
{
if (StringUtils.isNull(u)) {
BeanValidators.validateWithException(validator, user);
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
userMapper.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
}
else if (isUpdateSupport)
{
} else if (isUpdateSupport) {
BeanValidators.validateWithException(validator, user);
checkUserAllowed(u);
checkUserDataScope(u.getUserId());
@@ -526,28 +475,21 @@ public class SysUserServiceImpl implements ISysUserService
userMapper.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
}
else
{
} else {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
}
}
catch (Exception e)
{
} catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
}
if (failureNum > 0)
{
if (failureNum > 0) {
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString());
}
else
{
} else {
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
}
return successMsg.toString();


Write Preview
Loading…
Cancel
Save