From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/ImgController.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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 b0b3b0b..5e864b3 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,19 +1,20 @@
 package com.supersavedriving.driver.modular.system.api;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 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.model.SystemConfig;
 import com.supersavedriving.driver.modular.system.service.IImgService;
+import com.supersavedriving.driver.modular.system.service.ISystemConfigService;
 import com.supersavedriving.driver.modular.system.util.ResultUtil;
 import com.supersavedriving.driver.modular.system.warpper.BaseWarpper;
 import com.supersavedriving.driver.modular.system.warpper.ResponseWarpper;
 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.*;
 
@@ -27,11 +28,14 @@
     @Autowired
     private IImgService imgService;
 
+    @Autowired
+    private ISystemConfigService systemConfigService;
+
 
 
     @ResponseBody
     @PostMapping("/base/img/querySysImg")
-    @ServiceLog(name = "获取系统图片", url = "/base/img/querySysImg")
+//    @ServiceLog(name = "获取系统图片", url = "/base/img/querySysImg")
     @ApiOperation(value = "获取系统图片", tags = {"司机端-公共接口"}, notes = "")
     @ApiImplicitParams({
             @ApiImplicitParam(value = "数据类型(1=启动页)", name = "type", required = true, dataType = "int"),
@@ -41,13 +45,20 @@
             return ResponseWarpper.success(ResultUtil.paranErr("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().longValue());
-                baseWarpper.setPath(img.getImg());
-                list.add(baseWarpper);
+            SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
+            if(null != systemConfig) {
+                JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+                Integer num2 = jsonObject1.getInteger("num2");//启动页开关
+                if(1 == num2){
+                    List<Img> imgs = imgService.selectList(new EntityWrapper<Img>().eq("type", type));
+                    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){

--
Gitblit v1.7.1