Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
fill-system
Commits
a5b3ad84
Commit
a5b3ad84
authored
Dec 06, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加新闻来源
parent
44089f4e
Pipeline
#2388
canceled with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
16 deletions
+24
-16
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
.../java/com/mortals/xhx/module/home/web/HomeController.java
+2
-13
fill-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+22
-3
No files found.
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
View file @
a5b3ad84
...
...
@@ -35,10 +35,7 @@ import com.mortals.xhx.module.matter.service.MatterDatumService;
import
com.mortals.xhx.module.matter.service.MatterService
;
import
org.checkerframework.checker.units.qual.A
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -163,16 +160,12 @@ public class HomeController extends BaseJsonBodyController {
int
code
=
VALUE_RESULT_SUCCESS
;
try
{
Map
<
String
,
String
>
params
=
new
HashMap
<>();
// HttpUtil.d
params
.
put
(
"siteid"
,
queryPdu
.
getSiteId
().
toString
());
params
.
put
(
"type"
,
queryPdu
.
getType
().
toString
());
params
.
put
(
"page"
,
queryPdu
.
getPage
().
toString
());
params
.
put
(
"size"
,
queryPdu
.
getSize
().
toString
());
UrlBuilder
urlBuilder
=
domain
.
addPath
(
"news"
).
addPath
(
"newsList"
);
String
response
=
HttpUtil
.
doGet
(
urlBuilder
.
toString
(),
params
);
//todo 实现新闻列表
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
return
response
;
}
catch
(
Exception
e
)
{
...
...
@@ -185,7 +178,7 @@ public class HomeController extends BaseJsonBodyController {
}
@
Pos
tMapping
({
"notice/info"
})
@
Ge
tMapping
({
"notice/info"
})
public
String
noteInfo
(
Long
id
)
{
String
url
=
GlobalSysInfo
.
getParamValue
(
Constant
.
PARAMS_NOTICE_URL
,
"http://192.168.0.98:8090/api/"
);
...
...
@@ -196,13 +189,9 @@ public class HomeController extends BaseJsonBodyController {
int
code
=
VALUE_RESULT_SUCCESS
;
try
{
Map
<
String
,
String
>
params
=
new
HashMap
<>();
// HttpUtil.d
params
.
put
(
"id"
,
id
.
toString
());
UrlBuilder
urlBuilder
=
domain
.
addPath
(
"news"
).
addPath
(
"newInfo"
);
String
response
=
HttpUtil
.
doGet
(
urlBuilder
.
toString
(),
params
);
//todo 实现新闻列表
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
return
response
;
}
catch
(
Exception
e
)
{
...
...
fill-manager/src/test/java/com/mortals/httpclient/system.http
View file @
a5b3ad84
...
...
@@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login
Content-Type: application/json
{
"loginName":"admin",
"password":"admin"
"loginName":
"admin",
"password":
"admin"
}
> {%
...
...
@@ -27,7 +27,26 @@ Content-Type: application/json
POST {{baseUrl}}/home/info
Content-Type: application/json
{"siteId": 3}
{
"siteId": 3
}
###通知列表
POST {{baseUrl}}/home/notice/list
Content-Type: application/json
{
"siteId": 3,
"page": 1,
"size": 10,
"type": 1
}
###通知详细
POST {{baseUrl}}/home/notice/info?id=14
Content-Type: application/json
...
...
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