Wang-Xiao-Ran пре 1 година
родитељ
комит
01e308c052

+ 6 - 4
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/FireIncidentController.java

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

+ 9 - 8
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/RemoteFireVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
@@ -17,13 +18,13 @@ public class RemoteFireVO {
     /**
      * 事件名称
      */
-    @NotBlank
+    @NotBlank(message = "事件名称不能为空")
     private String eventName;
 
     /**
      * 事件详细类型( 101森林火情、102秸秆禁烧、103建筑物火情、1002消防占道、510水压监测异常、1001电瓶车进电梯)
      */
-    @NotBlank
+    @NotBlank(message = "事件类型不能为空")
     private String eventType;
 
     /**
@@ -34,13 +35,13 @@ public class RemoteFireVO {
     /**
      * 事件描述
      */
-    @NotBlank
+    @NotBlank(message = "事件描述不能为空")
     private String eventDescription;
 
     /**
      * 事件上报人
      */
-    @NotBlank
+    @NotBlank(message = "事件上报人不能为空")
     private String eventReporter;
 
     /**
@@ -51,26 +52,26 @@ public class RemoteFireVO {
     /**
      * 事件上报时间
      */
-    @NotBlank
+    @NotNull(message = "事件上报时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date eventReportTime;
 
     /**
      * 事件地理位置
      */
-    @NotBlank
+    @NotBlank(message = "事件地理位置不能为空")
     private String eventLocation;
 
     /**
      * 事件坐标(经度)
      */
-    @NotBlank
+    @NotBlank(message = "事件坐标(经度)不能为空")
     private String eventLongitude;
 
     /**
      * 事件坐标(纬度)
      */
-    @NotBlank
+    @NotBlank(message = "事件坐标(纬度)不能为空")
     private String eventLatitude;
 
     /**

+ 4 - 1
src/main/java/com/sooka/sponest/event/centereventteventtype/service/impl/CentereventTEventtypeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.event.centereventteventtype.service.impl;
 
+import com.ruoyi.common.core.utils.StringUtils;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventtype.domain.CentereventTEventtype;
 import com.sooka.sponest.event.centereventteventtype.mapper.CentereventTEventtypeMapper;
@@ -72,7 +73,9 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
     @Override
     public CentereventTEventtype selectCentereventTEventtypeById(String id) {
         CentereventTEventtype type = centereventTEventtypeMapper.selectCentereventTEventtypeById(id);
-        dateChange(type);
+        if (StringUtils.isNotNull(type)) {
+            dateChange(type);
+        }
         return type;
     }