From 89c6943973621c6dfc23844999245cc35ee477b4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 22 ++++-
screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java | 38 +++++++++
screen-manage/src/main/resources/application-dev.yml | 3
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 1
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 19 ++++
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 16 ++--
screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java | 2
screen-api/src/main/java/com/moral/api/controller/UserController.java | 23 ++++-
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java | 72 ++++++++++--------
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 36 +++++++-
10 files changed, 171 insertions(+), 61 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GroupController.java b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
index d1aa64d..9e9faab 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
@@ -21,10 +21,10 @@
import com.moral.api.entity.Group;
import com.moral.api.service.GroupService;
import com.moral.api.service.UserGroupService;
+import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"���"})
@@ -53,6 +53,10 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
+
+ //������
+ String content = "���������������" + group.getGroupName();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -61,18 +65,22 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
- public ResultMessage deleteGroup(@RequestBody Map<String, Object> parameters) {
- if (!parameters.containsKey("groupId")) {
+ public ResultMessage deleteGroup(@RequestBody Group group, HttpServletRequest request) {
+ if (group.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", parameters.get("groupId"));
- Group group = groupService.getOne(queryWrapper);
+ queryWrapper.eq("id", group.getId());
+ group = groupService.getOne(queryWrapper);
if (group == null) {
return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
}
groupService.deleteGroup(group);
+
+ //������
+ String content = "���������������" + group.getGroupName();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -87,6 +95,10 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
+
+ //������
+ String content = "���������������" + group.getGroupName();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
diff --git a/screen-api/src/main/java/com/moral/api/controller/LoginController.java b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
index dfb403e..7fe1193 100644
--- a/screen-api/src/main/java/com/moral/api/controller/LoginController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -21,7 +21,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysConfig;
+import com.moral.api.entity.UserLog;
import com.moral.api.service.SysConfigService;
+import com.moral.api.service.UserLogService;
import com.moral.api.service.UserService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
@@ -29,6 +31,7 @@
import com.moral.pojo.VerificationCode;
import com.moral.util.KaptchaUtils;
import com.moral.util.TokenUtils;
+import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -41,9 +44,12 @@
@Autowired
private SysConfigService sysConfigService;
+ @Autowired
+ private UserLogService userLogService;
+
@ApiOperation(value = "������", notes = "������")
@RequestMapping(value = "login", method = RequestMethod.POST)
- public ResultMessage login(@RequestBody Map<String, Object> parameters) {
+ public ResultMessage login(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -52,7 +58,16 @@
if (!result.containsKey("data")) {
return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
}
- return ResultMessage.ok(result.get("data"));
+ Map<String, Object> data = (Map<String, Object>) result.get("data");
+ Map<String, Object> userInfo = (Map<String, Object>) data.get("user");
+ UserLog userLog = new UserLog();
+ String ip = WebUtils.getIpAddr(request);
+ userLog.setIp(ip);
+ userLog.setOperateId((Integer) userInfo.get("userId"));
+ userLog.setOrganizationId((Integer) userInfo.get("organizationId"));
+ userLog.setContent(userInfo.get("account") + "���������");
+ userLogService.save(userLog);
+ return ResultMessage.ok(data);
}
@ApiOperation(value = "������", notes = "������")
diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index ceffe70..8f582ab 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.moral.api.service.UserService;
+import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
@@ -49,27 +50,35 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "Integer")
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteUser", method = RequestMethod.POST)
- public ResultMessage deleteUser(@RequestBody Map<String, Object> parameters) {
- if (!parameters.containsKey("uid")) {
+ public ResultMessage deleteUser(@RequestBody User user, HttpServletRequest request) {
+ if (user.getId() == null) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", parameters.get("uid"));
- User user = userService.getOne(queryWrapper);
+ queryWrapper.eq("id", user.getId());
+ user = userService.getOne(queryWrapper);
if (user == null) {
return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(),
ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
}
userService.deleteUser(user);
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
@@ -88,6 +97,10 @@
if (!result.isEmpty()) {
return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
}
+
+ //������
+ String content = "������������������" + user.getAccount();
+ OperationLogUtils.insertLog(request, content);
return ResultMessage.ok();
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index fe6e20a..755f741 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -291,15 +291,15 @@
}
//������������������
String password = user.getPassword();
- if (password != null) {
- //������������
- //password = AESUtils.decrypt(password, AESKey);
- if (!RegexUtils.checkPassword(password)) {
- result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
- result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
- return result;
- }
+
+ //������������
+ //password = AESUtils.decrypt(password, AESKey);
+ if (!RegexUtils.checkPassword(password)) {
+ result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
+ result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
+ return result;
}
+
//���������������������
if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
diff --git a/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
new file mode 100644
index 0000000..c217379
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/utils/OperationLogUtils.java
@@ -0,0 +1,38 @@
+package com.moral.api.utils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.moral.api.entity.UserLog;
+import com.moral.api.service.UserLogService;
+import com.moral.util.TokenUtils;
+import com.moral.util.WebUtils;
+
+@Slf4j
+@Component
+public class OperationLogUtils {
+
+ private static UserLogService userLogService;
+
+ @Autowired
+ public void setUserLogService(UserLogService userLogService) {
+ this.userLogService = userLogService;
+ }
+
+ public static void insertLog(HttpServletRequest request, String content) {
+ String token = request.getHeader("token");
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ UserLog userLog = new UserLog();
+ userLog.setIp(WebUtils.getIpAddr(request));
+ userLog.setOperateId((Integer) currentUserInfo.get("userId"));
+ userLog.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ userLog.setContent(content);
+ userLogService.save(userLog);
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
index b902599..c7b3c65 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java
@@ -14,13 +14,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -46,45 +44,53 @@
@RequestMapping(value = "getAllManageRole", method = RequestMethod.GET)
public ResultMessage getAllManageRole(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- List<ManageRole> re = manageRoleService.getAllWithPagingQuery(parameters);
+ Map<String,Object> re = manageRoleService.getAllWithPagingQuery(parameters);
return ResultMessage.ok(re);
}
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "desc", value = "������", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "desc", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "menuIds", value = "������������", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "insertOneManageRole", method = RequestMethod.POST)
- public ResultMessage insertOneManageRole(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- ManageRole manageRole = JSON.parseObject(JSON.toJSONString(parameters), ManageRole.class);
+ @ResponseBody
+ public ResultMessage insertOneManageRole(@RequestBody Map<String, Object> parameters) {
List list = new ArrayList();
- list.add(1);
- list.add(2);
- list.add(3);
- list.add(4);
+ if (parameters.get("menuIds") != null){
+ String menuIdsStr = parameters.get("menuIds").toString();
+ menuIdsStr = menuIdsStr.replace(" ","");
+ if (menuIdsStr.length() > 2){
+ menuIdsStr = menuIdsStr.substring(1,menuIdsStr.length()-1);
+ String[] menuIdsArray = menuIdsStr.split(",");
+ list = Arrays.asList(menuIdsArray);
+ }
+ parameters.remove("menuIds");
+ }
+ ManageRole manageRole = JSON.parseObject(JSON.toJSONString(parameters), ManageRole.class);
Map<String,Object> resultMap = manageRoleService.insertOne(manageRole,list);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
+ //return null;
}
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "name", value = "������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "desc", value = "������", required = true, paramType = "query", dataType = "String")
})
@RequestMapping(value = "updateManageRole", method = RequestMethod.POST)
- public ResultMessage updateManageRole(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage updateManageRole(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = manageRoleService.updateManageRole(parameters);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
@@ -95,12 +101,11 @@
@ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
})
@RequestMapping(value = "deleteManageRole", method = RequestMethod.POST)
- public ResultMessage deleteManageRole(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage deleteManageRole(@RequestBody Map<String, Object> parameters) {
Map<String,Object> resultMap = manageRoleService.deleteManageRole(parameters);
String msg = resultMap.get("msg").toString();
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
return ResultMessage.ok(msg);
}
return ResultMessage.fail(msg);
@@ -124,16 +129,19 @@
@ApiImplicitParam(name = "id", value = "������", required = true, paramType = "query", dataType = "int")
})
@RequestMapping(value = "updateRoleMenu", method = RequestMethod.POST)
- public ResultMessage updateRoleMenu(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- int id = Integer.parseInt(parameters.get("id").toString());
+ public ResultMessage updateRoleMenu(@RequestBody Map<String, Object> parameters) {
List list = new ArrayList();
- //list.add(1);
- //list.add(2);
- list.add(3);
- list.add(4);
- list.add(5);
- list.add(6);
+ if (parameters.get("menuIds") != null){
+ String menuIdsStr = parameters.get("menuIds").toString();
+ menuIdsStr = menuIdsStr.replace(" ","");
+ if (menuIdsStr.length() > 2){
+ menuIdsStr = menuIdsStr.substring(1,menuIdsStr.length()-1);
+ String[] menuIdsArray = menuIdsStr.split(",");
+ list = Arrays.asList(menuIdsArray);
+ }
+ parameters.remove("menuIds");
+ }
+ int id = Integer.parseInt(parameters.get("id").toString());
Map<String,Object> re = manageRoleMenuService.updateRoleMenu(list,id);
return ResultMessage.ok(re);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
index 8b237d7..f3d6066 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java
@@ -19,7 +19,7 @@
public interface ManageRoleService extends IService<ManageRole> {
@Transactional
- List<ManageRole> getAllWithPagingQuery(Map map);
+ Map<String,Object> getAllWithPagingQuery(Map map);
@Transactional
Map<String,Object> insertOne(ManageRole manageRole,List list);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index 7d18186..75a4dfb 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -111,7 +111,6 @@
limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
limitMap.put("number", Integer.parseInt(map.get("size").toString()));
List<ManageMenu> manageMenus = manageMenuMapper.getDataWithPage(limitMap);
- System.out.println(manageMenus);
return manageMenus;
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 81aef52..a262230 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.ManageAccountRole;
import com.moral.api.entity.ManageMenu;
@@ -18,10 +19,8 @@
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* <p>
@@ -54,13 +53,36 @@
@Override
@Transactional
- public List<ManageRole> getAllWithPagingQuery(Map map) {
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(Integer.parseInt(map.get("current").toString()), Integer.parseInt(map.get("size").toString()));
+ public Map<String,Object> getAllWithPagingQuery(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
+ wrapper.orderByDesc("create_time");
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
- return manageRoles;
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> manageRolesList = new ArrayList<>();
+ for (ManageRole manageRole:manageRoles) {
+ Map manageRoleMap = JSON.parseObject(JSON.toJSONString(manageRole),Map.class);
+ String createTime = SDF.format(manageRole.getCreateTime());
+ String updateTime = SDF.format(manageRole.getUpdateTime());
+ manageRoleMap.put("createTime",createTime);
+ manageRoleMap.put("updateTime",updateTime);
+ manageRolesList.add(manageRoleMap);
+ }
+ resultMap.put("manageRoles",manageRolesList);
+ int totalNumber = manageRoleMapper.selectCount(wrapper);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
}
@Override
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 4dd6901..2c657e4 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -124,7 +124,10 @@
- /role/getAllManageRole
- /role/getManageRoleByNameFuzzy
+ - /role/insertOneManageRole
+ - /role/updateManageRole
- /role/updateRoleMenu
+ - /role/deleteManageRole
- /menu/getAllManageMenu
- /menu/getManageMenuByNameFuzzy
- /api/**
--
Gitblit v1.8.0