From 08a691792cd4165d9943cc17c150eeedd799ab25 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: Sat, 22 Jul 2023 10:26:04 +0800
Subject: [PATCH] 封装返回数据
---
ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml | 2
ard-work/src/main/java/com/ruoyi/utils/result/Results.java | 31 +++++++++++++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java | 2
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 7 ++-
ard-work/src/main/java/com/ruoyi/utils/result/Constants.java | 13 ++++++
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 3 +
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 17 +++++++-
7 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 4dc0b4d..d431ac7 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -17,6 +17,7 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.httpclient.SYCarClient;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.bytedeco.javacv.CanvasFrame;
@@ -275,9 +276,9 @@
}
@PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
- @GetMapping("carListById")
+ @GetMapping("/carListById/{id}")
@ApiOperation("根据车辆ID获取车辆列表")
- public List<ArdSyCar> carListById(String carId){
- return ardSyCarService.carListById(carId);
+ public Results carListById(@PathVariable String id){
+ return ardSyCarService.carListById(id);
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
index f366718..d3d7138 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
@@ -72,5 +72,5 @@
* @param carId
* @return
*/
- List<ArdSyCar> carListById(String carId);
+ List<ArdSyCar> carListById(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
index dd29dfd..cc330bc 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.ruoyi.sy.domain.ArdSyCar;
+import com.ruoyi.utils.result.Results;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -82,5 +83,5 @@
*/
public String uploadCarPicture(String id, MultipartFile carPicture);
- List<ArdSyCar> carListById(String carId);
+ Results carListById(String id);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 2b9e9c0..599b126 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -16,11 +16,14 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.utils.httpclient.SYCarClient;
+import com.ruoyi.utils.result.Constants;
+import com.ruoyi.utils.result.Results;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.ListObjectsArgs;
import io.minio.PutObjectArgs;
import io.minio.Result;
import io.minio.http.Method;
+import io.minio.messages.Contents;
import io.minio.messages.Item;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
@@ -325,7 +328,17 @@
}
@Override
- public List<ArdSyCar> carListById(String carId) {
- return ardSyCarMapper.carListById(carId);
+ public Results carListById(String id) {
+ try {
+ List<ArdSyCar> list = ardSyCarMapper.carListById(id);
+ if(list.size()>0){
+ ArdSyCar ardSyCar = list.get(0);
+ return Results.succeed(ardSyCar);
+ }else {
+ return Results.succeed();
+ }
+ } catch (Exception e) {
+ return Results.error(e.toString());
+ }
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java b/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java
new file mode 100644
index 0000000..932b53a
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java
@@ -0,0 +1,13 @@
+package com.ruoyi.utils.result;
+
+/**
+ * @author 11441
+ * 返回状态码
+ */
+public interface Constants {
+ String CODE_200 = "200"; // 成功
+ String CODE_400 = "400"; // 参数错误
+ String CODE_500 = "500"; // 系统错误
+ String CODE_401 = "401"; // 权限不足
+}
+
diff --git a/ard-work/src/main/java/com/ruoyi/utils/result/Results.java b/ard-work/src/main/java/com/ruoyi/utils/result/Results.java
new file mode 100644
index 0000000..b6c861e
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/utils/result/Results.java
@@ -0,0 +1,31 @@
+package com.ruoyi.utils.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 11441
+ * 返回结果集
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Results {
+ private String code;
+ private String msg;
+ private Object data;
+
+ public static Results succeed() {
+ return new Results(Constants.CODE_200, "操作成功!", null);
+ }
+
+ public static Results succeed(Object data) {
+ return new Results(Constants.CODE_200, "操作成功!", data);
+ }
+
+ public static Results error(String msg) {
+ return new Results(Constants.CODE_500, msg, null);
+ }
+}
+
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
index 185cbd9..35d3c4b 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
@@ -103,6 +103,6 @@
</select>
<select id="carListById" parameterType="String" resultMap="ArdSyCarResult">
- select * from ard_sy_car where car_id = #{carId}
+ select * from ard_sy_car where id = #{id}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3