微调
This commit is contained in:
@@ -109,9 +109,6 @@ public class CarryCapacityController extends BaseController {
|
||||
@ApiOperation("导出数据集模板")
|
||||
@GetMapping(value = "getExcelTemplate")
|
||||
public HttpResult<String> getExcelTemplate(HttpServletResponse response) throws IOException {
|
||||
|
||||
|
||||
|
||||
String sheetName = "数据集模版";
|
||||
List<CarryCapcityDataEexcel> excels = new ArrayList<>();
|
||||
CarryCapcityDataEexcel exportHeadersExcel = new CarryCapcityDataEexcel();
|
||||
@@ -120,10 +117,6 @@ public class CarryCapacityController extends BaseController {
|
||||
.sheet(sheetName)
|
||||
.doWrite(excels);
|
||||
EasyExcelUtil.writeWithSheetsWeb(response, "数据集模版.xlsx");
|
||||
|
||||
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -132,7 +125,6 @@ public class CarryCapacityController extends BaseController {
|
||||
@ApiOperation("上传数据集")
|
||||
public HttpResult<Boolean> uploadExcel(@Validated ExcelDataParam excelDataParam) throws Exception {
|
||||
String methodDescribe = getMethodDescribe("uploadExcel");
|
||||
|
||||
boolean flag = carryCapcityService.uploadExcel(excelDataParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
|
||||
}
|
||||
|
||||
@@ -28,6 +28,9 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author hongawen
|
||||
*/
|
||||
@Slf4j
|
||||
@Validated
|
||||
@RestController
|
||||
|
||||
@@ -81,7 +81,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
|
||||
TimeInterval timeInterval = new TimeInterval();
|
||||
//调用方法获取暂降事件详情
|
||||
RmpEventDetailPO rmpEventDetailPO = rmpEventAdvanceMapper.selectById(eventIndex);
|
||||
EntityAdvancedData entityAdvancedData = null;
|
||||
EntityAdvancedData entityAdvancedData ;
|
||||
|
||||
//获取PT变比
|
||||
LineDetailDataVO lineDetailDataVO = lineFeignClient.getLineDetailData(rmpEventDetailPO.getLineId()).getData();
|
||||
|
||||
Reference in New Issue
Block a user