Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bill-platform
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
赵啸非
bill-platform
Commits
5425aab8
Commit
5425aab8
authored
Jun 21, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加重复订单请求
parent
88d4d8ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
135 additions
and
12 deletions
+135
-12
bill-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StartService.java
...m/mortals/xhx/daemon/applicationservice/StartService.java
+30
-0
bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueController.java
...java/com/mortals/xhx/module/ph/web/PhQueueController.java
+14
-6
bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateController.java
...a/com/mortals/xhx/module/pj/web/PjEvaluateController.java
+17
-5
bill-manager/src/test/java/com/mortals/httpclient/pj/PjEvaluateController.http
.../java/com/mortals/httpclient/pj/PjEvaluateController.http
+74
-1
No files found.
bill-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StartService.java
0 → 100644
View file @
5425aab8
package
com.mortals.xhx.daemon.applicationservice
;
import
com.mortals.framework.springcloud.service.IApplicationStartedService
;
import
com.mortals.framework.util.ThreadPool
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Component
;
@Component
@Slf4j
public
class
StartService
implements
IApplicationStartedService
{
@Override
public
void
start
()
{
ThreadPool
.
getInstance
().
init
(
10
);
}
@Override
public
void
stop
()
{
log
.
info
(
"停止服务.."
);
}
@Override
public
int
getOrder
()
{
return
10
;
}
}
bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueController.java
View file @
5425aab8
...
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.framework.util.ThreadPool
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.pdu.RespData
;
...
...
@@ -102,12 +103,19 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue
@Override
@UnAuth
public
String
batchSave
(
@RequestBody
List
<
PhQueueEntity
>
list
)
{
for
(
PhQueueEntity
entity
:
list
)
{
getSite
(
entity
);
}
removeDuplicate
(
list
);
return
super
.
batchSave
(
list
);
Runnable
runnable
=
new
Runnable
()
{
@Override
public
void
run
()
{
for
(
PhQueueEntity
entity
:
list
)
{
getSite
(
entity
);
}
removeDuplicate
(
list
);
}
};
ThreadPool
.
getInstance
().
execute
(
runnable
);
return
JSON
.
toJSONString
(
Rest
.
ok
(
"接收成功"
));
// return super.batchSave(list);
}
//去掉重复的元素
...
...
@@ -138,7 +146,7 @@ public class PhQueueController extends BaseCRUDJsonBodyMappingController<PhQueue
RedisTemplate
<
String
,
String
>
baseRedisTemplate
=
cacheService
.
selectDbRedisTemplate
(
1
);
//com:mortals:xhx:module:site:model:SiteEntity redis调用
String
siteStr
=
(
String
)
baseRedisTemplate
.
opsForHash
().
get
(
"com:mortals:xhx:module:site:model:SiteEntity"
,
String
.
valueOf
(
entity
.
getSiteId
()));
String
siteStr
=
(
String
)
baseRedisTemplate
.
opsForHash
().
get
(
"com:mortals:xhx:module:site:model:SiteEntity"
,
String
.
valueOf
(
entity
.
getSiteId
()));
if
(!
ObjectUtils
.
isEmpty
(
siteStr
))
{
SitePdu
sitePdu
=
JSON
.
parseObject
(
siteStr
,
SitePdu
.
class
);
if
(!
ObjectUtils
.
isEmpty
(
sitePdu
))
{
...
...
bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateController.java
View file @
5425aab8
...
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.framework.util.ThreadPool
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.pdu.RespData
;
...
...
@@ -103,12 +104,23 @@ public class PjEvaluateController extends BaseCRUDJsonBodyMappingController<PjEv
@Override
@UnAuth
public
String
batchSave
(
@RequestBody
List
<
PjEvaluateEntity
>
list
)
{
for
(
PjEvaluateEntity
entity
:
list
)
{
getSite
(
entity
);
}
removeDuplicate
(
list
);
return
super
.
batchSave
(
list
);
//线程保存
Runnable
runnable
=
new
Runnable
()
{
@Override
public
void
run
()
{
for
(
PjEvaluateEntity
entity
:
list
)
{
getSite
(
entity
);
}
removeDuplicate
(
list
);
}
};
ThreadPool
.
getInstance
().
execute
(
runnable
);
return
JSON
.
toJSONString
(
Rest
.
ok
(
"接收成功"
));
// return super.batchSave(list);
}
...
...
bill-manager/src/test/java/com/mortals/httpclient/pj/PjEvaluateController.http
View file @
5425aab8
...
...
@@ -58,13 +58,86 @@ Content-Type: application/json
"siteId":1,
"siteCode":"511500000000-0001",
"siteName":"智慧排队管理服务系统",
"extNum":"511500000000-0001-
3
"
"extNum":"511500000000-0001-
4
"
}
> {%
client.global.set("PjEvaluate_id", JSON.parse(response.body).data.id);
%}
###评价汇总批量保存
POST {{baseUrl}}/pj/evaluate/batchSave
Content-Type: application/json
[{
"peopleIdcard":"bdQuCS",
"peopleName":"张三",
"peopleSex":"男",
"peoplePhone":"13808095770",
"pjOption":"非常满意",
"contentTag":"aaa",
"picUrl":"/xxx/xxx.jpg",
"sectionName":"行政审批局",
"hallName":"公安大厅",
"pjSource":"导视机",
"opinion":"工作人员态度好",
"windowName":"社保大厅",
"windowFromnum":"D21",
"flounum":"uukl09",
"pjxt":"自助服务终端",
"workmanName":"张三",
"workmanNumber":"123",
"devicenum":"DC-BC-AE-DF",
"evaluatestatus":"等待评价",
"evaluatetype":"截图",
"photobefor":"/xxx/xxx.jpg",
"photoautograph":"/xxx/xxx.jpg",
"picture":"/xxx/xxx.jpg",
"process":"/xxx/xxx.mp4",
"eyevaluate":"标记非恶意差评",
"pjType":"窗口评价",
"pjTime":1716739241000,
"siteId":1,
"siteCode":"511500000000-0001",
"siteName":"智慧排队管理服务系统",
"extNum":"511500000000-0001-5"
},
{
"peopleIdcard":"bdQuCS",
"peopleName":"张三",
"peopleSex":"男",
"peoplePhone":"13808095770",
"pjOption":"非常满意",
"contentTag":"aaa",
"picUrl":"/xxx/xxx.jpg",
"sectionName":"行政审批局",
"hallName":"公安大厅",
"pjSource":"导视机",
"opinion":"工作人员态度好",
"windowName":"社保大厅",
"windowFromnum":"D21",
"flounum":"uukl09",
"pjxt":"自助服务终端",
"workmanName":"张三",
"workmanNumber":"123",
"devicenum":"DC-BC-AE-DF",
"evaluatestatus":"等待评价",
"evaluatetype":"截图",
"photobefor":"/xxx/xxx.jpg",
"photoautograph":"/xxx/xxx.jpg",
"picture":"/xxx/xxx.jpg",
"process":"/xxx/xxx.mp4",
"eyevaluate":"标记非恶意差评",
"pjType":"窗口评价",
"pjTime":1716739204000,
"siteId":1,
"siteCode":"511500000000-0001",
"siteName":"智慧排队管理服务系统",
"extNum":"511500000000-0001-7"
}]
###评价汇总查看
GET {{baseUrl}}/pj/evaluate/info?id={{PjEvaluate_id}}
Accept: 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