From 7a9d2dd4ae60a924ae0ac9018871b02eb2c706f7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 10 Sep 2024 12:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/RemoteEnergyService.java | 4 +-- .../controller/BaseBuildInfoController.java | 26 ++++++++++++++++++- .../service/impl/SysUserServiceImpl.java | 2 +- .../resources/mapper/system/SysUserMapper.xml | 4 +-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java index 4659648a..ad2047e1 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteEnergyService.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestBody; */ @FeignClient(contextId = "remoteEnergyService", value = ServiceNameConstants.ENERGY_SERVICE, fallbackFactory = RemoteEnergyFallbackFactory.class) public interface RemoteEnergyService { - @PostMapping("/energy/addDatasource") + @PostMapping("/buildInfo/addDatasource") public R addDatasource(@RequestBody DataSourcePropertyDTO dataSourceProperty); - @PostMapping("/energy/removeDatasource") + @PostMapping("/buildInfo/removeDatasource") public R removeDatasource(@RequestBody DataSourcePropertyDTO dataSourceProperty); } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/base/controller/BaseBuildInfoController.java b/op-modules/op-energy/src/main/java/com/op/energy/base/controller/BaseBuildInfoController.java index e9684c53..3a89c560 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/base/controller/BaseBuildInfoController.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/base/controller/BaseBuildInfoController.java @@ -1,17 +1,24 @@ package com.op.energy.base.controller; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; +import com.op.common.core.domain.R; +import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; import com.op.energy.base.domain.BaseBuildInfo; import com.op.energy.base.domain.Ztree; import com.op.energy.base.service.IBaseBuildInfoService; +import com.op.system.api.domain.DataSourcePropertyDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -26,7 +33,10 @@ import java.util.List; public class BaseBuildInfoController extends BaseController { @Autowired private IBaseBuildInfoService baseBuildInfoService; - + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 查询建筑信息管理列表 */ @@ -97,5 +107,19 @@ public class BaseBuildInfoController extends BaseController { List ztrees = baseBuildInfoService.selectBaseBuildInfoTree(); return ztrees; } + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } } diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java index c7e76bcd..f452077f 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java @@ -593,7 +593,7 @@ public class SysUserServiceImpl implements ISysUserService { } int n = 0; - //sap返回的供应商编码 + //sap返回的编码 List codes = dtos.stream().map(HRInfo::getUserName).collect(Collectors.toList()); //sap返回的工作中心编码-本地已存在 List exsitCodes = userMapper.getExsitCodes(codes); diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml index 5ca38953..8b1fd304 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{item.updateBy}, update_time = #{item.updateTime} where - user_name = #{item.userName} + user_name = #{item.userName} and del_flag = '0' @@ -285,7 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select max(create_time) from sys_user where create_by = 'job' and del_flag = '0'