diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/handler/BizLogCheckHandler.java b/casic-service-person/src/main/java/com/casic/missiles/modular/handler/BizLogCheckHandler.java deleted file mode 100644 index 68622f7..0000000 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/handler/BizLogCheckHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.missiles.modular.handler; - -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.handler.BizCheckLoginHandler; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.system.service.IPersonAttendanceLogService; -import lombok.Data; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 考勤记录 按每天首次登陆增加 - * - * @author lwh - */ -@Component -@Data -@DependsOn("loadDatabasePropertyConfig") -public class BizLogCheckHandler implements BizCheckLoginHandler { - @Value("${casic.attend.log.roleTips}") - private List roleTips; - @Value("${casic.attend.log.interval}") - private Integer interval; - private final ICommonPermissionService service; - private final IPersonAttendanceLogService personAttendanceLogService; - private static final Logger logger = LoggerFactory.getLogger(BizLogCheckHandler.class); - - public BizLogCheckHandler(ICommonPermissionService service, IPersonAttendanceLogService personAttendanceLogService) { - this.service = service; - this.personAttendanceLogService = personAttendanceLogService; - } - - @Override - public void checkUser(ShiroUser shiroUser, Boolean isApp) { - //校验当前登录用户 - if (isApp) { - // - if (shiroUser.getRoleTips().stream().anyMatch(str -> roleTips.contains(str))) { - personAttendanceLogService.saveUserLog(shiroUser.getAccount(), interval); - } - } - } -} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/handler/BizLogCheckHandler.java b/casic-service-person/src/main/java/com/casic/missiles/modular/handler/BizLogCheckHandler.java deleted file mode 100644 index 68622f7..0000000 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/handler/BizLogCheckHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.missiles.modular.handler; - -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.handler.BizCheckLoginHandler; -import com.casic.missiles.core.shiro.ShiroUser; -import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.system.service.IPersonAttendanceLogService; -import lombok.Data; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 考勤记录 按每天首次登陆增加 - * - * @author lwh - */ -@Component -@Data -@DependsOn("loadDatabasePropertyConfig") -public class BizLogCheckHandler implements BizCheckLoginHandler { - @Value("${casic.attend.log.roleTips}") - private List roleTips; - @Value("${casic.attend.log.interval}") - private Integer interval; - private final ICommonPermissionService service; - private final IPersonAttendanceLogService personAttendanceLogService; - private static final Logger logger = LoggerFactory.getLogger(BizLogCheckHandler.class); - - public BizLogCheckHandler(ICommonPermissionService service, IPersonAttendanceLogService personAttendanceLogService) { - this.service = service; - this.personAttendanceLogService = personAttendanceLogService; - } - - @Override - public void checkUser(ShiroUser shiroUser, Boolean isApp) { - //校验当前登录用户 - if (isApp) { - // - if (shiroUser.getRoleTips().stream().anyMatch(str -> roleTips.contains(str))) { - personAttendanceLogService.saveUserLog(shiroUser.getAccount(), interval); - } - } - } -} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/controller/PersonAttendanceLogController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/controller/PersonAttendanceLogController.java index dabd72a..d588f81 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/system/controller/PersonAttendanceLogController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/controller/PersonAttendanceLogController.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dto.PersonAttendDTO; import com.casic.missiles.modular.system.enums.PersonRecordExportEnum; @@ -15,6 +16,7 @@ import com.casic.missiles.modular.system.service.IPersonAttendanceLogService; import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,10 +38,27 @@ @RequestMapping("/staff") public class PersonAttendanceLogController extends ExportController { - + @Value("${casic.attend.log.roleTips}") + private List roleTips; + @Value("${casic.attend.log.interval}") + private Integer interval; @Autowired private IPersonAttendanceLogService personAttendanceLogService; + @Autowired + private ICommonPermissionService service; + /** + * 人员考勤日志保存接口 + */ + @RequestMapping(value = "/saveUserLog") + @ResponseBody + public Object saveUserLog() { + ShiroUser shiroUser = service.getCurrLoginUser(); + if (shiroUser.getRoleTips().stream().anyMatch(str -> roleTips.contains(str))) { + personAttendanceLogService.saveUserLog(service.getCurrLoginUser().getAccount(), interval); + } + return ResponseData.success(); + } /** * 获取人员考勤分页列表