解决服务指令-镜像日志查询接口:后台使用@DS注解 内部使用DynamicDataSourceContextHolder.push(dataSource);切换后再清理 导致默认切回到了主数据源问题
This commit is contained in:
parent
a4119b330e
commit
dd7d5a4e36
|
|
@ -73,17 +73,7 @@ public class DirectiveSyncLogMainController extends JeecgController<DirectiveSyn
|
||||||
@ApiOperation(value = "服务指令镜像日志主表-分页列表查询", notes = "服务指令镜像日志主表-分页列表查询")
|
@ApiOperation(value = "服务指令镜像日志主表-分页列表查询", notes = "服务指令镜像日志主表-分页列表查询")
|
||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
@DS("ope")
|
@DS("ope")
|
||||||
public Result<IPage<DirectiveSyncLogMain>> queryPageList(DirectiveSyncLogMain directiveSyncLogMain,
|
public Result<IPage<DirectiveSyncLogMain>> queryPageList(DirectiveSyncLogMain directiveSyncLogMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
|
||||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
||||||
HttpServletRequest req) {
|
|
||||||
JSONObject deptInfo = new JSONObject();
|
|
||||||
try {
|
|
||||||
DynamicDataSourceContextHolder.push("master");
|
|
||||||
deptInfo = sysBaseAPI.getDeptInfo();
|
|
||||||
} finally {
|
|
||||||
DynamicDataSourceContextHolder.clear();
|
|
||||||
}
|
|
||||||
// 自定义查询规则
|
// 自定义查询规则
|
||||||
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
||||||
// 自定义多选的查询规则为:LIKE_WITH_OR
|
// 自定义多选的查询规则为:LIKE_WITH_OR
|
||||||
|
|
@ -91,7 +81,6 @@ public class DirectiveSyncLogMainController extends JeecgController<DirectiveSyn
|
||||||
customeRuleMap.put("targetOrgCode", QueryRuleEnum.LIKE_WITH_OR);
|
customeRuleMap.put("targetOrgCode", QueryRuleEnum.LIKE_WITH_OR);
|
||||||
QueryWrapper<DirectiveSyncLogMain> queryWrapper = QueryGenerator.initQueryWrapper(directiveSyncLogMain, req.getParameterMap(), customeRuleMap);
|
QueryWrapper<DirectiveSyncLogMain> queryWrapper = QueryGenerator.initQueryWrapper(directiveSyncLogMain, req.getParameterMap(), customeRuleMap);
|
||||||
Page<DirectiveSyncLogMain> page = new Page<DirectiveSyncLogMain>(pageNo, pageSize);
|
Page<DirectiveSyncLogMain> page = new Page<DirectiveSyncLogMain>(pageNo, pageSize);
|
||||||
queryWrapper.eq("target_org_code", deptInfo.getString("code"));
|
|
||||||
queryWrapper.orderByDesc("create_time");
|
queryWrapper.orderByDesc("create_time");
|
||||||
IPage<DirectiveSyncLogMain> pageList = directiveSyncLogMainService.page(page, queryWrapper);
|
IPage<DirectiveSyncLogMain> pageList = directiveSyncLogMainService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue