From df8b1094a09897b3f881529a31db8893d298ed12 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 19 七月 2022 15:58:30 +0800
Subject: [PATCH] api名称修改和导出一张时候大小修改
---
src/main/java/com/example/jz/controller/ReportController.java | 8 ++++----
src/main/java/com/example/jz/controller/CauseController.java | 16 ++++++++--------
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 20 ++++++++++++++++----
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java
index a5cde56..f3c288e 100644
--- a/src/main/java/com/example/jz/controller/CauseController.java
+++ b/src/main/java/com/example/jz/controller/CauseController.java
@@ -49,7 +49,7 @@
}
- @ApiOperation(httpMethod = "POST", value = "娣诲姞妗堜欢")
+ @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-妗堜欢褰曞叆-娣诲姞妗堜欢")
@PostMapping("/addCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R addCause(@RequestBody CauseDto causeDto) {
@@ -57,7 +57,7 @@
return R.ok();
}
- @ApiOperation(httpMethod = "PUT", value = "淇敼妗堜欢")
+ @ApiOperation(httpMethod = "PUT", value = "妗堜欢鍙�-妗堜欢褰曞叆-淇敼妗堜欢")
@PutMapping("/updateCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R updateCause(@RequestBody CauseDto causeDto, Integer id) {
@@ -65,35 +65,35 @@
}
- @ApiOperation(httpMethod = "GET", value = "妗堜欢褰曞叆鍒楄〃")
+ @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢褰曞叆鍒楄〃")
@GetMapping("/getCauseList")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R getCauseList(String cause, Integer status, Integer size, Integer current) {
return R.ok(causeService.getCauserListByCondition(cause, status, size, current));
}
- @ApiOperation(httpMethod = "GET", value = "璐熻矗浜烘煡璇�")
+ @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-璐熻矗浜烘煡璇�")
@GetMapping("/getManagerList")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R getManagerList() {
return R.ok(causeService.getManagerList());
}
- @ApiOperation(httpMethod = "GET", value = "鑾峰彇鎶ユ浜哄憳")
+ @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-鑾峰彇妗堜欢鎶ユ浜哄憳")
@GetMapping("/getReporterList")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R getReporterList(Integer causeId) {
return R.ok(causeService.getReporterList(causeId));
}
- @ApiOperation(httpMethod = "GET", value = "鑾峰彇妗堜欢缇ゅ叕鍛�")
+ @ApiOperation(httpMethod = "GET", value = "妗堜欢鍙�-妗堜欢褰曞叆-鑾峰彇妗堜欢缇ゅ叕鍛�")
@GetMapping("/getGroupAnnouncement")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R getGroupAnnouncement(Integer groupId) {
return R.ok(causeService.getGroupAnnouncement(groupId));
}
- @ApiOperation(httpMethod = "DELETE", value = "妗堜欢鍒犻櫎")
+ @ApiOperation(httpMethod = "DELETE", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢鍒犻櫎")
@DeleteMapping("/deleteCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R deleteCause(@RequestParam(value = "id") Integer id) {
@@ -101,7 +101,7 @@
return R.ok();
}
- @ApiOperation(httpMethod = "POST", value = "妗堜欢瀵煎叆")
+ @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-妗堜欢褰曞叆-妗堜欢瀵煎叆")
@PostMapping("/upload")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
@SneakyThrows
diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index 2734a05..2448a01 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -86,7 +86,7 @@
return R.ok(reportService.audit(report));
}
- @ApiOperation(httpMethod = "PUT", value = "鎶ユ浜虹紪杈�")
+ @ApiOperation(httpMethod = "PUT", value = "妗堜欢鍙�-鎶ユ浜哄憳-缂栬緫")
@PutMapping("/updateReport")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R updateReport(@RequestBody Report report) {
@@ -94,7 +94,7 @@
return R.ok();
}
- @ApiOperation(httpMethod = "DELETE", value = "鎶ユ浜轰汉鍛橀��缇�")
+ @ApiOperation(httpMethod = "DELETE", value = "妗堜欢鍙�-鎶ユ浜哄憳-閫�缇�")
@DeleteMapping("/leaveGroup")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R leaveGroup(@RequestParam(value = "id") Integer id, @RequestParam(value = "groupId") Integer groupId) {
@@ -102,7 +102,7 @@
return R.ok();
}
- @ApiOperation(httpMethod = "DELETE", value = "鍒犻櫎鎶ユ浜�")
+ @ApiOperation(httpMethod = "DELETE", value = "妗堜欢鍙�-鎶ユ浜哄憳-鍒犻櫎")
@DeleteMapping("/deleteReporter")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R deleteReporter(@RequestParam(value = "id") Integer id) {
@@ -110,7 +110,7 @@
return R.ok();
}
- @ApiOperation(httpMethod = "POST", value = "瀵煎嚭鏉愭枡")
+ @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-鎶ユ浜哄憳-鎶ユ鏉愭枡瀵煎嚭")
@PostMapping("/exportReporter")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public void exportReport(@RequestParam(value = "id") Integer id, HttpServletResponse response) {
diff --git a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
index d6dd6c8..1cac461 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -113,17 +113,29 @@
ArrayList<ImageData> imageDataList = new ArrayList<>();
if (StringUtils.isNotBlank(a.getReportMaterials())) {
String[] urls = a.getReportMaterials().split(",");
- for (int i = 0; i < urls.length; i++) {
+ if (urls.length==1){
int width=600;
try {
ImageData imageData = new ImageData();
- imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[i])).openConnection().getInputStream()));
- imageData.setLeft(width/ urls.length*i);
- imageData.setRight(width-width/ urls.length*(i+1));
+ imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[0])).openConnection().getInputStream()));
+ imageData.setRight(width/2);
imageDataList.add(imageData);
} catch (Exception e) {
throw new RuntimeException(e);
}
+ }else {
+ for (int i = 0; i < urls.length; i++) {
+ int width = 600;
+ try {
+ ImageData imageData = new ImageData();
+ imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[i])).openConnection().getInputStream()));
+ imageData.setLeft(width / urls.length * i);
+ imageData.setRight(width - width / urls.length * (i + 1));
+ imageDataList.add(imageData);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}
objectWriteCellData.setImageDataList(imageDataList);
--
Gitblit v1.8.0