~admin/moral.git

			@@ -2,14 +2,8 @@

			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.moral.api.entity.ManageAccount;
			import com.moral.api.entity.ManageAccountRole;
			import com.moral.api.entity.ManageLog;
			import com.moral.api.entity.ManageRole;
			import com.moral.api.mapper.ManageAccountRoleMapper;
			import com.moral.api.mapper.ManageLogMapper;
			import com.moral.api.mapper.ManageRoleMapper;
			import com.moral.api.mapper.ManageRoleMenuMapper;
			import com.moral.api.entity.*;
			import com.moral.api.mapper.*;
			import com.moral.api.pojo.dto.login.AccountInfoDTO;
			import com.moral.api.service.ManageRoleService;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			@@ -51,6 +45,9 @@

			@Autowired(required = false)
			private ManageRoleMapper manageRoleMapper;

			@Autowired(required = false)
			private ManageMenuMapper manageMenuMapper;

			@Autowired(required = false)
			private ManageRoleMenuMapper manageRoleMenuMapper;
			@@ -105,28 +102,35 @@
			return resultMap;
			}
			if (manageRoleMapper.getManageRoleByName(manageRole.getName()) != null){
			resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXPIRE.getCode());
			resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXPIRE.getMsg());
			resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXIST.getCode());
			resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXIST.getMsg());
			return resultMap;
			}
			manageRoleMapper.insertOne(manageRole);
			ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
			int role_id = manageRoleIns.getId();
			List insertList = new ArrayList();
			for (Object temp: list) {
			Map<String,Integer> insertMap = new HashMap<>();
			insertMap.put("role_id",role_id);
			insertMap.put("menu_id",Integer.parseInt(temp.toString()));
			insertList.add(insertMap);
			}
			//判断在新建角色时，是否添加菜单
			if (insertList.size()>0){
			if (list.size()>0){
			//补充父菜单
			List supplementList = new ArrayList();
			supplementList.addAll(list);
			for (int i=0;i<supplementList.size();i++) {
			supplementList.addAll(supplementParentMenus(Integer.parseInt(supplementList.get(i).toString())));
			}
			LinkedHashSet<Object> hashSet = new LinkedHashSet<>(supplementList);
			ArrayList<Object> menuList = new ArrayList<>(hashSet);
			List insertList = new ArrayList();
			for (Object temp: menuList) {
			Map<String,Integer> insertMap = new HashMap<>();
			insertMap.put("role_id",role_id);
			insertMap.put("menu_id",Integer.parseInt(temp.toString()));
			insertList.add(insertMap);
			}
			manageRoleMenuMapper.insertBatch(insertList);
			}
			//操作插入日志
			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
			String content = "添加角色:"+manageRole.getName()+";";
			logUtils.saveOperationForManage(request,content,"1");
			logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
			resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			return resultMap;
			@@ -145,7 +149,21 @@
			resultMap.put("code",ResponseCodeEnum.ROLE_IS_NULL.getCode());
			resultMap.put("msg",ResponseCodeEnum.ROLE_IS_NULL.getMsg());
			}else {
			//在更新之前获取原来信息
			ManageRole manageRoleOld = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
			manageRoleMapper.updateManageRoleById(map);
			//操作插入日志
			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
			String content = "修改了角色:"+manageRoleOld.getName()+";";
			for (Object key:map.keySet()) {
			if (key.toString().equals("name")){
			content = content+"角色名:"+manageRoleOld.getName()+"->"+map.get(key)+";";
			}
			if (key.toString().equals("desc")){
			content = content+"备注:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
			}
			}
			logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
			resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			}
			@@ -203,21 +221,37 @@
			Map deleteMap = new HashMap();
			deleteMap.put("id",Integer.parseInt(map.get("id").toString()));
			deleteMap.put("is_delete",1);
			//manageRoleMapper.updateManageRoleById(deleteMap);
			manageRoleMapper.updateManageRoleById(deleteMap);
			ManageAccountRole manageAccountRole = new ManageAccountRole();
			manageAccountRole.setIsDelete("1");
			QueryWrapper<ManageAccountRole> wrapper = new QueryWrapper();
			wrapper.eq("role_id",Integer.parseInt(map.get("id").toString()));
			//manageAccountRoleMapper.update(manageAccountRole,wrapper);
			manageAccountRoleMapper.update(manageAccountRole,wrapper);
			//操作插入日志
			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
			ManageRole manageRole1 = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
			System.out.println(manageRole1);
			String content = "删除角色:"+manageRole.getName()+";";
			//logUtils.saveOperationForManage(request,content,"1");
			String content = "删除角色:"+manageRole1.getName()+";";
			logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
			resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			}
			return resultMap;
			}

			/**
			* @Description: 补充父菜单
			* @Param: [list, menuId]list：menuId集合
			* @return: void
			* @Author: 李子杰
			* @Date: 2021/4/28
			*/
			private List supplementParentMenus(int menuId) {
			List list = new ArrayList();
			ManageMenu manageMenu = manageMenuMapper.getManageMenuById(menuId);
			if (manageMenu.getParentId()!=0){
			list.add(manageMenu.getParentId());
			list.addAll(supplementParentMenus(manageMenu.getParentId()));
			}
			return list;
			}
			}