批量下载技术监督反馈文件

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java

@@ -4,7 +4,6 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.prepare.harmonic.api.line.fallback.CoustomReportFeignClientFallbackFactory;
 import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,5 +22,5 @@ public interface ThsSuperviseClient {
      * @return
      */
     @PostMapping("/initSupervise")
-    HttpResult<SuperviceRunLogVo> initSupervise(@RequestBody @Validated SuperviseParam superviseParam);
+    HttpResult<String> initSupervise(@RequestBody @Validated SuperviseParam superviseParam);
 }

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java

@@ -6,7 +6,6 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.utils.DeviceEnumUtil;
 import com.njcn.prepare.harmonic.api.line.ThsSuperviseClient;
 import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -26,7 +25,7 @@ public class ThsSuperviseClientFallbackFactory implements FallbackFactory<ThsSup
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new ThsSuperviseClient() {
             @Override
-            public HttpResult<SuperviceRunLogVo> initSupervise(@RequestBody @Validated SuperviseParam superviseParam) {
+            public HttpResult<String> initSupervise(@RequestBody @Validated SuperviseParam superviseParam) {
                 log.error("{}异常，降级处理，异常为：{}", "预警/告警事务的生成:  ", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java

@@ -3,7 +3,6 @@ package com.njcn.prepare.harmonic.controller.line;
 
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo;
 import com.njcn.prepare.harmonic.service.mysql.line.ThsSuperviseService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -32,8 +31,8 @@ public class ThsSuperviseController extends BaseController {
     @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true)
     @PostMapping("/initSupervise")
     @ResponseBody
-    public HttpResult<SuperviceRunLogVo> initSupervise(@RequestBody @Validated SuperviseParam superviseParam) {
-        HttpResult<SuperviceRunLogVo> superviceRunLogVoHttpResult = thsSuperviseService.initSupervise(superviseParam);
+    public HttpResult<String> initSupervise(@RequestBody @Validated SuperviseParam superviseParam) {
+        HttpResult<String> superviceRunLogVoHttpResult = thsSuperviseService.initSupervise(superviseParam);
         return superviceRunLogVoHttpResult;
     }
 }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java

@@ -3,6 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -78,7 +79,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl<ThsSuperviseMapper, Ths
     private static final String DESCRIPTION = "description";
 
     @Override
-    public HttpResult<SuperviceRunLogVo> initSupervise(SuperviseParam superviseParam) {
+    public HttpResult<String> initSupervise(SuperviseParam superviseParam) {
         SuperviceRunLogVo superviceRunLogVo = new SuperviceRunLogVo();
         List<ThsOverRunLog> overRunLogList = new ArrayList<>();
         if (InitTypeEnum.MANUAL.getCode().equals(superviseParam.getInitType()) && StringUtils.isBlank(superviseParam.getDeptId())) {
@@ -178,7 +179,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl<ThsSuperviseMapper, Ths
                 }
             }
         }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, superviceRunLogVo, "");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, JSON.toJSONString(superviceRunLogVo), "");
     }
 
     /**

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java

@@ -1,24 +1,18 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.harmonic.pojo.vo.SourceSteadyIndicator;
 import com.njcn.harmonic.pojo.vo.ThsStrategyVo;
 import com.njcn.prepare.enums.TypeEnum;
-import com.njcn.prepare.harmonic.pojo.dto.SuperviseDto;
 import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
 import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
 import com.njcn.prepare.harmonic.pojo.po.ThsSupervise;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviceRunLogVo;
-import com.njcn.prepare.harmonic.pojo.vo.SuperviseVo;
 import com.njcn.process.pojo.po.LimitRate;
 import com.njcn.process.pojo.po.ThsWarnStrategyAss;
 import com.njcn.user.pojo.po.Dept;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -34,7 +28,7 @@ public interface ThsSuperviseService extends IService<ThsSupervise> {
     /**
      * 初始化技术监督
      */
-    HttpResult<SuperviceRunLogVo> initSupervise(SuperviseParam superviseParam);
+    HttpResult<String> initSupervise(SuperviseParam superviseParam);
 
     /**
      * 查新策略集合