From 0c420edb24c2f3a783706e65f0ad76f282518d22 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 12 三月 2024 16:15:00 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 13 ++++++++-----
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 13 ++++++++-----
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 9720a00..a028a7d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -163,13 +163,13 @@
@RequestParam(required = false) Integer videoId) {
Page<Object> queryList;
- // 澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)
+ // 澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)
List<Integer> stateList = new ArrayList<>();
- switch (state){
+ switch (state) {
case "wait":
stateList.add(0);
break;
- case "handle":
+ case "handle":
stateList.add(5);
stateList.add(6);
stateList.add(7);
@@ -181,6 +181,9 @@
stateList.add(3);
stateList.add(4);
stateList.add(9);
+ break;
+ default:
+ stateList.add(Integer.valueOf(state));
break;
}
if (type == 1) {
@@ -542,8 +545,8 @@
@GetMapping("/work_order")
@ApiOperation("宸ュ崟缁熻")
public CommonResult getWorkOrder(@RequestParam Integer currentPage,
- @RequestParam Integer pageSize,
- @RequestParam(required = false) String keyword) {
+ @RequestParam Integer pageSize,
+ @RequestParam(required = false) String keyword) {
return CommonResult.success(baseCaseService.getWorkOrder(currentPage, pageSize, keyword));
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
index 8695987..c645879 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -56,7 +56,7 @@
checkApiUtil.cockpit(params);
CommonResult.success(iBaseCaseService.statistics());
StatisticsVO report = new StatisticsVO();
- report.setCount(2521L);
+ report.setCount(63L);
report.setRatio(BigDecimal.valueOf(0.9141));
report.setUp(true);
StatisticsVO dispose = new StatisticsVO();
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 31d76d6..31c5f28 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -232,12 +232,15 @@
HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);
ResponseEntity<String> response = restTemplate.postForEntity(url + "/sms/submit", sendReq, String.class);
- SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
- if (sendRes.getRspcod().equals("success")) {
- return 2;
- } else {
- return 3;
+ if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank( response.getBody())) {
+ SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
+ if (sendRes.getRspcod().equals("success")) {
+ return 2;
+ } else {
+ return 3;
+ }
}
+ return 3;
}
//鍙戦�侀偖浠�
--
Gitblit v1.8.0