From a8b2b318c1e6bb1ae155aa9ca6043eeb47bbfe7a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 29 九月 2022 17:48:48 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
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 b1913e7..147accf 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
@@ -1,5 +1,6 @@
package com.ycl.service.caseHandler.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,17 +43,17 @@
@Service
public class BaseCaseServiceImpl extends ServiceImpl<BaseCaseMapper, BaseCase> implements IBaseCaseService {
- // private CityPlatformService cityPlatformService;
+ private CityPlatformService cityPlatformService;
private IViolationsService violationsService;
private IVideoAlarmReportService videoAlarmReportService;
@Value("${fdfs.fileUrl}")
private String fileUrl;
-// @Autowired
-// public void setCityPlatformService(CityPlatformService cityPlatformService) {
-// this.cityPlatformService = cityPlatformService;
-// }
+ @Autowired
+ public void setCityPlatformService(CityPlatformService cityPlatformService) {
+ this.cityPlatformService = cityPlatformService;
+ }
@Autowired
public void setViolationsService(IViolationsService violationsService) {
@@ -100,33 +101,34 @@
medias = stringBuilder.toString();
}
}
- EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude().toString()).x84(baseCase.getLongitude().toString())
+ 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();
-// ResultResponseDto<EventAddResponseDto> result = cityPlatformService.addEvent(dto);
-// if (result.getCode() == 0) {
-// EventAddResponseDto responseDto = result.getResult();
-// baseCase.setTaskCode(responseDto.getTaskcode());
-// this.updateById(baseCase);
-// return null;
-// } else {
-// return result.getMsg();
-// }
- return null;
+ 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());
+ this.updateById(baseCase);
+ return null;
+ } else {
+ return result.getMsg();
+ }
}
@Override
public String processEvent(Integer caseId) {
BaseCase baseCase = this.getById(caseId);
EventProcessParamDto paramDto = EventProcessParamDto.builder().eventSign(baseCase.getCode()).taskcode(baseCase.getTaskCode()).build();
-// ResultResponseDto<EventProcessResponseDto> responseDto = cityPlatformService.getEventProcess(paramDto);
-// if (responseDto.getCode() == 0) {
-// EventProcessResponseDto eventProcessResponseDto = responseDto.getResult();
-// /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
-// return null;
-// } else {
-// return responseDto.getMsg();
-// }
- return null;
+ String msg = cityPlatformService.getEventProcess(paramDto);
+ ResultResponseDto responseDto = JSONObject.parseObject(msg, ResultResponseDto.class);
+ if (responseDto.getCode() == 0) {
+ EventProcessResponseDto eventProcessResponseDto = JSONObject.parseObject(responseDto.getResult(), EventProcessResponseDto.class);
+ /*********** 鏈鐞嗗競骞冲彴杩斿洖鏁版嵁 ***************/
+ return null;
+ } else {
+ return responseDto.getMsg();
+ }
}
@Override
--
Gitblit v1.8.0