From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index dfb341f..f7fce50 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -1,11 +1,23 @@
package com.ycl.platform.controller;
+import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.concurrent.ExecutionException;
+
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;
@@ -16,6 +28,7 @@
import com.ycl.platform.domain.query.YwPointQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
/**
* 杩愮淮鐐逛綅 鍓嶇鎺у埗鍣�
@@ -34,50 +47,101 @@
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ @PreAuthorize("@ss.hasPermi('point:add')")
public Result add(@RequestBody @Validated(Add.class) YwPointForm form) {
return ywPointService.add(form);
}
@PostMapping("/batch")
@ApiOperation(value = "鎵归噺娣诲姞", notes = "鎵归噺娣诲姞")
+ @PreAuthorize("@ss.hasPermi('point:add')")
public Result batchAdd(@RequestBody @NotEmpty(message = "鏁版嵁涓嶈兘涓虹┖") List<YwPointForm> form) {
return ywPointService.batchAdd(form);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
+ @PreAuthorize("@ss.hasPermi('point:edit')")
public Result update(@RequestBody @Validated(Update.class) YwPointForm form) {
return ywPointService.update(form);
}
+ @PutMapping("/batch")
+ @ApiOperation(value = "鎵归噺淇敼杩愮淮鍗曚綅", notes = "鎵归噺淇敼杩愮淮鍗曚綅")
+ @PreAuthorize("@ss.hasPermi('point:edit')")
+ public Result batchEdit(@RequestBody @Validated BatchEditPointForm form) {
+ return ywPointService.batchEdit(form);
+ }
+
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('point:remove')")
public Result removeById(@PathVariable("id") String id) {
return ywPointService.removeById(id);
}
@DeleteMapping("/batch")
@ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('point:remove')")
public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
return ywPointService.remove(ids);
}
- @PreAuthorize("@ss.hasPermi('point:page')")
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ @PreAuthorize("@ss.hasPermi('point:page')")
public Result page(YwPointQuery query) {
return ywPointService.page(query);
}
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @PreAuthorize("@ss.hasPermi('point:query')")
public Result detail(@PathVariable("id") String id) {
return ywPointService.detail(id);
}
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+// @PreAuthorize("@ss.hasPermi('point:list')")
public Result list() {
return ywPointService.all();
}
+
+ @GetMapping("/select")
+ @ApiOperation(value = "鐐逛綅涓嬫媺", notes = "鐐逛綅涓嬫媺")
+ public Result select(@NotBlank(message = "璇疯緭鍏ョ偣浣�") String keyword) {
+ return ywPointService.select(keyword);
+ }
+
+ @GetMapping("/export")
+ @ApiOperation(value = "瀵煎嚭鏁版嵁", notes = "瀵煎嚭鏁版嵁")
+ public void export(YwPointQuery query, HttpServletResponse response) throws IOException {
+ ywPointService.export(query, response);
+ }
+
+ @PostMapping("/import")
+ @ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁")
+ public Result importData(MultipartFile file,
+ Integer unitId,
+ String startTime,
+ Boolean needUpdateUnit,
+ String endTime) throws IOException, ParseException, ExecutionException, InterruptedException {
+ Date start = null;
+ Date end = null;
+ if (-1 == unitId) {
+ unitId = null;
+ }
+ if (StringUtils.hasText(startTime)) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ start = format.parse(startTime);
+ }
+ if (StringUtils.hasText(startTime)) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ end = format.parse(endTime);
+ }
+ return ywPointService.importData(file, unitId, start, end, needUpdateUnit);
+ }
+
+
}
--
Gitblit v1.8.0