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
ea83ee81
"src/test/git@gitlab.ruzhoukj.com:wangcaixuan/rz-gb.git" did not exist on "db8f601025c9b8570578ec8b5233a38ade3f2a35"
Commit
ea83ee81
authored
Mar 03, 2025
by
wujipeng
Browse files
定时任务-员工统计表
parent
26cf382b
Changes
11
Show whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/sms/controller/DingAttendanceController.java
View file @
ea83ee81
package
com.ruzhoukj.sms.controller
;
import
cn.hutool.core.util.StrUtil
;
import
com.dingtalk.api.DefaultDingTalkClient
;
import
com.dingtalk.api.DingTalkClient
;
import
com.dingtalk.api.request.OapiAttendanceGetleaveapprovedurationRequest
;
...
...
@@ -58,6 +59,7 @@ public class DingAttendanceController {
OapiAttendanceListRecordResponse
rsp
=
client
.
execute
(
req
,
accessToken
);
List
<
DingAttendanceVO
>
data
=
Lists
.
newArrayList
();
rsp
.
getRecordresult
().
forEach
(
recordresult
->
{
if
(
StrUtil
.
isNotEmpty
(
recordresult
.
getCheckType
()))
{
data
.
add
(
DingAttendanceVO
.
builder
()
.
userId
(
recordresult
.
getUserId
())
.
userAddress
(
recordresult
.
getUserAddress
())
...
...
@@ -67,6 +69,7 @@ public class DingAttendanceController {
.
checkType
(
recordresult
.
getCheckType
())
.
sourceType
(
recordresult
.
getSourceType
())
.
build
());
}
});
//userIds中有data中没有的,添加一条空数据
...
...
src/main/java/com/ruzhoukj/sms/dao/DingAttendanceDao.java
View file @
ea83ee81
...
...
@@ -6,6 +6,7 @@ import com.ruzhoukj.sms.model.vo.DingAttendanceDTO;
import
com.ruzhoukj.sms.model.vo.DingAttendanceVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -24,5 +25,13 @@ public interface DingAttendanceDao extends BaseMapper<DingAttendanceEntity> {
* @return List<DingAttendanceVO>
*/
List
<
DingAttendanceVO
>
getSyncData
(
DingAttendanceDTO
dingAttendanceDTO
);
/**
* 根据时间查询考勤数据
*
* @param previousDateAsDate previousDateAsDate
* @return List<DingAttendanceEntity>
*/
List
<
DingAttendanceEntity
>
getListByDate
(
Date
previousDateAsDate
);
}
src/main/java/com/ruzhoukj/sms/dao/DingAttendanceTotalDao.java
0 → 100644
View file @
ea83ee81
package
com.ruzhoukj.sms.dao
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruzhoukj.sms.entity.DingAttendanceTotalEntity
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* @author : wujipeng
* @date : 2025/3/3 14:45
* @Version: 1.0
* @Desc : 描述信息
*/
@Mapper
public
interface
DingAttendanceTotalDao
extends
BaseMapper
<
DingAttendanceTotalEntity
>
{
}
src/main/java/com/ruzhoukj/sms/entity/DingAttendanceEntity.java
View file @
ea83ee81
...
...
@@ -33,7 +33,6 @@ public class DingAttendanceEntity {
@TableField
(
value
=
"name"
)
private
String
name
;
@ApiModelProperty
(
value
=
"实际打卡时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@TableField
(
value
=
"user_check_time"
)
...
...
@@ -75,4 +74,14 @@ public class DingAttendanceEntity {
@ApiModelProperty
(
value
=
"审批单类型 1:加班 2:出差/外出 3:请假"
)
@TableField
(
value
=
"biz_type"
)
private
Long
bizType
;
@ApiModelProperty
(
value
=
"开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@TableField
(
value
=
"start_time"
)
private
Date
startTime
;
@ApiModelProperty
(
value
=
"结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@TableField
(
value
=
"end_time"
)
private
Date
endTime
;
}
src/main/java/com/ruzhoukj/sms/entity/DingAttendanceTotalEntity.java
0 → 100644
View file @
ea83ee81
package
com.ruzhoukj.sms.entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author : wujipeng
* @date : 2025/3/3 14:43
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
@TableName
(
"ding_attendance_total"
)
public
class
DingAttendanceTotalEntity
{
@ApiModelProperty
(
value
=
"主键id"
)
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"员工id"
)
@TableField
(
value
=
"user_id"
)
private
String
userId
;
@ApiModelProperty
(
value
=
"员工姓名"
)
@TableField
(
value
=
"name"
)
private
String
name
;
@ApiModelProperty
(
value
=
"实际工作时长(h)"
)
@TableField
(
value
=
"work_time"
)
private
String
workTime
;
@ApiModelProperty
(
value
=
"时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@TableField
(
value
=
"date"
)
private
Date
date
;
@ApiModelProperty
(
"请假时长"
)
@TableField
(
value
=
"duration"
)
private
String
duration
;
@ApiModelProperty
(
value
=
"请假时长单位"
)
@TableField
(
value
=
"duration_unit"
)
private
String
durationUnit
;
@ApiModelProperty
(
value
=
"子类型名称"
)
@TableField
(
value
=
"sub_type"
)
private
String
subType
;
@ApiModelProperty
(
value
=
"审批单类型 请假 出差 外出 加班"
)
@TableField
(
value
=
"tag_name"
)
private
String
tagName
;
@ApiModelProperty
(
value
=
"审批单类型 1:加班 2:出差/外出 3:请假"
)
@TableField
(
value
=
"biz_type"
)
private
Long
bizType
;
}
src/main/java/com/ruzhoukj/sms/service/DingAttendanceService.java
View file @
ea83ee81
...
...
@@ -5,6 +5,7 @@ import com.ruzhoukj.sms.entity.DingAttendanceEntity;
import
com.ruzhoukj.sms.model.vo.DingAttendanceDTO
;
import
com.ruzhoukj.sms.model.vo.DingAttendanceVO
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -23,4 +24,12 @@ public interface DingAttendanceService extends IService<DingAttendanceEntity> {
* @return List<DingAttendanceVO>
*/
List
<
DingAttendanceVO
>
getSyncData
(
DingAttendanceDTO
dingAttendanceDTO
);
/**
* 根据日期查询考勤数据
*
* @param previousDateAsDate previousDateAsDate
* @return List<DingAttendanceEntity>
*/
List
<
DingAttendanceEntity
>
getListByDate
(
Date
previousDateAsDate
);
}
src/main/java/com/ruzhoukj/sms/service/DingAttendanceTotalService.java
0 → 100644
View file @
ea83ee81
package
com.ruzhoukj.sms.service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.sms.entity.DingAttendanceTotalEntity
;
/**
* @author : wujipeng
* @date : 2025/3/3 14:46
* @Version: 1.0
* @Desc : 描述信息
*/
public
interface
DingAttendanceTotalService
extends
IService
<
DingAttendanceTotalEntity
>
{
}
src/main/java/com/ruzhoukj/sms/service/impl/DingAttendanceServiceImpl.java
View file @
ea83ee81
...
...
@@ -8,6 +8,7 @@ import com.ruzhoukj.sms.model.vo.DingAttendanceVO;
import
com.ruzhoukj.sms.service.DingAttendanceService
;
import
org.springframework.stereotype.Service
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -22,4 +23,9 @@ public class DingAttendanceServiceImpl extends ServiceImpl<DingAttendanceDao, Di
public
List
<
DingAttendanceVO
>
getSyncData
(
DingAttendanceDTO
dingAttendanceDTO
)
{
return
baseMapper
.
getSyncData
(
dingAttendanceDTO
);
}
@Override
public
List
<
DingAttendanceEntity
>
getListByDate
(
Date
previousDateAsDate
)
{
return
baseMapper
.
getListByDate
(
previousDateAsDate
);
}
}
src/main/java/com/ruzhoukj/sms/service/impl/DingAttendanceTotalServiceImpl.java
0 → 100644
View file @
ea83ee81
package
com.ruzhoukj.sms.service.impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.sms.dao.DingAttendanceTotalDao
;
import
com.ruzhoukj.sms.entity.DingAttendanceTotalEntity
;
import
com.ruzhoukj.sms.service.DingAttendanceTotalService
;
import
org.springframework.stereotype.Service
;
/**
* @author : wujipeng
* @date : 2025/3/3 14:46
* @Version: 1.0
* @Desc : 描述信息
*/
@Service
public
class
DingAttendanceTotalServiceImpl
extends
ServiceImpl
<
DingAttendanceTotalDao
,
DingAttendanceTotalEntity
>
implements
DingAttendanceTotalService
{
}
src/main/java/com/ruzhoukj/sms/task/DingTask.java
View file @
ea83ee81
package
com.ruzhoukj.sms.task
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.dingtalk.api.response.OapiAttendanceGetupdatedataResponse
;
import
com.google.common.collect.Lists
;
import
com.ruzhoukj.sms.controller.DingAttendanceController
;
import
com.ruzhoukj.sms.controller.DingEmployeeController
;
import
com.ruzhoukj.sms.entity.DingAttendanceEntity
;
import
com.ruzhoukj.sms.entity.DingAttendanceTotalEntity
;
import
com.ruzhoukj.sms.entity.DingUserEntity
;
import
com.ruzhoukj.sms.model.vo.DingAttendanceDTO
;
import
com.ruzhoukj.sms.model.vo.DingAttendanceVO
;
import
com.ruzhoukj.sms.model.vo.DingUserVO
;
import
com.ruzhoukj.sms.service.DingAttendanceService
;
import
com.ruzhoukj.sms.service.DingAttendanceTotalService
;
import
com.ruzhoukj.sms.service.DingUserService
;
import
com.ruzhoukj.sms.util.DateUtils
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -18,7 +21,9 @@ import org.springframework.scheduling.annotation.Scheduled;
import
org.springframework.stereotype.Component
;
import
javax.annotation.Resource
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -40,6 +45,8 @@ public class DingTask {
@Resource
private
DingAttendanceService
dingAttendanceService
;
@Resource
private
DingAttendanceTotalService
dingAttendanceTotalService
;
@Resource
private
DingAttendanceController
dingAttendanceController
;
/**
...
...
@@ -92,7 +99,7 @@ public class DingTask {
DingUserVO
employeeDetail
=
dingEmployeeController
.
getEmployeeDetail
(
dingAttendanceEntity
.
getUserId
());
List
<
OapiAttendanceGetupdatedataResponse
.
AtApproveForOpenVo
>
userClockIn
=
dingAttendanceController
.
getUserClockIn
(
dingAttendanceEntity
.
getUserId
(),
startAndEndOfDay
[
0
]);
dingAttendanceEntity
.
setName
(
employeeDetail
.
getName
());
if
(!
userClockIn
.
isEmpty
()){
if
(!
userClockIn
.
isEmpty
())
{
dingAttendanceEntity
.
setDuration
(
userClockIn
.
get
(
0
).
getDuration
());
dingAttendanceEntity
.
setDurationUnit
(
userClockIn
.
get
(
0
).
getDurationUnit
());
dingAttendanceEntity
.
setSubType
(
userClockIn
.
get
(
0
).
getSubType
());
...
...
@@ -104,4 +111,61 @@ public class DingTask {
dingAttendanceService
.
saveOrUpdateBatch
(
dingAttendanceEntities
);
log
.
info
(
"同步考勤数据结束"
);
}
/**
* 汇总考勤数据
*/
@Scheduled
(
cron
=
"0 0 10 * * *"
)
// @Scheduled(fixedRate = 20000)
public
void
collectAttendance
()
{
// 获取当前日期
Date
currentDate
=
new
Date
();
LocalDate
localDate
=
currentDate
.
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
();
// 减去两天
LocalDate
previousDate
=
localDate
.
minusDays
(
2
);
// 将 LocalDate 转换回 Date
Date
previousDateAsDate
=
Date
.
from
(
previousDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
//上午结束时间
LocalDateTime
localDateTime
=
previousDateAsDate
.
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDateTime
();
LocalDateTime
noonDateTime
=
localDateTime
.
withHour
(
12
).
withMinute
(
0
).
withSecond
(
0
).
withNano
(
0
);
Date
an
=
Date
.
from
(
noonDateTime
.
atZone
(
ZoneId
.
systemDefault
()).
toInstant
());
//下午开始时间
LocalDateTime
localDateTime1
=
previousDateAsDate
.
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDateTime
();
LocalDateTime
noonDateTime1
=
localDateTime1
.
withHour
(
13
).
withMinute
(
30
).
withSecond
(
0
).
withNano
(
0
);
Date
pn
=
Date
.
from
(
noonDateTime1
.
atZone
(
ZoneId
.
systemDefault
()).
toInstant
());
List
<
DingAttendanceEntity
>
dingAttendanceList
=
dingAttendanceService
.
getListByDate
(
previousDateAsDate
);
List
<
DingAttendanceTotalEntity
>
dingAttendanceTotalList
=
Lists
.
newArrayList
();
for
(
DingAttendanceEntity
dingAttendanceEntity
:
dingAttendanceList
)
{
double
workMillisecond
=
0.0
;
if
(
ObjectUtil
.
isNotEmpty
(
dingAttendanceEntity
.
getStartTime
())
&&
dingAttendanceEntity
.
getStartTime
().
before
(
an
))
{
long
diffInMillis
=
Math
.
abs
(
dingAttendanceEntity
.
getStartTime
().
getTime
()
-
an
.
getTime
());
workMillisecond
+=
diffInMillis
;
}
if
(
ObjectUtil
.
isNotEmpty
(
dingAttendanceEntity
.
getEndTime
())
&&
dingAttendanceEntity
.
getEndTime
().
after
(
pn
))
{
long
diffInMillis
=
Math
.
abs
(
pn
.
getTime
()
-
dingAttendanceEntity
.
getEndTime
().
getTime
());
workMillisecond
+=
diffInMillis
;
}
double
workMilliHour
=
workMillisecond
/
(
1000
*
60
*
60
);
DingAttendanceTotalEntity
dingAttendanceTotalEntity
=
new
DingAttendanceTotalEntity
();
dingAttendanceTotalEntity
.
setUserId
(
dingAttendanceEntity
.
getUserId
());
dingAttendanceTotalEntity
.
setName
(
dingAttendanceEntity
.
getName
());
//workMilliHour保留两位小数
dingAttendanceTotalEntity
.
setWorkTime
(
String
.
format
(
"%.2f"
,
workMilliHour
));
dingAttendanceTotalEntity
.
setDate
(
dingAttendanceEntity
.
getDate
());
dingAttendanceTotalEntity
.
setDuration
(
dingAttendanceEntity
.
getDuration
());
dingAttendanceTotalEntity
.
setDurationUnit
(
dingAttendanceEntity
.
getDurationUnit
());
dingAttendanceTotalEntity
.
setSubType
(
dingAttendanceEntity
.
getSubType
());
dingAttendanceTotalEntity
.
setTagName
(
dingAttendanceEntity
.
getTagName
());
dingAttendanceTotalEntity
.
setBizType
(
dingAttendanceEntity
.
getBizType
());
dingAttendanceTotalList
.
add
(
dingAttendanceTotalEntity
);
}
dingAttendanceTotalService
.
saveOrUpdateBatch
(
dingAttendanceTotalList
);
}
}
src/main/resources/com/ruzhoukj/sms/dao/DingAttendanceDao.xml
View file @
ea83ee81
...
...
@@ -26,4 +26,31 @@
GROUP BY min.id, min.name, min.user_id, min.user_address, min.time_result, min.user_check_time
order by min.user_check_time
</select>
<select
id=
"getListByDate"
resultType=
"com.ruzhoukj.sms.entity.DingAttendanceEntity"
>
SELECT min.name,
min.user_id,
min.date,
MIN(min.user_check_time) AS startTime,
MAX(max.offduty_max_time) AS endTime,
min.time_result,
min.duration,
min.duration_unit,
min.sub_type,
min.tag_name,
min.biz_type
FROM ding_attendance min
LEFT JOIN (SELECT user_id,
MAX(user_check_time) AS offduty_max_time
FROM ding_attendance
WHERE date = #{previousDateAsDate}
AND check_type = 'OffDuty'
GROUP BY user_id
) max
ON min.user_id = max.user_id
WHERE min.date = #{previousDateAsDate}
AND (min.check_type = 'OnDuty'
or check_type IS NULL)
GROUP BY min.id, min.name, min.user_id, min.user_address, min.time_result, min.user_check_time
order by min.user_check_time
</select>
</mapper>
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