diff --git a/nursing-unit-common/pom.xml b/nursing-unit-common/pom.xml index 995b5fc..d9cc368 100644 --- a/nursing-unit-common/pom.xml +++ b/nursing-unit-common/pom.xml @@ -17,6 +17,11 @@ nursing-unit-base-core 2.0.0 + + com.nursingunit.boot + nu-system-local-api + 2.0.0 + diff --git a/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java b/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java index ec3ff75..0ae0eff 100644 --- a/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java +++ b/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java @@ -32,43 +32,6 @@ public class RabbitMQConfig { return new DirectExchange("hldy.fwzl"); } - // 队列 - @Bean - public Queue nu001FwzlAsyncQueue() { - return new Queue("nu001.fwzl.async", true); - } - @Bean - public Queue nu001FwzlStatusQueue() { - return new Queue("nu001.fwzl.status", true); - } - @Bean - public Queue nu002FwzlAsyncQueue() { - return new Queue("nu002.fwzl.async", true); - } - @Bean - public Queue nu002FwzlStatusQueue() { - return new Queue("nu002.fwzl.status", true); - } - - @Bean - public Binding binding1(Queue nu001FwzlAsyncQueue, DirectExchange fwzlExchange) { - return BindingBuilder.bind(nu001FwzlAsyncQueue).to(fwzlExchange).with("nu001.fwzl.async"); - } - @Bean - public Binding binding2(Queue nu001FwzlStatusQueue, DirectExchange fwzlExchange) { - return BindingBuilder.bind(nu001FwzlStatusQueue).to(fwzlExchange).with("nu001.fwzl.status"); - } - @Bean - public Binding binding3(Queue nu002FwzlAsyncQueue, DirectExchange fwzlExchange) { - return BindingBuilder.bind(nu002FwzlAsyncQueue).to(fwzlExchange).with("nu002.fwzl.async"); - } - @Bean - public Binding binding4(Queue nu002FwzlStatusQueue, DirectExchange fwzlExchange) { - return BindingBuilder.bind(nu002FwzlStatusQueue).to(fwzlExchange).with("nu002.fwzl.status"); - } - - - //注册 @Bean public DirectExchange registerExchange() { diff --git a/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java index ecc5a82..c0fe6cd 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java @@ -16,4 +16,6 @@ public class StatusMQDto { private String dictId; private String orgCode; + private String orgName; } + diff --git a/nursing-unit-common/src/main/java/com/nu/modules/async/controller/AsyncMainController.java b/nursing-unit-common/src/main/java/com/nu/modules/async/controller/AsyncMainController.java index 6fe43b4..687a5a7 100644 --- a/nursing-unit-common/src/main/java/com/nu/modules/async/controller/AsyncMainController.java +++ b/nursing-unit-common/src/main/java/com/nu/modules/async/controller/AsyncMainController.java @@ -2,6 +2,7 @@ package com.nu.modules.async.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; @@ -35,6 +37,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; @RequestMapping("/asyncmain/asyncMain") @Slf4j public class AsyncMainController extends JeecgController { + @Autowired private IAsyncMainService asyncMainService; @@ -60,7 +63,7 @@ public class AsyncMainController extends JeecgController pageList = asyncMainService.page(page, queryWrapper); List records = pageList.getRecords(); if (records != null && !records.isEmpty()) { - records = asyncMainService.pageList(records); + records = asyncMainService.pageList(records,asyncMain); pageList.setRecords(records); } return Result.OK(pageList); @@ -168,4 +171,8 @@ public class AsyncMainController extends JeecgController>> listByType(@RequestBody AsyncMain am){ + return Result.OK(asyncMainService.listByType(am)); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/modules/async/entity/AsyncMain.java b/nursing-unit-common/src/main/java/com/nu/modules/async/entity/AsyncMain.java index 3346ae4..35e1ffb 100644 --- a/nursing-unit-common/src/main/java/com/nu/modules/async/entity/AsyncMain.java +++ b/nursing-unit-common/src/main/java/com/nu/modules/async/entity/AsyncMain.java @@ -43,6 +43,10 @@ public class AsyncMain implements Serializable { @Excel(name = "机构编码", width = 15) @ApiModelProperty(value = "机构编码") private java.lang.String orgCode; + /**机构名称*/ + @Excel(name = "机构名称", width = 15) + @ApiModelProperty(value = "机构名称") + private java.lang.String orgName; /**类型（同步的是什么类型的数据）*/ @Excel(name = "类型（同步的是什么类型的数据）", width = 15) @ApiModelProperty(value = "类型（同步的是什么类型的数据）") @@ -67,4 +71,6 @@ public class AsyncMain implements Serializable { @TableField(exist = false) private List asyncStatusList; + @TableField(exist = false) + private List ids; } diff --git a/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/AsyncMainMapper.java b/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/AsyncMainMapper.java index 7ea455e..5c44b4b 100644 --- a/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/AsyncMainMapper.java +++ b/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/AsyncMainMapper.java @@ -14,5 +14,5 @@ import java.util.List; */ public interface AsyncMainMapper extends BaseMapper { - List pageList(@Param("pojo") List records); + List pageList(@Param("records") List records,@Param("dto") AsyncMain dto); } diff --git a/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/xml/AsyncMainMapper.xml b/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/xml/AsyncMainMapper.xml index 1e80625..48717db 100644 --- a/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/xml/AsyncMainMapper.xml +++ b/nursing-unit-common/src/main/java/com/nu/modules/async/mapper/xml/AsyncMainMapper.xml @@ -6,6 +6,7 @@ + @@ -25,6 +26,7 @@ f.id as id, f.primary_key as primaryKey, f.org_code as orgCode, + f.org_name as orgName, f.type as type, f.descr as descr, f.create_by as createBy, @@ -38,10 +40,16 @@ from nu_async_main f left join nu_async_status z on f.id = z.pkid - f.id in - - #{am.id} - + + f.id in + + #{am.id} + + + + and f.primary_key = #{dto.primaryKey} + and f.status = '500' + order by f.create_time desc,z.update_time desc diff --git a/nursing-unit-common/src/main/java/com/nu/modules/async/service/IAsyncMainService.java b/nursing-unit-common/src/main/java/com/nu/modules/async/service/IAsyncMainService.java index d75fa1d..9ae6fda 100644 --- a/nursing-unit-common/src/main/java/com/nu/modules/async/service/IAsyncMainService.java +++ b/nursing-unit-common/src/main/java/com/nu/modules/async/service/IAsyncMainService.java @@ -4,6 +4,7 @@ import com.nu.modules.async.entity.AsyncMain; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 数据同步主表 @@ -13,5 +14,7 @@ import java.util.List; */ public interface IAsyncMainService extends IService { - List pageList(List records); + List pageList(List records, AsyncMain dto); + + Map> listByType(AsyncMain am); } diff --git a/nursing-unit-common/src/main/java/com/nu/modules/async/service/impl/AsyncMainServiceImpl.java b/nursing-unit-common/src/main/java/com/nu/modules/async/service/impl/AsyncMainServiceImpl.java index 1dd4be6..a3773ba 100644 --- a/nursing-unit-common/src/main/java/com/nu/modules/async/service/impl/AsyncMainServiceImpl.java +++ b/nursing-unit-common/src/main/java/com/nu/modules/async/service/impl/AsyncMainServiceImpl.java @@ -1,25 +1,73 @@ package com.nu.modules.async.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.common.collect.Maps; +import com.nu.enums.MQStatus; import com.nu.modules.async.entity.AsyncMain; import com.nu.modules.async.mapper.AsyncMainMapper; import com.nu.modules.async.service.IAsyncMainService; +import org.apache.commons.compress.utils.Lists; +import org.jeecg.common.system.api.ISysBaseAPI; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; +import java.util.Map; /** * @Description: 数据同步主表 * @Author: 张明远 - * @Date: 2025-04-23 + * @Date: 2025-04-23 * @Version: V1.0 */ @Service public class AsyncMainServiceImpl extends ServiceImpl implements IAsyncMainService { + @Autowired + private ISysBaseAPI sysBaseAPI; + @Override - public List pageList(List records) { - return baseMapper.pageList(records); + public List pageList(List records, AsyncMain dto) { + return baseMapper.pageList(records, dto); + } + + @Override + public Map> listByType(AsyncMain am) { + Map> result = Maps.newHashMap(); + List errorList = Lists.newArrayList(); + List processingList = Lists.newArrayList(); + List successList = Lists.newArrayList(); + + List depts = sysBaseAPI.queryOpeDept(); + + QueryWrapper asyncMainQueryWrapper = new QueryWrapper<>(); + asyncMainQueryWrapper.eq("primary_key", am.getPrimaryKey()); + asyncMainQueryWrapper.orderByAsc("org_code"); + List asyncMains = baseMapper.selectList(asyncMainQueryWrapper); + if (asyncMains != null && !asyncMains.isEmpty()) { + asyncMains.stream().forEach(a -> { + if ((MQStatus.SUCCESS.getCode() + "").equals(a.getStatus())) { + successList.add(a); + } else { + errorList.add(a); + } + depts.removeIf(dept -> a.getOrgCode().equals(dept.getString("code"))); + }); + } + depts.forEach(dept -> { + AsyncMain asyncMain = new AsyncMain(); + asyncMain.setOrgCode(dept.getString("code")); + asyncMain.setOrgName(dept.getString("name")); + asyncMain.setDescr("同步中/待同步"); + processingList.add(asyncMain); + }); + + result.put("errorList", errorList); + result.put("processingList", processingList); + result.put("successList", successList); + return result; } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index e19bdc3..d733b50 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -67,7 +67,7 @@ public class ConfigServiceDirectiveController extends JeecgController> queryPageList(String dataSourceCode,ConfigServiceDirective configServiceDirective, + public Result> queryPageList(String dataSourceCode, ConfigServiceDirective configServiceDirective, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @@ -113,8 +113,9 @@ public class ConfigServiceDirectiveController extends JeecgController async(@RequestBody DirectiveMQDto dto) { - List dicts = sysBaseAPI.getDictItems("mq_org_queue"); - String queue = dicts.stream().filter(d -> d.getValue().equals(dto.getOrgCode())).findFirst().map(DictModel::getText).orElse(null); +// List dicts = sysBaseAPI.getDictItems("mq_org_queue"); +// String queue = dicts.stream().filter(d -> d.getValue().equals(dto.getOrgCode())).findFirst().map(DictModel::getText).orElse(null); + String queue = dto.getOrgCode() + ".fwzl.async"; if (StringUtils.isNotBlank(queue)) { //先在数据同步表中插入数据 AsyncMain asyncMain = new AsyncMain(); @@ -167,5 +168,4 @@ public class ConfigServiceDirectiveController extends JeecgController qw = new LambdaQueryWrapper<>(); qw.eq(AsyncStatus::getPkid, dto.getAsyncId()); diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 092e4e5..94e3406 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -544,4 +544,9 @@ public interface ISysBaseAPI extends CommonAPI { */ boolean dictTableWhiteListCheckByDict(String tableOrDictCode, String... fields); + /** + * 查询各业务机构 编码、名称 + * + */ + List queryOpeDept(); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index ec33261..ca799fd 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.service.impl; +import cn.hutool.core.collection.ListUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -10,6 +11,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Joiner; +import com.google.common.collect.Maps; +import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang3.ArrayUtils; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.modules.message.entity.SysMessageTemplate; import org.jeecg.modules.message.handle.impl.DdSendMsgHandle; @@ -83,194 +87,196 @@ import java.util.stream.Collectors; @Slf4j @Service public class SysBaseApiImpl implements ISysBaseAPI { - /** 当前系统数据库类型 */ - private static String DB_TYPE = ""; + /** + * 当前系统数据库类型 + */ + private static String DB_TYPE = ""; - @Autowired - private ISysMessageTemplateService sysMessageTemplateService; - @Resource - private SysUserMapper userMapper; - @Resource - private SysUserRoleMapper sysUserRoleMapper; - @Autowired - private ISysDepartService sysDepartService; - @Autowired - private ISysDictService sysDictService; - @Resource - private SysAnnouncementMapper sysAnnouncementMapper; - @Resource - private SysAnnouncementSendMapper sysAnnouncementSendMapper; - @Resource + @Autowired + private ISysMessageTemplateService sysMessageTemplateService; + @Resource + private SysUserMapper userMapper; + @Resource + private SysUserRoleMapper sysUserRoleMapper; + @Autowired + private ISysDepartService sysDepartService; + @Autowired + private ISysDictService sysDictService; + @Resource + private SysAnnouncementMapper sysAnnouncementMapper; + @Resource + private SysAnnouncementSendMapper sysAnnouncementSendMapper; + @Resource private WebSocket webSocket; - @Resource - private SysRoleMapper roleMapper; - @Resource - private SysDepartMapper departMapper; - @Resource - private SysCategoryMapper categoryMapper; - @Autowired - private ISysDataSourceService dataSourceService; - @Autowired - private ISysUserDepartService sysUserDepartService; - @Resource - private SysPermissionMapper sysPermissionMapper; - @Autowired - private ISysPermissionDataRuleService sysPermissionDataRuleService; - @Autowired - private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService; - @Autowired - private ThirdAppDingtalkServiceImpl dingtalkService; - @Autowired - ISysCategoryService sysCategoryService; - @Autowired - private ISysUserService sysUserService; - @Autowired - private ISysDataLogService sysDataLogService; - @Autowired - private ISysRoleService sysRoleService; - @Autowired - private ISysUserTenantService sysUserTenantService; + @Resource + private SysRoleMapper roleMapper; + @Resource + private SysDepartMapper departMapper; + @Resource + private SysCategoryMapper categoryMapper; + @Autowired + private ISysDataSourceService dataSourceService; + @Autowired + private ISysUserDepartService sysUserDepartService; + @Resource + private SysPermissionMapper sysPermissionMapper; + @Autowired + private ISysPermissionDataRuleService sysPermissionDataRuleService; + @Autowired + private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService; + @Autowired + private ThirdAppDingtalkServiceImpl dingtalkService; + @Autowired + ISysCategoryService sysCategoryService; + @Autowired + private ISysUserService sysUserService; + @Autowired + private ISysDataLogService sysDataLogService; + @Autowired + private ISysRoleService sysRoleService; + @Autowired + private ISysUserTenantService sysUserTenantService; - @Autowired - private ISysUserRoleService sysUserRoleService; + @Autowired + private ISysUserRoleService sysUserRoleService; - @Autowired - private ISysUserPositionService sysUserPositionService; + @Autowired + private ISysUserPositionService sysUserPositionService; - @Autowired - private IDictTableWhiteListHandler dictTableWhiteListHandler; + @Autowired + private IDictTableWhiteListHandler dictTableWhiteListHandler; - @Override - //@SensitiveDecode - public LoginUser getUserByName(String username) { - //update-begin-author:taoyan date:2022-6-6 for: VUEN-1276 【v3流程图】测试bug 1、通过我发起的流程或者流程实例，查看历史，流程图预览问题 - if (oConvertUtils.isEmpty(username)) { - return null; - } - //update-end-author:taoyan date:2022-6-6 for: VUEN-1276 【v3流程图】测试bug 1、通过我发起的流程或者流程实例，查看历史，流程图预览问题 - LoginUser user = sysUserService.getEncodeUserInfo(username); + @Override + //@SensitiveDecode + public LoginUser getUserByName(String username) { + //update-begin-author:taoyan date:2022-6-6 for: VUEN-1276 【v3流程图】测试bug 1、通过我发起的流程或者流程实例，查看历史，流程图预览问题 + if (oConvertUtils.isEmpty(username)) { + return null; + } + //update-end-author:taoyan date:2022-6-6 for: VUEN-1276 【v3流程图】测试bug 1、通过我发起的流程或者流程实例，查看历史，流程图预览问题 + LoginUser user = sysUserService.getEncodeUserInfo(username); - //相同类中方法间调用时脱敏解密 Aop会失效，获取用户信息太重要，此处采用原生解密方法，不采用@SensitiveDecodeAble注解方式 - try { - SensitiveInfoUtil.handlerObject(user, false); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } + //相同类中方法间调用时脱敏解密 Aop会失效，获取用户信息太重要，此处采用原生解密方法，不采用@SensitiveDecodeAble注解方式 + try { + SensitiveInfoUtil.handlerObject(user, false); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } - return user; - } + return user; + } - @Override - @Cacheable(cacheNames=CommonConstant.SYS_USER_ID_MAPPING_CACHE, key="#username") - public String getUserIdByName(String username) { - if (oConvertUtils.isEmpty(username)) { - return null; - } - String userId = userMapper.getUserIdByName(username); - return userId; - } + @Override + @Cacheable(cacheNames = CommonConstant.SYS_USER_ID_MAPPING_CACHE, key = "#username") + public String getUserIdByName(String username) { + if (oConvertUtils.isEmpty(username)) { + return null; + } + String userId = userMapper.getUserIdByName(username); + return userId; + } - @Override - public String translateDictFromTable(String table, String text, String code, String key) { - return sysDictService.queryTableDictTextByKey(table, text, code, key); - } + @Override + public String translateDictFromTable(String table, String text, String code, String key) { + return sysDictService.queryTableDictTextByKey(table, text, code, key); + } - @Override - public String translateDict(String code, String key) { - return sysDictService.queryDictTextByKey(code, key); - } + @Override + public String translateDict(String code, String key) { + return sysDictService.queryDictTextByKey(code, key); + } - @Override - public List queryPermissionDataRule(String component, String requestPath, String username) { - List currentSyspermission = null; - if(oConvertUtils.isNotEmpty(component)) { - //1.通过注解属性pageComponent 获取菜单 - LambdaQueryWrapper query = new LambdaQueryWrapper(); - query.eq(SysPermission::getDelFlag,0); - query.eq(SysPermission::getComponent, component); - currentSyspermission = sysPermissionMapper.selectList(query); - }else { - //1.直接通过前端请求地址查询菜单 - LambdaQueryWrapper query = new LambdaQueryWrapper(); - query.eq(SysPermission::getMenuType,2); - query.eq(SysPermission::getDelFlag,0); + @Override + public List queryPermissionDataRule(String component, String requestPath, String username) { + List currentSyspermission = null; + if (oConvertUtils.isNotEmpty(component)) { + //1.通过注解属性pageComponent 获取菜单 + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(SysPermission::getDelFlag, 0); + query.eq(SysPermission::getComponent, component); + currentSyspermission = sysPermissionMapper.selectList(query); + } else { + //1.直接通过前端请求地址查询菜单 + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(SysPermission::getMenuType, 2); + query.eq(SysPermission::getDelFlag, 0); - //update-begin-author:taoyan date:2023-2-21 for: 解决参数顺序问题 - List allPossiblePaths = this.getOnlinePossiblePaths(requestPath); - log.info("获取的菜单地址= {}", allPossiblePaths.toString()); - if(allPossiblePaths.size()==1){ - query.eq(SysPermission::getUrl, requestPath); - }else{ - query.in(SysPermission::getUrl, allPossiblePaths); - } - //update-end-author:taoyan date:2023-2-21 for: 解决参数顺序问题 + //update-begin-author:taoyan date:2023-2-21 for: 解决参数顺序问题 + List allPossiblePaths = this.getOnlinePossiblePaths(requestPath); + log.info("获取的菜单地址= {}", allPossiblePaths.toString()); + if (allPossiblePaths.size() == 1) { + query.eq(SysPermission::getUrl, requestPath); + } else { + query.in(SysPermission::getUrl, allPossiblePaths); + } + //update-end-author:taoyan date:2023-2-21 for: 解决参数顺序问题 - currentSyspermission = sysPermissionMapper.selectList(query); - //2.未找到 再通过自定义匹配URL 获取菜单 - if(currentSyspermission==null || currentSyspermission.size()==0) { - //通过自定义URL匹配规则 获取菜单（实现通过菜单配置数据权限规则，实际上针对获取数据接口进行数据规则控制） - String userMatchUrl = UrlMatchEnum.getMatchResultByUrl(requestPath); - LambdaQueryWrapper queryQserMatch = new LambdaQueryWrapper(); - // update-begin-author:taoyan date:20211027 for: online菜单如果配置成一级菜单 权限查询不到 取消menuType = 1 - //queryQserMatch.eq(SysPermission::getMenuType, 1); - // update-end-author:taoyan date:20211027 for: online菜单如果配置成一级菜单 权限查询不到 取消menuType = 1 - queryQserMatch.eq(SysPermission::getDelFlag, 0); - queryQserMatch.eq(SysPermission::getUrl, userMatchUrl); - if(oConvertUtils.isNotEmpty(userMatchUrl)){ - currentSyspermission = sysPermissionMapper.selectList(queryQserMatch); - } - } - //3.未找到 再通过正则匹配获取菜单 - if(currentSyspermission==null || currentSyspermission.size()==0) { - //通过正则匹配权限配置 - String regUrl = getRegexpUrl(requestPath); - if(regUrl!=null) { - currentSyspermission = sysPermissionMapper.selectList(new LambdaQueryWrapper().eq(SysPermission::getMenuType,2).eq(SysPermission::getUrl, regUrl).eq(SysPermission::getDelFlag,0)); - } - } - } - if(currentSyspermission!=null && currentSyspermission.size()>0){ - List dataRules = new ArrayList(); - for (SysPermission sysPermission : currentSyspermission) { - // update-begin--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722 - List temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId()); - if(temp!=null && temp.size()>0) { - //dataRules.addAll(temp); - dataRules = oConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class); - } - // update-end--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722 - } - return dataRules; - } - return null; - } + currentSyspermission = sysPermissionMapper.selectList(query); + //2.未找到 再通过自定义匹配URL 获取菜单 + if (currentSyspermission == null || currentSyspermission.size() == 0) { + //通过自定义URL匹配规则 获取菜单（实现通过菜单配置数据权限规则，实际上针对获取数据接口进行数据规则控制） + String userMatchUrl = UrlMatchEnum.getMatchResultByUrl(requestPath); + LambdaQueryWrapper queryQserMatch = new LambdaQueryWrapper(); + // update-begin-author:taoyan date:20211027 for: online菜单如果配置成一级菜单 权限查询不到 取消menuType = 1 + //queryQserMatch.eq(SysPermission::getMenuType, 1); + // update-end-author:taoyan date:20211027 for: online菜单如果配置成一级菜单 权限查询不到 取消menuType = 1 + queryQserMatch.eq(SysPermission::getDelFlag, 0); + queryQserMatch.eq(SysPermission::getUrl, userMatchUrl); + if (oConvertUtils.isNotEmpty(userMatchUrl)) { + currentSyspermission = sysPermissionMapper.selectList(queryQserMatch); + } + } + //3.未找到 再通过正则匹配获取菜单 + if (currentSyspermission == null || currentSyspermission.size() == 0) { + //通过正则匹配权限配置 + String regUrl = getRegexpUrl(requestPath); + if (regUrl != null) { + currentSyspermission = sysPermissionMapper.selectList(new LambdaQueryWrapper().eq(SysPermission::getMenuType, 2).eq(SysPermission::getUrl, regUrl).eq(SysPermission::getDelFlag, 0)); + } + } + } + if (currentSyspermission != null && currentSyspermission.size() > 0) { + List dataRules = new ArrayList(); + for (SysPermission sysPermission : currentSyspermission) { + // update-begin--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722 + List temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId()); + if (temp != null && temp.size() > 0) { + //dataRules.addAll(temp); + dataRules = oConvertUtils.entityListToModelList(temp, SysPermissionDataRuleModel.class); + } + // update-end--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722 + } + return dataRules; + } + return null; + } - /** - * 匹配前端传过来的地址 匹配成功返回正则地址 - * AntPathMatcher匹配地址 - *()* 匹配0个或多个字符 - *()**匹配0个或多个目录 - */ - private String getRegexpUrl(String url) { - List list = sysPermissionMapper.queryPermissionUrlWithStar(); - if(list!=null && list.size()>0) { - for (String p : list) { - PathMatcher matcher = new AntPathMatcher(); - if(matcher.match(p, url)) { - return p; - } - } - } - return null; - } + /** + * 匹配前端传过来的地址 匹配成功返回正则地址 + * AntPathMatcher匹配地址 + * ()* 匹配0个或多个字符 + * ()**匹配0个或多个目录 + */ + private String getRegexpUrl(String url) { + List list = sysPermissionMapper.queryPermissionUrlWithStar(); + if (list != null && list.size() > 0) { + for (String p : list) { + PathMatcher matcher = new AntPathMatcher(); + if (matcher.match(p, url)) { + return p; + } + } + } + return null; + } - @Override - public SysUserCacheInfo getCacheUser(String username) { - SysUserCacheInfo info = new SysUserCacheInfo(); - info.setOneDepart(true); - LoginUser user = this.getUserByName(username); + @Override + public SysUserCacheInfo getCacheUser(String username) { + SysUserCacheInfo info = new SysUserCacheInfo(); + info.setOneDepart(true); + LoginUser user = this.getUserByName(username); // try { // //相同类中方法间调用时脱敏@SensitiveDecodeAble解密 Aop失效处理 @@ -279,508 +285,509 @@ public class SysBaseApiImpl implements ISysBaseAPI { // e.printStackTrace(); // } - if(user!=null) { - info.setSysUserId(user.getId()); - info.setSysUserCode(user.getUsername()); - info.setSysUserName(user.getRealname()); - info.setSysOrgCode(user.getOrgCode()); - info.setSysOrgId(user.getOrgId()); - info.setSysRoleCode(user.getRoleCode()); - }else{ - return null; - } - //多部门支持in查询 - List list = departMapper.queryUserDeparts(user.getId()); - List sysMultiOrgCode = new ArrayList(); - if(list==null || list.size()==0) { - //当前用户无部门 - //sysMultiOrgCode.add("0"); - }else if(list.size()==1) { - sysMultiOrgCode.add(list.get(0).getOrgCode()); - }else { - info.setOneDepart(false); - for (SysDepart dpt : list) { - sysMultiOrgCode.add(dpt.getOrgCode()); - } - } - info.setSysMultiOrgCode(sysMultiOrgCode); - return info; - } + if (user != null) { + info.setSysUserId(user.getId()); + info.setSysUserCode(user.getUsername()); + info.setSysUserName(user.getRealname()); + info.setSysOrgCode(user.getOrgCode()); + info.setSysOrgId(user.getOrgId()); + info.setSysRoleCode(user.getRoleCode()); + } else { + return null; + } + //多部门支持in查询 + List list = departMapper.queryUserDeparts(user.getId()); + List sysMultiOrgCode = new ArrayList(); + if (list == null || list.size() == 0) { + //当前用户无部门 + //sysMultiOrgCode.add("0"); + } else if (list.size() == 1) { + sysMultiOrgCode.add(list.get(0).getOrgCode()); + } else { + info.setOneDepart(false); + for (SysDepart dpt : list) { + sysMultiOrgCode.add(dpt.getOrgCode()); + } + } + info.setSysMultiOrgCode(sysMultiOrgCode); + return info; + } - @Override - public LoginUser getUserById(String id) { - if(oConvertUtils.isEmpty(id)) { - return null; - } - LoginUser loginUser = new LoginUser(); - SysUser sysUser = userMapper.selectById(id); - if(sysUser==null) { - return null; - } - BeanUtils.copyProperties(sysUser, loginUser); - //去掉用户敏感信息 - loginUser.setPassword(null); - loginUser.setRelTenantIds(null); - loginUser.setDepartIds(null); - return loginUser; - } + @Override + public LoginUser getUserById(String id) { + if (oConvertUtils.isEmpty(id)) { + return null; + } + LoginUser loginUser = new LoginUser(); + SysUser sysUser = userMapper.selectById(id); + if (sysUser == null) { + return null; + } + BeanUtils.copyProperties(sysUser, loginUser); + //去掉用户敏感信息 + loginUser.setPassword(null); + loginUser.setRelTenantIds(null); + loginUser.setDepartIds(null); + return loginUser; + } - @Override - public List getRolesByUsername(String username) { - return sysUserRoleMapper.getRoleByUserName(username); - } + @Override + public List getRolesByUsername(String username) { + return sysUserRoleMapper.getRoleByUserName(username); + } - @Override - public List getRolesByUserId(String userId) { - return sysUserRoleMapper.getRoleCodeByUserId(userId); - } + @Override + public List getRolesByUserId(String userId) { + return sysUserRoleMapper.getRoleCodeByUserId(userId); + } - @Override - public List getDepartIdsByUsername(String username) { - List list = sysDepartService.queryDepartsByUsername(username); - List result = new ArrayList<>(list.size()); - for (SysDepart depart : list) { - result.add(depart.getId()); - } - return result; - } + @Override + public List getDepartIdsByUsername(String username) { + List list = sysDepartService.queryDepartsByUsername(username); + List result = new ArrayList<>(list.size()); + for (SysDepart depart : list) { + result.add(depart.getId()); + } + return result; + } - @Override - public List getDepartIdsByUserId(String userId) { - return sysDepartService.queryDepartsByUserId(userId); - } + @Override + public List getDepartIdsByUserId(String userId) { + return sysDepartService.queryDepartsByUserId(userId); + } - @Override - public Set getDepartParentIdsByUsername(String username) { - List list = sysDepartService.queryDepartsByUsername(username); - Set result = new HashSet<>(list.size()); - for (SysDepart depart : list) { - result.add(depart.getParentId()); - } - return result; - } + @Override + public Set getDepartParentIdsByUsername(String username) { + List list = sysDepartService.queryDepartsByUsername(username); + Set result = new HashSet<>(list.size()); + for (SysDepart depart : list) { + result.add(depart.getParentId()); + } + return result; + } - @Override - public Set getDepartParentIdsByDepIds(Set depIds) { - LambdaQueryWrapper departQuery = new LambdaQueryWrapper().in(SysDepart::getId, depIds); - List departList = departMapper.selectList(departQuery); + @Override + public Set getDepartParentIdsByDepIds(Set depIds) { + LambdaQueryWrapper departQuery = new LambdaQueryWrapper().in(SysDepart::getId, depIds); + List departList = departMapper.selectList(departQuery); - if(CollectionUtils.isEmpty(departList)){ - return null; - } - Set parentIds = departList.stream() - .map(SysDepart::getParentId) - .collect(Collectors.toSet()); - return parentIds; - } + if (CollectionUtils.isEmpty(departList)) { + return null; + } + Set parentIds = departList.stream() + .map(SysDepart::getParentId) + .collect(Collectors.toSet()); + return parentIds; + } - @Override - public List getDepartNamesByUsername(String username) { - List list = sysDepartService.queryDepartsByUsername(username); - List result = new ArrayList<>(list.size()); - for (SysDepart depart : list) { - result.add(depart.getDepartName()); - } - return result; - } + @Override + public List getDepartNamesByUsername(String username) { + List list = sysDepartService.queryDepartsByUsername(username); + List result = new ArrayList<>(list.size()); + for (SysDepart depart : list) { + result.add(depart.getDepartName()); + } + return result; + } - @Override - public DictModel getParentDepartId(String departId) { - SysDepart depart = departMapper.getParentDepartId(departId); - DictModel model = new DictModel(depart.getId(),depart.getParentId()); - return model; - } + @Override + public DictModel getParentDepartId(String departId) { + SysDepart depart = departMapper.getParentDepartId(departId); + DictModel model = new DictModel(depart.getId(), depart.getParentId()); + return model; + } - @Override - @Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code", unless = "#result == null ") - public List queryDictItemsByCode(String code) { - return sysDictService.queryDictItemsByCode(code); - } + @Override + @Cacheable(value = CacheConstant.SYS_DICT_CACHE, key = "#code", unless = "#result == null ") + public List queryDictItemsByCode(String code) { + return sysDictService.queryDictItemsByCode(code); + } - @Override - @Cacheable(value = CacheConstant.SYS_ENABLE_DICT_CACHE,key = "#code", unless = "#result == null ") - public List queryEnableDictItemsByCode(String code) { - return sysDictService.queryEnableDictItemsByCode(code); - } + @Override + @Cacheable(value = CacheConstant.SYS_ENABLE_DICT_CACHE, key = "#code", unless = "#result == null ") + public List queryEnableDictItemsByCode(String code) { + return sysDictService.queryEnableDictItemsByCode(code); + } - @Override - public List queryTableDictItemsByCode(String tableFilterSql, String text, String code) { - //【Online+系统】字典表加权限控制机制逻辑，想法不错 LOWCOD-799 - if(tableFilterSql.indexOf(SymbolConstant.SYS_VAR_PREFIX)>=0){ - tableFilterSql = QueryGenerator.getSqlRuleValue(tableFilterSql); - } - return sysDictService.queryTableDictItemsByCode(tableFilterSql, text, code); - } + @Override + public List queryTableDictItemsByCode(String tableFilterSql, String text, String code) { + //【Online+系统】字典表加权限控制机制逻辑，想法不错 LOWCOD-799 + if (tableFilterSql.indexOf(SymbolConstant.SYS_VAR_PREFIX) >= 0) { + tableFilterSql = QueryGenerator.getSqlRuleValue(tableFilterSql); + } + return sysDictService.queryTableDictItemsByCode(tableFilterSql, text, code); + } - @Override - public List queryAllDepartBackDictModel() { - return sysDictService.queryAllDepartBackDictModel(); - } + @Override + public List queryAllDepartBackDictModel() { + return sysDictService.queryAllDepartBackDictModel(); + } - @Override - public void sendSysAnnouncement(MessageDTO message) { - this.sendSysAnnouncement(message.getFromUser(), - message.getToUser(), - message.getTitle(), - message.getContent(), - message.getCategory()); - try { - // 同步发送第三方APP消息 - wechatEnterpriseService.sendMessage(message, true); - dingtalkService.sendMessage(message, true); - } catch (Exception e) { - log.error("同步发送第三方APP消息失败！", e); - } - } + @Override + public void sendSysAnnouncement(MessageDTO message) { + this.sendSysAnnouncement(message.getFromUser(), + message.getToUser(), + message.getTitle(), + message.getContent(), + message.getCategory()); + try { + // 同步发送第三方APP消息 + wechatEnterpriseService.sendMessage(message, true); + dingtalkService.sendMessage(message, true); + } catch (Exception e) { + log.error("同步发送第三方APP消息失败！", e); + } + } - @Override - public void sendBusAnnouncement(BusMessageDTO message) { - sendBusAnnouncement(message.getFromUser(), - message.getToUser(), - message.getTitle(), - message.getContent(), - message.getCategory(), - message.getBusType(), - message.getBusId()); - try { - // 同步发送第三方APP消息 - wechatEnterpriseService.sendMessage(message, true); - dingtalkService.sendMessage(message, true); - } catch (Exception e) { - log.error("同步发送第三方APP消息失败！", e); - } - } + @Override + public void sendBusAnnouncement(BusMessageDTO message) { + sendBusAnnouncement(message.getFromUser(), + message.getToUser(), + message.getTitle(), + message.getContent(), + message.getCategory(), + message.getBusType(), + message.getBusId()); + try { + // 同步发送第三方APP消息 + wechatEnterpriseService.sendMessage(message, true); + dingtalkService.sendMessage(message, true); + } catch (Exception e) { + log.error("同步发送第三方APP消息失败！", e); + } + } - @Override - public void sendTemplateAnnouncement(TemplateMessageDTO message) { - String templateCode = message.getTemplateCode(); - String title = message.getTitle(); - Map tmplateParam = message.getTemplateParam(); - String fromUser = message.getFromUser(); - String toUser = message.getToUser(); + @Override + public void sendTemplateAnnouncement(TemplateMessageDTO message) { + String templateCode = message.getTemplateCode(); + String title = message.getTitle(); + Map tmplateParam = message.getTemplateParam(); + String fromUser = message.getFromUser(); + String toUser = message.getToUser(); - List sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); - if(sysSmsTemplates==null||sysSmsTemplates.size()==0){ - throw new JeecgBootException("消息模板不存在，模板编码："+templateCode); - } - SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); - //模板标题 - title = title==null?sysSmsTemplate.getTemplateName():title; - //模板内容 - String content = sysSmsTemplate.getTemplateContent(); - if(tmplateParam!=null) { - for (Map.Entry entry : tmplateParam.entrySet()) { - String str = "${" + entry.getKey() + "}"; - if(oConvertUtils.isNotEmpty(title)){ - title = title.replace(str, entry.getValue()); - } - content = content.replace(str, entry.getValue()); - } - } - String mobileOpenUrl = null; - if(tmplateParam!=null && oConvertUtils.isNotEmpty(tmplateParam.get(CommonConstant.MSG_HREF_URL))){ - mobileOpenUrl = tmplateParam.get(CommonConstant.MSG_HREF_URL); - } - SysAnnouncement announcement = new SysAnnouncement(); - announcement.setTitile(title); - announcement.setMsgContent(content); - announcement.setSender(fromUser); - announcement.setPriority(CommonConstant.PRIORITY_M); - announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); - announcement.setSendStatus(CommonConstant.HAS_SEND); - announcement.setSendTime(new Date()); - announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); - announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); - sysAnnouncementMapper.insert(announcement); - // 2.插入用户通告阅读标记表记录 - String userId = toUser; - String[] userIds = userId.split(","); - String anntId = announcement.getId(); - for(int i=0;i sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); + if (sysSmsTemplates == null || sysSmsTemplates.size() == 0) { + throw new JeecgBootException("消息模板不存在，模板编码：" + templateCode); + } + SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); + //模板标题 + title = title == null ? sysSmsTemplate.getTemplateName() : title; + //模板内容 + String content = sysSmsTemplate.getTemplateContent(); + if (tmplateParam != null) { + for (Map.Entry entry : tmplateParam.entrySet()) { + String str = "${" + entry.getKey() + "}"; + if (oConvertUtils.isNotEmpty(title)) { + title = title.replace(str, entry.getValue()); + } + content = content.replace(str, entry.getValue()); + } + } + String mobileOpenUrl = null; + if (tmplateParam != null && oConvertUtils.isNotEmpty(tmplateParam.get(CommonConstant.MSG_HREF_URL))) { + mobileOpenUrl = tmplateParam.get(CommonConstant.MSG_HREF_URL); + } + SysAnnouncement announcement = new SysAnnouncement(); + announcement.setTitile(title); + announcement.setMsgContent(content); + announcement.setSender(fromUser); + announcement.setPriority(CommonConstant.PRIORITY_M); + announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); + announcement.setSendStatus(CommonConstant.HAS_SEND); + announcement.setSendTime(new Date()); + announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); + announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); + sysAnnouncementMapper.insert(announcement); + // 2.插入用户通告阅读标记表记录 + String userId = toUser; + String[] userIds = userId.split(","); + String anntId = announcement.getId(); + for (int i = 0; i < userIds.length; i++) { + if (oConvertUtils.isNotEmpty(userIds[i])) { + SysUser sysUser = userMapper.getUserByName(userIds[i]); + if (sysUser == null) { + continue; + } + SysAnnouncementSend announcementSend = new SysAnnouncementSend(); + announcementSend.setAnntId(anntId); + announcementSend.setUserId(sysUser.getId()); + announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); + sysAnnouncementSendMapper.insert(announcementSend); + JSONObject obj = new JSONObject(); + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); + obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId()); + obj.put(WebsocketConst.MSG_ID, announcement.getId()); + obj.put(WebsocketConst.MSG_TXT, announcement.getTitile()); + webSocket.sendMessage(sysUser.getId(), obj.toJSONString()); + } + } + try { + // 同步企业微信、钉钉的消息通知 + dingtalkService.sendActionCardMessage(announcement, mobileOpenUrl, true); + wechatEnterpriseService.sendTextCardMessage(announcement, true); + } catch (Exception e) { + log.error("同步发送第三方APP消息失败！", e); + } - } + } - @Override - public void sendBusTemplateAnnouncement(BusTemplateMessageDTO message) { - String templateCode = message.getTemplateCode(); - String title = message.getTitle(); - Map tmplateParam = message.getTemplateParam(); - String fromUser = message.getFromUser(); - String toUser = message.getToUser(); - String busId = message.getBusId(); - String busType = message.getBusType(); + @Override + public void sendBusTemplateAnnouncement(BusTemplateMessageDTO message) { + String templateCode = message.getTemplateCode(); + String title = message.getTitle(); + Map tmplateParam = message.getTemplateParam(); + String fromUser = message.getFromUser(); + String toUser = message.getToUser(); + String busId = message.getBusId(); + String busType = message.getBusType(); - List sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); - if(sysSmsTemplates==null||sysSmsTemplates.size()==0){ - throw new JeecgBootException("消息模板不存在，模板编码："+templateCode); - } - SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); - //模板标题 - title = title==null?sysSmsTemplate.getTemplateName():title; - //模板内容 - String content = sysSmsTemplate.getTemplateContent(); - if(tmplateParam!=null) { - for (Map.Entry entry : tmplateParam.entrySet()) { - String str = "${" + entry.getKey() + "}"; - if (entry.getValue() != null) { - title = title.replace(str, entry.getValue()); - content = content.replace(str, entry.getValue()); - } - } - } - SysAnnouncement announcement = new SysAnnouncement(); - announcement.setTitile(title); - announcement.setMsgContent(content); - announcement.setSender(fromUser); - announcement.setPriority(CommonConstant.PRIORITY_M); - announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); - announcement.setSendStatus(CommonConstant.HAS_SEND); - announcement.setSendTime(new Date()); + List sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); + if (sysSmsTemplates == null || sysSmsTemplates.size() == 0) { + throw new JeecgBootException("消息模板不存在，模板编码：" + templateCode); + } + SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); + //模板标题 + title = title == null ? sysSmsTemplate.getTemplateName() : title; + //模板内容 + String content = sysSmsTemplate.getTemplateContent(); + if (tmplateParam != null) { + for (Map.Entry entry : tmplateParam.entrySet()) { + String str = "${" + entry.getKey() + "}"; + if (entry.getValue() != null) { + title = title.replace(str, entry.getValue()); + content = content.replace(str, entry.getValue()); + } + } + } + SysAnnouncement announcement = new SysAnnouncement(); + announcement.setTitile(title); + announcement.setMsgContent(content); + announcement.setSender(fromUser); + announcement.setPriority(CommonConstant.PRIORITY_M); + announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); + announcement.setSendStatus(CommonConstant.HAS_SEND); + announcement.setSendTime(new Date()); - if(tmplateParam!=null && oConvertUtils.isNotEmpty(tmplateParam.get(CommonSendStatus.MSG_ABSTRACT_JSON))){ - announcement.setMsgAbstract(tmplateParam.get(CommonSendStatus.MSG_ABSTRACT_JSON)); - } - String mobileOpenUrl = null; - if(tmplateParam!=null && oConvertUtils.isNotEmpty(tmplateParam.get(CommonConstant.MSG_HREF_URL))){ - mobileOpenUrl = tmplateParam.get(CommonConstant.MSG_HREF_URL); - } + if (tmplateParam != null && oConvertUtils.isNotEmpty(tmplateParam.get(CommonSendStatus.MSG_ABSTRACT_JSON))) { + announcement.setMsgAbstract(tmplateParam.get(CommonSendStatus.MSG_ABSTRACT_JSON)); + } + String mobileOpenUrl = null; + if (tmplateParam != null && oConvertUtils.isNotEmpty(tmplateParam.get(CommonConstant.MSG_HREF_URL))) { + mobileOpenUrl = tmplateParam.get(CommonConstant.MSG_HREF_URL); + } - announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); - announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); - announcement.setBusId(busId); - announcement.setBusType(busType); - announcement.setOpenType(SysAnnmentTypeEnum.getByType(busType).getOpenType()); - announcement.setOpenPage(SysAnnmentTypeEnum.getByType(busType).getOpenPage()); - sysAnnouncementMapper.insert(announcement); - // 2.插入用户通告阅读标记表记录 - String userId = toUser; - String[] userIds = userId.split(","); - String anntId = announcement.getId(); - for(int i=0;i map = templateDTO.getTemplateParam(); - List sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); - if(sysSmsTemplates==null||sysSmsTemplates.size()==0){ - throw new JeecgBootException("消息模板不存在，模板编码："+templateCode); - } - SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); - //模板内容 - String content = sysSmsTemplate.getTemplateContent(); - if(map!=null) { - for (Map.Entry entry : map.entrySet()) { - String str = "${" + entry.getKey() + "}"; - content = content.replace(str, entry.getValue()); - } - } - return content; - } + @Override + public String parseTemplateByCode(TemplateDTO templateDTO) { + String templateCode = templateDTO.getTemplateCode(); + Map map = templateDTO.getTemplateParam(); + List sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode); + if (sysSmsTemplates == null || sysSmsTemplates.size() == 0) { + throw new JeecgBootException("消息模板不存在，模板编码：" + templateCode); + } + SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0); + //模板内容 + String content = sysSmsTemplate.getTemplateContent(); + if (map != null) { + for (Map.Entry entry : map.entrySet()) { + String str = "${" + entry.getKey() + "}"; + content = content.replace(str, entry.getValue()); + } + } + return content; + } - @Override - public void updateSysAnnounReadFlag(String busType, String busId) { - SysAnnouncement announcement = sysAnnouncementMapper.selectOne(new QueryWrapper().eq("bus_type",busType).eq("bus_id",busId)); - if(announcement != null){ - LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); - String userId = sysUser.getId(); - LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); - updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); - updateWrapper.set(SysAnnouncementSend::getReadTime, new Date()); - updateWrapper.eq(SysAnnouncementSend::getAnntId,announcement.getId()); - updateWrapper.eq(SysAnnouncementSend::getUserId,userId); - //updateWrapper.last("where annt_id ='"+announcement.getId()+"' and user_id ='"+userId+"'"); - SysAnnouncementSend announcementSend = new SysAnnouncementSend(); - sysAnnouncementSendMapper.update(announcementSend, updateWrapper); - } - } + @Override + public void updateSysAnnounReadFlag(String busType, String busId) { + SysAnnouncement announcement = sysAnnouncementMapper.selectOne(new QueryWrapper().eq("bus_type", busType).eq("bus_id", busId)); + if (announcement != null) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = sysUser.getId(); + LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); + updateWrapper.set(SysAnnouncementSend::getReadFlag, CommonConstant.HAS_READ_FLAG); + updateWrapper.set(SysAnnouncementSend::getReadTime, new Date()); + updateWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId()); + updateWrapper.eq(SysAnnouncementSend::getUserId, userId); + //updateWrapper.last("where annt_id ='"+announcement.getId()+"' and user_id ='"+userId+"'"); + SysAnnouncementSend announcementSend = new SysAnnouncementSend(); + sysAnnouncementSendMapper.update(announcementSend, updateWrapper); + } + } - /** - * 获取数据库类型 - * @param dataSource - * @return - * @throws SQLException - */ - private String getDatabaseTypeByDataSource(DataSource dataSource) throws SQLException{ - if("".equals(DB_TYPE)) { - Connection connection = dataSource.getConnection(); - try { - DatabaseMetaData md = connection.getMetaData(); - String dbType = md.getDatabaseProductName().toLowerCase(); - if(dbType.indexOf(DataBaseConstant.DB_TYPE_MYSQL.toLowerCase())>=0) { - DB_TYPE = DataBaseConstant.DB_TYPE_MYSQL; - }else if(dbType.indexOf(DataBaseConstant.DB_TYPE_ORACLE.toLowerCase())>=0) { - DB_TYPE = DataBaseConstant.DB_TYPE_ORACLE; - }else if(dbType.indexOf(DataBaseConstant.DB_TYPE_SQLSERVER.toLowerCase())>=0||dbType.indexOf(DataBaseConstant.DB_TYPE_SQL_SERVER_BLANK)>=0) { - DB_TYPE = DataBaseConstant.DB_TYPE_SQLSERVER; - }else if(dbType.indexOf(DataBaseConstant.DB_TYPE_POSTGRESQL.toLowerCase())>=0) { - DB_TYPE = DataBaseConstant.DB_TYPE_POSTGRESQL; - }else if(dbType.indexOf(DataBaseConstant.DB_TYPE_MARIADB.toLowerCase())>=0) { - DB_TYPE = DataBaseConstant.DB_TYPE_MARIADB; - }else { - log.error("数据库类型:[" + dbType + "]不识别!"); - //throw new JeecgBootException("数据库类型:["+dbType+"]不识别!"); - } - } catch (Exception e) { - log.error(e.getMessage(), e); - }finally { - connection.close(); - } - } - return DB_TYPE; + /** + * 获取数据库类型 + * + * @param dataSource + * @return + * @throws SQLException + */ + private String getDatabaseTypeByDataSource(DataSource dataSource) throws SQLException { + if ("".equals(DB_TYPE)) { + Connection connection = dataSource.getConnection(); + try { + DatabaseMetaData md = connection.getMetaData(); + String dbType = md.getDatabaseProductName().toLowerCase(); + if (dbType.indexOf(DataBaseConstant.DB_TYPE_MYSQL.toLowerCase()) >= 0) { + DB_TYPE = DataBaseConstant.DB_TYPE_MYSQL; + } else if (dbType.indexOf(DataBaseConstant.DB_TYPE_ORACLE.toLowerCase()) >= 0) { + DB_TYPE = DataBaseConstant.DB_TYPE_ORACLE; + } else if (dbType.indexOf(DataBaseConstant.DB_TYPE_SQLSERVER.toLowerCase()) >= 0 || dbType.indexOf(DataBaseConstant.DB_TYPE_SQL_SERVER_BLANK) >= 0) { + DB_TYPE = DataBaseConstant.DB_TYPE_SQLSERVER; + } else if (dbType.indexOf(DataBaseConstant.DB_TYPE_POSTGRESQL.toLowerCase()) >= 0) { + DB_TYPE = DataBaseConstant.DB_TYPE_POSTGRESQL; + } else if (dbType.indexOf(DataBaseConstant.DB_TYPE_MARIADB.toLowerCase()) >= 0) { + DB_TYPE = DataBaseConstant.DB_TYPE_MARIADB; + } else { + log.error("数据库类型:[" + dbType + "]不识别!"); + //throw new JeecgBootException("数据库类型:["+dbType+"]不识别!"); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + connection.close(); + } + } + return DB_TYPE; - } + } - @Override - public List queryAllDict() { - // 查询并排序 - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.orderByAsc("create_time"); - List dicts = sysDictService.list(queryWrapper); - // 封装成 model - List list = new ArrayList(); - for (SysDict dict : dicts) { - list.add(new DictModel(dict.getDictCode(), dict.getDictName())); - } + @Override + public List queryAllDict() { + // 查询并排序 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByAsc("create_time"); + List dicts = sysDictService.list(queryWrapper); + // 封装成 model + List list = new ArrayList(); + for (SysDict dict : dicts) { + list.add(new DictModel(dict.getDictCode(), dict.getDictName())); + } - return list; - } + return list; + } - @Override - public List queryAllSysCategory() { - List ls = categoryMapper.selectList(null); - List res = oConvertUtils.entityListToModelList(ls,SysCategoryModel.class); - return res; - } + @Override + public List queryAllSysCategory() { + List ls = categoryMapper.selectList(null); + List res = oConvertUtils.entityListToModelList(ls, SysCategoryModel.class); + return res; + } - @Override - public List queryFilterTableDictInfo(String table, String text, String code, String filterSql) { - return sysDictService.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql); - } + @Override + public List queryFilterTableDictInfo(String table, String text, String code, String filterSql) { + return sysDictService.queryTableDictItemsByCodeAndFilter(table, text, code, filterSql); + } - @Override - public List queryTableDictByKeys(String table, String text, String code, String[] keyArray) { - return sysDictService.queryTableDictByKeys(table,text,code,Joiner.on(",").join(keyArray)); - } + @Override + public List queryTableDictByKeys(String table, String text, String code, String[] keyArray) { + return sysDictService.queryTableDictByKeys(table, text, code, Joiner.on(",").join(keyArray)); + } - @Override - public List queryAllUserBackCombo() { - List list = new ArrayList(); - List userList = userMapper.selectList(new QueryWrapper().eq("status",1).eq("del_flag",0)); - for(SysUser user : userList){ - ComboModel model = new ComboModel(); - model.setTitle(user.getRealname()); - model.setId(user.getId()); - model.setUsername(user.getUsername()); - list.add(model); - } - return list; - } + @Override + public List queryAllUserBackCombo() { + List list = new ArrayList(); + List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0)); + for (SysUser user : userList) { + ComboModel model = new ComboModel(); + model.setTitle(user.getRealname()); + model.setId(user.getId()); + model.setUsername(user.getUsername()); + list.add(model); + } + return list; + } - @Override - public JSONObject queryAllUser(String userIds, Integer pageNo, Integer pageSize) { - JSONObject json = new JSONObject(); - QueryWrapper queryWrapper = new QueryWrapper().eq("status",1).eq("del_flag",0); - List list = new ArrayList(); - Page page = new Page(pageNo, pageSize); - IPage pageList = userMapper.selectPage(page, queryWrapper); - for(SysUser user : pageList.getRecords()){ - ComboModel model = new ComboModel(); - model.setUsername(user.getUsername()); - model.setTitle(user.getRealname()); - model.setId(user.getId()); - model.setEmail(user.getEmail()); - if(oConvertUtils.isNotEmpty(userIds)){ - String[] temp = userIds.split(","); - for(int i = 0; i queryWrapper = new QueryWrapper().eq("status", 1).eq("del_flag", 0); + List list = new ArrayList(); + Page page = new Page(pageNo, pageSize); + IPage pageList = userMapper.selectPage(page, queryWrapper); + for (SysUser user : pageList.getRecords()) { + ComboModel model = new ComboModel(); + model.setUsername(user.getUsername()); + model.setTitle(user.getRealname()); + model.setId(user.getId()); + model.setEmail(user.getEmail()); + if (oConvertUtils.isNotEmpty(userIds)) { + String[] temp = userIds.split(","); + for (int i = 0; i < temp.length; i++) { + if (temp[i].equals(user.getId())) { + model.setChecked(true); + } + } + } + list.add(model); + } + json.put("list", list); + json.put("total", pageList.getTotal()); + return json; + } - @Override - public List queryAllRole() { - List list = new ArrayList(); - List roleList = roleMapper.selectList(new QueryWrapper()); - for(SysRole role : roleList){ - ComboModel model = new ComboModel(); - model.setTitle(role.getRoleName()); - model.setId(role.getId()); - list.add(model); - } - return list; - } + @Override + public List queryAllRole() { + List list = new ArrayList(); + List roleList = roleMapper.selectList(new QueryWrapper()); + for (SysRole role : roleList) { + ComboModel model = new ComboModel(); + model.setTitle(role.getRoleName()); + model.setId(role.getId()); + list.add(model); + } + return list; + } @Override public List queryAllRole(String[] roleIds) { List list = new ArrayList(); List roleList = roleMapper.selectList(new QueryWrapper()); - for(SysRole role : roleList){ + for (SysRole role : roleList) { ComboModel model = new ComboModel(); model.setTitle(role.getRoleName()); model.setId(role.getId()); model.setRoleCode(role.getRoleCode()); - if(oConvertUtils.isNotEmpty(roleIds)) { + if (oConvertUtils.isNotEmpty(roleIds)) { for (int i = 0; i < roleIds.length; i++) { if (roleIds[i].equals(role.getId())) { model.setChecked(true); @@ -792,1040 +799,1076 @@ public class SysBaseApiImpl implements ISysBaseAPI { return list; } - @Override - public List getRoleIdsByUsername(String username) { - return sysUserRoleMapper.getRoleIdByUserName(username); - } + @Override + public List getRoleIdsByUsername(String username) { + return sysUserRoleMapper.getRoleIdByUserName(username); + } - @Override - public String getDepartIdsByOrgCode(String orgCode) { - return departMapper.queryDepartIdByOrgCode(orgCode); - } + @Override + public String getDepartIdsByOrgCode(String orgCode) { + return departMapper.queryDepartIdByOrgCode(orgCode); + } - @Override - public List getAllSysDepart() { - List departModelList = new ArrayList(); - List departList = departMapper.selectList(new QueryWrapper().eq("del_flag","0")); - for(SysDepart depart : departList){ - SysDepartModel model = new SysDepartModel(); - BeanUtils.copyProperties(depart,model); - departModelList.add(model); - } - return departModelList; - } + @Override + public List getAllSysDepart() { + List departModelList = new ArrayList(); + List departList = departMapper.selectList(new QueryWrapper().eq("del_flag", "0")); + for (SysDepart depart : departList) { + SysDepartModel model = new SysDepartModel(); + BeanUtils.copyProperties(depart, model); + departModelList.add(model); + } + return departModelList; + } - @Override - public DynamicDataSourceModel getDynamicDbSourceById(String dbSourceId) { - SysDataSource dbSource = dataSourceService.getById(dbSourceId); - if(dbSource!=null && StringUtils.isNotBlank(dbSource.getDbPassword())){ - String dbPassword = dbSource.getDbPassword(); - String decodedStr = SecurityUtil.jiemi(dbPassword); - dbSource.setDbPassword(decodedStr); - } - return new DynamicDataSourceModel(dbSource); - } + @Override + public DynamicDataSourceModel getDynamicDbSourceById(String dbSourceId) { + SysDataSource dbSource = dataSourceService.getById(dbSourceId); + if (dbSource != null && StringUtils.isNotBlank(dbSource.getDbPassword())) { + String dbPassword = dbSource.getDbPassword(); + String decodedStr = SecurityUtil.jiemi(dbPassword); + dbSource.setDbPassword(decodedStr); + } + return new DynamicDataSourceModel(dbSource); + } - @Override - public DynamicDataSourceModel getDynamicDbSourceByCode(String dbSourceCode) { - SysDataSource dbSource = dataSourceService.getOne(new LambdaQueryWrapper().eq(SysDataSource::getCode, dbSourceCode)); - if(dbSource!=null && StringUtils.isNotBlank(dbSource.getDbPassword())){ - String dbPassword = dbSource.getDbPassword(); - String decodedStr = SecurityUtil.jiemi(dbPassword); - dbSource.setDbPassword(decodedStr); - } - return new DynamicDataSourceModel(dbSource); - } + @Override + public DynamicDataSourceModel getDynamicDbSourceByCode(String dbSourceCode) { + SysDataSource dbSource = dataSourceService.getOne(new LambdaQueryWrapper().eq(SysDataSource::getCode, dbSourceCode)); + if (dbSource != null && StringUtils.isNotBlank(dbSource.getDbPassword())) { + String dbPassword = dbSource.getDbPassword(); + String decodedStr = SecurityUtil.jiemi(dbPassword); + dbSource.setDbPassword(decodedStr); + } + return new DynamicDataSourceModel(dbSource); + } - @Override - public List getDeptHeadByDepId(String deptId) { - QueryWrapper queryWrapper = new QueryWrapper().eq("status", 1).eq("del_flag", 0); - //支持逗号分割传递多个部门id - if (oConvertUtils.isNotEmpty(deptId) && deptId.contains(SymbolConstant.COMMA)) { - String[] vals = deptId.split(SymbolConstant.COMMA); - queryWrapper.and(andWrapper -> { - for (int i = 0; i < vals.length; i++) { - andWrapper.like("depart_ids", vals[i]); - andWrapper.or(); - } - }); - } else { - queryWrapper.like("depart_ids", deptId); - } + @Override + public List getDeptHeadByDepId(String deptId) { + QueryWrapper queryWrapper = new QueryWrapper().eq("status", 1).eq("del_flag", 0); + //支持逗号分割传递多个部门id + if (oConvertUtils.isNotEmpty(deptId) && deptId.contains(SymbolConstant.COMMA)) { + String[] vals = deptId.split(SymbolConstant.COMMA); + queryWrapper.and(andWrapper -> { + for (int i = 0; i < vals.length; i++) { + andWrapper.like("depart_ids", vals[i]); + andWrapper.or(); + } + }); + } else { + queryWrapper.like("depart_ids", deptId); + } - List userList = userMapper.selectList(queryWrapper); - List list = new ArrayList<>(); - for(SysUser user : userList){ - list.add(user.getUsername()); - } - return list; - } + List userList = userMapper.selectList(queryWrapper); + List list = new ArrayList<>(); + for (SysUser user : userList) { + list.add(user.getUsername()); + } + return list; + } - @Override - public void sendWebSocketMsg(String[] userIds, String cmd) { - JSONObject obj = new JSONObject(); - obj.put(WebsocketConst.MSG_CMD, cmd); - webSocket.sendMessage(userIds, obj.toJSONString()); - } + @Override + public void sendWebSocketMsg(String[] userIds, String cmd) { + JSONObject obj = new JSONObject(); + obj.put(WebsocketConst.MSG_CMD, cmd); + webSocket.sendMessage(userIds, obj.toJSONString()); + } - @Override - public List queryAllUserByIds(String[] userIds) { - QueryWrapper queryWrapper = new QueryWrapper().eq("status",1).eq("del_flag",0); - queryWrapper.in("id",userIds); - List loginUsers = new ArrayList<>(); - List sysUsers = userMapper.selectList(queryWrapper); - for (SysUser user:sysUsers) { - UserAccountInfo loginUser=new UserAccountInfo(); - BeanUtils.copyProperties(user, loginUser); - loginUsers.add(loginUser); - } - return loginUsers; - } + @Override + public List queryAllUserByIds(String[] userIds) { + QueryWrapper queryWrapper = new QueryWrapper().eq("status", 1).eq("del_flag", 0); + queryWrapper.in("id", userIds); + List loginUsers = new ArrayList<>(); + List sysUsers = userMapper.selectList(queryWrapper); + for (SysUser user : sysUsers) { + UserAccountInfo loginUser = new UserAccountInfo(); + BeanUtils.copyProperties(user, loginUser); + loginUsers.add(loginUser); + } + return loginUsers; + } - /** - * 推送签到人员信息 - * @param userId - */ - @Override - public void meetingSignWebsocket(String userId) { - JSONObject obj = new JSONObject(); - obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_SIGN); - obj.put(WebsocketConst.MSG_USER_ID,userId); - //TODO 目前全部推送，后面修改 - webSocket.sendMessage(obj.toJSONString()); - } + /** + * 推送签到人员信息 + * + * @param userId + */ + @Override + public void meetingSignWebsocket(String userId) { + JSONObject obj = new JSONObject(); + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_SIGN); + obj.put(WebsocketConst.MSG_USER_ID, userId); + //TODO 目前全部推送，后面修改 + webSocket.sendMessage(obj.toJSONString()); + } - @Override - public List queryUserByNames(String[] userNames) { - QueryWrapper queryWrapper = new QueryWrapper().eq("status",1).eq("del_flag",0); - queryWrapper.in("username",userNames); - List loginUsers = new ArrayList<>(); - List sysUsers = userMapper.selectList(queryWrapper); - for (SysUser user:sysUsers) { - UserAccountInfo loginUser=new UserAccountInfo(); - BeanUtils.copyProperties(user, loginUser); - loginUsers.add(loginUser); - } - return loginUsers; - } + @Override + public List queryUserByNames(String[] userNames) { + QueryWrapper queryWrapper = new QueryWrapper().eq("status", 1).eq("del_flag", 0); + queryWrapper.in("username", userNames); + List loginUsers = new ArrayList<>(); + List sysUsers = userMapper.selectList(queryWrapper); + for (SysUser user : sysUsers) { + UserAccountInfo loginUser = new UserAccountInfo(); + BeanUtils.copyProperties(user, loginUser); + loginUsers.add(loginUser); + } + return loginUsers; + } - @Override - public List queryUserBySuperQuery(String superQuery,String matchType) { - List result=new ArrayList<>(); - Map parameterMap=new HashMap<>(); - parameterMap.put("superQueryMatchType",new String[]{matchType}); - parameterMap.put("superQueryParams",new String[]{superQuery}); - SysUser sysUser=new SysUser(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysUser, parameterMap); - List list= sysUserService.list(queryWrapper); - if(ObjectUtils.isNotEmpty(list)){ + @Override + public List queryUserBySuperQuery(String superQuery, String matchType) { + List result = new ArrayList<>(); + Map parameterMap = new HashMap<>(); + parameterMap.put("superQueryMatchType", new String[]{matchType}); + parameterMap.put("superQueryParams", new String[]{superQuery}); + SysUser sysUser = new SysUser(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysUser, parameterMap); + List list = sysUserService.list(queryWrapper); + if (ObjectUtils.isNotEmpty(list)) { - //update-begin-author:taoyan date:2023-5-19 for: QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 - String departKey = "depart"; - QueryCondition departCondition = null; - try { - String temp = URLDecoder.decode(superQuery, "UTF-8"); - List conditions = JSON.parseArray(temp, QueryCondition.class); - for(QueryCondition condition: conditions){ - if(departKey.equals(condition.getField())){ - departCondition = condition; - break; - } - } - } catch (UnsupportedEncodingException e) { - log.error("查询用户信息，查询条件json转化失败", e); - } + //update-begin-author:taoyan date:2023-5-19 for: QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 + String departKey = "depart"; + QueryCondition departCondition = null; + try { + String temp = URLDecoder.decode(superQuery, "UTF-8"); + List conditions = JSON.parseArray(temp, QueryCondition.class); + for (QueryCondition condition : conditions) { + if (departKey.equals(condition.getField())) { + departCondition = condition; + break; + } + } + } catch (UnsupportedEncodingException e) { + log.error("查询用户信息，查询条件json转化失败", e); + } - for (SysUser user : list) { - JSONObject userJson = JSONObject.parseObject(JSONObject.toJSONString(user)); - List departList = sysDepartService.queryDepartsByUsername(user.getUsername()); - List departIds = null; - if(departList!=null && departList.size()>0){ - departIds = departList.stream().map(i->i.getId()).collect(Collectors.toList()); - List departNames = departList.stream().map(i->i.getDepartName()).collect(Collectors.toList()); - userJson.put(departKey, oConvertUtils.list2JSONArray(departIds)); - userJson.put(departKey+"_dictText", String.join(",", departNames)); - } - boolean flag = getDepartConditionResult(departCondition, departIds); - if(flag){ - result.add(userJson); - } - //update-end-author:taoyan date:2023-5-19 for: QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 + for (SysUser user : list) { + JSONObject userJson = JSONObject.parseObject(JSONObject.toJSONString(user)); + List departList = sysDepartService.queryDepartsByUsername(user.getUsername()); + List departIds = null; + if (departList != null && departList.size() > 0) { + departIds = departList.stream().map(i -> i.getId()).collect(Collectors.toList()); + List departNames = departList.stream().map(i -> i.getDepartName()).collect(Collectors.toList()); + userJson.put(departKey, oConvertUtils.list2JSONArray(departIds)); + userJson.put(departKey + "_dictText", String.join(",", departNames)); + } + boolean flag = getDepartConditionResult(departCondition, departIds); + if (flag) { + result.add(userJson); + } + //update-end-author:taoyan date:2023-5-19 for: QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 - } - } - return result; - } + } + } + return result; + } - /** - * 判断用户的部门是否满足条件 -等于/不等于/在--中/不在--中/为空/不为空 - * QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 - * @param departCondition - * @param departIds - * @return - */ - private boolean getDepartConditionResult(QueryCondition departCondition, List departIds){ - if(departCondition == null){ - return true; - } - QueryRuleEnum rule = QueryRuleEnum.getByValue(departCondition.getRule()); - String conditionVal = departCondition.getVal(); - if(rule == QueryRuleEnum.EMPTY){ - if(departIds==null || departIds.size()==0){ - return true; - } - }else if (rule == QueryRuleEnum.NOT_EMPTY){ - if(departIds!=null && departIds.size()>0){ - return true; - } - }else{ - if(oConvertUtils.isEmpty(conditionVal)){ - return false; - } - if(departIds==null || departIds.size()==0){ - return false; - } - List conditionList; - if(conditionVal.startsWith("[") && conditionVal.endsWith("]")){ - conditionList = JSONArray.parseArray(conditionVal, String.class); - }else{ - conditionList = new ArrayList(Arrays.asList(conditionVal.split(","))); - } - if(rule == QueryRuleEnum.EQ){ - if(oConvertUtils.isEqList(conditionList, departIds)){ - return true; - } - }else if(rule == QueryRuleEnum.NE){ - if(!oConvertUtils.isEqList(conditionList, departIds)){ - return true; - } - }else if(rule == QueryRuleEnum.IN){ - if(oConvertUtils.isInList(departIds, conditionList)){ - return true; - } - }else if(rule == QueryRuleEnum.NOT_IN){ - if(!oConvertUtils.isInList(departIds, conditionList)){ - return true; - } - } - } - return false; - } + /** + * 判断用户的部门是否满足条件 -等于/不等于/在--中/不在--中/为空/不为空 + * QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 + * + * @param departCondition + * @param departIds + * @return + */ + private boolean getDepartConditionResult(QueryCondition departCondition, List departIds) { + if (departCondition == null) { + return true; + } + QueryRuleEnum rule = QueryRuleEnum.getByValue(departCondition.getRule()); + String conditionVal = departCondition.getVal(); + if (rule == QueryRuleEnum.EMPTY) { + if (departIds == null || departIds.size() == 0) { + return true; + } + } else if (rule == QueryRuleEnum.NOT_EMPTY) { + if (departIds != null && departIds.size() > 0) { + return true; + } + } else { + if (oConvertUtils.isEmpty(conditionVal)) { + return false; + } + if (departIds == null || departIds.size() == 0) { + return false; + } + List conditionList; + if (conditionVal.startsWith("[") && conditionVal.endsWith("]")) { + conditionList = JSONArray.parseArray(conditionVal, String.class); + } else { + conditionList = new ArrayList(Arrays.asList(conditionVal.split(","))); + } + if (rule == QueryRuleEnum.EQ) { + if (oConvertUtils.isEqList(conditionList, departIds)) { + return true; + } + } else if (rule == QueryRuleEnum.NE) { + if (!oConvertUtils.isEqList(conditionList, departIds)) { + return true; + } + } else if (rule == QueryRuleEnum.IN) { + if (oConvertUtils.isInList(departIds, conditionList)) { + return true; + } + } else if (rule == QueryRuleEnum.NOT_IN) { + if (!oConvertUtils.isInList(departIds, conditionList)) { + return true; + } + } + } + return false; + } - @Override - public JSONObject queryUserById(String id) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(true, SysUser::getId, id); - SysUser sysUser = sysUserService.getOne(queryWrapper); - if (ObjectUtils.isNotEmpty(sysUser)) { - return JSONObject.parseObject(JSONObject.toJSONString(sysUser)); - } - return null; - } + @Override + public JSONObject queryUserById(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(true, SysUser::getId, id); + SysUser sysUser = sysUserService.getOne(queryWrapper); + if (ObjectUtils.isNotEmpty(sysUser)) { + return JSONObject.parseObject(JSONObject.toJSONString(sysUser)); + } + return null; + } - @Override - public List queryDeptBySuperQuery(String superQuery,String matchType) { - List result=new ArrayList<>(); - Map parameterMap=new HashMap<>(); - parameterMap.put("superQueryMatchType",new String[]{matchType}); - parameterMap.put("superQueryParams",new String[]{superQuery}); - SysDepart sysDepart=new SysDepart(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, parameterMap); - List list= sysDepartService.list(queryWrapper); - if(ObjectUtils.isNotEmpty(list)){ - for (SysDepart depart: list) { - result.add(JSONObject.parseObject(JSONObject.toJSONString(depart))); - } - } - return result; - } + @Override + public List queryDeptBySuperQuery(String superQuery, String matchType) { + List result = new ArrayList<>(); + Map parameterMap = new HashMap<>(); + parameterMap.put("superQueryMatchType", new String[]{matchType}); + parameterMap.put("superQueryParams", new String[]{superQuery}); + SysDepart sysDepart = new SysDepart(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, parameterMap); + List list = sysDepartService.list(queryWrapper); + if (ObjectUtils.isNotEmpty(list)) { + for (SysDepart depart : list) { + result.add(JSONObject.parseObject(JSONObject.toJSONString(depart))); + } + } + return result; + } - @Override - public List queryRoleBySuperQuery(String superQuery,String matchType) { - List result=new ArrayList<>(); - Map parameterMap=new HashMap<>(); - parameterMap.put("superQueryMatchType",new String[]{matchType}); - parameterMap.put("superQueryParams",new String[]{superQuery}); - SysRole sysDepart=new SysRole(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, parameterMap); - List list= sysRoleService.list(queryWrapper); - if(ObjectUtils.isNotEmpty(list)){ - for (SysRole role: list) { - result.add(JSONObject.parseObject(JSONObject.toJSONString(role))); - } - } - return result; - } + @Override + public List queryRoleBySuperQuery(String superQuery, String matchType) { + List result = new ArrayList<>(); + Map parameterMap = new HashMap<>(); + parameterMap.put("superQueryMatchType", new String[]{matchType}); + parameterMap.put("superQueryParams", new String[]{superQuery}); + SysRole sysDepart = new SysRole(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, parameterMap); + List list = sysRoleService.list(queryWrapper); + if (ObjectUtils.isNotEmpty(list)) { + for (SysRole role : list) { + result.add(JSONObject.parseObject(JSONObject.toJSONString(role))); + } + } + return result; + } - @Override - public List selectUserIdByTenantId(String tenantId) { - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.select("user_id"); - queryWrapper.eq("tenant_id",tenantId); - return sysUserTenantService.listObjs(queryWrapper,e->e.toString()); - } + @Override + public List selectUserIdByTenantId(String tenantId) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.select("user_id"); + queryWrapper.eq("tenant_id", tenantId); + return sysUserTenantService.listObjs(queryWrapper, e -> e.toString()); + } - @Override - public SysDepartModel selectAllById(String id) { - SysDepart sysDepart = sysDepartService.getById(id); - SysDepartModel sysDepartModel = new SysDepartModel(); - BeanUtils.copyProperties(sysDepart,sysDepartModel); - return sysDepartModel; - } + @Override + public SysDepartModel selectAllById(String id) { + SysDepart sysDepart = sysDepartService.getById(id); + SysDepartModel sysDepartModel = new SysDepartModel(); + BeanUtils.copyProperties(sysDepart, sysDepartModel); + return sysDepartModel; + } - @Override - public List queryDeptUsersByUserId(String userId) { - List userIds = new ArrayList<>(); - List userDepartList = sysUserDepartService.list(new QueryWrapper().eq("user_id",userId)); - if(userDepartList != null){ - //查找所属公司 - String orgCodes = ""; - StringBuilder orgCodesBuilder = new StringBuilder(); + @Override + public List queryDeptUsersByUserId(String userId) { + List userIds = new ArrayList<>(); + List userDepartList = sysUserDepartService.list(new QueryWrapper().eq("user_id", userId)); + if (userDepartList != null) { + //查找所属公司 + String orgCodes = ""; + StringBuilder orgCodesBuilder = new StringBuilder(); orgCodesBuilder.append(orgCodes); - for(SysUserDepart userDepart : userDepartList){ - //查询所属公司编码 - SysDepart depart = sysDepartService.getById(userDepart.getDepId()); - int length = YouBianCodeUtil.ZHANWEI_LENGTH; - String compyOrgCode = ""; - if(depart != null && depart.getOrgCode() != null){ - compyOrgCode = depart.getOrgCode().substring(0,length); - if(orgCodes.indexOf(compyOrgCode) == -1){ + for (SysUserDepart userDepart : userDepartList) { + //查询所属公司编码 + SysDepart depart = sysDepartService.getById(userDepart.getDepId()); + int length = YouBianCodeUtil.ZHANWEI_LENGTH; + String compyOrgCode = ""; + if (depart != null && depart.getOrgCode() != null) { + compyOrgCode = depart.getOrgCode().substring(0, length); + if (orgCodes.indexOf(compyOrgCode) == -1) { orgCodesBuilder.append(SymbolConstant.COMMA).append(compyOrgCode); - } - } - } + } + } + } orgCodes = orgCodesBuilder.toString(); - if(oConvertUtils.isNotEmpty(orgCodes)){ - orgCodes = orgCodes.substring(1); - List listIds = departMapper.getSubDepIdsByOrgCodes(orgCodes.split(",")); - List userList = sysUserDepartService.list(new QueryWrapper().in("dep_id",listIds)); - for(SysUserDepart userDepart : userList){ - if(!userIds.contains(userDepart.getUserId())){ - userIds.add(userDepart.getUserId()); - } - } - } - } - return userIds; - } + if (oConvertUtils.isNotEmpty(orgCodes)) { + orgCodes = orgCodes.substring(1); + List listIds = departMapper.getSubDepIdsByOrgCodes(orgCodes.split(",")); + List userList = sysUserDepartService.list(new QueryWrapper().in("dep_id", listIds)); + for (SysUserDepart userDepart : userList) { + if (!userIds.contains(userDepart.getUserId())) { + userIds.add(userDepart.getUserId()); + } + } + } + } + return userIds; + } - /** - * 查询用户拥有的角色集合 - * @param username - * @return - */ - @Override - public Set getUserRoleSet(String username) { - // 查询用户拥有的角色集合 - List roles = sysUserRoleMapper.getRoleByUserName(username); - log.info("-------通过数据库读取用户拥有的角色Rules------username： " + username + ",Roles size: " + (roles == null ? 0 : roles.size())); - return new HashSet<>(roles); - } + /** + * 查询用户拥有的角色集合 + * + * @param username + * @return + */ + @Override + public Set getUserRoleSet(String username) { + // 查询用户拥有的角色集合 + List roles = sysUserRoleMapper.getRoleByUserName(username); + log.info("-------通过数据库读取用户拥有的角色Rules------username： " + username + ",Roles size: " + (roles == null ? 0 : roles.size())); + return new HashSet<>(roles); + } - /** - * 查询用户拥有的角色集合 - * @param useId - * @return - */ - @Override - public Set getUserRoleSetById(String useId) { - // 查询用户拥有的角色集合 - List roles = sysUserRoleMapper.getRoleCodeByUserId(useId); - log.info("-------通过数据库读取用户拥有的角色Rules------useId： " + useId + ",Roles size: " + (roles == null ? 0 : roles.size())); - return new HashSet<>(roles); - } + /** + * 查询用户拥有的角色集合 + * + * @param useId + * @return + */ + @Override + public Set getUserRoleSetById(String useId) { + // 查询用户拥有的角色集合 + List roles = sysUserRoleMapper.getRoleCodeByUserId(useId); + log.info("-------通过数据库读取用户拥有的角色Rules------useId： " + useId + ",Roles size: " + (roles == null ? 0 : roles.size())); + return new HashSet<>(roles); + } - /** - * 查询用户拥有的权限集合 - * @param userId - * @return - */ - @Override - public Set getUserPermissionSet(String userId) { - Set permissionSet = new HashSet<>(); - List permissionList = sysPermissionMapper.queryByUser(userId); - //================= begin 开启租户的时候 如果没有test角色，默认加入test角色================ - if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ - if (permissionList == null) { - permissionList = new ArrayList<>(); - } - List testRoleList = sysPermissionMapper.queryPermissionByTestRoleId(); - permissionList.addAll(testRoleList); - } - //================= end 开启租户的时候 如果没有test角色，默认加入test角色================ - for (SysPermission po : permissionList) { + /** + * 查询用户拥有的权限集合 + * + * @param userId + * @return + */ + @Override + public Set getUserPermissionSet(String userId) { + Set permissionSet = new HashSet<>(); + List permissionList = sysPermissionMapper.queryByUser(userId); + //================= begin 开启租户的时候 如果没有test角色，默认加入test角色================ + if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { + if (permissionList == null) { + permissionList = new ArrayList<>(); + } + List testRoleList = sysPermissionMapper.queryPermissionByTestRoleId(); + permissionList.addAll(testRoleList); + } + //================= end 开启租户的时候 如果没有test角色，默认加入test角色================ + for (SysPermission po : permissionList) { // // TODO URL规则有问题？ // if (oConvertUtils.isNotEmpty(po.getUrl())) { // permissionSet.add(po.getUrl()); // } - if (oConvertUtils.isNotEmpty(po.getPerms())) { - permissionSet.add(po.getPerms()); - } - } - log.info("-------通过数据库读取用户拥有的权限Perms------userId： "+ userId+",Perms size: "+ (permissionSet==null?0:permissionSet.size()) ); - return permissionSet; - } + if (oConvertUtils.isNotEmpty(po.getPerms())) { + permissionSet.add(po.getPerms()); + } + } + log.info("-------通过数据库读取用户拥有的权限Perms------userId： " + userId + ",Perms size: " + (permissionSet == null ? 0 : permissionSet.size())); + return permissionSet; + } - /** - * 判断online菜单是否有权限 - * @param onlineAuthDTO - * @return - */ - @Override - public boolean hasOnlineAuth(OnlineAuthDTO onlineAuthDTO) { - String username = onlineAuthDTO.getUsername(); - List possibleUrl = onlineAuthDTO.getPossibleUrl(); - String onlineFormUrl = onlineAuthDTO.getOnlineFormUrl(); - //查询菜单 - LambdaQueryWrapper query = new LambdaQueryWrapper(); - query.eq(SysPermission::getDelFlag, 0); - query.in(SysPermission::getUrl, possibleUrl); - List permissionList = sysPermissionMapper.selectList(query); - if (permissionList == null || permissionList.size() == 0) { - //没有配置菜单 找online表单菜单地址 - SysPermission sysPermission = new SysPermission(); - sysPermission.setUrl(onlineFormUrl); - int count = sysPermissionMapper.queryCountByUsername(username, sysPermission); - if(count<=0){ - //update-begin---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ - sysPermission.setUrl(onlineAuthDTO.getOnlineWorkOrderUrl()); - count = sysPermissionMapper.queryCountByUsername(username, sysPermission); - if(count<=0) { - return false; - } - //update-end---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ - } - } else { - //找到菜单了 - boolean has = false; - for (SysPermission p : permissionList) { - int count = sysPermissionMapper.queryCountByUsername(username, p); - has = has || (count>0); - } - return has; - } - return true; - } + /** + * 判断online菜单是否有权限 + * + * @param onlineAuthDTO + * @return + */ + @Override + public boolean hasOnlineAuth(OnlineAuthDTO onlineAuthDTO) { + String username = onlineAuthDTO.getUsername(); + List possibleUrl = onlineAuthDTO.getPossibleUrl(); + String onlineFormUrl = onlineAuthDTO.getOnlineFormUrl(); + //查询菜单 + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(SysPermission::getDelFlag, 0); + query.in(SysPermission::getUrl, possibleUrl); + List permissionList = sysPermissionMapper.selectList(query); + if (permissionList == null || permissionList.size() == 0) { + //没有配置菜单 找online表单菜单地址 + SysPermission sysPermission = new SysPermission(); + sysPermission.setUrl(onlineFormUrl); + int count = sysPermissionMapper.queryCountByUsername(username, sysPermission); + if (count <= 0) { + //update-begin---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ + sysPermission.setUrl(onlineAuthDTO.getOnlineWorkOrderUrl()); + count = sysPermissionMapper.queryCountByUsername(username, sysPermission); + if (count <= 0) { + return false; + } + //update-end---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ + } + } else { + //找到菜单了 + boolean has = false; + for (SysPermission p : permissionList) { + int count = sysPermissionMapper.queryCountByUsername(username, p); + has = has || (count > 0); + } + return has; + } + return true; + } - /** - * 查询用户拥有的角色集合 common api 里面的接口实现 - * @param username - * @return - */ - @Override - public Set queryUserRoles(String username) { - return getUserRoleSet(username); - } + /** + * 查询用户拥有的角色集合 common api 里面的接口实现 + * + * @param username + * @return + */ + @Override + public Set queryUserRoles(String username) { + return getUserRoleSet(username); + } - @Override - public Set queryUserRolesById(String userId) { - return getUserRoleSetById(userId); - } + @Override + public Set queryUserRolesById(String userId) { + return getUserRoleSetById(userId); + } - /** - * 查询用户拥有的权限集合 common api 里面的接口实现 - * @param userId - * @return - */ - @Override - public Set queryUserAuths(String userId) { - return getUserPermissionSet(userId); - } + /** + * 查询用户拥有的权限集合 common api 里面的接口实现 + * + * @param userId + * @return + */ + @Override + public Set queryUserAuths(String userId) { + return getUserPermissionSet(userId); + } - /** - * 36根据多个用户账号(逗号分隔)，查询返回多个用户信息 - * @param usernames - * @return - */ - @Override - public List queryUsersByUsernames(String usernames) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getUsername,usernames.split(",")); - return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); - } + /** + * 36根据多个用户账号(逗号分隔)，查询返回多个用户信息 + * + * @param usernames + * @return + */ + @Override + public List queryUsersByUsernames(String usernames) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysUser::getUsername, usernames.split(",")); + return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); + } - @Override - public List queryUsersByIds(String ids) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getId,ids.split(",")); - return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); - } + @Override + public List queryUsersByIds(String ids) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysUser::getId, ids.split(",")); + return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); + } - /** - * 37根据多个部门编码(逗号分隔)，查询返回多个部门信息 - * @param orgCodes - * @return - */ - @Override - public List queryDepartsByOrgcodes(String orgCodes) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDepart::getOrgCode,orgCodes.split(",")); - return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); - } + /** + * 37根据多个部门编码(逗号分隔)，查询返回多个部门信息 + * + * @param orgCodes + * @return + */ + @Override + public List queryDepartsByOrgcodes(String orgCodes) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysDepart::getOrgCode, orgCodes.split(",")); + return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); + } - @Override - public List queryDepartsByIds(String ids) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDepart::getId,ids.split(",")); - return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); - } + @Override + public List queryDepartsByIds(String ids) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysDepart::getId, ids.split(",")); + return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); + } - /** - * 发消息 - * @param fromUser - * @param toUser - * @param title - * @param msgContent - * @param setMsgCategory - */ - private void sendSysAnnouncement(String fromUser, String toUser, String title, String msgContent, String setMsgCategory) { - SysAnnouncement announcement = new SysAnnouncement(); - announcement.setTitile(title); - announcement.setMsgContent(msgContent); - announcement.setSender(fromUser); - announcement.setPriority(CommonConstant.PRIORITY_M); - announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); - announcement.setSendStatus(CommonConstant.HAS_SEND); - announcement.setSendTime(new Date()); - announcement.setMsgCategory(setMsgCategory); - announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); - sysAnnouncementMapper.insert(announcement); - // 2.插入用户通告阅读标记表记录 - String userId = toUser; - String[] userIds = userId.split(","); - String anntId = announcement.getId(); - for(int i=0;i getDeptUserByOrgCode(String orgCode) { - //1.获取公司信息 - SysDepart comp=sysDepartService.queryCompByOrgCode(orgCode); - if(comp!=null){ - //2.获取公司下级部门 - List departs=sysDepartService.queryDeptByPid(comp.getId()); - //3.获取部门下的人员信息 - List list=new ArrayList(); - //4.处理部门和下级用户数据 - for (SysDepart dept:departs) { - Map map=new HashMap(5); - //部门名称 - String departName = dept.getDepartName(); - //根据部门编码获取下级部门id - List listIds = departMapper.getSubDepIdsByDepId(dept.getId()); - //根据下级部门ids获取下级部门的所有用户 - List userList = sysUserDepartService.list(new QueryWrapper().in("dep_id",listIds)); - List userIds = new ArrayList<>(); - for(SysUserDepart userDepart : userList){ - if(!userIds.contains(userDepart.getUserId())){ - userIds.add(userDepart.getUserId()); - } - } - map.put("name",departName); - map.put("ids",userIds); - list.add(map); - } - return list; - } - return null; - } + /** + * 获取公司下级部门和所有用户id信息 + * + * @param orgCode + * @return + */ + @Override + public List getDeptUserByOrgCode(String orgCode) { + //1.获取公司信息 + SysDepart comp = sysDepartService.queryCompByOrgCode(orgCode); + if (comp != null) { + //2.获取公司下级部门 + List departs = sysDepartService.queryDeptByPid(comp.getId()); + //3.获取部门下的人员信息 + List list = new ArrayList(); + //4.处理部门和下级用户数据 + for (SysDepart dept : departs) { + Map map = new HashMap(5); + //部门名称 + String departName = dept.getDepartName(); + //根据部门编码获取下级部门id + List listIds = departMapper.getSubDepIdsByDepId(dept.getId()); + //根据下级部门ids获取下级部门的所有用户 + List userList = sysUserDepartService.list(new QueryWrapper().in("dep_id", listIds)); + List userIds = new ArrayList<>(); + for (SysUserDepart userDepart : userList) { + if (!userIds.contains(userDepart.getUserId())) { + userIds.add(userDepart.getUserId()); + } + } + map.put("name", departName); + map.put("ids", userIds); + list.add(map); + } + return list; + } + return null; + } - /** - * 查询分类字典翻译 - * - * @param ids 分类字典表id - * @return - */ - @Override - public List loadCategoryDictItem(String ids) { - return sysCategoryService.loadDictItem(ids, false); - } + /** + * 查询分类字典翻译 + * + * @param ids 分类字典表id + * @return + */ + @Override + public List loadCategoryDictItem(String ids) { + return sysCategoryService.loadDictItem(ids, false); + } - @Override - public List loadCategoryDictItemByNames(String names, boolean delNotExist) { - return sysCategoryService.loadDictItemByNames(names, delNotExist); - } + @Override + public List loadCategoryDictItemByNames(String names, boolean delNotExist) { + return sysCategoryService.loadDictItemByNames(names, delNotExist); + } - /** - * 根据字典code加载字典text - * - * @param dictCode 顺序：tableName,text,code - * @param keys 要查询的key - * @return - */ - @Override - public List loadDictItem(String dictCode, String keys) { - String[] params = dictCode.split(","); - return sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, false); - } + /** + * 根据字典code加载字典text + * + * @param dictCode 顺序：tableName,text,code + * @param keys 要查询的key + * @return + */ + @Override + public List loadDictItem(String dictCode, String keys) { + String[] params = dictCode.split(","); + return sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, false); + } - @Override - public Map copyLowAppDict(String originalAppId, String appId, String tenantId) { - Map dictCodeMapping = new HashMap(); - List ls = sysDictService.getDictListByLowAppId(originalAppId); - for (SysDictVo vo : ls) { - vo.setId(null); - vo.setLowAppId(appId); - vo.setTenantId(oConvertUtils.getInt(tenantId, null)); - String newDictCode = sysDictService.addDictByLowAppId(vo); - dictCodeMapping.put(vo.getDictCode(), newDictCode); - } + @Override + public Map copyLowAppDict(String originalAppId, String appId, String tenantId) { + Map dictCodeMapping = new HashMap(); + List ls = sysDictService.getDictListByLowAppId(originalAppId); + for (SysDictVo vo : ls) { + vo.setId(null); + vo.setLowAppId(appId); + vo.setTenantId(oConvertUtils.getInt(tenantId, null)); + String newDictCode = sysDictService.addDictByLowAppId(vo); + dictCodeMapping.put(vo.getDictCode(), newDictCode); + } - log.info(" --- 批量复制应用下的字典到新租户下 —— 原应用ID:{}，新应用ID:{}，新租户ID：{}，字典个数：{} --- ", originalAppId, appId, tenantId, dictCodeMapping.size()); - return dictCodeMapping; - } + log.info(" --- 批量复制应用下的字典到新租户下 —— 原应用ID:{}，新应用ID:{}，新租户ID：{}，字典个数：{} --- ", originalAppId, appId, tenantId, dictCodeMapping.size()); + return dictCodeMapping; + } - /** - * 根据字典code查询字典项 - * - * @param dictCode 顺序：tableName,text,code - * @param dictCode 要查询的key - * @return - */ - @Override - public List getDictItems(String dictCode) { - List ls = sysDictService.getDictItems(dictCode); - if (ls == null) { - ls = new ArrayList<>(); - } - return ls; - } + /** + * 根据字典code查询字典项 + * + * @param dictCode 顺序：tableName,text,code + * @param dictCode 要查询的key + * @return + */ + @Override + public List getDictItems(String dictCode) { + List ls = sysDictService.getDictItems(dictCode); + if (ls == null) { + ls = new ArrayList<>(); + } + return ls; + } - /** - * 根据多个字典code查询多个字典项 - * - * @param dictCodeList - * @return key = dictCode ； value=对应的字典项 - */ - @Override - public Map> getManyDictItems(List dictCodeList) { - return sysDictService.queryDictItemsByCodeList(dictCodeList); - } + /** + * 根据多个字典code查询多个字典项 + * + * @param dictCodeList + * @return key = dictCode ； value=对应的字典项 + */ + @Override + public Map> getManyDictItems(List dictCodeList) { + return sysDictService.queryDictItemsByCodeList(dictCodeList); + } - /** - * 【下拉搜索】 - * 大数据量的字典表 走异步加载，即前端输入内容过滤数据 - * - * @param dictCode 字典code格式：table,text,code - * @param keyword 过滤关键字 - * @return - */ - @Override - public List loadDictItemByKeyword(String dictCode, String keyword, Integer pageNo, Integer pageSize) { - return sysDictService.loadDict(dictCode, keyword,pageNo, pageSize); - } + /** + * 【下拉搜索】 + * 大数据量的字典表 走异步加载，即前端输入内容过滤数据 + * + * @param dictCode 字典code格式：table,text,code + * @param keyword 过滤关键字 + * @return + */ + @Override + public List loadDictItemByKeyword(String dictCode, String keyword, Integer pageNo, Integer pageSize) { + return sysDictService.loadDict(dictCode, keyword, pageNo, pageSize); + } - @Override - public Map> translateManyDict(String dictCodes, String keys) { - List dictCodeList = Arrays.asList(dictCodes.split(",")); - List values = Arrays.asList(keys.split(",")); - //update-begin---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ - return sysDictService.queryManyDictByKeys(dictCodeList, values); - //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ - } + @Override + public Map> translateManyDict(String dictCodes, String keys) { + List dictCodeList = Arrays.asList(dictCodes.split(",")); + List values = Arrays.asList(keys.split(",")); + //update-begin---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ + return sysDictService.queryManyDictByKeys(dictCodeList, values); + //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ + } - //update-begin---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ - @Override - public List translateDictFromTableByKeys(String table, String text, String code, String keys, String dataSource) { - return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")), dataSource); - } - //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ + //update-begin---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ + @Override + public List translateDictFromTableByKeys(String table, String text, String code, String keys, String dataSource) { + return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")), dataSource); + } + //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ - //-------------------------------------流程节点发送模板消息----------------------------------------------- - @Autowired - private QywxSendMsgHandle qywxSendMsgHandle; + //-------------------------------------流程节点发送模板消息----------------------------------------------- + @Autowired + private QywxSendMsgHandle qywxSendMsgHandle; - @Autowired - private SystemSendMsgHandle systemSendMsgHandle; + @Autowired + private SystemSendMsgHandle systemSendMsgHandle; - @Autowired - private EmailSendMsgHandle emailSendMsgHandle; + @Autowired + private EmailSendMsgHandle emailSendMsgHandle; - @Autowired - private DdSendMsgHandle ddSendMsgHandle; + @Autowired + private DdSendMsgHandle ddSendMsgHandle; - @Override - public void sendTemplateMessage(MessageDTO message) { - String messageType = message.getType(); - log.debug(" 【万能通用】推送消息 messageType = {}", messageType); - //update-begin-author:taoyan date:2022-7-9 for: 将模板解析代码移至消息发送, 而不是调用的地方 - String templateCode = message.getTemplateCode(); - if(oConvertUtils.isNotEmpty(templateCode)){ - SysMessageTemplate templateEntity = getTemplateEntity(templateCode); - boolean isMarkdown = CommonConstant.MSG_TEMPLATE_TYPE_MD.equals(templateEntity.getTemplateType()); - String content = templateEntity.getTemplateContent(); - if(oConvertUtils.isNotEmpty(content) && null!=message.getData()){ - content = FreemarkerParseFactory.parseTemplateContent(content, message.getData(), isMarkdown); - } - message.setIsMarkdown(isMarkdown); - message.setContent(content); - } - if(oConvertUtils.isEmpty(message.getContent())){ - log.error("发送消息失败,消息内容为空！"); - throw new JeecgBootException("发送消息失败,消息内容为空！"); - } + @Override + public void sendTemplateMessage(MessageDTO message) { + String messageType = message.getType(); + log.debug(" 【万能通用】推送消息 messageType = {}", messageType); + //update-begin-author:taoyan date:2022-7-9 for: 将模板解析代码移至消息发送, 而不是调用的地方 + String templateCode = message.getTemplateCode(); + if (oConvertUtils.isNotEmpty(templateCode)) { + SysMessageTemplate templateEntity = getTemplateEntity(templateCode); + boolean isMarkdown = CommonConstant.MSG_TEMPLATE_TYPE_MD.equals(templateEntity.getTemplateType()); + String content = templateEntity.getTemplateContent(); + if (oConvertUtils.isNotEmpty(content) && null != message.getData()) { + content = FreemarkerParseFactory.parseTemplateContent(content, message.getData(), isMarkdown); + } + message.setIsMarkdown(isMarkdown); + message.setContent(content); + } + if (oConvertUtils.isEmpty(message.getContent())) { + log.error("发送消息失败,消息内容为空！"); + throw new JeecgBootException("发送消息失败,消息内容为空！"); + } - //update-end-author:taoyan date:2022-7-9 for: 将模板解析代码移至消息发送, 而不是调用的地方 - if(MessageTypeEnum.XT.getType().equals(messageType)){ - if (message.isMarkdown()) { - // 系统消息要解析Markdown - message.setContent(HTMLUtils.parseMarkdown(message.getContent())); - } - systemSendMsgHandle.sendMessage(message); - }else if(MessageTypeEnum.YJ.getType().equals(messageType)){ - if (message.isMarkdown()) { - // 邮件消息要解析Markdown - message.setContent(HTMLUtils.parseMarkdown(message.getContent())); - } - //update-begin---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定--- - if(message.getIsTimeJob() != null && message.getIsTimeJob()){ - emailSendMsgHandle.sendEmailMessage(message); - }else{ - emailSendMsgHandle.sendMessage(message); - } - //update-end---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定--- - }else if(MessageTypeEnum.DD.getType().equals(messageType)){ - ddSendMsgHandle.sendMessage(message); - }else if(MessageTypeEnum.QYWX.getType().equals(messageType)){ - qywxSendMsgHandle.sendMessage(message); - } - } + //update-end-author:taoyan date:2022-7-9 for: 将模板解析代码移至消息发送, 而不是调用的地方 + if (MessageTypeEnum.XT.getType().equals(messageType)) { + if (message.isMarkdown()) { + // 系统消息要解析Markdown + message.setContent(HTMLUtils.parseMarkdown(message.getContent())); + } + systemSendMsgHandle.sendMessage(message); + } else if (MessageTypeEnum.YJ.getType().equals(messageType)) { + if (message.isMarkdown()) { + // 邮件消息要解析Markdown + message.setContent(HTMLUtils.parseMarkdown(message.getContent())); + } + //update-begin---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定--- + if (message.getIsTimeJob() != null && message.getIsTimeJob()) { + emailSendMsgHandle.sendEmailMessage(message); + } else { + emailSendMsgHandle.sendMessage(message); + } + //update-end---author:wangshuai---date:2024-11-20---for:【QQYUN-8523】敲敲云发邮件通知，不稳定--- + } else if (MessageTypeEnum.DD.getType().equals(messageType)) { + ddSendMsgHandle.sendMessage(message); + } else if (MessageTypeEnum.QYWX.getType().equals(messageType)) { + qywxSendMsgHandle.sendMessage(message); + } + } - @Override - public String getTemplateContent(String code) { - List list = sysMessageTemplateService.selectByCode(code); - if(list==null || list.size()==0){ - return null; - } - return list.get(0).getTemplateContent(); - } + @Override + public String getTemplateContent(String code) { + List list = sysMessageTemplateService.selectByCode(code); + if (list == null || list.size() == 0) { + return null; + } + return list.get(0).getTemplateContent(); + } - /** - * 获取模板内容，解析markdown - * - * @param code - * @return - */ - public SysMessageTemplate getTemplateEntity(String code) { - List list = sysMessageTemplateService.selectByCode(code); - if (list == null || list.size() == 0) { - return null; - } - return list.get(0); - } + /** + * 获取模板内容，解析markdown + * + * @param code + * @return + */ + public SysMessageTemplate getTemplateEntity(String code) { + List list = sysMessageTemplateService.selectByCode(code); + if (list == null || list.size() == 0) { + return null; + } + return list.get(0); + } - //-------------------------------------流程节点发送模板消息----------------------------------------------- + //-------------------------------------流程节点发送模板消息----------------------------------------------- - @Override - public void saveDataLog(DataLogDTO dataLogDto) { - try { - SysDataLog entity = new SysDataLog(); - entity.setDataTable(dataLogDto.getTableName()); - entity.setDataId(dataLogDto.getDataId()); - entity.setDataContent(dataLogDto.getContent()); - entity.setType(dataLogDto.getType()); - entity.setDataVersion("1"); - if (oConvertUtils.isNotEmpty(dataLogDto.getCreateName())) { - entity.setCreateBy(dataLogDto.getCreateName()); - } else { - entity.autoSetCreateName(); - } - sysDataLogService.save(entity); - } catch (Exception e) { - log.warn(e.getMessage(), e); - //e.printStackTrace(); - } - } + @Override + public void saveDataLog(DataLogDTO dataLogDto) { + try { + SysDataLog entity = new SysDataLog(); + entity.setDataTable(dataLogDto.getTableName()); + entity.setDataId(dataLogDto.getDataId()); + entity.setDataContent(dataLogDto.getContent()); + entity.setType(dataLogDto.getType()); + entity.setDataVersion("1"); + if (oConvertUtils.isNotEmpty(dataLogDto.getCreateName())) { + entity.setCreateBy(dataLogDto.getCreateName()); + } else { + entity.autoSetCreateName(); + } + sysDataLogService.save(entity); + } catch (Exception e) { + log.warn(e.getMessage(), e); + //e.printStackTrace(); + } + } @Override public void updateAvatar(LoginUser loginUser) { - SysUser sysUser = new SysUser(); - // 创建UpdateWrapper对象 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id", loginUser.getId()); // 设置更新条件 - sysUser.setAvatar(loginUser.getAvatar()); // 设置要更新的字段 - sysUserService.update(sysUser, updateWrapper); + SysUser sysUser = new SysUser(); + // 创建UpdateWrapper对象 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", loginUser.getId()); // 设置更新条件 + sysUser.setAvatar(loginUser.getAvatar()); // 设置要更新的字段 + sysUserService.update(sysUser, updateWrapper); } - @Override - public void sendAppChatSocket(String userId) { - JSONObject obj = new JSONObject(); - obj.put(WebsocketConst.MSG_CMD, WebsocketConst.MSG_CHAT); - obj.put(WebsocketConst.MSG_USER_ID, userId); - webSocket.sendMessage(userId, obj.toJSONString()); - } + @Override + public void sendAppChatSocket(String userId) { + JSONObject obj = new JSONObject(); + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.MSG_CHAT); + obj.put(WebsocketConst.MSG_USER_ID, userId); + webSocket.sendMessage(userId, obj.toJSONString()); + } - @Override - public String getRoleCodeById(String id) { - SysRole role = roleMapper.selectById(id); - if(role!=null){ - return role.getRoleCode(); - } - return null; - } + @Override + public String getRoleCodeById(String id) { + SysRole role = roleMapper.selectById(id); + if (role != null) { + return role.getRoleCode(); + } + return null; + } - @Override - public List queryRoleDictByCode(String roleCodes) { - if (oConvertUtils.isEmpty(roleCodes)) { - return new ArrayList<>(); - } - List codeList = Arrays.asList(roleCodes.split(",")); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysRole::getRoleCode, codeList); - List list = roleMapper.selectList(queryWrapper); - // 转换成SysRoleVo - return list.stream().map(sysRole -> { - DictModel model = new DictModel(); - model.setText(sysRole.getRoleName()); - model.setValue(sysRole.getRoleCode()); - return model; - }).collect(Collectors.toList()); - } + @Override + public List queryRoleDictByCode(String roleCodes) { + if (oConvertUtils.isEmpty(roleCodes)) { + return new ArrayList<>(); + } + List codeList = Arrays.asList(roleCodes.split(",")); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysRole::getRoleCode, codeList); + List list = roleMapper.selectList(queryWrapper); + // 转换成SysRoleVo + return list.stream().map(sysRole -> { + DictModel model = new DictModel(); + model.setText(sysRole.getRoleName()); + model.setValue(sysRole.getRoleCode()); + return model; + }).collect(Collectors.toList()); + } - @Override - public List queryUserIdsByDeptIds(List deptIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().select(SysUserDepart::getUserId).in(true,SysUserDepart::getDepId,deptIds); - return sysUserDepartService.listObjs(queryWrapper,e->e.toString()); - } + @Override + public List queryUserIdsByDeptIds(List deptIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().select(SysUserDepart::getUserId).in(true, SysUserDepart::getDepId, deptIds); + return sysUserDepartService.listObjs(queryWrapper, e -> e.toString()); + } - @Override - public List queryUserAccountsByDeptIds(List deptIds) { - return departMapper.queryUserAccountByDepartIds(deptIds); - } + @Override + public List queryUserAccountsByDeptIds(List deptIds) { + return departMapper.queryUserAccountByDepartIds(deptIds); + } - @Override - public List queryUserIdsByRoleds(List roleCodes) { - LambdaQueryWrapper query = new LambdaQueryWrapper() - .in(SysRole::getRoleCode, roleCodes); - List roleList = sysRoleService.list(query); - if(roleList!=null && roleList.size()>0){ - List idList = roleList.stream().map(role->role.getId()).collect(Collectors.toList()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().select(SysUserRole::getUserId).in(true,SysUserRole::getRoleId, idList); - return sysUserRoleService.listObjs(queryWrapper,e->e.toString()); - } - return null; - } + @Override + public List queryUserIdsByRoleds(List roleCodes) { + LambdaQueryWrapper query = new LambdaQueryWrapper() + .in(SysRole::getRoleCode, roleCodes); + List roleList = sysRoleService.list(query); + if (roleList != null && roleList.size() > 0) { + List idList = roleList.stream().map(role -> role.getId()).collect(Collectors.toList()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().select(SysUserRole::getUserId).in(true, SysUserRole::getRoleId, idList); + return sysUserRoleService.listObjs(queryWrapper, e -> e.toString()); + } + return null; + } - @Override - public List queryUserIdsByPositionIds(List positionIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().select(SysUserPosition::getUserId).in(true,SysUserPosition::getPositionId,positionIds); - return sysUserPositionService.listObjs(queryWrapper,e->e.toString()); - } + @Override + public List queryUserIdsByPositionIds(List positionIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().select(SysUserPosition::getUserId).in(true, SysUserPosition::getPositionId, positionIds); + return sysUserPositionService.listObjs(queryWrapper, e -> e.toString()); + } - //update-begin-author:taoyan date:2023-2-21 for: 解决参数顺序问题 - /** - * 获取带参数的报表地址，因为多个参数可能顺序会变，所以要将参数顺序重排，获取所有可能的地址集合 - * 如下：参数顺序调整使用in查询，就能查询出菜单数据 - * /online/cgreport/1624393012494286850?name=1&age=16 - * /online/cgreport/1624393012494286850?age=16&name=1 - * @param path - * @return - */ - private List getOnlinePossiblePaths(String path){ - List result = new ArrayList<>(); - log.info(" path = "+ path); - if (path.indexOf("?") >= 0 && (path.contains("/online/cgreport/") || path.contains("/online/cgformList/") || path.contains("/online/graphreport/"))) { - //包含?说明有多个参数 - String[] pathArray = path.split("\\?"); - if(oConvertUtils.isNotEmpty(pathArray[1])){ - String[] params = pathArray[1].split("&"); - if(params.length==1){ - result.add(path); - }else{ - result = anm(pathArray[0], Arrays.asList(params)); - } - }else{ - result.add(path); - } - }else{ - result.add(path); - } - return result; - } + //update-begin-author:taoyan date:2023-2-21 for: 解决参数顺序问题 + + /** + * 获取带参数的报表地址，因为多个参数可能顺序会变，所以要将参数顺序重排，获取所有可能的地址集合 + * 如下：参数顺序调整使用in查询，就能查询出菜单数据 + * /online/cgreport/1624393012494286850?name=1&age=16 + * /online/cgreport/1624393012494286850?age=16&name=1 + * + * @param path + * @return + */ + private List getOnlinePossiblePaths(String path) { + List result = new ArrayList<>(); + log.info(" path = " + path); + if (path.indexOf("?") >= 0 && (path.contains("/online/cgreport/") || path.contains("/online/cgformList/") || path.contains("/online/graphreport/"))) { + //包含?说明有多个参数 + String[] pathArray = path.split("\\?"); + if (oConvertUtils.isNotEmpty(pathArray[1])) { + String[] params = pathArray[1].split("&"); + if (params.length == 1) { + result.add(path); + } else { + result = anm(pathArray[0], Arrays.asList(params)); + } + } else { + result.add(path); + } + } else { + result.add(path); + } + return result; + } - /** - * 获取数组元素的 不同排列 a(n,m) - * @param list - * @return - */ - private List anm(String baseUrl, List list) { - int len = list.size(); - int[] destArray = new int[len]; - for (int i = 0; i < len; i++) { - destArray[i] = i; - } - int[] temp = new int[len]; - List result = new ArrayList<>(); - while (temp[0] < len) { - temp[temp.length - 1]++; - for (int i = temp.length - 1; i > 0; i--) { - if (temp[i] == len) { - temp[i] = 0; - temp[i - 1]++; - } - } - int[] tt = temp.clone(); - Arrays.sort(tt); - if (!Arrays.equals(tt, destArray)) { - continue; - } - String str = ""; - for (int i = 0; i < len; i++) { - if(i>0){ - str += "&"; - } - str += list.get(temp[i]); - } - result.add(baseUrl+"?"+str); - } - return result; - } - //update-end-author:taoyan date:2023-2-21 for: 解决参数顺序问题 + /** + * 获取数组元素的 不同排列 a(n,m) + * + * @param list + * @return + */ + private List anm(String baseUrl, List list) { + int len = list.size(); + int[] destArray = new int[len]; + for (int i = 0; i < len; i++) { + destArray[i] = i; + } + int[] temp = new int[len]; + List result = new ArrayList<>(); + while (temp[0] < len) { + temp[temp.length - 1]++; + for (int i = temp.length - 1; i > 0; i--) { + if (temp[i] == len) { + temp[i] = 0; + temp[i - 1]++; + } + } + int[] tt = temp.clone(); + Arrays.sort(tt); + if (!Arrays.equals(tt, destArray)) { + continue; + } + String str = ""; + for (int i = 0; i < len; i++) { + if (i > 0) { + str += "&"; + } + str += list.get(temp[i]); + } + result.add(baseUrl + "?" + str); + } + return result; + } + //update-end-author:taoyan date:2023-2-21 for: 解决参数顺序问题 - @Override - public List getUserAccountsByDepCode(String orgCode) { - return userMapper.getUserAccountsByDepCode(orgCode); - } + @Override + public List getUserAccountsByDepCode(String orgCode) { + return userMapper.getUserAccountsByDepCode(orgCode); + } - @Override - public boolean dictTableWhiteListCheckBySql(String selectSql) { - return dictTableWhiteListHandler.isPassBySql(selectSql); - } + @Override + public boolean dictTableWhiteListCheckBySql(String selectSql) { + return dictTableWhiteListHandler.isPassBySql(selectSql); + } - @Override - public boolean dictTableWhiteListCheckByDict(String tableOrDictCode, String... fields) { - if (fields == null || fields.length == 0) { - return dictTableWhiteListHandler.isPassByDict(tableOrDictCode); - } else { - return dictTableWhiteListHandler.isPassByDict(tableOrDictCode, fields); - } - } + @Override + public boolean dictTableWhiteListCheckByDict(String tableOrDictCode, String... fields) { + if (fields == null || fields.length == 0) { + return dictTableWhiteListHandler.isPassByDict(tableOrDictCode); + } else { + return dictTableWhiteListHandler.isPassByDict(tableOrDictCode, fields); + } + } + + @Override + public List queryOpeDept() { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("org_category", "1"); + qw.eq("del_flag","0"); + List list = sysDepartService.list(qw); + List result = Lists.newArrayList(); + if (list != null && !list.isEmpty()) { + list.stream().forEach(d -> { + Map map = Maps.newHashMap(); + map.put("code",d.getOrgCode()); + map.put("name",d.getDepartName()); + result.add(new JSONObject(map)); + }); + } + return result; + } } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index 4604385..cbf0742 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java @@ -75,6 +75,7 @@ public class SysDictServiceImpl extends ServiceImpl impl private DictQueryBlackListHandler dictQueryBlackListHandler; @Autowired private RabbitMQUtil rabbitMQUtil; + @Lazy @Autowired private IAsyncMainService asyncMainService; diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/mq/dict/listener/DictMQListener.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/mq/dict/listener/DictMQListener.java index 2dea804..f2cf07b 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/mq/dict/listener/DictMQListener.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/mq/dict/listener/DictMQListener.java @@ -21,6 +21,7 @@ public class DictMQListener { asyncMain.setPrimaryKey(dto.getDictId()); asyncMain.setStatus(dto.getStatus()+""); asyncMain.setOrgCode(dto.getOrgCode()); + asyncMain.setOrgName(dto.getOrgName()); asyncMain.setDescr(dto.getMessage()); asyncMainService.save(asyncMain); }