From 81bf4b2959277fb03eabf3532312161390062c47 Mon Sep 17 00:00:00 2001 From: panbaolin <13071138970@163.com> Date: Tue, 12 Aug 2025 17:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A7=AF=E6=9C=A8=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-module-system/jeecg-system-biz/pom.xml | 26 ---- .../JimuDragExternalServiceImpl.java | 124 ------------------ .../jimureport/JimuReportTokenService.java | 107 --------------- pom.xml | 54 +------- 4 files changed, 1 insertion(+), 310 deletions(-) delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java delete mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index a68169f..636f293 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -29,32 +29,6 @@ org.jeecgframework weixin4j - - - org.jeecgframework.jimureport - jimureport-spring-boot3-starter-fastjson2 - - - com.github.jsqlparser - jsqlparser - - - - - org.jeecgframework.jimureport - jimureport-nosql-starter - - - - org.jeecgframework.jimureport - jimubi-spring-boot3-starter - - - com.github.jsqlparser - jsqlparser - - - org.jeecgframework.boot diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java deleted file mode 100644 index eb865bb..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.jeecg.config.jimureport; - -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.dto.LogDTO; -import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.base.service.BaseCommonService; -import org.jeecg.modules.drag.service.IOnlDragExternalService; -import org.jeecg.modules.drag.vo.DragDictModel; -import org.jeecg.modules.drag.vo.DragLogDTO; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Description: 字典处理 - * @Author: lsq - * @Date:2023-01-09 - * @Version:V1.0 - */ -@Slf4j -@Service("onlDragExternalServiceImpl") -public class JimuDragExternalServiceImpl implements IOnlDragExternalService { - - @Autowired - @Lazy - private BaseCommonService baseCommonService; - - @Autowired - @Lazy - private ISysBaseAPI sysBaseApi; - /** - * 根据多个字典code查询多个字典项 - * @param codeList - * @return key = dictCode ； value=对应的字典项 - */ - @Override - public Map> getManyDictItems(List codeList, List tableDictList) { - Map> manyDragDictItems = new HashMap<>(); - if(!CollectionUtils.isEmpty(codeList)){ - Map> dictItemsMap = sysBaseApi.getManyDictItems(codeList); - dictItemsMap.forEach((k,v)->{ - List dictItems = new ArrayList<>(); - v.forEach(dictItem->{ - DragDictModel dictModel = new DragDictModel(); - BeanUtils.copyProperties(dictItem,dictModel); - dictItems.add(dictModel); - }); - manyDragDictItems.put(k,dictItems); - }); - } - - if(!CollectionUtils.isEmpty(tableDictList)){ - tableDictList.forEach(item->{ - List dictItems = new ArrayList<>(); - JSONObject object = JSONObject.parseObject(item.toString()); - String dictField = object.getString("dictField"); - String dictTable = object.getString("dictTable"); - String dictText = object.getString("dictText"); - String fieldName = object.getString("fieldName"); - List dictItemsList = sysBaseApi.queryTableDictItemsByCode(dictTable,dictText,dictField); - dictItemsList.forEach(dictItem->{ - DragDictModel dictModel = new DragDictModel(); - BeanUtils.copyProperties(dictItem,dictModel); - dictItems.add(dictModel); - }); - manyDragDictItems.put(fieldName,dictItems); - }); - } - return manyDragDictItems; - } - - /** - * - * @param dictCode - * @return - */ - @Override - public List getDictItems(String dictCode) { - List dictItems = new ArrayList<>(); - if(oConvertUtils.isNotEmpty(dictCode)){ - List dictItemsList = sysBaseApi.getDictItems(dictCode); - dictItemsList.forEach(dictItem->{ - DragDictModel dictModel = new DragDictModel(); - BeanUtils.copyProperties(dictItem,dictModel); - dictItems.add(dictModel); - }); - } - return dictItems; - } - - /** - * 添加日志 - * @param dragLogDTO - */ - @Override - public void addLog(DragLogDTO dragLogDTO) { - if(oConvertUtils.isNotEmpty(dragLogDTO)){ - LogDTO dto = new LogDTO(); - BeanUtils.copyProperties(dragLogDTO,dto); - baseCommonService.addLog(dto); - } - } - - /** - * 保存日志 - * @param logMsg - * @param logType - * @param operateType - */ - @Override - public void addLog(String logMsg, int logType, int operateType) { - baseCommonService.addLog(logMsg,logType,operateType); - } -} \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java deleted file mode 100644 index 3fe54d1..0000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.jeecg.config.jimureport; - -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.system.vo.SysUserCacheInfo; -import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.TokenUtils; -import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; -import org.jeecg.modules.system.service.impl.SysBaseApiImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import jakarta.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制) - * * 1.自定义获取登录token - * * 2.自定义获取登录用户 - * @author: jeecg-boot - */ - - -@Slf4j -@Component -public class JimuReportTokenService implements JmReportTokenServiceI { - @Autowired - private SysBaseApiImpl sysBaseApi; - @Autowired - @Lazy - private RedisUtil redisUtil; - - @Override - public String getToken(HttpServletRequest request) { - return TokenUtils.getTokenByRequest(request); - } - - @Override - public String getUsername(String token) { - return JwtUtil.getUsername(token); - } - - @Override - public String[] getRoles(String token) { - String username = JwtUtil.getUsername(token); - Set roles = sysBaseApi.getUserRoleSet(username); - if(CollectionUtils.isEmpty(roles)){ - return null; - } - return (String[]) roles.toArray(new String[roles.size()]); - } - - @Override - public Boolean verifyToken(String token) { - return TokenUtils.verifyToken(token, sysBaseApi, redisUtil); - } - - @Override - public Map getUserInfo(String token) { - Map map = new HashMap(5); - String username = JwtUtil.getUsername(token); - //此处通过token只能拿到一个信息 用户账号 后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义 - SysUserCacheInfo userInfo = null; - try { - userInfo = sysBaseApi.getCacheUser(username); - } catch (Exception e) { - log.error("获取用户信息异常:"+ e.getMessage()); - return map; - } - //设置账号名 - map.put(SYS_USER_CODE, userInfo.getSysUserCode()); - //设置部门编码 - map.put(SYS_ORG_CODE, userInfo.getSysOrgCode()); - // 将所有信息存放至map 解析sql/api会根据map的键值解析 - return map; - } - - /** - * 将jeecgboot平台的权限传递给积木报表 - * @param token - * @return - */ - @Override - public String[] getPermissions(String token) { - // 获取用户信息 - String username = JwtUtil.getUsername(token); - SysUserCacheInfo userInfo = null; - try { - userInfo = sysBaseApi.getCacheUser(username); - } catch (Exception e) { - log.error("获取用户信息异常:"+ e.getMessage()); - } - if(userInfo == null){ - return null; - } - // 查询权限 - Set userPermissions = sysBaseApi.getUserPermissionSet(userInfo.getSysUserId()); - if(CollectionUtils.isEmpty(userPermissions)){ - return null; - } - return userPermissions.toArray(new String[0]); - } -} diff --git a/pom.xml b/pom.xml index 5a00b5e..985ae60 100644 --- a/pom.xml +++ b/pom.xml @@ -53,9 +53,6 @@ 9.0.0 8.1.1.49 - - - 2.0.0 1.10.11 3.5.12 @@ -424,50 +421,7 @@ - - - org.jeecgframework.jimureport - jimureport-spring-boot3-starter-fastjson2 - ${jimureport-spring-boot-starter.version} - - - com.alibaba - fastjson - - - commons-lang - commons-lang - - - checker-qual - org.checkerframework - - - autopoi-web - org.jeecgframework - - - druid - com.alibaba - - - jsqlparser - com.github.jsqlparser - - - - - org.jeecgframework.jimureport - jimureport-nosql-starter - 1.9.5.2 - - - org.apache.calcite - calcite-elasticsearch - - - - + org.jeecgframework.boot3 minidao-spring-boot-starter-jsqlparser-4.9 @@ -483,12 +437,6 @@ - - - org.jeecgframework.jimureport - jimubi-spring-boot3-starter - 1.9.5 - org.jeecgframework.boot