|
@@ -19,6 +19,7 @@ import com.sooka.sponest.event.centereventtreportmessage.service.ICentereventTRe
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -104,17 +105,17 @@ public class FireIncidentController {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 第三方上报事件接口
|
|
|
|
|
|
+ * 上报事件
|
|
* @param RemoteFireVO
|
|
* @param RemoteFireVO
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@PostMapping("/remoteReport")
|
|
@PostMapping("/remoteReport")
|
|
- public AjaxResult remoteReport(@RequestBody RemoteFireVO remoteFireVO) {
|
|
|
|
|
|
+ public AjaxResult remoteReport(@Validated @RequestBody RemoteFireVO remoteFireVO) {
|
|
try {
|
|
try {
|
|
//根据事件小类,反查事件大类
|
|
//根据事件小类,反查事件大类
|
|
CentereventTEventtype eventtype = centereventTEventtypeService.selectCentereventTEventtypeById(remoteFireVO.getEventType());
|
|
CentereventTEventtype eventtype = centereventTEventtypeService.selectCentereventTEventtypeById(remoteFireVO.getEventType());
|
|
if(StringUtils.isNull(eventtype)){
|
|
if(StringUtils.isNull(eventtype)){
|
|
- return AjaxResult.error("参数错误");
|
|
|
|
|
|
+ return AjaxResult.error(201,"参数错误");
|
|
}
|
|
}
|
|
remoteFireVO.setEventSubType(eventtype.getParentId());
|
|
remoteFireVO.setEventSubType(eventtype.getParentId());
|
|
//处理上报逻辑
|
|
//处理上报逻辑
|
|
@@ -128,8 +129,9 @@ public class FireIncidentController {
|
|
tReportMessage.setContext(JSON.toJSONString(remoteFireVO));
|
|
tReportMessage.setContext(JSON.toJSONString(remoteFireVO));
|
|
centereventTReportmessageService.insertCentereventTReportmessage(tReportMessage);
|
|
centereventTReportmessageService.insertCentereventTReportmessage(tReportMessage);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
- return AjaxResult.error("上报失败");
|
|
|
|
|
|
+ return AjaxResult.error(500,"上报失败");
|
|
}
|
|
}
|
|
return AjaxResult.success("上报成功");
|
|
return AjaxResult.success("上报成功");
|
|
}
|
|
}
|