大屏接口实现远程调用

guoshilong

2023-03-13 d4bb9224e835cf0221be254d349efb3d4aaab68b

 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java

@@ -1,23 +1,17 @@
package org.springblade.modules.dp.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.tool.api.R;
import org.springblade.fire.entity.FireSupplementEntity;
import org.springblade.fire.feign.IFireClient;
import org.springblade.modules.dp.service.IMilitaryLocalCoordinationService;
import org.springblade.modules.fire.service.IFireService;
import org.springblade.modules.fire.vo.FireVO;
import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
import org.springblade.modules.fireSupplement.service.IFireSupplementService;
import org.springblade.system.dto.DeptDTO;
import org.springblade.fire.vo.FireVO;
import org.springblade.system.feign.ISysClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
@@ -34,19 +28,19 @@
@RequestMapping("dp/militaryLocalCoordination")
@Api(value = "军地协同", tags = "军地协同接口")
public class MilitaryLocalCoordinationController extends BladeController {
   private final IFireService fireService;
   private final IFireSupplementService fireSupplementService;
   private final IMilitaryLocalCoordinationService militaryLocalCoordinationService;

   private final ISysClient sysClient;
   private final IFireClient fireClient;


   /**
    * 火警事件
    */
   @GetMapping("/fireAlarmIncident")
   @ApiOperation(value = "火警事件", notes = "火警事件")
   public R<IPage<FireVO>> getEarlyWarningLedger(FireVO fire, Query query) {
      IPage<FireVO> pages = fireService.selectFirePage(Condition.getPage(query), fire);
   public R<BladePage<FireVO>> getEarlyWarningLedger(FireVO fire, @RequestParam Integer current, @RequestParam Integer size) {
      BladePage<FireVO> pages = fireClient.selectFirePage(current,size, fire);
      return R.data(pages);
   }

@@ -56,8 +50,7 @@
   @GetMapping("/disasterAssessment")
   @ApiOperation(value = "详情", notes = "传入fireSupplement")
   public R<FireSupplementEntity> detail(FireSupplementEntity fireSupplement) {
      FireSupplementEntity detail = fireSupplementService.getOne(Condition.getQueryWrapper(fireSupplement));
      return R.data(detail);
      return R.data(fireClient.getSupplementOne(fireSupplement));
   }

   /**
@@ -89,6 +82,6 @@
   @GetMapping("export-fire-report")
   @ApiOperation(value = "导出火灾报告", notes = "传入火灾id")
   public void exportUser(String fireId,HttpServletResponse response) {
      militaryLocalCoordinationService.getFireAllDetail(fireId,response);
//      militaryLocalCoordinationService.getFireAllDetail(fireId,response);
   }
}