diff --git a/pom.xml b/pom.xml index ef3b8b5..baca097 100644 --- a/pom.xml +++ b/pom.xml @@ -221,6 +221,7 @@ zhiLian-business/zhiLian-data-service zhiLian-cloud-datasource zhiLian-cloud-datasource/zhiLian-datasource-service + zhiLian-common/zhiLian-common-business pom diff --git a/zhiLian-business/zhiLian-data-service/pom.xml b/zhiLian-business/zhiLian-data-service/pom.xml index e148732..f3e9ffc 100644 --- a/zhiLian-business/zhiLian-data-service/pom.xml +++ b/zhiLian-business/zhiLian-data-service/pom.xml @@ -25,6 +25,11 @@ mybatis-plus-join 1.2.4 + + com.zhiLian + zhiLian-common-business + 3.6.3 + com.baomidou mybatis-plus-boot-starter diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/Job/ManyJob.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/Job/ManyJob.java index 30a8438..0f9808b 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/Job/ManyJob.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/Job/ManyJob.java @@ -1,8 +1,9 @@ package com.zhiLian.business.Job; -import com.zhiLian.business.domain.Entinfo; + import com.zhiLian.business.service.impl.EntinfoServiceImpl; +import com.zhiLian.common.business.domain.Entinfo; import com.zhiLian.common.redis.service.RedisService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +29,7 @@ public class ManyJob { @Autowired private EntinfoServiceImpl entinfoService; + // @Scheduled(cron = "*/10 * * * * *") // 每10分钟执行一次 public void manyJob(){ redisService.deleteObject("entinfo"); 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 d472ed5..b0fa415 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 @@ -1,22 +1,19 @@ package com.zhiLian.business.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import com.zhiLian.business.domain.Cart; import com.zhiLian.business.domain.CartVo; -import com.zhiLian.business.domain.Entinfo; import com.zhiLian.business.service.IEntinfoService; import com.zhiLian.business.service.PlusService; -import com.zhiLian.business.service.impl.PlusServiceImpl; +import com.zhiLian.common.business.domain.Entinfo; import com.zhiLian.common.core.domain.Result; import com.zhiLian.common.core.utils.poi.ExcelUtil; import com.zhiLian.common.core.web.controller.BaseController; import com.zhiLian.common.core.web.page.TableDataInfo; import com.zhiLian.common.log.annotation.Log; import com.zhiLian.common.log.enums.BusinessType; -import com.zhiLian.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -62,7 +59,7 @@ public class EntinfoController extends BaseController return getDataTable(list); } - @GetMapping("ListAll") + @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 index f43e52e..b0c3ee7 100644 --- 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 @@ -1,7 +1,8 @@ package com.zhiLian.business.feign; -import com.zhiLian.business.domain.Entinfo; + +import com.zhiLian.common.business.domain.Entinfo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -16,6 +17,6 @@ import java.util.List; */ @FeignClient(value = "zhiLian-business-service") public interface EntInfoFeign { - @GetMapping("ListAll") + @GetMapping("/entinfo/listAll") public List listAll(); } diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/EntinfoMapper.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/EntinfoMapper.java index 9c36a2a..b315798 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/EntinfoMapper.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/EntinfoMapper.java @@ -3,7 +3,7 @@ package com.zhiLian.business.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhiLian.business.domain.Entinfo; +import com.zhiLian.common.business.domain.Entinfo; /** * 多数据源Mapper接口 diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/IEntinfoService.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/IEntinfoService.java index f749836..361a7cb 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/IEntinfoService.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/IEntinfoService.java @@ -1,8 +1,7 @@ package com.zhiLian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhiLian.business.domain.Business; -import com.zhiLian.business.domain.Entinfo; +import com.zhiLian.common.business.domain.Entinfo; import java.util.List; 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 552de94..4593bb4 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 @@ -4,13 +4,12 @@ package com.zhiLian.business.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhiLian.business.config.RabbitmqConfig; import com.zhiLian.business.domain.Business; -import com.zhiLian.business.domain.Entinfo; import com.zhiLian.business.mapper.BusinessMapper; //import com.zhiLian.business.remote.factory.RemoteUserLoginFactory; import com.zhiLian.business.service.IBusinessService; +import com.zhiLian.common.business.domain.Entinfo; import com.zhiLian.common.core.domain.Result; import com.zhiLian.common.core.utils.DateUtils; import com.zhiLian.common.redis.service.RedisService; @@ -18,24 +17,18 @@ import com.zhiLian.common.security.utils.SecurityUtils; import com.zhiLian.common.system.domain.LoginUser; import com.zhiLian.common.system.domain.SysUser; import com.zhiLian.common.system.remote.RemoteUserService; -import org.apache.catalina.User; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.ProtocolException; import java.net.URL; import java.util.HashMap; import java.util.List; import java.util.UUID; -import java.util.concurrent.TimeUnit; /** * 企业Service业务层处理 @@ -160,6 +153,7 @@ public class BusinessServiceImpl extends ServiceImpl @Autowired private RabbitTemplate rabbitTemplate; + /** * http URL 链接 * @param business @@ -196,12 +190,12 @@ public class BusinessServiceImpl extends ServiceImpl new InputStreamReader(httpConn.getInputStream())); String resultData = br.readLine(); System.out.println("从服务端返回结果: " + resultData); - // 7.关闭HttpURLConnection连接 httpConn.disconnect(); } catch (Exception e) { throw new RuntimeException(e); } + Entinfo build = Entinfo.builder() .entCode("test_" + business.getId()) .ip("192.168.120.128") diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/EntinfoServiceImpl.java b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/EntinfoServiceImpl.java index d376256..9d418a9 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/EntinfoServiceImpl.java +++ b/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/EntinfoServiceImpl.java @@ -3,10 +3,9 @@ package com.zhiLian.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhiLian.business.domain.Business; -import com.zhiLian.business.domain.Entinfo; import com.zhiLian.business.mapper.EntinfoMapper; import com.zhiLian.business.service.IEntinfoService; +import com.zhiLian.common.business.domain.Entinfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml b/zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml index 0499dfb..068dc81 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml +++ b/zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ spring: password: guest virtualHost: / port: 5672 - host: 111.229.102.61 + host: 43.142.12.243 listener: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 diff --git a/zhiLian-business/zhiLian-data-service/src/main/resources/mapper/entInfo/EntinfoMapper.xml b/zhiLian-business/zhiLian-data-service/src/main/resources/mapper/entInfo/EntinfoMapper.xml index 0a1cda3..f734160 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/resources/mapper/entInfo/EntinfoMapper.xml +++ b/zhiLian-business/zhiLian-data-service/src/main/resources/mapper/entInfo/EntinfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ent_code, ip, port, id from entinfo - and ent_code = #{entCode} @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - and ent_code = #{entCode} @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into entinfo ent_code, @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update entinfo ent_code = #{entCode}, diff --git a/zhiLian-common/zhiLian-common-business/pom.xml b/zhiLian-common/zhiLian-common-business/pom.xml new file mode 100644 index 0000000..c65294b --- /dev/null +++ b/zhiLian-common/zhiLian-common-business/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.zhiLian + zhiLian-server + 3.6.3 + ../../pom.xml + + + zhiLian-common-business + + + 17 + 17 + UTF-8 + + + + + + com.zhiLian + zhiLian-common-core + + + + diff --git a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/EntInfo.java b/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/domain/Entinfo.java similarity index 95% rename from zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/EntInfo.java rename to zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/domain/Entinfo.java index 775f251..3a115c2 100644 --- a/zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/EntInfo.java +++ b/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/domain/Entinfo.java @@ -1,4 +1,4 @@ -package com.zhiLian.business.domain; +package com.zhiLian.common.business.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.zhiLian.common.core.annotation.Excel; diff --git a/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/remote/RemoteBusinessService.java b/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/remote/RemoteBusinessService.java new file mode 100644 index 0000000..e0b33c2 --- /dev/null +++ b/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/remote/RemoteBusinessService.java @@ -0,0 +1,22 @@ +package com.zhiLian.common.business.remote; + +import com.zhiLian.common.business.domain.Entinfo; +import com.zhiLian.common.business.remote.factory.RemoteBusinessFallbackFactory; +import com.zhiLian.common.core.constant.ServiceNameConstants; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +/** + * 用户服务 + * + * @author zhiLian + */ +@FeignClient(contextId = "remoteBusinessService", value = ServiceNameConstants.SYSTEM_BUSINESS, fallbackFactory = RemoteBusinessFallbackFactory.class) +public interface RemoteBusinessService { + + + @GetMapping("/entinfo/listAll") + public List listAll(); +} diff --git a/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/remote/factory/RemoteBusinessFallbackFactory.java b/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/remote/factory/RemoteBusinessFallbackFactory.java new file mode 100644 index 0000000..83d922c --- /dev/null +++ b/zhiLian-common/zhiLian-common-business/src/main/java/com/zhiLian/common/business/remote/factory/RemoteBusinessFallbackFactory.java @@ -0,0 +1,33 @@ +package com.zhiLian.common.business.remote.factory; + +import com.zhiLian.common.business.domain.Entinfo; +import com.zhiLian.common.business.remote.RemoteBusinessService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 用户服务降级处理 + * + * @author zhiLian + */ +@Component +public class RemoteBusinessFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteBusinessFallbackFactory.class); + + @Override + public RemoteBusinessService create (Throwable throwable) { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteBusinessService(){ + + + @Override + public List listAll() { + return null; + } + }; + } +} diff --git a/zhiLian-common/zhiLian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhiLian-common/zhiLian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b624ab9 --- /dev/null +++ b/zhiLian-common/zhiLian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.zhiLian.common.business.remote.factory.RemoteBusinessFallbackFactory diff --git a/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/constant/ServiceNameConstants.java b/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/constant/ServiceNameConstants.java index bc6efee..cb3aa73 100644 --- a/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/constant/ServiceNameConstants.java +++ b/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/constant/ServiceNameConstants.java @@ -15,6 +15,7 @@ public class ServiceNameConstants { * 系统模块的serviceid */ public static final String SYSTEM_SERVICE = "zhiLian-system"; + public static final String SYSTEM_BUSINESS = "zhiLian-business"; /** * 文件服务的serviceid 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 deleted file mode 100644 index d18089f..0000000 --- a/zhiLian-common/zhiLian-common-core/src/main/java/com/zhiLian/common/core/domain/Entinfo.java +++ /dev/null @@ -1,44 +0,0 @@ -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 d6366c5..7d15276 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,7 +1,6 @@ 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; @@ -34,8 +33,7 @@ public interface RemoteFileService { @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 2ea529d..c180114 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,6 +1,5 @@ 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; @@ -35,10 +34,7 @@ public class RemoteFileFallbackFactory implements FallbackFactory listAll() { - return null; - } + }; } } diff --git a/zhiLian-modules/zhiLian-modules-gen/src/main/java/com/zhiLian/gen/controller/GenController.java b/zhiLian-modules/zhiLian-modules-gen/src/main/java/com/zhiLian/gen/controller/GenController.java index f92c1d5..01f8423 100644 --- a/zhiLian-modules/zhiLian-modules-gen/src/main/java/com/zhiLian/gen/controller/GenController.java +++ b/zhiLian-modules/zhiLian-modules-gen/src/main/java/com/zhiLian/gen/controller/GenController.java @@ -73,7 +73,6 @@ public class GenController extends BaseController { List list = genTableService.selectDbTableList(genTable); return getDataTable(list); } - /** * 查询数据表字段列表 */ diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/pom.xml b/zhiLian-vehicle/zhiLian-vehicle-service/pom.xml index 9193f17..144576a 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/pom.xml +++ b/zhiLian-vehicle/zhiLian-vehicle-service/pom.xml @@ -20,7 +20,11 @@ zhiLian-vehicle-service业务系统模块 - + + com.zhiLian + zhiLian-common-business + 3.6.3 + com.zhiLian zhiLian-common-system diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/ZhiLianVehicleApplication.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/ZhiLianVehicleApplication.java index 23cc5ce..c9f129f 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/ZhiLianVehicleApplication.java +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/ZhiLianVehicleApplication.java @@ -8,6 +8,7 @@ import com.zhiLian.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -21,7 +22,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication(exclude = {DynamicDataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class }) -@EnableScheduling public class ZhiLianVehicleApplication { public static void main (String[] args) { SpringApplication.run(ZhiLianVehicleApplication.class, args); 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 d5e72eb..923a5af 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 @@ -4,13 +4,13 @@ package com.zhiLian.vehicle.datasource; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.fastjson2.JSON; import com.rabbitmq.client.Channel; +import com.zhiLian.common.business.domain.Entinfo; +import com.zhiLian.common.business.remote.RemoteBusinessService; 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; -import com.zhiLian.vehicle.datasource.domain.Entinfo; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.Queue; @@ -21,10 +21,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Primary; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -42,38 +40,33 @@ public class ManyDataSource { - @PostConstruct - public void init() { - new Thread(() -> { - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - - }).start(); - } - @Autowired private RedisTemplate redisTemplate; + @Autowired + private RemoteBusinessService remoteBusinessService; + // @Autowired -// private RemoteFileService remoteFileService; +// private EntInfoFeign entInfoFeign; - - //调用注解 添加队列名称 - @RabbitListener(queuesToDeclare = {@Queue(name = "zhiLian-vehicle-exchange")}) - public void smsConfig(String msg, Message message, Channel channel){ - //获取消息的ID + // @PostConstruct +// public void init() { // new Thread(() -> { // try { // Thread.sleep(10000); // } catch (InterruptedException e) { // throw new RuntimeException(e); // } +// // }).start(); +// } + + //调用注解 添加队列名称 + @RabbitListener(queuesToDeclare = {@Queue(name = "zhiLian-vehicle-exchange")}) + public void smsConfig(String msg, Message message, Channel channel){ + //获取消息的ID String messageId = message.getMessageProperties().getMessageId(); try { //添加消息id到redis set集合中 添加成功返回1 表示未消费 添加失败返回0 表示已消费 @@ -103,7 +96,6 @@ public class ManyDataSource { private void druidData(String msg) { Entinfo entinfo1 = JSON.parseObject(msg, Entinfo.class); log.info("消息为：{}",entinfo1); - DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class); DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(entinfo1.getEntCode(), entinfo1.getIp(), entinfo1.getPort()); @@ -120,14 +112,19 @@ public class ManyDataSource { .port(3306) .build()); }}; -// List entinfos = remoteFileService.listAll(); -// databaseNameList.a(entinfos) - List entinfo = redisTemplate.opsForList().range("entinfo", 0, -1); + List list = remoteBusinessService.listAll(); + databaseNameList.addAll(list); + +// List entinfo = redisTemplate.opsForList().range("entinfo", 0, -1); +// entinfo.forEach(string -> { +// Entinfo entInfo = JSON.parseObject(String.valueOf(string), Entinfo.class); +// databaseNameList.add(entInfo); +// }); + +// List entinfos = entInfoFeign.listAll(); +// databaseNameList.addAll(entinfos); + - entinfo.forEach(string -> { - Entinfo entInfo = JSON.parseObject(string, Entinfo.class); - databaseNameList.add(entInfo); - }); // if(SecurityUtils.getLoginUser() == null){ // return databaseNameList; // }else{ diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/role/DynamicDataSource.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/role/DynamicDataSource.java index fc0bce3..f3db0a2 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/role/DynamicDataSource.java +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/config/role/DynamicDataSource.java @@ -27,6 +27,7 @@ public class DynamicDataSource extends AbstractRoutingDataSource { */ private Map defineTargetDataSources; + /** * 决定当前线程使用哪个数据源 */ @@ -35,6 +36,7 @@ public class DynamicDataSource extends AbstractRoutingDataSource { return DynamicDataSourceHolder.getDynamicDataSourceKey(); } + /** * 添加数据库 * @param key 键 diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/domain/Entinfo.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/domain/Entinfo.java deleted file mode 100644 index 0cc5422..0000000 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/domain/Entinfo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zhiLian.vehicle.datasource.domain; - - -import com.baomidou.mybatisplus.annotation.TableName; -import com.zhiLian.common.core.annotation.Excel; -import com.zhiLian.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - -import java.io.Serializable; - -/** - * BingRui.Hou - * - * @Description 描述 - * EntInfo - * @Date 2024/06/04 14:34 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class Entinfo extends BaseEntity implements Serializable -{ - 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-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/feign/EntInfoFeign.java b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/feign/EntInfoFeign.java new file mode 100644 index 0000000..d00531b --- /dev/null +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/feign/EntInfoFeign.java @@ -0,0 +1,21 @@ +//package com.zhiLian.vehicle.datasource.feign; +// +// +//import com.zhiLian.common.business.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("/entinfo/listAll") +// public List listAll(); +//} diff --git a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/resources/bootstrap.yml b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/resources/bootstrap.yml index 4a6cf64..4128206 100644 --- a/zhiLian-vehicle/zhiLian-vehicle-service/src/main/resources/bootstrap.yml +++ b/zhiLian-vehicle/zhiLian-vehicle-service/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ spring: password: guest virtualHost: / port: 5672 - host: 111.229.102.61 + host: 43.142.12.243 listener: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条