diff --git a/oscm/server/src/main/java/com/jsc/oscm/controller/DataPackageController.java b/oscm/server/src/main/java/com/jsc/oscm/controller/DataPackageController.java index d198332..347ce1c 100644 --- a/oscm/server/src/main/java/com/jsc/oscm/controller/DataPackageController.java +++ b/oscm/server/src/main/java/com/jsc/oscm/controller/DataPackageController.java @@ -3,32 +3,21 @@ package com.jsc.oscm.controller; import com.jsc.oscm.entity.DataPackage; import com.jsc.oscm.entity.DataPackageLog; 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.PageRequest; 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.client.RestTemplate; 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 -@RequestMapping("/data-package") public class DataPackageController { @javax.annotation.Resource private DataPackageService dataPackageService; - @GetMapping("/list") + @GetMapping("/data-package/list") public ResponseEntity> getPackageList( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) { @@ -36,21 +25,21 @@ public class DataPackageController { return ResponseEntity.ok(dataPackageService.getPackageList(pageable)); } - @GetMapping("/log/list") + @GetMapping("/data-package/log/list") public ResponseEntity> getLogList( @RequestParam(defaultValue = "0") int page, @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)); } - @PostMapping + @PostMapping("/open/data-package/add/package") public ResponseEntity addPackage(@RequestBody DataPackage dataPackage) { dataPackageService.addPackage(dataPackage); return ResponseEntity.ok().build(); } - @GetMapping("/download/{id}") + @GetMapping("/data-package/download/{id}") public ResponseEntity getDownloadUrl(@PathVariable Integer id, HttpServletRequest request) { DataPackage dataPackage = dataPackageService.getPackageById(id); if (dataPackage == null) {