github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

升级仪表盘

pull/6878/head
JEECG 2024-07-03 11:56:53 +08:00
parent 17a8964487
commit 0e4d304878
3 changed files with 186 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
View File

@ -35,9 +35,9 @@
<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId> <artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jeecgframework.boot3</groupId> <groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-drag</artifactId> <artifactId>drag-free-springboot3</artifactId>
<version>2.0.2</version> <version>1.1.2</version>
</dependency> </dependency>
<!-- 积木报表 mongo redis 支持包 <!-- 积木报表 mongo redis 支持包
<dependency> <dependency>

204
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
View File

@ -1,102 +1,102 @@
//package org.jeecg.config.jimureport; package org.jeecg.config.jimureport;
//
//import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
//import org.jeecg.common.api.dto.LogDTO; import org.jeecg.common.api.dto.LogDTO;
//import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.ISysBaseAPI;
//import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModel;
//import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
//import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.service.BaseCommonService;
//import org.jeecg.modules.drag.service.IOnlDragExternalService; import org.jeecg.modules.drag.service.IOnlDragExternalService;
//import org.jeecg.modules.drag.vo.DragDictModel; import org.jeecg.modules.drag.vo.DragDictModel;
//import org.jeecg.modules.drag.vo.DragLogDTO; import org.jeecg.modules.drag.vo.DragLogDTO;
//import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
//import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
//
//import java.util.ArrayList; import java.util.ArrayList;
//import java.util.HashMap; import java.util.HashMap;
//import java.util.List; import java.util.List;
//import java.util.Map; import java.util.Map;
//
///** /**
// * @Description: 字典处理 * @Description: 字典处理
// * @Author: lsq * @Author: lsq
// * @Date:2023-01-09 * @Date:2023-01-09
// * @Version:V1.0 * @Version:V1.0
// */ */
//@Slf4j @Slf4j
//@Service("onlDragExternalServiceImpl") @Service("onlDragExternalServiceImpl")
//public class JimuDragExternalServiceImpl implements IOnlDragExternalService { public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
//
// @Autowired @Autowired
// @Lazy @Lazy
// private BaseCommonService baseCommonService; private BaseCommonService baseCommonService;
//
// @Autowired @Autowired
// @Lazy @Lazy
// private ISysBaseAPI sysBaseApi; private ISysBaseAPI sysBaseApi;
// /** /**
// * 根据多个字典code查询多个字典项 * 根据多个字典code查询多个字典项
// * @param codeList * @param codeList
// * @return key = dictCode ； value=对应的字典项 * @return key = dictCode ； value=对应的字典项
// */ */
// @Override @Override
// public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) { public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
// Map<String, List<DragDictModel>> manyDragDictItems = new HashMap<>(); Map<String, List<DragDictModel>> manyDragDictItems = new HashMap<>();
// Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList); Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
// dictItemsMap.forEach((k,v)->{ dictItemsMap.forEach((k,v)->{
// List<DragDictModel> dictItems = new ArrayList<>(); List<DragDictModel> dictItems = new ArrayList<>();
// v.forEach(dictItem->{ v.forEach(dictItem->{
// DragDictModel dictModel = new DragDictModel(); DragDictModel dictModel = new DragDictModel();
// BeanUtils.copyProperties(dictItem,dictModel); BeanUtils.copyProperties(dictItem,dictModel);
// dictItems.add(dictModel); dictItems.add(dictModel);
// }); });
// manyDragDictItems.put(k,dictItems); manyDragDictItems.put(k,dictItems);
// }); });
// return manyDragDictItems; return manyDragDictItems;
// } }
//
// /** /**
// * *
// * @param dictCode * @param dictCode
// * @return * @return
// */ */
// @Override @Override
// public List<DragDictModel> getDictItems(String dictCode) { public List<DragDictModel> getDictItems(String dictCode) {
// List<DragDictModel> dictItems = new ArrayList<>(); List<DragDictModel> dictItems = new ArrayList<>();
// if(oConvertUtils.isNotEmpty(dictCode)){ if(oConvertUtils.isNotEmpty(dictCode)){
// List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode); List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
// dictItemsList.forEach(dictItem->{ dictItemsList.forEach(dictItem->{
// DragDictModel dictModel = new DragDictModel(); DragDictModel dictModel = new DragDictModel();
// BeanUtils.copyProperties(dictItem,dictModel); BeanUtils.copyProperties(dictItem,dictModel);
// dictItems.add(dictModel); dictItems.add(dictModel);
// }); });
// } }
// return dictItems; return dictItems;
// } }
//
// /** /**
// * 添加日志 * 添加日志
// * @param dragLogDTO * @param dragLogDTO
// */ */
// @Override @Override
// public void addLog(DragLogDTO dragLogDTO) { public void addLog(DragLogDTO dragLogDTO) {
// if(oConvertUtils.isNotEmpty(dragLogDTO)){ if(oConvertUtils.isNotEmpty(dragLogDTO)){
// LogDTO dto = new LogDTO(); LogDTO dto = new LogDTO();
// BeanUtils.copyProperties(dragLogDTO,dto); BeanUtils.copyProperties(dragLogDTO,dto);
// baseCommonService.addLog(dto); baseCommonService.addLog(dto);
// } }
// } }
//
// /** /**
// * 保存日志 * 保存日志
// * @param logMsg * @param logMsg
// * @param logType * @param logType
// * @param operateType * @param operateType
// */ */
// @Override @Override
// public void addLog(String logMsg, int logType, int operateType) { public void addLog(String logMsg, int logType, int operateType) {
// baseCommonService.addLog(logMsg,logType,operateType); baseCommonService.addLog(logMsg,logType,operateType);
// } }
//} }

162
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
View File

@ -1,81 +1,81 @@
//package org.jeecg.config.jimureport; package org.jeecg.config.jimureport;
//
//import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
//import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.JwtUtil;
//import org.jeecg.common.system.vo.SysUserCacheInfo; import org.jeecg.common.system.vo.SysUserCacheInfo;
//import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RedisUtil;
//import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.TokenUtils;
//import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
//import org.jeecg.modules.system.service.impl.SysBaseApiImpl; import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
//import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
//import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
//
//import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
//import java.util.HashMap; import java.util.HashMap;
//import java.util.Map; import java.util.Map;
//import java.util.Set; import java.util.Set;
//
///** /**
// * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制) * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
// * * 1.自定义获取登录token * * 1.自定义获取登录token
// * * 2.自定义获取登录用户 * * 2.自定义获取登录用户
// * @author: jeecg-boot * @author: jeecg-boot
// */ */
//
//
//@Slf4j @Slf4j
//@Component @Component
//public class JimuReportTokenService implements JmReportTokenServiceI { public class JimuReportTokenService implements JmReportTokenServiceI {
// @Autowired @Autowired
// private SysBaseApiImpl sysBaseApi; private SysBaseApiImpl sysBaseApi;
// @Autowired @Autowired
// @Lazy @Lazy
// private RedisUtil redisUtil; private RedisUtil redisUtil;
//
// @Override @Override
// public String getToken(HttpServletRequest request) { public String getToken(HttpServletRequest request) {
// return TokenUtils.getTokenByRequest(request); return TokenUtils.getTokenByRequest(request);
// } }
//
// @Override @Override
// public String getUsername(String token) { public String getUsername(String token) {
// return JwtUtil.getUsername(token); return JwtUtil.getUsername(token);
// } }
//
// @Override @Override
// public String[] getRoles(String token) { public String[] getRoles(String token) {
// String username = JwtUtil.getUsername(token); String username = JwtUtil.getUsername(token);
// Set roles = sysBaseApi.getUserRoleSet(username); Set roles = sysBaseApi.getUserRoleSet(username);
// if(CollectionUtils.isEmpty(roles)){ if(CollectionUtils.isEmpty(roles)){
// return null; return null;
// } }
// return (String[]) roles.toArray(new String[roles.size()]); return (String[]) roles.toArray(new String[roles.size()]);
// } }
//
// @Override @Override
// public Boolean verifyToken(String token) { public Boolean verifyToken(String token) {
// return TokenUtils.verifyToken(token, sysBaseApi, redisUtil); return TokenUtils.verifyToken(token, sysBaseApi, redisUtil);
// } }
//
// @Override @Override
// public Map<String, Object> getUserInfo(String token) { public Map<String, Object> getUserInfo(String token) {
// Map<String, Object> map = new HashMap(5); Map<String, Object> map = new HashMap(5);
// String username = JwtUtil.getUsername(token); String username = JwtUtil.getUsername(token);
// //此处通过token只能拿到一个信息 用户账号 后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义 //此处通过token只能拿到一个信息 用户账号 后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义
// SysUserCacheInfo userInfo = null; SysUserCacheInfo userInfo = null;
// try { try {
// userInfo = sysBaseApi.getCacheUser(username); userInfo = sysBaseApi.getCacheUser(username);
// } catch (Exception e) { } catch (Exception e) {
// log.error("获取用户信息异常:"+ e.getMessage()); log.error("获取用户信息异常:"+ e.getMessage());
// return map; return map;
// } }
// //设置账号名 //设置账号名
// map.put(SYS_USER_CODE, userInfo.getSysUserCode()); map.put(SYS_USER_CODE, userInfo.getSysUserCode());
// //设置部门编码 //设置部门编码
// map.put(SYS_ORG_CODE, userInfo.getSysOrgCode()); map.put(SYS_ORG_CODE, userInfo.getSysOrgCode());
// // 将所有信息存放至map 解析sql/api会根据map的键值解析 // 将所有信息存放至map 解析sql/api会根据map的键值解析
// return map; return map;
// } }
//} }