无人机增加事件类型

修复bug图片上传失败

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CenterEventReportController.java

@@ -144,6 +144,9 @@ public class CenterEventReportController extends BaseController {
     @ApiOperation("事件类型年度统计")
     @PostMapping("/getEventTypeYearStatistics")
     public R getEventTypeYearStatistics(@RequestBody VisuForestCloudMapVO visuForestCloudMapVO) {
+        if(Arrays.asList(visuForestCloudMapVO.getEventTypeId()).size() == 0){
+            return R.fail("缺少必要参数");
+        }
         if (StringUtils.isEmpty(visuForestCloudMapVO.getYearMonth())) {
             visuForestCloudMapVO.setYearMonth(DateUtils.getLast30Days());
         }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/CentereventTEventcatalogue.java

@@ -35,6 +35,16 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.address = address;
     }
 
+    public CentereventTEventcatalogue(String eventName, String eventDescription, String longitude, String latitude, String reportor, Date reportTime, String address) {
+        this.eventName = eventName;
+        this.eventDescription = eventDescription;
+        this.longitude = longitude;
+        this.latitude = latitude;
+        this.reportor = reportor;
+        this.reportTime = reportTime;
+        this.address = address;
+    }
+
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -49,6 +49,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static com.ruoyi.common.core.utils.DateUtils.YYYY_MM_DD_HH_MM_SS;
@@ -725,7 +726,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             }
 
             try{
-                MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(alarm.getPhotoPath(), alarm.getPhotoName());
+                MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(alarm.getPhotoPath(), System.currentTimeMillis() + ".jpg");
                 SysFile data1 = fileService.upload(multipartFile).getData();
                 String url = data1.getUrl();
                 alarm.setLocalPath(url);
@@ -735,10 +736,26 @@ public class AlarmEventServiceImpl implements AlarmEventService {
 
 
             String eventName = MapUtils.getString(data, "uavName") + "上报" + MapUtils.getString(eventType, "eventTypeName") + "事件";
-            String eventDescription = "基站:" + MapUtils.getString(data, "baseStationName") + ",无人机:" + MapUtils.getString(data, "uavName") + ",经度:" + alarm.getLongitude() + ",纬度:" + alarm.getLatitude() + ",海拔:" + alarm.getAltitude() + (StringUtils.isEmpty(alarm.getImageDescription()) ? "牲畜总数量: 未知" : alarm.getImageDescription());
+
+            StringBuilder eventDescription = new StringBuilder();
+            eventDescription.append("基站:").append(MapUtils.getString(data, "baseStationName")).append(",无人机:").append(MapUtils.getString(data, "uavName"))
+                    .append(",经度:").append(alarm.getLongitude()).append(",纬度:").append(alarm.getLatitude()).append(",海拔:").append(alarm.getAltitude());
+
+            // 违法畜牧单独增加描述:  牲畜总数量: xx
+            if("Sheep".equals(alarm.getAlarmType())){
+                eventDescription.append(StringUtils.isEmpty(alarm.getImageDescription()) ? "牲畜总数量: 未知" : alarm.getImageDescription());
+            }
 
             //创建事件主体, 写入事件表.
-            CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("2", MapUtils.getString(eventType, "eventType"), eventName, eventDescription, alarm.getLongitude(), alarm.getLatitude(), MapUtils.getString(data, "uavName"), alarm.getCreationTime(), "");
+            CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventName, eventDescription.toString(), alarm.getLongitude(), alarm.getLatitude(), MapUtils.getString(data, "uavName"), alarm.getCreationTime(), "");
+
+            if("0".equals(MapUtils.getString(eventType, "parentId"))){
+                centereventTEventcatalogue.setEventType(MapUtils.getString(eventType, "eventType"));
+            }else{
+                centereventTEventcatalogue.setEventType(MapUtils.getString(eventType, "parentId"));
+                centereventTEventcatalogue.setEventTypeXl(MapUtils.getString(eventType, "eventType"));
+            }
+
             centereventTEventcatalogue.setLongitude(alarm.getLongitude());
             centereventTEventcatalogue.setLatitude(alarm.getLatitude());
             centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_6);

src/main/resources/mapper/centereventteventcatalogue/AlarmEventMapper.xml

@@ -32,7 +32,7 @@
     </insert>
 
     <select id="getEventTypeByCodeTower" parameterType="string" resultType="map">
-        select event_type_name eventTypeName, id eventType from centerevent_t_eventtype
+        select event_type_name eventTypeName, id eventType, parent_id parentId from centerevent_t_eventtype
         where code_tower = #{codeTower}
     </select>
 </mapper>