Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
1e50d0c9
Commit
1e50d0c9
authored
Feb 14, 2020
by
Md Suleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fixes in effective time period
parent
7e3df43f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
13 deletions
+24
-13
EffectiveLoginTimeController.java
...nisum/myteam/controller/EffectiveLoginTimeController.java
+16
-9
EffectiveLoginData.java
...n/java/com/nisum/myteam/model/dao/EffectiveLoginData.java
+1
-0
EffectiveLoginTimeScheduler.java
...m/nisum/myteam/schedular/EffectiveLoginTimeScheduler.java
+1
-1
IEffectiveLoginTimeService.java
.../com/nisum/myteam/service/IEffectiveLoginTimeService.java
+2
-1
EffectiveLoginTimeService.java
.../nisum/myteam/service/impl/EffectiveLoginTimeService.java
+4
-2
No files found.
src/main/java/com/nisum/myteam/controller/EffectiveLoginTimeController.java
View file @
1e50d0c9
package
com
.
nisum
.
myteam
.
controller
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.model.dao.EffectiveLoginData
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.service.IEffectiveLoginTimeService
;
import
com.nisum.myteam.service.IEmployeeService
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import
org.springframework.web.bind.annotation.RestController
;
import
java.text.ParseException
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
@RestController
...
...
@@ -24,15 +29,17 @@ public class EffectiveLoginTimeController {
@Autowired
private
IEmployeeService
employeeService
;
// @GetMapping("/effecitveLoginTime")
// public EffectiveLoginData getLoginData(@RequestParam("loginId") String loginEmpId) throws MyTeamException {
//// List<Employee> allEmployees = employeeService.getActiveEmployees();
//// for(Employee employee:allEmployees){
//// EffectiveLoginData effectiveLoginData =
//// effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(employee.getEmployeeId());
//// }
// return effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(loginEmpId);
// }
@GetMapping
(
"/updateLogins"
)
public
List
<
EffectiveLoginData
>
getLoginData
()
throws
MyTeamException
{
List
<
EffectiveLoginData
>
loginData
=
new
ArrayList
<>();
List
<
Employee
>
allEmployees
=
employeeService
.
getActiveEmployees
();
for
(
Employee
employee:
allEmployees
){
EffectiveLoginData
effectiveLoginData
=
effectiveLoginTimeService
.
calculateEffectiveLoginTimeForEmpAndSave
(
employee
);
loginData
.
add
(
effectiveLoginData
);
}
return
loginData
;
}
@GetMapping
(
"/effectiveLogin"
)
public
Map
<
String
,
Object
>
getAllEmployeesLoginData
(
@RequestParam
(
"employeeId"
)
long
employeeId
,
...
...
src/main/java/com/nisum/myteam/model/dao/EffectiveLoginData.java
View file @
1e50d0c9
...
...
@@ -26,6 +26,7 @@ public class EffectiveLoginData implements Serializable{
@Id
private
ObjectId
id
;
private
String
name
;
private
String
employeeId
;
private
Date
date
;
private
String
loginTime
;
...
...
src/main/java/com/nisum/myteam/schedular/EffectiveLoginTimeScheduler.java
View file @
1e50d0c9
...
...
@@ -29,7 +29,7 @@ public class EffectiveLoginTimeScheduler {
List
<
Employee
>
allEmployees
=
employeeService
.
getActiveEmployees
();
for
(
Employee
employee:
allEmployees
){
EffectiveLoginData
effectiveLoginData
=
effectiveLoginTimeService
.
calculateEffectiveLoginTimeForEmpAndSave
(
employee
.
getEmployeeId
()
);
effectiveLoginTimeService
.
calculateEffectiveLoginTimeForEmpAndSave
(
employee
x
);
}
}
}
src/main/java/com/nisum/myteam/service/IEffectiveLoginTimeService.java
View file @
1e50d0c9
...
...
@@ -3,6 +3,7 @@ package com.nisum.myteam.service;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.model.EmployeeLoginData
;
import
com.nisum.myteam.model.dao.EffectiveLoginData
;
import
com.nisum.myteam.model.dao.Employee
;
import
java.text.ParseException
;
import
java.util.Date
;
...
...
@@ -11,7 +12,7 @@ import java.util.Map;
public
interface
IEffectiveLoginTimeService
{
public
EffectiveLoginData
calculateEffectiveLoginTimeForEmpAndSave
(
String
employeeId
)
throws
MyTeamException
;
public
EffectiveLoginData
calculateEffectiveLoginTimeForEmpAndSave
(
Employee
employee
)
throws
MyTeamException
;
public
Map
<
String
,
Object
>
getEmployeesEffLoginData
(
long
employeeId
,
Date
fromDate
,
Date
toDate
)
throws
ParseException
;
}
src/main/java/com/nisum/myteam/service/impl/EffectiveLoginTimeService.java
View file @
1e50d0c9
...
...
@@ -4,6 +4,7 @@ import com.nisum.myteam.configuration.DbConnection;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.model.EmployeeLoginData
;
import
com.nisum.myteam.model.dao.EffectiveLoginData
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.repository.EffectiveLoginDataRepo
;
import
com.nisum.myteam.service.IEffectiveLoginTimeService
;
import
com.nisum.myteam.utils.CommomUtil
;
...
...
@@ -33,9 +34,9 @@ public class EffectiveLoginTimeService implements IEffectiveLoginTimeService {
private
EffectiveLoginDataRepo
effectiveLoginDataRepo
;
@Override
public
EffectiveLoginData
calculateEffectiveLoginTimeForEmpAndSave
(
String
employeeId
)
throws
MyTeamException
{
public
EffectiveLoginData
calculateEffectiveLoginTimeForEmpAndSave
(
Employee
employee
)
throws
MyTeamException
{
String
query
=
String
.
format
(
MyTeamUtils
.
EMPLOYEE_YESTERDAY_LOGIN_DETAILS_QUERY
,
employee
Id
);
String
query
=
String
.
format
(
MyTeamUtils
.
EMPLOYEE_YESTERDAY_LOGIN_DETAILS_QUERY
,
employee
.
getEmployeeId
()
);
EffectiveLoginData
effectiveLoginData
=
null
;
try
(
Connection
connection
=
dbConnection
.
getDBConnection
();
Statement
statement
=
connection
.
createStatement
();
...
...
@@ -61,6 +62,7 @@ public class EffectiveLoginTimeService implements IEffectiveLoginTimeService {
if
(
Strings
.
isNullOrEmpty
(
entryType
)){
effectiveLoginData
=
new
EffectiveLoginData
();
entryType
=
employeeLoginData
.
getEntryType
();
effectiveLoginData
.
setName
(
employee
.
getEmployeeName
());
effectiveLoginData
.
setEmployeeId
(
employeeLoginData
.
getEmployeeId
());
effectiveLoginData
.
setDate
(
employeeLoginData
.
getDate
());
effectiveLoginData
.
setLoginTime
(
employeeLoginData
.
getTime
().
toString
());
...
...
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