Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
8dd34b9c
Commit
8dd34b9c
authored
4 years ago
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
0c9911e5
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
25 deletions
+40
-25
src/main/java/cn/timer/api/config/Initialization/InitializeSetting.java
+4
-1
src/main/java/cn/timer/api/controller/kqgl/AttController.java
+6
-2
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+12
-13
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+13
-8
src/main/resources/application-dev.yml
+3
-1
src/main/resources/application-pro.yml
+1
-0
src/main/resources/application-test.yml
+1
-0
No files found.
src/main/java/cn/timer/api/config/Initialization/InitializeSetting.java
View file @
8dd34b9c
package
cn
.
timer
.
api
.
config
.
Initialization
;
package
cn
.
timer
.
api
.
config
.
Initialization
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.boot.ApplicationArguments
;
import
org.springframework.boot.ApplicationArguments
;
import
org.springframework.boot.ApplicationRunner
;
import
org.springframework.boot.ApplicationRunner
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.core.annotation.Order
;
...
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Component;
...
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Component;
@Order
(
3
)
//根据order的值的大小决定启动顺序
@Order
(
3
)
//根据order的值的大小决定启动顺序
public
class
InitializeSetting
implements
ApplicationRunner
{
public
class
InitializeSetting
implements
ApplicationRunner
{
// @Value("${PROJECT_NAME}")
// @Value("${PROJECT_NAME}")
// private String PROJECT_NAME;
// private String PROJECT_NAME;
...
@@ -20,7 +22,8 @@ public class InitializeSetting implements ApplicationRunner {
...
@@ -20,7 +22,8 @@ public class InitializeSetting implements ApplicationRunner {
public
void
run
(
ApplicationArguments
args
)
throws
Exception
{
public
void
run
(
ApplicationArguments
args
)
throws
Exception
{
// StaticVariable.mac_command = "http://120.24.24.239:8095";//考勤机执行命令
// StaticVariable.mac_command = "http://120.24.24.239:8095";//考勤机执行命令
StaticVariable
.
mac_command
=
"http://172.20.10.2:8088"
;
//考勤机执行命令
// StaticVariable.mac_command = "http://192.168.4.95:8088";//考勤机执行命令
// StaticVariable.mac_command = "http://test-8timer-fk.youlingrc.com/";//考勤机执行命令
}
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/AttController.java
View file @
8dd34b9c
...
@@ -15,6 +15,7 @@ import java.util.Locale;
...
@@ -15,6 +15,7 @@ import java.util.Locale;
import
java.util.Set
;
import
java.util.Set
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
...
@@ -111,6 +112,9 @@ import io.swagger.annotations.ApiParam;
...
@@ -111,6 +112,9 @@ import io.swagger.annotations.ApiParam;
@RequestMapping
(
value
=
"/kqz"
,
produces
=
{
"application/json"
,
"multipart/form-data"
})
@RequestMapping
(
value
=
"/kqz"
,
produces
=
{
"application/json"
,
"multipart/form-data"
})
public
class
AttController
{
public
class
AttController
{
@Value
(
"${config-8timer.machine8timerUrl}"
)
public
String
mac_command
;
// 回调地址
//班次
//班次
@Autowired
@Autowired
private
ShiftManagementMapper
shiftmanagementservice
;
private
ShiftManagementMapper
shiftmanagementservice
;
...
@@ -1516,7 +1520,7 @@ public class AttController {
...
@@ -1516,7 +1520,7 @@ public class AttController {
}
}
YgglMainEmp
yggluser
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
YgglMainEmp:
:
getEmpNum
,
attser
[
u
]));
YgglMainEmp
yggluser
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
YgglMainEmp:
:
getEmpNum
,
attser
[
u
]));
String
url
=
StaticVariable
.
mac_command
+
"/addUserName"
;
String
url
=
mac_command
+
"/addUserName"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"devId"
,
kqj
.
getCode
());
params
.
add
(
"devId"
,
kqj
.
getCode
());
...
@@ -5004,7 +5008,7 @@ public class AttController {
...
@@ -5004,7 +5008,7 @@ public class AttController {
// vResultJson.put("user_privilege", "USER");
// vResultJson.put("user_privilege", "USER");
// String sFinal = vResultJson.toString();
// String sFinal = vResultJson.toString();
//
//
// String url =
StaticVariable.
mac_command;
// String url = mac_command;
// HttpHeaders headers = new HttpHeaders();
// HttpHeaders headers = new HttpHeaders();
// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
// params.add("cmd", "SET_USER_INFO");
// params.add("cmd", "SET_USER_INFO");
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
8dd34b9c
...
@@ -18,7 +18,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -18,7 +18,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONObject
;
import
cn.timer.api.bean.kqgl.PunchCardDetails
;
import
cn.timer.api.bean.kqmk.KqglAssoBcsz
;
import
cn.timer.api.bean.kqmk.KqglAssoBcsz
;
import
cn.timer.api.bean.kqmk.KqglAssoDkjl
;
import
cn.timer.api.bean.kqmk.KqglAssoDkjl
;
import
cn.timer.api.bean.kqmk.KqglAssoDkmx
;
import
cn.timer.api.bean.kqmk.KqglAssoDkmx
;
...
@@ -518,14 +517,14 @@ public class ClockInController {
...
@@ -518,14 +517,14 @@ public class ClockInController {
for
(
int
o
=
0
;
o
<
2
;
o
++){
for
(
int
o
=
0
;
o
<
2
;
o
++){
if
(
o
==
0
){
if
(
o
==
0
){
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
1
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbdk1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
1
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbdk1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getSbqjks1
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjks1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getSbqjks1
())
||
shiftm
.
getSbqjks1
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjks1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
endtime
((
""
).
equals
(
shiftm
.
getSbqjjs1
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjjs1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
.
endtime
((
""
).
equals
(
shiftm
.
getSbqjjs1
())
||
shiftm
.
getSbqjjs1
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjjs1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
atts
.
add
(
as
);
atts
.
add
(
as
);
}
else
{
}
else
{
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
2
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbdk1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
2
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbdk1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getXbqjks1
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjks1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getXbqjks1
())
||
shiftm
.
getXbqjks1
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjks1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
endtime
((
""
).
equals
(
shiftm
.
getXbqjjs1
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjjs1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
.
endtime
((
""
).
equals
(
shiftm
.
getXbqjjs1
())
||
shiftm
.
getXbqjjs1
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjjs1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
atts
.
add
(
as
);
atts
.
add
(
as
);
}
}
}
}
...
@@ -535,13 +534,13 @@ public class ClockInController {
...
@@ -535,13 +534,13 @@ public class ClockInController {
for
(
int
o
=
0
;
o
<
2
;
o
++){
for
(
int
o
=
0
;
o
<
2
;
o
++){
if
(
o
==
0
){
if
(
o
==
0
){
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
3
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbdk2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
3
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbdk2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getSbqjks2
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjks2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getSbqjks2
())
||
shiftm
.
getSbqjks2
()==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjks2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
endtime
((
""
).
equals
(
shiftm
.
getSbqjjs2
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjjs2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
.
endtime
((
""
).
equals
(
shiftm
.
getSbqjjs2
())
||
shiftm
.
getSbqjjs2
()==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjjs2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
atts
.
add
(
as
);
atts
.
add
(
as
);
}
else
{
}
else
{
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
4
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbdk2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
4
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbdk2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getXbqjks2
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjks2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getXbqjks2
())
||
shiftm
.
getXbqjks2
()==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjks2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
endtime
((
""
).
equals
(
shiftm
.
getXbqjjs2
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjjs2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
.
endtime
((
""
).
equals
(
shiftm
.
getXbqjjs2
())
||
shiftm
.
getXbqjjs2
()==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjjs2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
atts
.
add
(
as
);
atts
.
add
(
as
);
}
}
}
}
...
@@ -551,13 +550,13 @@ public class ClockInController {
...
@@ -551,13 +550,13 @@ public class ClockInController {
for
(
int
o
=
0
;
o
<
2
;
o
++){
for
(
int
o
=
0
;
o
<
2
;
o
++){
if
(
o
==
0
){
if
(
o
==
0
){
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
5
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbdk3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
5
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbdk3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getSbqjks3
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjks3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getSbqjks3
())
||
shiftm
.
getSbqjks3
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjks3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
endtime
((
""
).
equals
(
shiftm
.
getSbqjjs3
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjjs3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
.
endtime
((
""
).
equals
(
shiftm
.
getSbqjjs3
())
||
shiftm
.
getSbqjjs3
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getSbqjjs3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
atts
.
add
(
as
);
atts
.
add
(
as
);
}
else
{
}
else
{
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
6
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbdk3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
AttSchedule
as
=
AttSchedule
.
builder
().
id
(
shiftm
.
getId
()).
sort
(
6
).
time
(
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbdk3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getXbqjks3
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjks3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
starttime
((
""
).
equals
(
shiftm
.
getXbqjks3
())
||
shiftm
.
getXbqjks3
()==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjks3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
))))
.
endtime
((
""
).
equals
(
shiftm
.
getXbqjjs3
())
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjjs3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
.
endtime
((
""
).
equals
(
shiftm
.
getXbqjjs3
())
||
shiftm
.
getXbqjjs3
()
==
null
?
0
:
Long
.
valueOf
(
ClockInTool
.
dateToStamp
((
str
+
" "
+
shiftm
.
getXbqjjs3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
)))).
build
();
atts
.
add
(
as
);
atts
.
add
(
as
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
View file @
8dd34b9c
...
@@ -11,6 +11,7 @@ import java.util.List;
...
@@ -11,6 +11,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
...
@@ -125,6 +126,10 @@ import io.swagger.annotations.ApiOperation;
...
@@ -125,6 +126,10 @@ import io.swagger.annotations.ApiOperation;
@Transactional
@Transactional
@RequestMapping
(
value
=
"/kqmk"
,
produces
=
{
"application/json"
,
"multipart/form-data"
})
@RequestMapping
(
value
=
"/kqmk"
,
produces
=
{
"application/json"
,
"multipart/form-data"
})
public
class
TimeCardController
{
public
class
TimeCardController
{
@Value
(
"${config-8timer.machine8timerUrl}"
)
public
String
mac_command
;
// 回调地址
@Autowired
@Autowired
private
KqglAssoBcszMapper
kqglassobcszmapper
;
private
KqglAssoBcszMapper
kqglassobcszmapper
;
@Autowired
@Autowired
...
@@ -489,7 +494,7 @@ public class TimeCardController {
...
@@ -489,7 +494,7 @@ public class TimeCardController {
@ApiOperation
(
value
=
"考勤机一键同步"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"考勤机一键同步"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
SynchronizationTime
(
@CurrentUser
UserBean
userBean
,
@PathVariable
(
"code"
)
String
code
)
{
public
Result
<
Object
>
SynchronizationTime
(
@CurrentUser
UserBean
userBean
,
@PathVariable
(
"code"
)
String
code
)
{
String
url
=
StaticVariable
.
mac_command
+
"/setTime"
;
String
url
=
mac_command
+
"/setTime"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"devId"
,
code
);
params
.
add
(
"devId"
,
code
);
...
@@ -516,7 +521,7 @@ public class TimeCardController {
...
@@ -516,7 +521,7 @@ public class TimeCardController {
KqglAssoKqj
kqj
=
KqglAssoKqj
.
builder
().
id
(
kqjid
).
build
().
selectById
();
//查询考勤机“序列号”
KqglAssoKqj
kqj
=
KqglAssoKqj
.
builder
().
id
(
kqjid
).
build
().
selectById
();
//查询考勤机“序列号”
for
(
int
a
=
0
;
a
<
xgyh
.
length
;
a
++){
for
(
int
a
=
0
;
a
<
xgyh
.
length
;
a
++){
String
url
=
StaticVariable
.
mac_command
+
"/addUserPrivilege"
;
String
url
=
mac_command
+
"/addUserPrivilege"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"devId"
,
kqj
.
getCode
());
params
.
add
(
"devId"
,
kqj
.
getCode
());
...
@@ -547,7 +552,7 @@ public class TimeCardController {
...
@@ -547,7 +552,7 @@ public class TimeCardController {
for
(
int
a
=
0
;
a
<
xgyh
.
length
;
a
++){
for
(
int
a
=
0
;
a
<
xgyh
.
length
;
a
++){
String
url
=
StaticVariable
.
mac_command
+
"/addUserPrivilege"
;
String
url
=
mac_command
+
"/addUserPrivilege"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"devId"
,
kqj
.
getCode
());
params
.
add
(
"devId"
,
kqj
.
getCode
());
...
@@ -588,7 +593,7 @@ public class TimeCardController {
...
@@ -588,7 +593,7 @@ public class TimeCardController {
if
(!
kqglassokqj
.
insert
())
if
(!
kqglassokqj
.
insert
())
return
ResultUtil
.
error
(
"操作失败--新增考勤机"
);
return
ResultUtil
.
error
(
"操作失败--新增考勤机"
);
String
url
=
StaticVariable
.
mac_command
+
"/addDev"
;
String
url
=
mac_command
+
"/addDev"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"orgCode"
,
kqglassokqj
.
getType
());
params
.
add
(
"orgCode"
,
kqglassokqj
.
getType
());
...
@@ -956,7 +961,7 @@ public class TimeCardController {
...
@@ -956,7 +961,7 @@ public class TimeCardController {
for
(
UserAttendanceRel
user:
attusers
)
{
for
(
UserAttendanceRel
user:
attusers
)
{
String
user_id
=
user
.
getEmpnum
();
//"1692";//要删除的考勤组里面用户ID
String
user_id
=
user
.
getEmpnum
();
//"1692";//要删除的考勤组里面用户ID
String
url
=
StaticVariable
.
mac_command
+
"/deleteUser"
;
String
url
=
mac_command
+
"/deleteUser"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"devId"
,
DevId
);
params
.
add
(
"devId"
,
DevId
);
...
@@ -1081,7 +1086,7 @@ public class TimeCardController {
...
@@ -1081,7 +1086,7 @@ public class TimeCardController {
YgglMainEmp
yggluser
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
YgglMainEmp:
:
getEmpNum
,
attser
[
u
]));
YgglMainEmp
yggluser
=
YgglMainEmp
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
YgglMainEmp:
:
getEmpNum
,
attser
[
u
]));
String
url
=
StaticVariable
.
mac_command
+
"/addUserName"
;
String
url
=
mac_command
+
"/addUserName"
;
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
params
.
add
(
"devId"
,
kqj
.
getCode
());
params
.
add
(
"devId"
,
kqj
.
getCode
());
...
@@ -1192,7 +1197,7 @@ public class TimeCardController {
...
@@ -1192,7 +1197,7 @@ public class TimeCardController {
//考勤组新增员工
//考勤组新增员工
String
[]
addmember
=
attsetuser
.
getAddMember
();
String
[]
addmember
=
attsetuser
.
getAddMember
();
String
urladd
=
StaticVariable
.
mac_command
+
"/addUserName"
;
String
urladd
=
mac_command
+
"/addUserName"
;
for
(
int
a
=
0
;
a
<
addmember
.
length
;
a
++){
for
(
int
a
=
0
;
a
<
addmember
.
length
;
a
++){
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
...
@@ -1215,7 +1220,7 @@ public class TimeCardController {
...
@@ -1215,7 +1220,7 @@ public class TimeCardController {
//考勤组减少员工
//考勤组减少员工
String
[]
removemember
=
attsetuser
.
getRemoveMember
();
String
[]
removemember
=
attsetuser
.
getRemoveMember
();
String
urlre
=
StaticVariable
.
mac_command
+
"/deleteUser"
;
String
urlre
=
mac_command
+
"/deleteUser"
;
for
(
int
r
=
0
;
r
<
removemember
.
length
;
r
++){
for
(
int
r
=
0
;
r
<
removemember
.
length
;
r
++){
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
params
=
new
LinkedMultiValueMap
<>();
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev.yml
View file @
8dd34b9c
...
@@ -171,6 +171,7 @@ logging:
...
@@ -171,6 +171,7 @@ logging:
# operations-sorter: method # 它提供了两个配置项:alpha和method,分别代表了按字母表排序以及按方法定义顺序排序
# operations-sorter: method # 它提供了两个配置项:alpha和method,分别代表了按字母表排序以及按方法定义顺序排序
config-8timer
:
config-8timer
:
machine8timerUrl
:
'
http://test-8timer-fk.youlingrc.com'
register-free-time
:
90
#系统赠送时间
register-free-time
:
90
#系统赠送时间
register-company-max-num
:
100
#默认最大公司数量
register-company-max-num
:
100
#默认最大公司数量
register-childAccount-max-num
:
10
#默认最大子账号数量
register-childAccount-max-num
:
10
#默认最大子账号数量
...
@@ -200,7 +201,7 @@ config-8timer:
...
@@ -200,7 +201,7 @@ config-8timer:
two
:
7
two
:
7
three
:
30
three
:
30
init-password
:
123456
init-password
:
123456
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/application-pro.yml
View file @
8dd34b9c
...
@@ -146,6 +146,7 @@ logging:
...
@@ -146,6 +146,7 @@ logging:
# operations-sorter: method # 它提供了两个配置项:alpha和method,分别代表了按字母表排序以及按方法定义顺序排序
# operations-sorter: method # 它提供了两个配置项:alpha和method,分别代表了按字母表排序以及按方法定义顺序排序
config-8timer
:
config-8timer
:
machine8timerUrl
:
'
http://test-8timer-fk.youlingrc.com'
register-free-time
:
90
#系统赠送时间
register-free-time
:
90
#系统赠送时间
register-company-max-num
:
100
register-company-max-num
:
100
register-childAccount-max-num
:
10
register-childAccount-max-num
:
10
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application-test.yml
View file @
8dd34b9c
...
@@ -145,6 +145,7 @@ logging:
...
@@ -145,6 +145,7 @@ logging:
# operations-sorter: method # 它提供了两个配置项:alpha和method,分别代表了按字母表排序以及按方法定义顺序排序
# operations-sorter: method # 它提供了两个配置项:alpha和method,分别代表了按字母表排序以及按方法定义顺序排序
config-8timer
:
config-8timer
:
machine8timerUrl
:
'
http://test-8timer-fk.youlingrc.com'
register-free-time
:
90
#系统赠送时间
register-free-time
:
90
#系统赠送时间
register-company-max-num
:
100
register-company-max-num
:
100
register-childAccount-max-num
:
10
register-childAccount-max-num
:
10
...
...
This diff is collapsed.
Click to expand it.
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