From 54af4825ef5a74f16754297b1fccef49472b860e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 15 八月 2023 21:13:34 +0800
Subject: [PATCH] bug修改

---
 ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java           |    2 +-
 ycl-platform/src/main/java/com/ycl/remote/dto/EventAddResponseDto.java               |    4 ++++
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java    |    8 ++++----
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |    5 +++--
 4 files changed, 12 insertions(+), 7 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 4922fec..139f112 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
@@ -86,11 +86,11 @@
     }
 
     @ApiOperation(value = "涓婁紶甯傚钩鍙�")
-    @PostMapping("/upload-event")
-    public CommonResult uploadEvent(@RequestParam Long caseId, CommonResult<Object> success) {
+    @PostMapping("/upload-event/{caseId}")
+    public CommonResult uploadEvent(@PathVariable Long caseId) {
         String msg = baseCaseService.uploadEvent(caseId);
         if (StringUtils.isEmpty(msg)) {
-            return success;
+            return CommonResult.success(msg);
         } else {
             return CommonResult.failed(msg);
         }
@@ -427,7 +427,7 @@
         Integer state = iDisposeRecordService
                 .list(new LambdaQueryWrapper<DisposeRecord>()
                         .eq(DisposeRecord::getBaseCaseId, caseId).
-                                orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
+                        orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
         return CommonResult.success(baseCaseService
                 .update(new LambdaUpdateWrapper<BaseCase>()
                         .eq(BaseCase::getId, caseId)
diff --git a/ycl-platform/src/main/java/com/ycl/remote/dto/EventAddResponseDto.java b/ycl-platform/src/main/java/com/ycl/remote/dto/EventAddResponseDto.java
index 78beab5..4b2fb0a 100644
--- a/ycl-platform/src/main/java/com/ycl/remote/dto/EventAddResponseDto.java
+++ b/ycl-platform/src/main/java/com/ycl/remote/dto/EventAddResponseDto.java
@@ -12,4 +12,8 @@
 @Data
 public class EventAddResponseDto {
     private String taskcode;
+//    private String msg;
+//    private Integer code;
+//    private String result;
+//    private String data;
 }
diff --git a/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java b/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java
index 0271955..d51487c 100644
--- a/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java
+++ b/ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java
@@ -12,7 +12,7 @@
  * @author: AI
  * @date: 2022-09-28 15:40
  **/
-@FeignClient(url = "http://10.53.139.176:81/api", name = "cityApi")
+@FeignClient(url = "https://zhzf.zfj.lishui.gov.cn/api", name = "cityApi")
 public interface CityPlatformService {
 
     /**
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 684cf46..5bb0fa8 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -143,12 +143,13 @@
                 medias = stringBuilder.toString();
             }
         }
+        eventDesc += "[澶у崕瑙嗛鎺ュ叆娴嬭瘯]";
         EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude() != null ? baseCase.getLatitude().toString() : "").x84(baseCase.getLongitude() != null ? baseCase.getLongitude().toString() : "").source(11).address(baseCase.getSite()).eventDesc(eventDesc).eventSign(baseCase.getCode()).medias(medias).build();
         String msg = cityPlatformService.addEvent(dto);
         ResultResponseDto result = JSONObject.parseObject(msg, ResultResponseDto.class);
         if (result.getCode() == 0) {
-            EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
-            baseCase.setTaskCode(responseDto.getTaskcode());
+//            EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
+            baseCase.setTaskCode(result.getResult());
             this.updateById(baseCase);
             return null;
         } else {

--
Gitblit v1.8.0