Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
Details
Activity
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
chenweisong
datacollector
Commits
1c7b0ede
Commit
1c7b0ede
authored
Mar 26, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新
parent
8d92466c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1 addition
and
37 deletions
+1
-37
ExcelController.java
...n/java/com/keymobile/rest/controller/ExcelController.java
+0
-1
TaskController.java
...in/java/com/keymobile/rest/controller/TaskController.java
+1
-1
ActivityService.java
...main/java/com/keymobile/rest/service/ActivityService.java
+0
-3
DataInfoService.java
...main/java/com/keymobile/rest/service/DataInfoService.java
+0
-2
GroupService.java
src/main/java/com/keymobile/rest/service/GroupService.java
+0
-25
ProcessService.java
src/main/java/com/keymobile/rest/service/ProcessService.java
+0
-1
TemplateService.java
...main/java/com/keymobile/rest/service/TemplateService.java
+0
-3
UserService.java
src/main/java/com/keymobile/rest/service/UserService.java
+0
-1
No files found.
src/main/java/com/keymobile/rest/controller/ExcelController.java
View file @
1c7b0ede
...
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
...
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
@Api
(
description
=
"模板 控制器"
)
@Api
(
description
=
"模板 控制器"
)
...
...
src/main/java/com/keymobile/rest/controller/TaskController.java
View file @
1c7b0ede
...
@@ -136,8 +136,8 @@ public class TaskController {
...
@@ -136,8 +136,8 @@ public class TaskController {
public
ApiResponse
createTask
(
@RequestBody
TaskForm
form
)
{
public
ApiResponse
createTask
(
@RequestBody
TaskForm
form
)
{
CommonValidator
.
notEmpty
(
form
.
getName
(),
"名称不能为空"
);
CommonValidator
.
notEmpty
(
form
.
getName
(),
"名称不能为空"
);
CommonValidator
.
notNull
(
form
.
getType
(),
"类型不能为空"
);
CommonValidator
.
notNull
(
form
.
getType
(),
"类型不能为空"
);
CommonValidator
.
isTrue
(
form
.
getExcels
()
!=
null
&&
form
.
getExcels
().
size
()
!=
0
,
"补录模板不能为空"
);
CommonValidator
.
isTrue
(
form
.
getExcels
()
!=
null
&&
form
.
getExcels
().
size
()
!=
0
,
"补录模板不能为空"
);
// 创建人 为 manager
// 创建人 为 manager
User
admin
=
getAdmin
();
User
admin
=
getAdmin
();
form
.
setUser
(
admin
);
form
.
setUser
(
admin
);
...
...
src/main/java/com/keymobile/rest/service/ActivityService.java
View file @
1c7b0ede
package
com
.
keymobile
.
rest
.
service
;
package
com
.
keymobile
.
rest
.
service
;
import
com.keymobile.rest.common.utils.DateUtil
;
import
com.keymobile.rest.dao.ActivityDao
;
import
com.keymobile.rest.dao.ActivityDao
;
import
com.keymobile.rest.model.Activity
;
import
com.keymobile.rest.model.Activity
;
import
com.keymobile.rest.vo.TaskForm
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
...
@@ -11,7 +9,6 @@ import org.springframework.data.domain.Pageable;
...
@@ -11,7 +9,6 @@ import org.springframework.data.domain.Pageable;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.sql.Timestamp
;
@Service
@Service
public
class
ActivityService
{
public
class
ActivityService
{
...
...
src/main/java/com/keymobile/rest/service/DataInfoService.java
View file @
1c7b0ede
package
com
.
keymobile
.
rest
.
service
;
package
com
.
keymobile
.
rest
.
service
;
import
com.keymobile.rest.common.utils.DateUtil
;
import
com.keymobile.rest.dao.*
;
import
com.keymobile.rest.dao.*
;
import
com.keymobile.rest.model.DataInfo
;
import
com.keymobile.rest.model.DataInfo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.sql.Timestamp
;
@Service
@Service
public
class
DataInfoService
{
public
class
DataInfoService
{
...
...
src/main/java/com/keymobile/rest/service/GroupService.java
View file @
1c7b0ede
package
com
.
keymobile
.
rest
.
service
;
package
com
.
keymobile
.
rest
.
service
;
import
com.keymobile.rest.dao.GroupDao
;
import
com.keymobile.rest.dao.GroupDao
;
import
com.keymobile.rest.dao.UserDao
;
import
com.keymobile.rest.model.Group
;
import
com.keymobile.rest.model.Group
;
import
com.keymobile.rest.model.RecordScope
;
import
com.keymobile.rest.model.User
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.PostConstruct
;
import
java.util.List
;
import
java.util.List
;
@Service
@Service
...
@@ -17,27 +13,6 @@ public class GroupService {
...
@@ -17,27 +13,6 @@ public class GroupService {
@Autowired
@Autowired
private
GroupDao
groupDao
;
private
GroupDao
groupDao
;
@Autowired
private
UserDao
userDao
;
@PostConstruct
private
void
init
()
{
List
<
Group
>
groupList
=
groupDao
.
findAll
();
groupList
.
forEach
(
group
->
{
List
<
User
>
userList
=
userDao
.
findAllByGroupId
(
group
.
getId
());
if
(
userList
.
size
()
==
0
)
{
String
groupName
=
group
.
getName
();
User
user
=
new
User
();
user
.
setGroup
(
group
);
user
.
setUsername
(
groupName
);
userDao
.
save
(
user
);
user
.
setUsername
(
groupName
+
"员工"
+
user
.
getId
());
userDao
.
save
(
user
);
}
});
}
public
List
<
Group
>
findAllByParentId
(
long
parentId
)
{
public
List
<
Group
>
findAllByParentId
(
long
parentId
)
{
return
groupDao
.
findAllByParentId
(
parentId
);
return
groupDao
.
findAllByParentId
(
parentId
);
}
}
...
...
src/main/java/com/keymobile/rest/service/ProcessService.java
View file @
1c7b0ede
...
@@ -5,7 +5,6 @@ import com.keymobile.rest.model.Process;
...
@@ -5,7 +5,6 @@ import com.keymobile.rest.model.Process;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
@Service
@Service
public
class
ProcessService
{
public
class
ProcessService
{
...
...
src/main/java/com/keymobile/rest/service/TemplateService.java
View file @
1c7b0ede
package
com
.
keymobile
.
rest
.
service
;
package
com
.
keymobile
.
rest
.
service
;
import
com.keymobile.rest.common.utils.DateUtil
;
import
com.keymobile.rest.dao.*
;
import
com.keymobile.rest.dao.*
;
import
com.keymobile.rest.model.Template
;
import
com.keymobile.rest.model.Template
;
import
com.keymobile.rest.vo.ExcelForm
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.sql.Timestamp
;
import
java.util.List
;
import
java.util.List
;
@Service
@Service
...
...
src/main/java/com/keymobile/rest/service/UserService.java
View file @
1c7b0ede
...
@@ -13,7 +13,6 @@ public class UserService {
...
@@ -13,7 +13,6 @@ public class UserService {
@Autowired
@Autowired
private
UserDao
userDao
;
private
UserDao
userDao
;
public
List
<
User
>
findAllByUsername
(
String
username
)
{
public
List
<
User
>
findAllByUsername
(
String
username
)
{
return
userDao
.
findAllByUsername
(
username
);
return
userDao
.
findAllByUsername
(
username
);
}
}
...
...
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