feat:mybatis Plus 联表查询

zhiLian-business/pom.xml

@@ -10,6 +10,10 @@
     </parent>
 
     <artifactId>zhiLian-business</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>zhiLian-data-plus</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -19,7 +23,5 @@
     <description>
         zhiLian-business系统模块
     </description>
-
-
 </project>
 

zhiLian-business/zhiLian-data-plus/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.zhiLian</groupId>
+        <artifactId>zhiLian-business</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>zhiLian-data-plus</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>

zhiLian-business/zhiLian-data-service/pom.xml

@@ -20,6 +20,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join</artifactId>
+            <version>1.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.1</version>
+        </dependency>
         <!--rabbitMQ-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/Job/ManyJob.java

@@ -28,7 +28,7 @@ public class ManyJob {
     @Autowired
     private EntinfoServiceImpl entinfoService;
 
-    @Scheduled(cron = "*/10 * * * * *") // 每10分钟执行一次
+//    @Scheduled(cron = "*/10 * * * * *") // 每10分钟执行一次
     public void manyJob(){
         redisService.deleteObject("entinfo");
         List<Entinfo> list = entinfoService.list();

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/EntinfoController.java

@@ -4,8 +4,12 @@ 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.core.domain.Result;
 import com.zhiLian.common.core.utils.poi.ExcelUtil;
 import com.zhiLian.common.core.web.controller.BaseController;
@@ -36,6 +40,16 @@ public class EntinfoController extends BaseController
     @Autowired
     private IEntinfoService entinfoService;
 
+    @Autowired
+    private PlusService plusService;
+
+    @PostMapping("cartLiat")
+    public Result cartList(@RequestBody CartVo cartVo){
+        List<Cart> list = plusService.list();
+        System.out.println(list);
+        return plusService.cartList();
+    }
+
     /**
      * 查询多数据源列表
      */

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/controller/PlusController.java

@@ -0,0 +1,15 @@
+package com.zhiLian.business.controller;
+
+
+import com.zhiLian.business.domain.Business;
+import com.zhiLian.business.mapper.BusinessMapper;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName PlusController
+ * @Date 2024/06/09 15:28
+ */
+public class PlusController{
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Cart.java

@@ -0,0 +1,35 @@
+package com.zhiLian.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.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName Cart
+ * @Date 2024/06/09 15:40
+ */
+@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;
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/CartVo.java

@@ -0,0 +1,30 @@
+package com.zhiLian.business.domain;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhiLian.common.core.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName BusinessVo
+ * @Date 2024/06/09 15:34
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class CartVo {
+    private Long id;
+    private String name;
+    private String typeName;
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/domain/Type.java

@@ -0,0 +1,31 @@
+package com.zhiLian.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;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName Type
+ * @Date 2024/06/09 15:40
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("type")
+public class Type {
+
+    @TableId
+    private Long id;
+
+    @TableField(value = "type_name")
+    private String typeName;
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/BusinessMapper.java

@@ -10,8 +10,6 @@ import java.util.List;
 
 /**
  * 企业Mapper接口
- *
- * @author muyu
  * @date 2024-05-26
  */
 public interface BusinessMapper extends BaseMapper<Business>

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/PlusMapper.java

@@ -0,0 +1,19 @@
+package com.zhiLian.business.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.zhiLian.business.domain.Cart;
+import com.zhiLian.business.domain.CartVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName PlusMapper
+ * @Date 2024/06/09 15:33
+ */
+@Mapper
+public interface PlusMapper extends MPJBaseMapper<Cart> {
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/mapper/TypeMapper.java

@@ -0,0 +1,20 @@
+package com.zhiLian.business.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.zhiLian.business.domain.Cart;
+import com.zhiLian.business.domain.Type;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.poi.ss.formula.functions.T;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName PlusMapper
+ * @Date 2024/06/09 15:33
+ */
+@Mapper
+public interface TypeMapper extends BaseMapper<Type> {
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/PlusService.java

@@ -0,0 +1,19 @@
+package com.zhiLian.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.github.yulichang.base.MPJBaseService;
+import com.zhiLian.business.domain.Cart;
+import com.zhiLian.business.domain.CartVo;
+import com.zhiLian.common.core.domain.Result;
+
+/**
+ * @ClassName PlusService
+ * @Description 描述
+ * @Author BingRui.Hou
+ * @Date 2024/06/09 15:36
+ */
+public interface PlusService extends IService<Cart> {
+    Result cartList();
+
+}

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/BusinessServiceImpl.java

@@ -186,21 +186,22 @@ public class BusinessServiceImpl extends ServiceImpl<BusinessMapper, Business>
                     new InputStreamReader(httpConn.getInputStream()));
             String resultData = br.readLine();
             System.out.println("从服务端返回结果: " + resultData);
-            Entinfo build = Entinfo.builder()
-                    .entCode("test_" + business.getId())
-                    .ip("192.168.120.128")
-                    .port(Integer.valueOf(3306 + Integer.valueOf(String.valueOf(business.getId())))).build();
-            entinfoService.insertEntinfo(build);
-            rabbitTemplate.convertAndSend("zhiLian-vehicle-exchange",JSON.toJSONString(build),message ->{
-                message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
-                return message;
-            } );
             // 7.关闭HttpURLConnection连接
             httpConn.disconnect();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
+        Entinfo build = Entinfo.builder()
+                .entCode("test_" + business.getId())
+                .ip("192.168.120.128")
+                .port(Integer.valueOf(3306 + Integer.valueOf(String.valueOf(business.getId())))).build();
+        entinfoService.insertEntinfo(build);
+        rabbitTemplate.convertAndSend("zhiLian-vehicle-exchange",JSON.toJSONString(build),message ->{
+            message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
+            return message;
+        } );
+
     }
 
     /**

zhiLian-business/zhiLian-data-service/src/main/java/com/zhiLian/business/service/impl/PlusServiceImpl.java

@@ -0,0 +1,58 @@
+package com.zhiLian.business.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.zhiLian.business.domain.Cart;
+import com.zhiLian.business.domain.CartVo;
+import com.zhiLian.business.domain.Type;
+import com.zhiLian.business.mapper.PlusMapper;
+import com.zhiLian.business.mapper.TypeMapper;
+import com.zhiLian.business.service.PlusService;
+import com.zhiLian.common.core.domain.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName PlusServiceImpl
+ * @Date 2024/06/09 15:37
+ */
+@Service
+public class PlusServiceImpl extends MPJBaseServiceImpl<PlusMapper, Cart> implements PlusService {
+
+    @Autowired
+    private PlusMapper plusMapper;
+
+    @Autowired
+    private TypeMapper typeMapper;
+
+    @Override
+    public Result cartList() {
+        MPJLambdaWrapper<Cart> mpjLambdaWrapper = new MPJLambdaWrapper<Cart>()
+                .selectAll( Cart.class) //查询主表所有的字段
+                .select(Type::getTypeName) //查询类型名称
+                .leftJoin(Type.class, Type::getId, Cart::getTypeId);//左连接查询，相当于 left join type on dept.id=user.dept_id
+        List<CartVo> cartList = plusMapper.selectJoinList(CartVo.class, mpjLambdaWrapper);
+//        return Result.success(cartList);
+
+
+//        MPJLambdaWrapper<Cart> mpjLambdaWrapper1 = new MPJLambdaWrapper<>();
+//        MPJLambdaWrapper<Cart> lambdaWrapper = mpjLambdaWrapper1.eq(Cart::getId, "1");
+        List<Cart> list = this.list();
+        list.stream().forEach(cart -> {
+            LambdaQueryWrapper<Type> 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());
+
+    }
+}

zhiLian-business/zhiLian-data-service/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     password: guest
     virtualHost: /
     port: 5672
-    host: 192.168.120.128
+    host: 122.51.111.225
     listener:
       simple:
         prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/ManyDataSource.java

@@ -90,7 +90,7 @@ public class ManyDataSource {
             }
         } catch (Exception e) {
             //删除队列ID
-            log.info("消费重复");
+            log.info("消费失败");
             try {
                 //回退消息
                 channel.basicReject(message.getMessageProperties().getDeliveryTag(),true);

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/datasource/contents/DatasourceContent.java

@@ -7,7 +7,7 @@ package com.zhiLian.vehicle.datasource.contents;
  */
 public class DatasourceContent {
 
-    public final static String DATASOURCE_URL = "jdbc:mysql://{}:{}/zhiLian-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
+    public final static String DATASOURCE_URL = "jdbc:mysql://{}:{}/zh iLian-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
 
     public final static String USER_NAME = "root";
 

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/Type.java

@@ -0,0 +1,31 @@
+package com.zhiLian.vehicle.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;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName Type
+ * @Date 2024/06/09 15:40
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("type")
+public class Type {
+
+    @TableId
+    private Long id;
+
+    @TableField(value = "type_name")
+    private String typeName;
+}

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/vo/VehicleVo.java

@@ -0,0 +1,54 @@
+package com.zhiLian.vehicle.domain.vo;
+
+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;
+
+/**
+ * 车辆录入对象 vehicle
+ *
+ * @author muyu
+ * @date 2024-05-27
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehicleVo extends BaseEntity
+{
+
+
+    /** 车辆主键 */
+    private Long id;
+
+    /** 车辆vin */
+    private String number;
+
+    /** 电子围栏ID */
+    private Long electonicId;
+
+    /** 电机厂商 */
+    private String motor;
+
+    /** 电池厂商 */
+    private String battery;
+
+    /** 电机编号 */
+    private Long motorNumber;
+
+    /** 电池编号 */
+    private Long batteryNumber;
+
+    /** 企业ID */
+//    @Excel(name = "企业ID")
+//    private Long businessId;
+    private Long groupId;
+
+    private String typeName;
+
+}

zhiLian-vehicle/zhiLian-vehicle-service/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     password: guest
     virtualHost: /
     port: 5672
-    host: 192.168.120.128
+    host: 122.51.111.225
     listener:
       simple:
         prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条