From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/HomeModuleController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/HomeModuleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/HomeModuleController.java
index 5b3f135..bf9f737 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/HomeModuleController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/HomeModuleController.java
@@ -1,17 +1,24 @@
package com.dsh.guns.modular.system.controller.code;
-import com.dsh.course.feignClient.other.model.Banner;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.guns.config.UserExt;
+import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.HomeModule;
import com.dsh.guns.modular.system.service.IHomeModuleService;
import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.util.ImageUtils;
import com.dsh.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -29,7 +36,10 @@
@RequestMapping("/tHomeModule_platformSet/{id}")
public String tHomeModulePlatformSet(@PathVariable Integer id, Model model) {
- HomeModule data = homeModuleService.getById(id);
+ HomeModule data = homeModuleService.getOne(new LambdaQueryWrapper<HomeModule>().eq(HomeModule::getStoreId, id));
+ if(data==null){
+ data =homeModuleService.getById(1);
+ }
List<Map<String, Object>> pages = storeService.typeChange(data.getModel());
List<Map<String, Object>> types = storeService.typeChangeOne(data.getJumpPage());
// type=1 查看详情 type=2 编辑
@@ -39,19 +49,50 @@
model.addAttribute("data",data);
model.addAttribute("pages",pages);
model.addAttribute("types",types);
+ model.addAttribute("id",id);
return PREFIX + "tHomeModule.html";
}
@ResponseBody
@RequestMapping("/updateHomeModule")
public ResultUtil updateAdvertisement(@RequestBody HomeModule homeModule) {
- if (homeModule.getType().equals("请选择")){
- homeModule.setType(null);
+ HomeModule one = homeModuleService.getOne(new LambdaQueryWrapper<HomeModule>().eq(HomeModule::getStoreId, homeModule.getStoreId()));
+ if(one==null){
+ one = new HomeModule();
+ BeanUtils.copyProperties(homeModule,one);
+ one.setId(null);
+ if (homeModule.getType().equals("请选择")){
+ one.setType(null);
+ }
+ if (homeModule.getPage().equals("请选择")){
+ one.setPage(null);
+ }
+ if (ToolUtil.isNotEmpty(homeModule.getBackgroundImage())) {
+ try {
+ one.setDisplayType(ImageUtils.getImageDimensions(homeModule.getBackgroundImage()).getDisplayType());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return ResultUtil.success(homeModuleService.saveOrUpdate(one));
+
+ }else {
+ if (homeModule.getType().equals("请选择")){
+ homeModule.setType(null);
+ }
+ if (homeModule.getPage().equals("请选择")){
+ homeModule.setPage(null);
+ }
+ if (ToolUtil.isNotEmpty(homeModule.getBackgroundImage())) {
+ try {
+ homeModule.setDisplayType(ImageUtils.getImageDimensions(homeModule.getBackgroundImage()).getDisplayType());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return ResultUtil.success(homeModuleService.updateById(homeModule));
}
- if (homeModule.getPage().equals("请选择")){
- homeModule.setPage(null);
- }
- return ResultUtil.success(homeModuleService.updateById(homeModule));
+
}
}
--
Gitblit v1.7.1