From 06fbdd9fdbf292ca84da1228c2d8daf627c2fdb8 Mon Sep 17 00:00:00 2001 From: hbr <1991483710@qq.com> Date: Sat, 8 Jun 2024 11:25:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E5=AE=8C=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EntinfoController.java | 6 +++ .../zhiLian/business/feign/EntInfoFeign.java | 21 +++++++++ .../service/impl/BusinessServiceImpl.java | 1 + .../zhiLian/common/core/domain/Entinfo.java | 44 +++++++++++++++++++ .../system/remote/RemoteFileService.java | 8 +++- .../factory/RemoteFileFallbackFactory.java | 8 ++++ .../system/mapper/SysUserRoleMapper.java | 2 + .../service/impl/SysUserServiceImpl.java | 9 ++-- .../mapper/system/SysUserRoleMapper.xml | 4 ++ .../vehicle/controller/VehicleController.java | 1 + .../vehicle/datasource/ManyDataSource.java | 6 +++ .../service/impl/VehicleServiceImpl.java | 2 + 12 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/feign/EntInfoFeign.java create mode 100644 zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/domain/Entinfo.java diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/EntinfoController.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/EntinfoController.java index 73145c5..dcd38e2 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/EntinfoController.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/EntinfoController.java @@ -48,6 +48,12 @@ public class EntinfoController extends BaseController return getDataTable(list); } + @GetMapping("ListAll") + public List listAll(){ + List list = entinfoService.list(); + return list; + } + /** * 导出多数据源列表 */ diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/feign/EntInfoFeign.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/feign/EntInfoFeign.java new file mode 100644 index 0000000..f43e52e --- /dev/null +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/feign/EntInfoFeign.java @@ -0,0 +1,21 @@ +package com.zhiLian.business.feign; + + +import com.zhiLian.business.domain.Entinfo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +/** + * BingRui.Hou + * + * @Description 描述 + * @ClassName EntInfoFeign + * @Date 2024/06/07 17:25 + */ +@FeignClient(value = "zhiLian-business-service") +public interface EntInfoFeign { + @GetMapping("ListAll") + public List listAll(); +} diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/BusinessServiceImpl.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/BusinessServiceImpl.java index 239a51e..b9cb106 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/BusinessServiceImpl.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/BusinessServiceImpl.java @@ -108,6 +108,7 @@ public class BusinessServiceImpl extends ServiceImpl .email(business.getBusinessEmail()) .phonenumber(business.getBusinessPhone()) .loginIp("111.229.102.61") + .roleId(Long.valueOf(2)) .userType(String.valueOf(business.getId())) .build(); Result add = remoteUserService.add(sysUser); diff --git a/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/domain/Entinfo.java b/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/domain/Entinfo.java new file mode 100644 index 0000000..d18089f --- /dev/null +++ b/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/domain/Entinfo.java @@ -0,0 +1,44 @@ +package com.zhiLian.common.core.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.zhiLian.common.core.annotation.Excel; +import com.zhiLian.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 多数据源对象 entinfo + * + * @author muyu + * @date 2024-06-06 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("entinfo") +public class Entinfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 数据源key */ + @Excel(name = "数据源key") + private String entCode; + + /** 数据源ip */ + @Excel(name = "数据源ip") + private String ip; + + /** 数据源端口 */ + @Excel(name = "数据源端口") + private Integer port; + + /** 数据源ID */ + private Long id; + + +} diff --git a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteFileService.java b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteFileService.java index e40ea33..d6366c5 100644 --- a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteFileService.java +++ b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/RemoteFileService.java @@ -1,6 +1,7 @@ package com.zhiLian.common.system.remote; import com.zhiLian.common.core.constant.ServiceNameConstants; +import com.zhiLian.common.core.domain.Entinfo; import com.zhiLian.common.core.domain.Result; import com.zhiLian.common.system.domain.SysFile; import com.zhiLian.common.system.remote.factory.RemoteFileFallbackFactory; @@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * 文件服务 * @@ -29,7 +32,10 @@ public interface RemoteFileService { @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public Result upload (@RequestPart(value = "file") MultipartFile file); - @GetMapping(value = "/{id}") public Result getInfo(@PathVariable("id") Long id); + @GetMapping("ListAll") + public List listAll(); + + } diff --git a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteFileFallbackFactory.java b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteFileFallbackFactory.java index 7fda8be..2ea529d 100644 --- a/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteFileFallbackFactory.java +++ b/zhiLian-common/zhiLian-common-system/src/main/java/com/zhiLian/common/system/remote/factory/RemoteFileFallbackFactory.java @@ -1,5 +1,6 @@ package com.zhiLian.common.system.remote.factory; +import com.zhiLian.common.core.domain.Entinfo; import com.zhiLian.common.core.domain.Result; import com.zhiLian.common.system.remote.RemoteFileService; import com.zhiLian.common.system.domain.SysFile; @@ -9,6 +10,8 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * 文件服务降级处理 * @@ -31,6 +34,11 @@ public class RemoteFileFallbackFactory implements FallbackFactory listAll() { + return null; + } }; } } diff --git a/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/mapper/SysUserRoleMapper.java b/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/mapper/SysUserRoleMapper.java index 15725cb..5361856 100644 --- a/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/mapper/SysUserRoleMapper.java +++ b/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/mapper/SysUserRoleMapper.java @@ -66,4 +66,6 @@ public interface SysUserRoleMapper extends BaseMapper { * @return 结果 */ public int deleteUserRoleInfos (@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); + + void insertUserRole(SysUserRole sysUserRole); } diff --git a/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/impl/SysUserServiceImpl.java b/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/impl/SysUserServiceImpl.java index 3589253..685c0c5 100644 --- a/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/impl/SysUserServiceImpl.java +++ b/zhiLian-modules/zhiLian-modules-system/src/main/java/com/zhiLian/system/service/impl/SysUserServiceImpl.java @@ -241,10 +241,11 @@ public class SysUserServiceImpl extends ServiceImpl impl // 新增用户岗位关联 insertUserPost(user); // 新增用户与角色管理 - if (null == user.getRoleId()|| user.getRoleId().equals("")){ - user.setRoleId(Long.valueOf(2)); - insertUserRole(user); - return rows; + if (2 == user.getRoleId()){ + SysUserRole sysUserRole = new SysUserRole(); + sysUserRole.setRoleId(Long.valueOf(2)); + sysUserRole.setUserId(user.getUserId()); + userRoleMapper.insertUserRole(sysUserRole); } insertUserRole(user); return rows; diff --git a/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dcbb2ef..09e1356 100644 --- a/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/zhiLian-modules/zhiLian-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -34,6 +34,10 @@ (#{item.userId},#{item.roleId}) + + insert into sys_user_role(user_id, role_id) + values (#{userId}, #{roleId}) + delete diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/controller/VehicleController.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/controller/VehicleController.java index 5ea4a10..f085dea 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/controller/VehicleController.java +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/controller/VehicleController.java @@ -10,6 +10,7 @@ import com.zhiLian.common.log.annotation.Log; import com.zhiLian.common.log.enums.BusinessType; import com.zhiLian.vehicle.domain.Vehicle; import com.zhiLian.vehicle.service.IVehicleService; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/ManyDataSource.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/ManyDataSource.java index ebffd70..0413857 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/ManyDataSource.java +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/ManyDataSource.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSON; import com.rabbitmq.client.Channel; import com.zhiLian.common.core.utils.SpringUtils; import com.zhiLian.common.redis.service.RedisService; +import com.zhiLian.common.system.remote.RemoteFileService; import com.zhiLian.vehicle.datasource.config.factory.DruidDataSourceFactory; import com.zhiLian.vehicle.datasource.config.role.DynamicDataSource; import com.zhiLian.vehicle.datasource.domain.DataSourceInfo; @@ -43,6 +44,9 @@ public class ManyDataSource { @Autowired private RedisTemplate redisTemplate; +// @Autowired +// private RemoteFileService remoteFileService; + //调用注解 添加队列名称 @RabbitListener(queuesToDeclare = {@Queue(name = "zhiLian-vehicle-exchange")}) @@ -107,6 +111,8 @@ public class ManyDataSource { .port(3306) .build()); }}; +// List entinfos = remoteFileService.listAll(); +// databaseNameList.a(entinfos) List entinfo = redisTemplate.opsForList().range("entinfo", 0, -1); entinfo.forEach(string -> { diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/service/impl/VehicleServiceImpl.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/service/impl/VehicleServiceImpl.java index f30dc92..4277665 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/service/impl/VehicleServiceImpl.java +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/service/impl/VehicleServiceImpl.java @@ -8,6 +8,7 @@ import com.zhiLian.common.system.domain.LoginUser; import com.zhiLian.common.system.domain.SysUser; import com.zhiLian.common.system.remote.RemoteFileService; import com.zhiLian.common.system.remote.RemoteUserService; +import com.zhiLian.vehicle.datasource.config.role.DynamicDataSource; import com.zhiLian.vehicle.domain.Vehicle; import com.zhiLian.vehicle.mapper.VehicleMapper; import com.zhiLian.vehicle.service.IVehicleService; @@ -66,6 +67,7 @@ public class VehicleServiceImpl extends ServiceImpl if (user.getUserType().equals("00")) { return vehicleMapper.selectVehicleList(vehicle); } + // vehicle.setBusinessId(Long.valueOf(user.getUserType())); List vehicles = vehicleMapper.selectVehicleList(vehicle); // vehicles.forEach(vehicle1 -> {