diff --git a/muyu-auth/pom.xml b/muyu-auth/pom.xml index a8ddedc..30213c1 100644 --- a/muyu-auth/pom.xml +++ b/muyu-auth/pom.xml @@ -52,6 +52,11 @@ muyu-common-security + + com.muyu + muyu-common + 3.6.3 + diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Entinfo.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Entinfo.java new file mode 100644 index 0000000..a1dcbd1 --- /dev/null +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Entinfo.java @@ -0,0 +1,44 @@ +package com.muyu.common.core.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.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/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java index 96dd181..59b5728 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java @@ -1,15 +1,19 @@ package com.muyu.common.system.remote; - +import com.muyu.common.core.domain.Entinfo; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysFile; import com.muyu.common.system.remote.factory.RemoteFileFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * 文件服务 * @@ -26,4 +30,11 @@ 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/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java index 395f74f..ef73bd2 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java @@ -1,5 +1,5 @@ package com.muyu.common.system.remote.factory; - +import com.muyu.common.core.domain.Entinfo; import com.muyu.common.core.domain.Result; import com.muyu.common.system.remote.RemoteFileService; import com.muyu.common.system.domain.SysFile; @@ -9,6 +9,8 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * 文件服务降级处理 * @@ -26,6 +28,16 @@ public class RemoteFileFallbackFactory implements FallbackFactory upload (MultipartFile file) { return Result.error("上传文件失败:" + throwable.getMessage()); } + + @Override + public Result getInfo(Long id) { + return Result.error("获取失败:" + throwable.getMessage()); + } + + @Override + public List listAll() { + return null; + } }; } } diff --git a/muyu-modules/muyu-business/muyu-data-service/pom.xml b/muyu-modules/muyu-business/muyu-data-service/pom.xml index f5d4223..35b46b2 100644 --- a/muyu-modules/muyu-business/muyu-data-service/pom.xml +++ b/muyu-modules/muyu-business/muyu-data-service/pom.xml @@ -19,6 +19,19 @@ + + + com.github.yulichang + mybatis-plus-join + 1.2.4 + + + + com.baomidou + mybatis-plus-boot-starter + 3.5.1 + + org.springframework.boot diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java index 2c6a73d..1e229e3 100644 --- a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java @@ -1,10 +1,12 @@ package com.muyu.business; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * qidong XiaoHuangBusinessApplication diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/config/RabbitmqConfig.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/config/RabbitmqConfig.java index 7b9e0d8..b27c687 100644 --- a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/config/RabbitmqConfig.java +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/config/RabbitmqConfig.java @@ -1,7 +1,8 @@ package com.muyu.business.config; -import ch.qos.logback.classic.pattern.MessageConverter; +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,8 +11,6 @@ public class RabbitmqConfig { // 消息转换配置 @Bean public MessageConverter jsonMessageConverter() { - -// return new Jackson2JsonMessageConverter(); -return null; + return new Jackson2JsonMessageConverter(); } } diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Cart.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Cart.java new file mode 100644 index 0000000..477c8dd --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Cart.java @@ -0,0 +1,37 @@ +package com.muyu.business.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * Cart + * + * @author xiaohuang + * on 2024/6/10 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("cart") +public class Cart { + + @TableId + private Long id; + + @TableField(value = "name") + private String name; + + + @TableField(value = "type_id") + private Long typeId; + + + +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/CartVo.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/CartVo.java new file mode 100644 index 0000000..8383a2d --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/CartVo.java @@ -0,0 +1,24 @@ +package com.muyu.business.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * CartVo + * + * @author xiaohuang + * on 2024/6/10 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class CartVo { + + private Long id; + private String name; + private String typeName; +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Type.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Type.java new file mode 100644 index 0000000..4b0e8c1 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Type.java @@ -0,0 +1,30 @@ +package com.muyu.business.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * Type + * + * @author xiaohuang + * on 2024/6/10 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("type") +public class Type { + + @TableId + private Long id; + + @TableField(value = "type_name") + private String typeName; +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/feign/EntInfoFeign.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/feign/EntInfoFeign.java new file mode 100644 index 0000000..cf83cf3 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/feign/EntInfoFeign.java @@ -0,0 +1,21 @@ +package com.muyu.business.feign; + +import com.muyu.business.domain.Entinfo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +/** + * EntInfoFeign + * + * @author xiaohuang + * on 2024/6/10 + */ + +@FeignClient(value = "muyu-business-service" ) +public interface EntInfoFeign { + + @GetMapping("ListAll") + public List listAll(); +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/PlusMapper.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/PlusMapper.java new file mode 100644 index 0000000..e5f350c --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/PlusMapper.java @@ -0,0 +1,18 @@ +package com.muyu.business.mapper; + + + +import com.github.yulichang.base.MPJBaseMapper; +import com.muyu.business.domain.Cart; +import org.apache.ibatis.annotations.Mapper; + +/** + * BingRui.Hou + * + * @Description 描述 + * @ClassName PlusMapper + * @Date 2024/06/09 15:33 + */ +@Mapper +public interface PlusMapper extends MPJBaseMapper { +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/TypeMapper.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/TypeMapper.java new file mode 100644 index 0000000..cb1d1b7 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/TypeMapper.java @@ -0,0 +1,17 @@ +package com.muyu.business.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.business.domain.Type; +import org.apache.ibatis.annotations.Mapper; + +/** + * BingRui.Hou + * + * @Description 描述 + * @ClassName PlusMapper + * @Date 2024/06/09 15:33 + */ +@Mapper +public interface TypeMapper extends BaseMapper { +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/PlusService.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/PlusService.java new file mode 100644 index 0000000..9447fd7 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/PlusService.java @@ -0,0 +1,16 @@ +package com.muyu.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.business.domain.Cart; +import com.muyu.common.core.domain.Result; + +/** + * @ClassName PlusService + * @Description 描述 + * @Author BingRui.Hou + * @Date 2024/06/09 15:36 + */ +public interface PlusService extends IService { + Result cartList(); + +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/PlusServiceImpl.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/PlusServiceImpl.java new file mode 100644 index 0000000..4c9f755 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/PlusServiceImpl.java @@ -0,0 +1,55 @@ +package com.muyu.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.muyu.business.domain.Cart; +import com.muyu.business.domain.CartVo; +import com.muyu.business.domain.Type; +import com.muyu.business.mapper.PlusMapper; +import com.muyu.business.mapper.TypeMapper; +import com.muyu.business.service.PlusService; +import com.muyu.common.core.domain.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * PlusServiceImpl + * + * @author xiaohuang + * on 2024/6/10 + */ + +@Service +public class PlusServiceImpl extends MPJBaseServiceImpl implements PlusService { + + + @Autowired + private PlusMapper plusMapper; + + @Autowired + private TypeMapper typeMapper; + + @Override + public Result cartList(){ + MPJLambdaWrapper mpjLambdaWrapper = new MPJLambdaWrapper() + .selectAll( Cart.class) //查询主表所有的字段 + .select(Type::getTypeName) //查询类型名称 + .leftJoin(Type.class, Type::getId, Cart::getTypeId);//左连接查询，相当于 left join type on dept.id=user.dept_id + List cartList = plusMapper.selectJoinList(CartVo.class, mpjLambdaWrapper); + + + List list = this.list(); + list.stream().forEach(cart -> { + + LambdaQueryWrapper typeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + Type type = typeMapper.selectOne(typeLambdaQueryWrapper.eq(Type::getId, cart.getTypeId())); + cart.setName(type.getTypeName()); + + }); + System.out.println(list); + return Result.success(list,cartList.toString()); + } +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml index 8cdd629..a915013 100644 --- a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml @@ -4,6 +4,17 @@ server: # Spring spring: + rabbitmq: + username: guest + password: guest + virtualHost: / + port: 5672 + host: 122.51.111.225 + listener: + simple: + prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) application: # 应用名称 name: muyu-business diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/mapper/business/entInfo/EntinfoMapper.xml b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/mapper/business/entInfo/EntinfoMapper.xml new file mode 100644 index 0000000..6ec3383 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/mapper/business/entInfo/EntinfoMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + select ent_code, ip, port, id from entinfo + + + + + + + + insert into entinfo + + ent_code, + ip, + port, + + + #{entCode}, + #{ip}, + #{port}, + + + + + update entinfo + + ent_code = #{entCode}, + ip = #{ip}, + port = #{port}, + + where id = #{id} + + + + delete from entinfo where id = #{id} + + + + delete from entinfo where id in + + #{id} + + + diff --git a/muyu-modules/muyu-modules-many-datasource/pom.xml b/muyu-modules/muyu-modules-many-datasource/pom.xml index cda401d..ce5defb 100644 --- a/muyu-modules/muyu-modules-many-datasource/pom.xml +++ b/muyu-modules/muyu-modules-many-datasource/pom.xml @@ -44,6 +44,12 @@ spring-boot-starter-actuator + + com.muyu + muyu-common + 3.6.3 + + io.springfox @@ -80,6 +86,14 @@ com.muyu muyu-common-swagger + + com.muyu + muyu-common-security + + + com.muyu + muyu-common-core + diff --git a/muyu-modules/muyu-modules-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java b/muyu-modules/muyu-modules-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java index 9477caf..4c8ceff 100644 --- a/muyu-modules/muyu-modules-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java +++ b/muyu-modules/muyu-modules-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java @@ -1,10 +1,12 @@ package com.muyu.cloud; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 多数据源启动类 CloudManyDataSourceApplication @@ -16,7 +18,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication +@SpringBootApplication(exclude = {DynamicDataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class}) public class CloudManyDataSourceApplication { public static void main(String[] args) { diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml index d767ec0..1b45181 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml @@ -4,6 +4,17 @@ server: # Spring spring: + rabbitmq: + username: guest + password: guest + virtualHost: / + port: 5672 + host: 122.51.111.225 + listener: + simple: + prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) application: # 应用名称 name: muyu-vehicle diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 4632831..f9ef819 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -23,5 +23,11 @@ muyu-modules业务模块 + + + com.muyu + muyu-common-security + +