违法畜牧增加描述

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/vo/DroneVO.java

@@ -64,6 +64,8 @@ public class DroneVO {
      */
     private String localPath;
 
+    private String imageDescription;
+
     private String disposeStatus;
 
     private String houseNumber;

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

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.system.api.RemoteDeptService;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.api.domain.SysFile;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
@@ -380,13 +381,18 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String eventType = centereventTEventtype.getParentId();
         String eventTypeXl = centereventTEventtype.getId();
         String eventName = infoVO.getChannelName() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, new Date(infoVO.getAlarmDate() * 1000)) + centereventTEventtype.getEventTypeName();
-        String eventDescription = infoVO.toString(centerdataTCamera);
+        StringBuilder eventDescription = new StringBuilder();
+        if("987654321".equals(MapUtils.getString(daHuaFireEventVO.getInfo(), "alarmType"))){
+            eventDescription.append(infoVO.toString(centerdataTCamera)).append(",").append(infoVO.getExtend().get("imageDescription"));
+        }else{
+            eventDescription.append(infoVO.toString(centerdataTCamera));
+        }
         String longitude = centerdataTCamera.getLongitude();
         String latitude = centerdataTCamera.getLatitude();
         String reportor = centerdataTCamera.getCameraName();
         Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate() * 1000);
         String address = centerdataTCamera.getCameraRegion();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription.toString(), longitude, latitude, reportor, reportTime, address);
         centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaFireEventVO.getCreateTime());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
@@ -704,7 +710,6 @@ public class AlarmEventServiceImpl implements AlarmEventService {
     public int insertDroneEvent(List<DroneVO> alarmData) {
         // 通过无人机id, 获取无人机信息和绑定的指挥中心
         alarmData.forEach(alarm -> {
-            alarm.setId(IdUtils.simpleUUID());
 
             Map<Object, Object> eventType = alarmEventMapper.getEventTypeByCodeTower(alarm.getAlarmType());
             if(null == eventType || eventType.isEmpty()){
@@ -720,15 +725,17 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             }
 
             try{
-                MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(alarm.getPhotoPath(), System.currentTimeMillis() + ".jpg");
-                alarm.setLocalPath(fileService.upload(multipartFile).getData().getUrl());
+                MultipartFile multipartFile = FilePrefixUtils.urlToMultipartFile(alarm.getPhotoPath(), alarm.getPhotoName());
+                SysFile data1 = fileService.upload(multipartFile).getData();
+                String url = data1.getUrl();
+                alarm.setLocalPath(url);
             }catch (Exception e){
                 logger.error(e.getMessage());
             }
 
 
             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();
+            String eventDescription = "基站:" + MapUtils.getString(data, "baseStationName") + ",无人机:" + MapUtils.getString(data, "uavName") + ",经度:" + alarm.getLongitude() + ",纬度:" + alarm.getLatitude() + ",海拔:" + alarm.getAltitude() + (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(), "");
@@ -741,6 +748,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, alarm.getCreationTime());
 
             String eventCode = centereventTEventcatalogue.getEventCode();
+            alarm.setId(eventCode);
             String createName = centereventTEventcatalogue.getCreateName();
             Date createTime = centereventTEventcatalogue.getCreateTime();
 

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

@@ -6,7 +6,7 @@
 
     <insert id="insertDrone" parameterType="list">
         insert into centerevent_t_drone
-        (id, copter_id, time_stamp, altitude, alarm_type, create_time, photo_path, latitude, longitude, photo_id, photo_name, local_path, dispose_status, house_number, is_hidden, photo_type, source_type)
+        (id, copter_id, time_stamp, altitude, alarm_type, create_time, photo_path, latitude, longitude, photo_id, photo_name, local_path, dispose_status, house_number, is_hidden, photo_type, source_type, image_description)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.id},
@@ -25,7 +25,8 @@
              #{item.houseNumber},
              #{item.isHidden},
              #{item.photoType},
-             #{item.sourceType}
+             #{item.sourceType},
+             #{item.imageDescription}
              )
         </foreach>
     </insert>