Commit 3e3a1156 authored by liqin's avatar liqin 💬

Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

parents d9c3c779 ce42e534
......@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
......@@ -101,21 +102,22 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
String operatingcontent = "";
Object[] method_param = null;
// Object object;
// try {
// method_param = point.getArgs(); //获取方法参数
// // String param=(String) point.proceed(point.getArgs());
// object = point.proceed();
// } catch (Exception e) {
// // 异常处理记录日志..log.error(e);
// throw e;
// }
Object object;
try {
method_param = point.getArgs(); //获取方法参数
// String param=(String) point.proceed(point.getArgs());
object = point.proceed();
} catch (Exception e) {
// 异常处理记录日志..log.error(e);
throw e;
}
if (methodLog.operModule().getMsg().contains("运维")) {
TOperationLog operationLog = new TOperationLog();
operationLog.setCreateTime(LocalDateTime.now());
operationLog.setUserId(user.getId());
operationLog.setOperationType(methodLog.operType().getMsg());
return operationLogService.save(operationLog);
operationLogService.save(operationLog);
return object;
}
SysLog sysLog = new SysLog();
if ("1".equals(user.getId())) {
......@@ -132,7 +134,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
getControllerMethodDescription(methodLog, sysLog);
int insert = sysLogMapper.insert(sysLog);
return insert;
return object;
}
/**
......
......@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* <p>
......@@ -69,8 +70,24 @@ public class Menu extends Model<Menu> {
/**
* 排序
*/
@TableField("sort")
@ApiModelProperty(value = "排序")
private Integer sort;
/**
* 级别
*/
@TableField("level")
@ApiModelProperty(value = "级别")
private Integer level;
/**
* 下级
*/
@TableField(exist = false)
@ApiModelProperty(value = "下级")
private List<Menu> children;
public String getId() {
return id;
......@@ -144,6 +161,22 @@ public class Menu extends Model<Menu> {
this.sort = sort;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
public List<Menu> getChildren() {
return children;
}
public void setChildren(List<Menu> children) {
this.children = children;
}
@Override
protected Serializable pkVal() {
return this.id;
......
......@@ -133,6 +133,11 @@ public class TUser implements Serializable {
@TableField(exist = false)
private String orgName;
@ApiModelProperty("机构编码")
@TableField(exist = false)
private String orgCode;
@ApiModelProperty("角色集合")
@TableField(exist = false)
private List<Role> roleList;
......
......@@ -9,7 +9,9 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
......@@ -28,7 +30,20 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
public List<Menu> getUserMenuPerms(List<Role> list) {
List<String> list1 = new ArrayList<>();
list.stream().forEach(r-> list1.add(r.getId()));
return menuMapper.getUserMenuPerms(list1);
List<Menu> menuList = menuMapper.getUserMenuPerms(list1);
HashMap<String, Menu> map = new HashMap<>();
menuList.forEach(m->map.put(m.getId(),m));
for (Menu menu : menuList) {
Menu parent = map.get(menu.getParentId());
if (parent!=null){
if (parent.getChildren()==null){
parent.setChildren(new ArrayList<>());
}
parent.getChildren().add(menu);
}
}
menuList = menuList.stream().filter(m -> m.getLevel()==1).collect(Collectors.toList());
return menuList;
}
}
......@@ -6,6 +6,7 @@ import cn.wisenergy.chnmuseum.party.common.log.OperType;
import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
import cn.wisenergy.chnmuseum.party.common.util.ImportExcelUtil;
import cn.wisenergy.chnmuseum.party.model.TArea;
import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.service.TAreaService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
......@@ -133,7 +134,13 @@ public class TOrganController extends BaseController {
@ApiOperation(value = "获取机构全部列表(无分页)", notes = "获取机构全部列表(无分页)")
@MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
public Map<String, Object> getTOrganList() {
List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0));
TUser user = null;
try {
user = getcurUser();
} catch (Exception e) {
e.printStackTrace();
}
List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0).likeRight(TOrgan::getCode,user.getOrgCode()).orderByDesc(TOrgan::getCreateTime));
return getResult(tOrganList);
}
......
......@@ -3,10 +3,13 @@ package cn.wisenergy.chnmuseum.party.web.controller.base;
import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
import cn.wisenergy.chnmuseum.party.common.enums.RESULT_INFO_ENUM;
import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -26,9 +29,13 @@ public class BaseController implements Serializable {
private static final long serialVersionUID = 624841049563451448L;
protected static final Logger logger = LoggerFactory.getLogger(BaseController.class);
@Resource
protected HttpServletRequest request;
@Resource
protected TUserServiceImpl userService;
/**
* <p>
* 获取分页对象
......@@ -190,4 +197,15 @@ public class BaseController implements Serializable {
return JwtTokenUtil.getUsername(authorization);
}
/**
* <p>
* 根据token信息获取当前用户
* </p>
*/
protected TUser getcurUser() {
String userName = getUserName();
TUser user = userService.selectByUsername(userName);
return user;
}
}
......@@ -12,11 +12,12 @@
<result column="menu_name" property="menuName" />
<result column="parent_id" property="parentId" />
<result column="is_button" property="isButton" />
<result column="level" property="level" />
</resultMap>
<select id="getUserMenuPerms" resultMap="BaseResultMap">
SELECT distinct
m.id,m.menu_name,m.menu_url,m.parent_id,m.sort,m.is_button
m.id,m.menu_name,m.menu_url,m.parent_id,m.sort,m.is_button,m.level
FROM
ref_role_menu rm
LEFT JOIN menu m ON m.id = rm.menu_id
......@@ -29,7 +30,7 @@
</foreach>
</if>
</where>
ORDER BY m.sort ASC
ORDER BY m.level desc
</select>
</mapper>
......@@ -27,6 +27,7 @@
<result column="password" property="password"/>
<result column="org_name" property="orgName"/>
<result column="area_name" property="areaName"/>
<result column="org_code" property="orgCode"/>
<collection fetchType="eager" property="roleList" ofType="cn.wisenergy.chnmuseum.party.model.Role"
select="selectRoles" column="user_name"/>
</resultMap>
......@@ -51,7 +52,7 @@
</sql>
<select id="selectByUsername" resultMap="BaseResultMap">
select u.*,o.name org_name,a.full_name area_name
select u.*,o.name org_name,a.full_name area_name,o.code org_code
from t_user u
left join t_organ o on o.id = u.org_id
left join t_area a on u.area_id = a.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment