From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/ImgController.java | 44 +++++++++++++++-----------------------------
1 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/ImgController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/ImgController.java
index c7a5fa0..3076392 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/ImgController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/ImgController.java
@@ -1,7 +1,7 @@
package com.supersavedriving.driver.modular.system.api;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.supersavedriving.driver.core.common.annotion.ServiceLog;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.model.Img;
import com.supersavedriving.driver.modular.system.service.IImgService;
@@ -11,8 +11,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,8 +21,6 @@
@RequestMapping("")
public class ImgController {
- Logger logger = LoggerFactory.getLogger("ServiceLog");
-
@Autowired
private IImgService imgService;
@@ -32,38 +28,28 @@
@ResponseBody
@PostMapping("/base/img/querySysImg")
+// @ServiceLog(name = "获取系统图片", url = "/base/img/querySysImg")
@ApiOperation(value = "获取系统图片", tags = {"司机端-公共接口"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "数据类型（1=启动页）", name = "type", required = true, dataType = "int"),
})
public ResponseWarpper<List<BaseWarpper>> querySysImg(@RequestParam("type") Integer type){
- ResponseWarpper responseWarpper = null;
if(ToolUtil.isEmpty(type)){
- responseWarpper = ResponseWarpper.success(ResultUtil.paranErr());
+ return ResponseWarpper.success(ResultUtil.paranErr("type"));
}
-
- if(ToolUtil.isNotEmpty(type)){
- try {
- List<Img> imgs = imgService.selectList(new EntityWrapper<Img>().eq("type", type));
- List<BaseWarpper> list = new ArrayList<>();
- for (Img img : imgs) {
- BaseWarpper baseWarpper = new BaseWarpper();
- baseWarpper.setId(img.getId());
- baseWarpper.setPath(img.getImg());
- list.add(baseWarpper);
- }
- responseWarpper = ResponseWarpper.success(list);
- }catch (Exception e){
- e.printStackTrace();
- responseWarpper = new ResponseWarpper(500, e.getMessage());
+ try {
+ List<Img> imgs = imgService.selectList(new EntityWrapper<Img>().eq("type", type));
+ List<BaseWarpper> list = new ArrayList<>();
+ for (Img img : imgs) {
+ BaseWarpper baseWarpper = new BaseWarpper();
+ baseWarpper.setId(img.getId().longValue());
+ baseWarpper.setPath(img.getImg());
+ list.add(baseWarpper);
}
+ return ResponseWarpper.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
}
- logger.debug("" +
- "\n接口地址：/base/img/querySysImg" +
- "\n接口名称：获取系统图片" +
- "\n请求参数：type:{}" +
- "\n响应结果：{}"
- , type, JSON.toJSONString(responseWarpper));
- return responseWarpper;
}
}
--
Gitblit v1.7.1