This commit is contained in:
TinyAnts 2022-09-06 19:16:08 +08:00
parent c6a1e5924a
commit 81224c4013
3 changed files with 27 additions and 14 deletions

View File

@ -2,6 +2,7 @@ package com.mdd.admin.controller.decorate;
import com.mdd.admin.service.decorate.IDecorateTabbarService;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.utils.ArrayUtil;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -26,8 +27,8 @@ public class TabbarController {
*/
@GetMapping("/detail")
public Object detail() {
List<Map<String, Object>> list = iDecorateTabbarService.detail();
return AjaxResult.success(list);
Map<String, Object> detail = iDecorateTabbarService.detail();
return AjaxResult.success(detail);
}
/**
@ -38,7 +39,9 @@ public class TabbarController {
* @return Object
*/
@PostMapping("/save")
public Object save(@RequestBody List<Map<String, String>> params) {
public Object save(@RequestBody Map<String, Object> params) {
System.out.println( ArrayUtil.objectToListAsStr(params.get("list")));
iDecorateTabbarService.save(params);
return AjaxResult.success();
}

View File

@ -12,9 +12,9 @@ public interface IDecorateTabbarService {
* 底部导航详情
*
* @author fzr
* @return List<Map<String, Object>>
* @return Map<String, Object>
*/
List<Map<String, Object>> detail();
Map<String, Object> detail();
/**
* 底部导航保存
@ -22,6 +22,6 @@ public interface IDecorateTabbarService {
* @author fzr
* @param params 参数
*/
void save(List<Map<String, String>> params);
void save(Map<String, Object> params);
}

View File

@ -1,11 +1,11 @@
package com.mdd.admin.service.decorate.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mdd.admin.service.decorate.IDecorateTabbarService;
import com.mdd.common.entity.decorate.DecorateTabbar;
import com.mdd.common.mapper.decorate.DecorateTabbarMapper;
import com.mdd.common.utils.TimeUtil;
import com.mdd.common.utils.UrlUtil;
import com.mdd.common.utils.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -28,15 +28,16 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService {
* 底部导航详情
*
* @author fzr
* @return List<Map<String, Object>>
* @return Map<String, Object>
*/
@Override
public List<Map<String, Object>> detail() {
List<Map<String, Object>> response = new LinkedList<>();
public Map<String, Object> detail() {
Map<String, Object> response = new LinkedHashMap<>();
List<DecorateTabbar> list = decorateTabbarMapper.selectList(
new QueryWrapper<DecorateTabbar>()
.orderByAsc("id"));
List<Map<String, Object>> tabList = new LinkedList<>();
for (DecorateTabbar tab: list) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("id", tab.getId());
@ -46,8 +47,12 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService {
map.put("link", tab.getLink());
map.put("createTime", TimeUtil.timestampToDate(tab.getCreateTime()));
map.put("updateTime", TimeUtil.timestampToDate(tab.getUpdateTime()));
response.add(map);
tabList.add(map);
}
String tabbar = ConfigUtil.get("tabbar", "style", "{}");
response.put("style", ToolsUtil.jsonToMap(tabbar));
response.put("list", tabList);
return response;
}
@ -59,10 +64,10 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService {
*/
@Override
@Transactional
public void save(List<Map<String, String>> params) {
public void save(Map<String, Object> params) {
decorateTabbarMapper.delete(new QueryWrapper<DecorateTabbar>().gt("id", 0));
for (Map<String, String> item: params) {
for (Map<String, String> item: ArrayUtil.stringToListAsMapStr(params.get("list").toString())) {
DecorateTabbar model = new DecorateTabbar();
model.setName(item.get("name"));
model.setSelected(UrlUtil.toRelativeUrl(item.get("selected")));
@ -72,6 +77,11 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService {
model.setUpdateTime(System.currentTimeMillis() / 1000);
decorateTabbarMapper.insert(model);
}
if (StringUtil.isNotNull(params.get("style"))) {
ConfigUtil.set("tabbar", "style", JSON.toJSONString(params.get("style")));
}
}
}