bug修改
This commit is contained in:
parent
d212b563ea
commit
d82b5446de
@ -72,6 +72,7 @@ public class AsyncWorker {
|
|||||||
if (list.size() > 0) {
|
if (list.size() > 0) {
|
||||||
for (WorkerInfo info : list) {
|
for (WorkerInfo info : list) {
|
||||||
try {
|
try {
|
||||||
|
info.setNoticeUserId(userId);
|
||||||
projectUfaceConfigService.sendBatchWorkerInfo(info, projectUfaceConfig, devList);
|
projectUfaceConfigService.sendBatchWorkerInfo(info, projectUfaceConfig, devList);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("下发人员异常,人员名称:{}", info.getWorkerName());
|
log.error("下发人员异常,人员名称:{}", info.getWorkerName());
|
||||||
|
|||||||
@ -385,6 +385,11 @@ public class WorkerInfo implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "证书类型名称")
|
@ApiModelProperty(value = "证书类型名称")
|
||||||
private String certificateTypeName;
|
private String certificateTypeName;
|
||||||
|
@TableField(exist = false)
|
||||||
|
/**
|
||||||
|
* 通知的人员id
|
||||||
|
*/
|
||||||
|
private Long noticeUserId;
|
||||||
|
|
||||||
public String toExistString() {
|
public String toExistString() {
|
||||||
return "WorkerInfo{" +
|
return "WorkerInfo{" +
|
||||||
|
|||||||
@ -821,6 +821,8 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
|
|||||||
workerAttendance.setImageUrl(MapUtils.getString(map, "faceUrl"));
|
workerAttendance.setImageUrl(MapUtils.getString(map, "faceUrl"));
|
||||||
workerAttendance.setAttendanceType(1);
|
workerAttendance.setAttendanceType(1);
|
||||||
workerAttendanceMapper.insert(workerAttendance);
|
workerAttendanceMapper.insert(workerAttendance);
|
||||||
|
//计算在场
|
||||||
|
workerAttendancePresenceService.addWorkerAttendancePresence(workerAttendance);
|
||||||
asyncSendAttendance.saveAndSendAttendance(workerAttendance, info);
|
asyncSendAttendance.saveAndSendAttendance(workerAttendance, info);
|
||||||
|
|
||||||
resultMap.put("msg", "操作成功");
|
resultMap.put("msg", "操作成功");
|
||||||
|
|||||||
@ -327,6 +327,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
|||||||
.antMatchers("/xmgl/workerBlacklist/list").permitAll()
|
.antMatchers("/xmgl/workerBlacklist/list").permitAll()
|
||||||
.antMatchers("/xmgl/carPassRecord/addCarPassRecord").permitAll()
|
.antMatchers("/xmgl/carPassRecord/addCarPassRecord").permitAll()
|
||||||
.antMatchers("/xmgl/notice/add").permitAll()
|
.antMatchers("/xmgl/notice/add").permitAll()
|
||||||
|
.antMatchers("/xmgl/upload/uploadBase64").permitAll()
|
||||||
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
|
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
|
||||||
.anyRequest().authenticated() // 剩下所有的验证都需要验证.
|
.anyRequest().authenticated() // 剩下所有的验证都需要验证.
|
||||||
.and()
|
.and()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user