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
357b583e
Commit
357b583e
authored
5 years ago
by
dengshichuan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dsc' into 'develop'
测试服务器版本 See merge request 8timerv2/8timerapiv200!28
parents
4acd4af0
45b594ed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
+11
-6
No files found.
src/main/java/cn/timer/api/controller/dzht/DzhtController.java
View file @
357b583e
...
@@ -678,13 +678,18 @@ public class DzhtController {
...
@@ -678,13 +678,18 @@ public class DzhtController {
}
}
@GetMapping
(
"/queryName"
)
@GetMapping
(
"/queryName"
)
@ApiOperation
(
value
=
"查
员工
名字"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"查
版本
名字"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
getName
(
@RequestParam
String
empNum
)
{
public
Result
<
Object
>
getName
(
@RequestParam
String
empNum
)
{
System
.
err
.
println
(
System
.
getProperty
(
"os.name"
));
String
a
=
System
.
getProperty
(
"os.name"
);
System
.
err
.
println
(
System
.
getProperty
(
"os.arch"
));
String
b
=
System
.
getProperty
(
"os.arch"
);
System
.
err
.
println
(
System
.
getProperty
(
"os.version"
));
String
c
=
System
.
getProperty
(
"os.version"
);
return
ResultUtil
.
data
(
YgglMainEmp
.
builder
().
build
()
Map
<
String
,
String
>
map
=
new
HashMap
<>();
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
eq
(
"emp_num"
,
empNum
)).
getName
());
map
.
put
(
"os.name"
,
a
);
map
.
put
(
"os.arch"
,
b
);
map
.
put
(
"os.version"
,
c
);
return
ResultUtil
.
data
(
map
);
// return ResultUtil.data(YgglMainEmp.builder().build()
// .selectOne(new QueryWrapper<YgglMainEmp>().eq("emp_num", empNum)).getName());
}
}
/*************************** 设置请求头 ***************************************/
/*************************** 设置请求头 ***************************************/
...
...
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