wanglei-liudekang
/
car-net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():修改多数据源信息

baize
baize 2024-06-12 22:32:22 +08:00
parent e445fd5d26
commit 5a003b84bf
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java
View File

@ -39,9 +39,9 @@ public class ManyDataSource {
DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class); DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class);
DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class); DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class);
EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder() EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder()
.entCode("liu_0605") .entCode("liu_42")
.ip("192.168.116.129") .ip("192.168.116.129")
.port(3309) .port(3348)
.build(); .build();
DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort()); DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort());
@ -55,9 +55,9 @@ public class ManyDataSource {
List<EnterPriseInfo> list = new ArrayList<>(); List<EnterPriseInfo> list = new ArrayList<>();
list.add( list.add(
EnterPriseInfo.builder() EnterPriseInfo.builder()
.entCode("liu_0608") .entCode("liu_44")
.ip("192.168.116.129") .ip("192.168.116.129")
.port(3310) .port(3350)
.build() .build()
); );
return list; return list;

9
muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java
View File

@ -183,6 +183,12 @@ public class EnterpriseController extends BaseController {
return toAjax(enterpriseService.removeBatchByIds(ids)); return toAjax(enterpriseService.removeBatchByIds(ids));
} }
/**
* 完善企业信息
* @param id
* @param enterpriseEditReq
* @return
*/
@PostMapping("/updateEnterprise/{id}") @PostMapping("/updateEnterprise/{id}")
public Result<String> updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) { public Result<String> updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
@ -194,9 +200,6 @@ public class EnterpriseController extends BaseController {
@PostMapping("/authentication") @PostMapping("/authentication")
public Result<String> authentication(@RequestBody Enterprise enterprise ) { public Result<String> authentication(@RequestBody Enterprise enterprise ) {
enterpriseService.authentication(enterprise); enterpriseService.authentication(enterprise);
if(!enterprise.getEnterpriseStatus().equals("Y")){
return Result.error("已经审核完成");
}
return Result.success(); return Result.success();
} }
} }

1
muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -49,7 +49,6 @@
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, select u.user_id,
u.dept_id, u.dept_id,
u.type,
u.user_name, u.user_name,
u.nick_name, u.nick_name,
u.email, u.email,