Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pension
Project
Project
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
mengmeng
pension
Commits
87bba441
Commit
87bba441
authored
Mar 12, 2021
by
mlchun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.订单评价优化
parent
fde588e1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
9 deletions
+11
-9
SwaggerConfig.java
hmit-api/src/main/java/io/hmit/config/SwaggerConfig.java
+1
-1
PensionOrderEvaluationController.java
...iceOrder/controller/PensionOrderEvaluationController.java
+3
-1
PensionOrderServiceImpl.java
...es/serviceOrder/service/impl/PensionOrderServiceImpl.java
+1
-1
application.yml
hmit-api/src/main/resources/application.yml
+6
-6
No files found.
hmit-api/src/main/java/io/hmit/config/SwaggerConfig.java
View file @
87bba441
...
...
@@ -27,7 +27,7 @@ public class SwaggerConfig {
@Bean
public
Docket
createRestApi
()
{
return
new
Docket
(
DocumentationType
.
SWAGGER_2
)
//
.host("byyl.zjhmit.com")
.
host
(
"byyl.zjhmit.com"
)
.
apiInfo
(
apiInfo
())
.
select
()
//加了ApiOperation注解的类,才生成接口文档
...
...
hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderEvaluationController.java
View file @
87bba441
...
...
@@ -17,6 +17,8 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
springfox.documentation.annotations.ApiIgnore
;
...
...
@@ -73,7 +75,7 @@ public class PensionOrderEvaluationController {
todto
=
URLDecoder
.
decode
(
dto
,
"UTF-8"
);
}
catch
(
Exception
ignored
){}
PensionOrderEvaluationDTO
pensionOrderEvaluationDTO
=
JSON
.
parseObject
(
todto
.
substring
(
4
),
PensionOrderEvaluationDTO
.
class
);
pensionOrderEvaluationDTO
.
setFile
(
StringUtils
.
join
(
pensionOrderEvaluationDTO
.
getFiles
(),
","
));
pensionOrderEvaluationService
.
save
(
pensionOrderEvaluationDTO
);
pensionOrderService
.
evaluationDone
(
pensionOrderEvaluationDTO
);
...
...
hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java
View file @
87bba441
...
...
@@ -176,7 +176,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
}
}
else
if
(
status
==
1
){
//派单
Long
recipient_id
=
Long
.
parseLong
(
params
.
get
(
"recipient_id"
).
toString
());
if
(
pensionOrderEntity
.
getStatus
()
==
5
)
{
if
(
pensionOrderEntity
.
getStatus
()
==
5
||
pensionOrderEntity
.
getStatus
()
==
0
)
{
pensionOrderEntity
.
setStatus
(
1
);
pensionOrderEntity
.
setStatusName
(
Constant
.
OrderStatus
.
ORDER
.
getMessage
());
UserEntity
recipient
=
userService
.
getUserByUserId
(
recipient_id
);
...
...
hmit-api/src/main/resources/application.yml
View file @
87bba441
...
...
@@ -38,11 +38,11 @@ spring:
max-wait
:
-1ms
# 连接池最大阻塞等待时间(使用负值表示没有限制)
max-idle
:
10
# 连接池中的最大空闲连接
min-idle
:
5
# 连接池中的最小空闲连接
#
mvc:
#
static-path-pattern: /static/**
#
resources:
#
static-locations: file:${QR.download-path},classpath:/META-INF/resources/, classpath:/resources/, classpath:/static/, classpath:/public/
#
#静态资源对外暴露的访问路径
mvc
:
static-path-pattern
:
/static/**
resources
:
static-locations
:
file:${QR.download-path},classpath:/META-INF/resources/, classpath:/resources/, classpath:/static/, classpath:/public/
#静态资源对外暴露的访问路径
hmit
:
redis
:
...
...
@@ -72,4 +72,4 @@ mybatis-plus:
jdbc-type-for-null
:
'
null'
QR
:
# download-path: D:/123/ /home/websoft/java_jar/pension_service/myfile/
download-path
:
D:/123/
\ No newline at end of file
download-path
:
/home/websoft/java_jar/pension_service/myfile/
\ No newline at end of file
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