''

src/main/java/com/tofly/river/config/ActiveMQConfig.java

@@ -1,7 +1,9 @@
 package com.tofly.river.config;
 
+import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +40,7 @@ public class ActiveMQConfig {
     }
 
     @Bean
-    public JmsListenerContainerFactory<?> jmsListenerContainerTopic(ConnectionFactory activeMQConnectionFactory) {
+    public JmsListenerContainerFactory<?> jmsListenerContainerTopic(ActiveMQConnectionFactory activeMQConnectionFactory) {
         DefaultJmsListenerContainerFactory bean = new DefaultJmsListenerContainerFactory();
         bean.setPubSubDomain(true);
         bean.setConnectionFactory(activeMQConnectionFactory);

src/main/java/com/tofly/river/controller/common/FileUploadDownloadController.java

@@ -7,7 +7,14 @@ import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.SftpException;
 import com.tofly.river.common.CommonRest;
+import com.tofly.river.common.Constants;
+import com.tofly.river.model.common.dto.FileDataMiddleDto;
+import com.tofly.river.model.common.po.FileDataMiddle;
+import com.tofly.river.model.common.po.FileInfo;
 import com.tofly.river.model.common.po.FileUploadDownloadInfo;
+import com.tofly.river.model.common.vo.FileInfoResultVo;
+import com.tofly.river.service.common.IFileDataMiddleService;
+import com.tofly.river.service.common.IFileInfoService;
 import com.tofly.river.service.common.IFileUploadDownloadInfoService;
 import com.tofly.river.util.Rest;
 import io.swagger.annotations.Api;
@@ -20,7 +27,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -41,6 +51,9 @@ public class FileUploadDownloadController {
 
     @Autowired
     private IFileDataMiddleService iFileDataMiddleService;
+    @Autowired
+    private IFileInfoService iFileInfoService;
+
     /**
      * 文件
      *
@@ -72,7 +85,7 @@ public class FileUploadDownloadController {
         Long dataId = parDto.getDataId();
         List<Long> fileIdList = parDto.getFileIdList();
         List<FileDataMiddle> fileDataMiddleList = new ArrayList<>();
-        fileIdList.forEach(fileId ->{
+        fileIdList.forEach(fileId -> {
             FileDataMiddle fileDataMiddle = new FileDataMiddle();
             fileDataMiddle.setFileId(fileId);
             fileDataMiddle.setDataType(dataType);
@@ -129,11 +142,10 @@ public class FileUploadDownloadController {
         // 清空文件信息
         iFileInfoService.removeById(id);
         FileDataMiddle fileDataMiddle = iFileDataMiddleService.getOne(new QueryWrapper<FileDataMiddle>().lambda().eq(FileDataMiddle::getFileId, id));
-        if(null!= fileDataMiddle){
+        if (null != fileDataMiddle) {
             // 清除关联信息
             iFileDataMiddleService.removeById(fileDataMiddle.getFileId());
         }
-
         return rest;
     }
 

src/main/java/com/tofly/river/service/data/impl/GovernPointInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.tofly.river.service.data.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.river.common.ExcelExportFileTypeEnum;
@@ -10,6 +11,7 @@ import com.tofly.river.common.ExcelImportFileTypeEnum;
 import com.tofly.river.common.GlobalConstantTypeEnum;
 import com.tofly.river.common.MonitorSiteTypeEnum;
 import com.tofly.river.mapper.data.GovernPointInfoMapper;
+import com.tofly.river.model.common.vo.special.SpecialGovernPointInfoVo;
 import com.tofly.river.model.data.po.*;
 import com.tofly.river.model.data.vo.*;
 import com.tofly.river.model.monitor.po.EstuaryMonitorInfo;