From 1e2308326c98c1d95b3d75ab1cac80bb6f828344 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 六月 2023 20:17:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TImgController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TImgController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TImgController.java
index 25a6a9d..7706dbe 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TImgController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TImgController.java
@@ -1,7 +1,12 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.modular.system.model.TSystemConfig;
+import com.stylefeng.guns.modular.system.service.ITSystemConfigService;
import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
@@ -11,6 +16,10 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TImg;
import com.stylefeng.guns.modular.system.service.ITImgService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 控制器
@@ -26,12 +35,21 @@
@Autowired
private ITImgService tImgService;
+ @Autowired
+ private ITSystemConfigService tSystemConfigService;
/**
* 跳转到首页
*/
@RequestMapping("")
- public String index() {
+ public String index(Model model) {
+ TSystemConfig config = tSystemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 8)
+ .last("LIMIT 1"));
+ JSONObject jsonObject = JSONObject.parseObject(config.getContent());
+ model.addAttribute("num2",jsonObject.getInteger("num2"));
+ List<TImg> tImgList = tImgService.selectList(new EntityWrapper<TImg>()
+ .eq("type", 1));
+ model.addAttribute("imgList",tImgList);
return PREFIX + "tImg.html";
}
@@ -94,6 +112,32 @@
}
/**
+ * 修改图片
+ */
+ @RequestMapping(value = "/updateSubmit")
+ @ResponseBody
+ public Object updateSubmit(String tImg) {
+ System.err.println(tImg);
+ // 删除所有图片
+ tImgService.delete(new EntityWrapper<TImg>()
+ .eq("type",1));
+ if(StringUtils.hasLength(tImg)){
+ String[] split = tImg.split(",");
+ List<TImg> tImgList = new ArrayList<>(split.length);
+ for (String s : split) {
+ TImg tImg1 = new TImg();
+ // 保存所有图片
+ tImg1.setType(1);
+ tImg1.setCreateTime(new Date());
+ tImg1.setImg(s);
+ tImgList.add(tImg1);
+ }
+ tImgService.insertBatch(tImgList);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
* 详情
*/
@RequestMapping(value = "/detail/{tImgId}")
--
Gitblit v1.7.1