Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
ops
Commits
89409cea
Commit
89409cea
authored
Feb 21, 2025
by
朱翔
Browse files
增加用户绩效接口
parent
951392fa
Changes
33
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/sms/service/ReportDataInfoService.java
View file @
89409cea
...
...
@@ -19,4 +19,6 @@ public interface ReportDataInfoService extends IService<ReportDataInfoEntity> {
List
<
ReportDataInfoVO
>
queryList
(
ReportDataInfoDTO
reportDataInfoDTO
);
void
test
();
boolean
saveOrUpdateReportData
(
ReportDataInfoDTO
reportDataInfoDTO
);
}
src/main/java/com/ruzhoukj/sms/service/
DeptAndUser
Service.java
→
src/main/java/com/ruzhoukj/sms/service/
UserPerformance
Service.java
View file @
89409cea
package
com.ruzhoukj.sms.service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.sms.entity.DeptAndUserEntity
;
import
com.ruzhoukj.sms.entity.UserPerformanceEntity
;
import
com.ruzhoukj.sms.model.dto.UserPerformanceDTO
;
import
com.ruzhoukj.sms.model.vo.UserPerformanceVO
;
import
java.util.List
;
...
...
@@ -9,16 +11,10 @@ import java.util.List;
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service
* @Project:OA
* @name:
DeptAndUser
Service
* @Date:2025/2/21 1
0:05
* @Filename:
DeptAndUser
Service
* @name:
UserPerformance
Service
* @Date:2025/2/21 1
4:22
* @Filename:
UserPerformance
Service
*/
public
interface
DeptAndUserService
extends
IService
<
DeptAndUserEntity
>
{
/**
*
* @param deptAndUserEntity deptAndUserEntity
* @return List<DeptAndUserEntity>
*/
List
<
DeptAndUserEntity
>
queryList
(
DeptAndUserEntity
deptAndUserEntity
);
public
interface
UserPerformanceService
extends
IService
<
UserPerformanceEntity
>
{
List
<
UserPerformanceVO
>
queryList
(
UserPerformanceDTO
userPerformanceDTO
);
}
src/main/java/com/ruzhoukj/sms/service/UserService.java
View file @
89409cea
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.ruzhoukj.sms.entity.ProjectEntity
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.UserDTO
;
import
com.ruzhoukj.sms.model.dto.UserPerformanceDTO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
java.util.List
;
...
...
@@ -49,4 +50,6 @@ public interface UserService extends IService<UserEntity> {
* @return UserVO
*/
UserVO
getUserInfo
(
String
id
);
List
<
UserVO
>
queryList
(
UserDTO
userDTO
);
}
src/main/java/com/ruzhoukj/sms/service/impl/DeptServiceImpl.java
View file @
89409cea
package
com.ruzhoukj.sms.service.impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.google.common.collect.Lists
;
import
com.ruzhoukj.sms.common.Constant
;
import
com.ruzhoukj.sms.dao.DeptDao
;
import
com.ruzhoukj.sms.entity.DeptAndUserEntity
;
import
com.ruzhoukj.sms.entity.DeptEntity
;
import
com.ruzhoukj.sms.entity.UserEntity
;
import
com.ruzhoukj.sms.model.dto.DeptDTO
;
import
com.ruzhoukj.sms.model.dto.UserDTO
;
import
com.ruzhoukj.sms.model.vo.DeptVO
;
import
com.ruzhoukj.sms.model.vo.UserVO
;
import
com.ruzhoukj.sms.service.DeptAndUserService
;
import
com.ruzhoukj.sms.service.DeptService
;
import
com.ruzhoukj.sms.service.UserService
;
import
org.springframework.stereotype.Service
;
...
...
@@ -33,8 +31,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
@Resource
private
UserService
userService
;
@Resource
private
DeptAndUserService
deptAndUserService
;
@Override
public
List
<
DeptVO
>
queryList
(
DeptDTO
deptDTO
)
{
return
baseMapper
.
queryList
(
deptDTO
);
...
...
@@ -43,36 +39,22 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
saveOrUpdateDept
(
DeptDTO
deptDTO
)
{
if
(
deptDTO
.
getId
()!=
null
){
//删除当前部门人员
deptAndUserService
.
remove
(
new
LambdaQueryWrapper
<
DeptAndUserEntity
>().
eq
(
DeptAndUserEntity:
:
getDeptId
,
deptDTO
.
getId
()));
updateById
(
deptDTO
);
//保存部门人员
deptDTO
.
getDeptUserList
().
forEach
(
deptAndUserEntity
->
deptAndUserEntity
.
setDeptId
(
deptDTO
.
getId
()));
}
else
{
save
(
deptDTO
);
//保存部门人员
deptDTO
.
getDeptUserList
().
forEach
(
deptAndUserEntity
->
{
deptAndUserEntity
.
setDeptId
(
deptDTO
.
getId
());
});
deptAndUserService
.
saveBatch
(
deptDTO
.
getDeptUserList
());
}
return
true
;
return
saveOrUpdate
(
deptDTO
);
}
@Override
public
List
<
DeptAndUserEntity
>
getDeptUserList
(
DeptDTO
deptDTO
)
{
public
List
<
UserVO
>
getDeptUserList
(
DeptDTO
deptDTO
)
{
//查看当前登录用户信息
UserEntity
user
=
userService
.
getById
(
deptDTO
.
getLoginUserId
());
DeptAndUserEntity
deptAndUserEntity
=
new
DeptAndUserEntity
();
UserDTO
userDTO
=
new
UserDTO
();
if
(
user
.
getUserRole
().
equals
(
Constant
.
ADMIN
)){
//查询全部用户
return
deptAndU
serService
.
queryList
(
deptAndUserEntity
);
return
u
serService
.
queryList
(
userDTO
);
}
if
(
user
.
getUserRole
().
equals
(
Constant
.
D_ADMIN
)){
//查看部门用户
deptAndUserEntity
.
setDeptId
(
deptDTO
.
ge
tId
());
return
deptAndU
serService
.
queryList
(
deptAndUserEntity
);
userDTO
.
setDeptId
(
user
.
getDep
tId
());
return
u
serService
.
queryList
(
userDTO
);
}
return
Lists
.
newArrayList
();
}
...
...
src/main/java/com/ruzhoukj/sms/service/impl/FileServiceImpl.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.service.impl
;
import
com.platform.exception.BusinessException
;
import
com.ruzhoukj.sms.common.Constant
;
import
com.ruzhoukj.sms.service.FileService
;
import
com.ruzhoukj.sms.util.AliOSSUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.annotation.Resource
;
import
java.io.IOException
;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl
* @Project:OA
* @name:FileServiceImpl
* @Date:2025/2/21 11:28
* @Filename:FileServiceImpl
*/
@Service
public
class
FileServiceImpl
implements
FileService
{
@Resource
private
AliOSSUtils
aliOSSUtils
;
@Override
public
String
upload
(
MultipartFile
multipartFile
)
{
String
url
;
try
{
url
=
aliOSSUtils
.
upload
(
multipartFile
,
Constant
.
DIR_OA
);
}
catch
(
IOException
e
)
{
throw
new
BusinessException
(
"上传文件失败"
);
}
return
url
;
}
}
src/main/java/com/ruzhoukj/sms/service/impl/ReportDataInfoServiceImpl.java
View file @
89409cea
...
...
@@ -2,10 +2,8 @@ package com.ruzhoukj.sms.service.impl;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.platform.utils.StringUtils
;
import
com.ruzhoukj.sms.dao.ReportDataInfoMapper
;
import
com.ruzhoukj.sms.dao.ReportDataInfoDao
;
import
com.ruzhoukj.sms.entity.ReportDataInfoEntity
;
import
com.ruzhoukj.sms.model.dto.ReportDataInfoDTO
;
import
com.ruzhoukj.sms.model.vo.ReportDataInfoVO
;
...
...
@@ -23,7 +21,7 @@ import java.util.List;
* @Filename:ReportDataInfoServiceImpl
*/
@Service
public
class
ReportDataInfoServiceImpl
extends
ServiceImpl
<
ReportDataInfo
Mapper
,
ReportDataInfoEntity
>
implements
ReportDataInfoService
{
public
class
ReportDataInfoServiceImpl
extends
ServiceImpl
<
ReportDataInfo
Dao
,
ReportDataInfoEntity
>
implements
ReportDataInfoService
{
@Override
public
List
<
ReportDataInfoVO
>
queryList
(
ReportDataInfoDTO
reportDataInfoDTO
)
{
return
baseMapper
.
queryList
(
reportDataInfoDTO
);
...
...
@@ -49,4 +47,9 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoMapper,
}
}
@Override
public
boolean
saveOrUpdateReportData
(
ReportDataInfoDTO
reportDataInfoDTO
)
{
return
saveOrUpdate
(
reportDataInfoDTO
);
}
}
src/main/java/com/ruzhoukj/sms/service/impl/
DeptAndUser
ServiceImpl.java
→
src/main/java/com/ruzhoukj/sms/service/impl/
UserPerformance
ServiceImpl.java
View file @
89409cea
package
com.ruzhoukj.sms.service.impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.sms.dao.DeptAndUserDao
;
import
com.ruzhoukj.sms.entity.DeptAndUserEntity
;
import
com.ruzhoukj.sms.service.DeptAndUserService
;
import
com.ruzhoukj.sms.dao.UserPerformanceDao
;
import
com.ruzhoukj.sms.entity.UserPerformanceEntity
;
import
com.ruzhoukj.sms.model.dto.UserPerformanceDTO
;
import
com.ruzhoukj.sms.model.vo.UserPerformanceVO
;
import
com.ruzhoukj.sms.service.UserPerformanceService
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
...
...
@@ -12,14 +14,14 @@ import java.util.List;
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl
* @Project:OA
* @name:
DeptAndUser
ServiceImpl
* @Date:2025/2/21 1
0:05
* @Filename:
DeptAndUser
ServiceImpl
* @name:
UserPerformance
ServiceImpl
* @Date:2025/2/21 1
4:22
* @Filename:
UserPerformance
ServiceImpl
*/
@Service
public
class
DeptAndUser
ServiceImpl
extends
ServiceImpl
<
DeptAndUserDao
,
DeptAndUser
Entity
>
implements
DeptAndUser
Service
{
public
class
UserPerformance
ServiceImpl
extends
ServiceImpl
<
UserPerformanceDao
,
UserPerformance
Entity
>
implements
UserPerformance
Service
{
@Override
public
List
<
DeptAndUserEntity
>
queryList
(
DeptAndUserEntity
deptAndUserEntity
)
{
return
baseMapper
.
queryList
(
deptAndUserEntity
);
public
List
<
UserPerformanceVO
>
queryList
(
UserPerformanceDTO
userPerformanceDTO
)
{
return
baseMapper
.
queryList
(
userPerformanceDTO
);
}
}
src/main/java/com/ruzhoukj/sms/service/impl/UserServiceImpl.java
View file @
89409cea
...
...
@@ -78,4 +78,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userVO
.
setUserExtend
(
userExtend
);
return
userVO
;
}
@Override
public
List
<
UserVO
>
queryList
(
UserDTO
userDTO
)
{
return
baseMapper
.
queryList
(
userDTO
);
}
}
src/main/java/com/ruzhoukj/sms/util/AliOSSUtils.java
0 → 100644
View file @
89409cea
package
com.ruzhoukj.sms.util
;
import
com.aliyun.oss.OSS
;
import
com.aliyun.oss.OSSClientBuilder
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.Date
;
import
java.util.UUID
;
@Component
public
class
AliOSSUtils
{
@Value
(
"${oss.endPoint}"
)
private
String
endpoint
;
@Value
(
"${oss.key}"
)
private
String
accessKeyId
;
@Value
(
"${oss.secret}"
)
private
String
accessKeySecret
;
@Value
(
"${oss.bucket}"
)
private
String
bucketName
;
/**
* 实现上传图片到OSS
*/
public
String
upload
(
MultipartFile
multipartFile
,
String
dir
)
throws
IOException
{
// 获取上传的文件的输入流
InputStream
inputStream
=
multipartFile
.
getInputStream
();
// 避免文件覆盖
String
originalFilename
=
multipartFile
.
getOriginalFilename
();
String
fileName
=
dir
+
UUID
.
randomUUID
().
toString
()
+
originalFilename
.
substring
(
originalFilename
.
lastIndexOf
(
"."
));
//上传文件到 OSS
OSS
ossClient
=
new
OSSClientBuilder
().
build
(
endpoint
,
accessKeyId
,
accessKeySecret
);
ossClient
.
putObject
(
bucketName
,
fileName
,
inputStream
);
Date
expiration
=
new
Date
(
System
.
currentTimeMillis
()
+
3600
*
596523
);
String
url
=
ossClient
.
generatePresignedUrl
(
bucketName
,
fileName
,
expiration
).
toString
();
// 关闭ossClient
ossClient
.
shutdown
();
// 把上传到oss的路径返回
return
url
;
}
/**
* 删除单个图片
*
* @param url
*/
public
void
deleteImg
(
String
url
)
{
// 填写文件完整路径。文件完整路径中不能包含Bucket名称。(这里根据自己的地址改)
url
=
url
.
replace
(
"http://"
+
bucketName
+
"."
+
endpoint
+
"/"
,
""
);
int
index
=
url
.
indexOf
(
"?"
);
url
=
url
.
substring
(
0
,
index
);
// 创建OSSClient实例。
OSS
ossClient
=
new
OSSClientBuilder
().
build
(
endpoint
,
accessKeyId
,
accessKeySecret
);
// 删除文件或目录。如果要删除目录,目录必须为空。
ossClient
.
deleteObject
(
bucketName
,
url
);
// 关闭OSSClient。
ossClient
.
shutdown
();
}
}
src/main/resources/application.yml
View file @
89409cea
...
...
@@ -25,4 +25,10 @@ pagehelper:
helperDialect
:
mysql
reasonable
:
true
supportMethodsArguments
:
true
params
:
count=countSql
\ No newline at end of file
params
:
count=countSql
oss
:
key
:
LTAI5tENboKK5bcuqHfPvEdr
secret
:
Q006EvMzC63i1ozDiVNxEAxo8eH9zA
endPoint
:
oss-cn-beijing.aliyuncs.com
bucket
:
manj
\ No newline at end of file
src/main/resources/com/ruzhoukj/sms/dao/ReportDataInfoDao.xml
View file @
89409cea
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.ruzhoukj.sms.dao.ReportDataInfo
Mapper
"
>
<mapper
namespace=
"com.ruzhoukj.sms.dao.ReportDataInfo
Dao
"
>
<select
id=
"queryList"
resultType=
"com.ruzhoukj.sms.model.vo.ReportDataInfoVO"
>
select
rdi.name name,
u.name userName,
rdi.id id,
rdi.user_id userId,
rdi.year year,
rdi.month month
r.id id,
r.user_id userId,
r.template_id templateId,
r.content content,
r.all_content allContent,
r.year year,
r.month month,
r.key_value keyValue,
u.name userName
from
report_data_info rdi
left join user u on
rdi.user_id = u.id
report_data_info r
left join
report_data_and_user rdau on
rdi.id = rdau.report_data_info_id
where
rdi.user_id = #{userId}
or
rdau.user_id = #{userId}
user u
on
r.user_id = u.id
<where>
<if
test=
"deptId != null and deptId != ''"
>
r.dept_id = #{deptId}
</if>
<if
test=
"userId != null and userId != ''"
>
r.user_id = #{userId}
</if>
</where>
</select>
</mapper>
src/main/resources/com/ruzhoukj/sms/dao/UserDao.xml
View file @
89409cea
...
...
@@ -7,7 +7,8 @@
SELECT
id,
name,
departments,
second_dept as secondDept,
third_dept as thirdDept,
create_time as createTime,
email,
phone
...
...
@@ -25,7 +26,8 @@
SELECT
id,
name,
departments,
second_dept as secondDept,
third_dept as thirdDept,
create_time as createTime
FROM user
WHERE name = #{name}
...
...
@@ -54,4 +56,26 @@
or visible_people like concat('%', #{id}, '%')
or visible_people = 'all'
</select>
<select
id=
"queryList"
resultType=
"com.ruzhoukj.sms.model.vo.UserVO"
>
SELECT
id,
name,
second_dept as secondDept,
third_dept as thirdDept,
create_time as createTime,
email,
phone
FROM
user
WHERE
1 = 1
<if
test=
"name != null and name != ''"
>
AND name LIKE CONCAT('%', #{name}, '%')
</if>
<if
test=
"deptId != null and deptId != ''"
>
AND dept_id = #{deptId}
</if>
ORDER BY id DESC
</select>
</mapper>
src/main/resources/com/ruzhoukj/sms/dao/UserPerformanceDao.xml
0 → 100644
View file @
89409cea
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.ruzhoukj.sms.dao.UserPerformanceDao"
>
<select
id=
"queryList"
resultType=
"com.ruzhoukj.sms.model.vo.UserPerformanceVO"
>
select
u.name userName,
up.user_id userId,
u.dept_id deptId,
up.performance_date performanceDate,
up.performance_score performanceScore,
d.name deptName
from
user_performance up
left join
user u on
u.id = up.user_id
left join
dept d on
up.dept_id = d.id
<where>
<if
test=
"deptId != null and deptId != ''"
>
and up.dept_id = #{deptId}
</if>
</where>
</select>
</mapper>
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment