From 0f41a81a6b28e591bfe734ccd8327a936f9c29e0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 01 Nov 2021 09:16:41 +0800
Subject: [PATCH] screen-api 增加获取一个城市24小时AQI接口
---
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index a96953c..afb4821 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -3,19 +3,28 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.GroupMenu;
+import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
+import com.moral.api.mapper.MenuMapper;
import com.moral.api.service.GroupMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.Constants;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -31,28 +40,42 @@
@Autowired
private GroupMenuMapper groupMenuMapper;
+ @Autowired
+ private GroupMapper groupMapper;
+
+ @Autowired
+ private MenuMapper menuMapper;
+
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
@Transactional
- public void allotMenus(Map<String, Object> parameters, String token) {
+ public void allotMenus(Map<String, Object> parameters) {
Integer groupId = Integer.parseInt(parameters.get("groupId").toString());
List<Integer> menuIds = (ArrayList) parameters.get("menuIds");
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
UpdateWrapper<GroupMenu> deleteWrapper = new UpdateWrapper<>();
- deleteWrapper.set("is_delete", Constants.DELETE)
- .eq("group_id", groupId)
- .eq("channel", Constants.WEB_CHANNEL);
- groupMenuMapper.update(null, deleteWrapper);
- if (menuIds != null && !menuIds.isEmpty()) {
- for (Integer menuId : menuIds) {
+ deleteWrapper.eq("group_id", groupId).eq("channel_key", Constants.WEB_CHANNEL);
+ groupMenuMapper.delete(deleteWrapper);
+ List<String> menus = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(menuIds)) {
+ menuIds.forEach(menuId -> {
+ menus.add(menuMapper.selectById(menuId).getName());
GroupMenu groupMenu = new GroupMenu();
groupMenu.setGroupId(groupId);
groupMenu.setMenuId(menuId);
- groupMenu.setChannel(Constants.WEB_CHANNEL);
+ groupMenu.setChannelKey(Constants.WEB_CHANNEL);
groupMenu.setOrganizationId((Integer) orgInfo.get("id"));
groupMenuMapper.insert(groupMenu);
- }
+ });
}
+
+ //������
+ String groupName = groupMapper.selectById((Integer) parameters.get("groupId")).getGroupName();
+ String content = "���������" + groupName + "������������������" + menus;
+ operationLogUtils.insertLog(content, Constants.UPDATE_OPERATE_TYPE);
}
@Override
@@ -61,9 +84,7 @@
queryWrapper.eq("group_id", groupId).eq("is_delete", Constants.NOT_DELETE);
List<GroupMenu> groupMenus = groupMenuMapper.selectList(queryWrapper);
List<Integer> menuIds = new ArrayList<>();
- for (GroupMenu groupMenu : groupMenus) {
- menuIds.add(groupMenu.getMenuId());
- }
+ groupMenus.forEach(groupMenu -> menuIds.add(groupMenu.getMenuId()));
return menuIds;
}
}
--
Gitblit v1.8.0