osc-group/osc
1
1
Fork 0
Code Pull Requests Projects Wiki Activity

Update DataPackageController.java

Browse Source 
完善更新数据包记录的接口
This commit is contained in:
yuxin-pc 2025-06-09 14:54:11 +08:00
parent 89b951beb4
commit 346bcdea22
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
oscm/server/src/main/java/com/jsc/oscm/controller/DataPackageController.java
View File

@ -3,32 +3,21 @@ package com.jsc.oscm.controller;
import com.jsc.oscm.entity.DataPackage; import com.jsc.oscm.entity.DataPackage;
import com.jsc.oscm.entity.DataPackageLog; import com.jsc.oscm.entity.DataPackageLog;
import com.jsc.oscm.service.DataPackageService; import com.jsc.oscm.service.DataPackageService;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.*; import org.springframework.data.domain.Sort;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
@RestController @RestController
@RequestMapping("/data-package")
public class DataPackageController { public class DataPackageController {
@javax.annotation.Resource @javax.annotation.Resource
private DataPackageService dataPackageService; private DataPackageService dataPackageService;
@GetMapping("/list") @GetMapping("/data-package/list")
public ResponseEntity<Page<DataPackage>> getPackageList( public ResponseEntity<Page<DataPackage>> getPackageList(
@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size) { @RequestParam(defaultValue = "10") int size) {
@ -36,21 +25,21 @@ public class DataPackageController {
return ResponseEntity.ok(dataPackageService.getPackageList(pageable)); return ResponseEntity.ok(dataPackageService.getPackageList(pageable));
} }
@GetMapping("/log/list") @GetMapping("/data-package/log/list")
public ResponseEntity<Page<DataPackageLog>> getLogList( public ResponseEntity<Page<DataPackageLog>> getLogList(
@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size) { @RequestParam(defaultValue = "10") int size) {
Pageable pageable = PageRequest.of(page, size); Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "operationTime"));
return ResponseEntity.ok(dataPackageService.getLogList(pageable)); return ResponseEntity.ok(dataPackageService.getLogList(pageable));
} }
@PostMapping @PostMapping("/open/data-package/add/package")
public ResponseEntity<Void> addPackage(@RequestBody DataPackage dataPackage) { public ResponseEntity<Void> addPackage(@RequestBody DataPackage dataPackage) {
dataPackageService.addPackage(dataPackage); dataPackageService.addPackage(dataPackage);
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
@GetMapping("/download/{id}") @GetMapping("/data-package/download/{id}")
public ResponseEntity<String> getDownloadUrl(@PathVariable Integer id, HttpServletRequest request) { public ResponseEntity<String> getDownloadUrl(@PathVariable Integer id, HttpServletRequest request) {
DataPackage dataPackage = dataPackageService.getPackageById(id); DataPackage dataPackage = dataPackageService.getPackageById(id);
if (dataPackage == null) { if (dataPackage == null) {